Changes in / [f6905b6:08499f0] in mainline

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,
-        /** Pointer (suggests clickable object) */
-        dcurs_pointer,
+        dcurs_ibeam
 } display_stock_cursor_t;
 
 enum {
         /** Number of stock cursor types */
-        dcurs_limit = dcurs_pointer + 1
+        dcurs_limit = dcurs_ibeam + 1
 };
 

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

@@ -49 +49 @@
         ui_curs_size_urdl,
         /** I-beam (suggests editable text) */
-        ui_curs_ibeam,
-        /** Pointer (suggests clickable object) */
-        ui_curs_pointer,
+        ui_curs_ibeam
 } 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] = {
         {
@@ -207 +183 @@
                 .rect = { -5, -9, 6, 10 },
                 .image = ibeam_img
-        },
-        {
-                .rect = { -6, 0, 13, 21 },
-                .image = pointer_img
         }
 };