Changeset 62018a0 in mainline for uspace/srv/hid/display/cursor.c

Timestamp:

2020-06-24T12:32:04Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8630748

Parents:

2fc1e6d

git-author:

Jiri Svoboda <jiri@…> (2020-06-23 18:31:47)

git-committer:

Jiri Svoboda <jiri@…> (2020-06-24 12:32:04)

Message:

Properly clip cursor when repainting a part of the display

Not doing so was causing excessively large update rectangles, increasing
CPU usage and display artifacts.

File:

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

uspace/srv/hid/display/cursor.c

@@ -89 +89 @@
  * @param cursor Cusor to paint
  * @param pos Position to paint at
+ * @param clip Clipping rectangle or @c NULL
  * @return EOK on success or an error code
  */
-errno_t ds_cursor_paint(ds_cursor_t *cursor, gfx_coord2_t *pos)
+errno_t ds_cursor_paint(ds_cursor_t *cursor, gfx_coord2_t *pos,
+    gfx_rect_t *clip)
 {
         gfx_context_t *dgc;
@@ -98 +100 @@
         gfx_bitmap_alloc_t alloc;
         gfx_coord2_t dims;
+        gfx_rect_t sclip;
+        gfx_rect_t srect;
         pixelmap_t pixelmap;
         pixel_t pixel;
@@ -150 +154 @@
         }
 
-        return gfx_bitmap_render(cursor->bitmap, NULL, pos);
+        /* Determine source rectangle */
+        if (clip == NULL) {
+                srect = cursor->rect;
+        } else {
+                gfx_rect_rtranslate(pos, clip, &sclip);
+                gfx_rect_clip(&cursor->rect, &sclip, &srect);
+        }
+
+        if (!gfx_rect_is_empty(&srect)) {
+                rc = gfx_bitmap_render(cursor->bitmap, &srect, pos);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        return EOK;
 error:
         return rc;