Changeset 4d8002d in mainline

Timestamp:

2020-05-15T16:18:51Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4912dd59

Parents:

6feccae

Message:

Bitmapped mouse cursor

Location:

uspace

Files:

• lib/display/include/types/display/cursor.h (added)
• srv/hid/display/cursimg.c (added)
• srv/hid/display/cursimg.h (added)
• srv/hid/display/cursor.c (added)
• srv/hid/display/cursor.h (added)
• srv/hid/display/display.c (modified) (6 diffs)
• srv/hid/display/display.h (modified) (2 diffs)
• srv/hid/display/meson.build (modified) (2 diffs)
• srv/hid/display/seat.c (modified) (5 diffs)
• srv/hid/display/test/cursor.c (added)
• srv/hid/display/types/display/cursimg.h (added)
• srv/hid/display/types/display/cursor.h (added)
• srv/hid/display/types/display/display.h (modified) (2 diffs)
• srv/hid/display/types/display/seat.h (modified) (1 diff)
• srv/hid/display/window.c (modified) (1 diff)

uspace/srv/hid/display/display.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include "client.h"
+#include "cursimg.h"
+#include "cursor.h"
 #include "seat.h"
 #include "window.h"
@@ -53 +55 @@
 {
         ds_display_t *disp;
+        ds_cursor_t *cursor;
+        int i;
         errno_t rc;
 
@@ -63 +67 @@
                 free(disp);
                 return ENOMEM;
+        }
+
+        list_initialize(&disp->cursors);
+
+        for (i = 0; i < dcurs_limit; i++) {
+                rc = ds_cursor_create(disp, &ds_cursimg[i].rect,
+                    ds_cursimg[i].image, &cursor);
+                if (rc != EOK)
+                        goto error;
+
+                disp->cursor[i] = cursor;
         }
 
@@ -73 +88 @@
         *rdisp = disp;
         return EOK;
+error:
+        ds_display_destroy(disp);
+        return rc;
 }
 
@@ -83 +101 @@
         assert(list_empty(&disp->clients));
         assert(list_empty(&disp->seats));
+        /* XXX destroy cursors */
         gfx_color_delete(disp->bg_color);
         free(disp);
@@ -462 +481 @@
 }
 
+/** Add cursor to display.
+ *
+ * @param display Display
+ * @param cursor Cursor
+ */
+void ds_display_add_cursor(ds_display_t *display, ds_cursor_t *cursor)
+{
+        assert(cursor->display == NULL);
+        assert(!link_used(&cursor->ldisplay));
+
+        cursor->display = display;
+        list_prepend(&cursor->ldisplay, &display->cursors);
+}
+
+/** Remove cursor from display.
+ *
+ * @param cursor Cursor
+ */
+void ds_display_remove_cursor(ds_cursor_t *cursor)
+{
+        list_remove(&cursor->ldisplay);
+        cursor->display = NULL;
+}
+
 // XXX
 gfx_context_t *ds_display_get_gc(ds_display_t *display)

uspace/srv/hid/display/display.h

@@ -43 +43 @@
 #include <io/kbd_event.h>
 #include "types/display/client.h"
+#include "types/display/cursor.h"
 #include "types/display/ddev.h"
 #include "types/display/display.h"
@@ -75 +76 @@
 extern ds_ddev_t *ds_display_first_ddev(ds_display_t *);
 extern ds_ddev_t *ds_display_next_ddev(ds_ddev_t *);
+extern void ds_display_add_cursor(ds_display_t *, ds_cursor_t *);
+extern void ds_display_remove_cursor(ds_cursor_t *);
 extern gfx_context_t *ds_display_get_gc(ds_display_t *);
 extern errno_t ds_display_paint_bg(ds_display_t *, gfx_rect_t *);

uspace/srv/hid/display/meson.build

@@ -31 +31 @@
 src = files(
         'client.c',
+        'cursor.c',
+        'cursimg.c',
         'ddev.c',
         'display.c',
@@ -43 +45 @@
 test_src = files(
         'client.c',
+        'cursimg.c',
+        'cursor.c',
         'display.c',
         'seat.c',
         'window.c',
         'test/client.c',
+        'test/cursor.c',
         'test/display.c',
         'test/main.c',

uspace/srv/hid/display/seat.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include "client.h"
+#include "cursor.h"
 #include "display.h"
 #include "seat.h"
@@ -61 +62 @@
         seat->pntpos.x = 0;
         seat->pntpos.y = 0;
+
+        seat->cursor = display->cursor[dcurs_arrow];
 
         *rseat = seat;
@@ -142 +145 @@
 }
 
-/** Draw cross at seat pointer position.
- *
- * @param seat Seat
- * @param len Cross length
- * @param w Cross extra width
- * @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, gfx_color_t *color)
-{
-        gfx_context_t *gc;
-        gfx_rect_t rect, r0;
-        errno_t rc;
-
-        gc = ds_display_get_gc(seat->display);
-        if (gc == NULL)
-                return EOK;
-
-        rc = gfx_set_color(gc, color);
-        if (rc != EOK)
-                goto error;
-
-        r0.p0.x = -len;
-        r0.p0.y = -w;
-        r0.p1.x = +len + 1;
-        r0.p1.y = +w + 1;
-        gfx_rect_translate(&seat->pntpos, &r0, &rect);
-
-        rc = gfx_fill_rect(gc, &rect);
-        if (rc != EOK)
-                goto error;
-
-        r0.p0.x = -w;
-        r0.p0.y = -len;
-        r0.p1.x = +w + 1;
-        r0.p1.y = +len + 1;
-        gfx_rect_translate(&seat->pntpos, &r0, &rect);
-
-        rc = gfx_fill_rect(gc, &rect);
-        if (rc != EOK)
-                goto error;
-
-        return EOK;
-error:
-        return rc;
-}
-
 /** Draw seat pointer
  *
@@ -199 +153 @@
 static errno_t ds_seat_draw_pointer(ds_seat_t *seat)
 {
-        errno_t rc;
-        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, 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;
-error:
-        if (black != NULL)
-                gfx_color_delete(black);
-        if (white != NULL)
-                gfx_color_delete(white);
-        return rc;
+        return ds_cursor_paint(seat->cursor, &seat->pntpos);
 }
 
@@ -241 +166 @@
         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;
-
+        /* Get rectangle covered by cursor */
+        ds_cursor_get_rect(seat->cursor, &seat->pntpos, &rect);
+
+        /* Repaint it */
         return ds_display_paint(seat->display, &rect);
 }

uspace/srv/hid/display/types/display/display.h

@@ -42 +42 @@
 #include <gfx/coord.h>
 #include <io/input.h>
+#include <types/display/cursor.h>
+#include "cursor.h"
 #include "window.h"
 
@@ -74 +76 @@
         gfx_color_t *bg_color;
 
+        /** Stock cursors */
+        ds_cursor_t *cursor[dcurs_limit];
+
+        /** List of all cursors */
+        list_t cursors;
+
         /** Bounding rectangle */
         gfx_rect_t rect;

uspace/srv/hid/display/types/display/seat.h

@@ -48 +48 @@
         /** Window this seat is focused on */
         struct ds_window *focus;
+        /** Current seat cursor */
+        struct ds_cursor *cursor;
         /** Pointer position */
         gfx_coord2_t pntpos;

uspace/srv/hid/display/window.c

@@ -31 +31 @@
  */
 /**
- * @file GFX window backend
- *
- * This implements a graphics context over display server window.
+ * @file Display server window
  */