Changeset 946fdd2 in mainline for uspace

Timestamp:

2026-03-18T08:16:33Z (40 hours ago)

Author:

GitHub <noreply@…>

Parents:

222774a (diff), cbaf408 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matej Volf <mat.volfik@…> (2026-03-18 08:16:33)

git-committer:

GitHub <noreply@…> (2026-03-18 08:16:33)

Message:

Merge cbaf408fef7cfefd533ecd43ec15ba0fa2a37154 into 222774a69b1583c34db4419abfda9fa6a1031f74

Location:

uspace

Files:

• lib/display/include/types/display/cursor.h (modified) (1 diff)
• lib/ui/include/types/ui/cursor.h (modified) (1 diff)
• lib/ui/src/window.c (modified) (1 diff)
• srv/hid/display/cursimg.c (modified) (2 diffs)

uspace/lib/display/include/types/display/cursor.h

@@ -49 +49 @@
         dcurs_size_urdl,
         /** I-beam (suggests editable text) */
-        dcurs_ibeam
+        dcurs_ibeam,
+        /** Pointer (suggests clickable object) */
+        dcurs_pointer,
 } display_stock_cursor_t;
 
 enum {
         /** Number of stock cursor types */
-        dcurs_limit = dcurs_ibeam + 1
+        dcurs_limit = dcurs_pointer + 1
 };
 

uspace/lib/ui/include/types/ui/cursor.h

@@ -49 +49 @@
         ui_curs_size_urdl,
         /** I-beam (suggests editable text) */
-        ui_curs_ibeam
+        ui_curs_ibeam,
+        /** Pointer (suggests clickable object) */
+        ui_curs_pointer,
 } ui_stock_cursor_t;
 

uspace/lib/ui/src/window.c

@@ -1346 +1346 @@
                 dcursor = dcurs_ibeam;
                 break;
+        case ui_curs_pointer:
+                dcursor = dcurs_pointer;
+                break;
         }
 

uspace/srv/hid/display/cursimg.c

@@ -159 +159 @@
 };
 
+static uint8_t pointer_img[] = {
+        0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 1, 2, 2, 2, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0,
+        0, 1, 1, 0, 1, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, 1, 1, 1, 0,
+        1, 2, 2, 1, 1, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, 1, 2, 2, 1,
+        1, 2, 2, 1, 1, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, 1, 2, 2, 1,
+        1, 2, 2, 1, 1, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, 1, 2, 2, 1,
+        1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+        1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+        0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+        0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+        0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+        0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+        0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+        0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+        0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+        0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 0,
+        0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 0, 0,
+        0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0
+};
+
 ds_cursimg_t ds_cursimg[dcurs_limit] = {
         {
@@ -183 +207 @@
                 .rect = { -5, -9, 6, 10 },
                 .image = ibeam_img
+        },
+        {
+                .rect = { -6, 0, 13, 21 },
+                .image = pointer_img
         }
 };