Changeset 4d8002d in mainline for uspace/srv/hid/display/display.c

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

File:

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

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)