Changeset 7dba813 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2012-11-22T09:03:39Z (12 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ba733e83

Parents:

8e6ec6e

Message:

Resolved Ticket #485 (Desktop is slow). GUI is usable in Qemu/non-KVM as long as windows are not transparent, rotated or scaled (i.e. if user limits himself only to translation and resizing).

File:

• uspace/srv/hid/compositor/compositor.c (modified) (3 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -314 +314 @@
                         /* Paint background color. */
                         for (sysarg_t y = y_dmg_vp - vp->pos.y; y <  y_dmg_vp - vp->pos.y + h_dmg_vp; ++y) {
-                                for (sysarg_t x = x_dmg_vp - vp->pos.x; x < x_dmg_vp - vp->pos.x + w_dmg_vp; ++x) {
-                                        surface_put_pixel(vp->surface, x, y, bg_color);
+                                pixel_t *dst = pixelmap_pixel_at(
+                                    surface_pixmap_access(vp->surface), x_dmg_vp - vp->pos.x, y);
+                                sysarg_t count = w_dmg_vp;
+                                while (count-- != 0) {
+                                        *dst++ = bg_color;
                                 }
                         }
+                        surface_add_damaged_region(vp->surface,
+                            x_dmg_vp - vp->pos.x, y_dmg_vp - vp->pos.y, w_dmg_vp, h_dmg_vp);
 
                         transform_t transform;
@@ -381 +386 @@
                                 if (isec_ptr) {
                                         /* Pointer is currently painted directly by copying pixels.
-                                         * However, it is possible to draw the painter similarly
+                                         * However, it is possible to draw the pointer similarly
                                          * as window by using drawctx_transfer. It would allow
                                          * more sophisticated control over drawing, but would also
                                          * cost more regarding the performance. */
 
-                                        pixel_t pix = 0;
                                         sysarg_t x_vp = x_dmg_ptr - vp->pos.x;
                                         sysarg_t y_vp = y_dmg_ptr - vp->pos.y;
@@ -393 +397 @@
 
                                         for (sysarg_t y = 0; y < h_dmg_ptr; ++y) {
-                                                for (sysarg_t x = 0; x < w_dmg_ptr; ++x) {
-                                                        pix = surface_get_pixel(sf_ptr, x_ptr + x, y_ptr + y);
-                                                        if (ALPHA(pix) == 255) {
-                                                                surface_put_pixel(vp->surface, x_vp + x, y_vp + y, pix);
-                                                        }
+                                                pixel_t *src = pixelmap_pixel_at(
+                                                    surface_pixmap_access(sf_ptr), x_ptr, y_ptr + y);
+                                                pixel_t *dst = pixelmap_pixel_at(
+                                                    surface_pixmap_access(vp->surface), x_vp, y_vp + y);
+                                                sysarg_t count = w_dmg_ptr;
+                                                while (count-- != 0) {
+                                                        *dst = (*src & 0xff000000) ? *src : *dst;
+                                                        ++dst; ++src;
                                                 }
                                         }
+                                        surface_add_damaged_region(vp->surface, x_vp, y_vp, w_dmg_ptr, h_dmg_ptr);
                                 }
                         }