Changeset 28db46b in mainline

Timestamp:

2020-01-25T22:26:50Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

01c2759

Parents:

2012fe0

Message:

Clear pointer by properly repainting what's under

File:

• uspace/srv/hid/display/seat.c (modified) (5 diffs)

uspace/srv/hid/display/seat.c

@@ -183 +183 @@
 }
 
-/** Draw or clear seat pointer
- *
- * @param seat Seat
- * @param shown @c true to display pointer, @c false to clear it
- *
- * @return EOK on success or an error code
- */
-static errno_t ds_seat_draw_pointer(ds_seat_t *seat, bool shown)
+/** Draw seat pointer
+ *
+ * @param seat Seat
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t ds_seat_draw_pointer(ds_seat_t *seat)
 {
         errno_t rc;
@@ -204 +203 @@
                 goto error;
 
-        rc = ds_seat_draw_cross(seat, 8, 1, shown ? black :
-            seat->display->bg_color);
-        if (rc != EOK)
-                return rc;
-
-        rc = ds_seat_draw_cross(seat, 8, 0, shown ? white :
-            seat->display->bg_color);
-        if (rc != EOK)
-                return rc;
+        rc = ds_seat_draw_cross(seat, 8, 1, black);
+        if (rc != EOK)
+                goto error;
+
+        rc = ds_seat_draw_cross(seat, 8, 0, white);
+        if (rc != EOK)
+                goto error;
+
+        gfx_color_delete(black);
+        gfx_color_delete(white);
 
         return EOK;
@@ -218 +218 @@
         if (black != NULL)
                 gfx_color_delete(black);
+        if (white != NULL)
+                gfx_color_delete(white);
         return rc;
+}
+
+/** Clear seat pointer
+ *
+ * @param seat Seat
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t ds_seat_clear_pointer(ds_seat_t *seat)
+{
+        gfx_rect_t rect;
+
+        rect.p0.x = seat->pntpos.x - 8;
+        rect.p0.y = seat->pntpos.y - 8;
+        rect.p1.x = seat->pntpos.x + 8 + 1;
+        rect.p1.y = seat->pntpos.y + 8 + 1;
+
+        return ds_display_paint(seat->display, &rect);
 }
 
@@ -277 +297 @@
 
                 printf("clear pointer\n");
-                (void) ds_seat_draw_pointer(seat, false);
+                (void) ds_seat_clear_pointer(seat);
                 seat->pntpos = npos;
 
@@ -291 +311 @@
 
                 printf("draw pointer\n");
-                (void) ds_seat_draw_pointer(seat, true);
+                (void) ds_seat_draw_pointer(seat);
         }