Changeset c79545e in mainline for uspace/srv/hid/display/seat.c

Timestamp:

2020-01-19T10:00:11Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2012fe0

Parents:

946a666

Message:

Paint desktop background with a solid color

File:

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

uspace/srv/hid/display/seat.c

@@ -139 +139 @@
  * @param len Cross length
  * @param w Cross extra width
- * @param br Brightness (0 to 65535)
+ * @param color Color
  *
  * @return EOK on success or an error code
  */
 static errno_t ds_seat_draw_cross(ds_seat_t *seat, gfx_coord_t len,
-    gfx_coord_t w, uint16_t br)
-{
-        gfx_color_t *color = NULL;
+    gfx_coord_t w, gfx_color_t *color)
+{
         gfx_context_t *gc;
         gfx_rect_t rect, r0;
@@ -154 +153 @@
         if (gc == NULL)
                 return EOK;
-
-        rc = gfx_color_new_rgb_i16(br, br, br, &color);
-        if (rc != EOK)
-                goto error;
 
         rc = gfx_set_color(gc, color);
@@ -183 +178 @@
                 goto error;
 
-        gfx_color_delete(color);
         return EOK;
 error:
-        if (color != NULL)
-                gfx_color_delete(color);
         return rc;
 }
@@ -201 +193 @@
 {
         errno_t rc;
-
-        rc = ds_seat_draw_cross(seat, 8, 1, 0);
+        gfx_color_t *black = NULL;
+        gfx_color_t *white;
+
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &black);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &white);
+        if (rc != EOK)
+                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 ? 65535 : 0);
+        rc = ds_seat_draw_cross(seat, 8, 0, shown ? white :
+            seat->display->bg_color);
         if (rc != EOK)
                 return rc;
 
         return EOK;
+error:
+        if (black != NULL)
+                gfx_color_delete(black);
+        return rc;
 }