Changeset 4912dd59 in mainline for uspace/srv/hid/display/ddev.c

Timestamp:

2020-05-19T10:21:12Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4c4d6142

Parents:

4d8002d

git-author:

Jiri Svoboda <jiri@…> (2020-05-18 18:17:47)

git-committer:

Jiri Svoboda <jiri@…> (2020-05-19 10:21:12)

Message:

Actually fill in fake cursor unit tests (paint, get_rect)

Fixed ds_cursor_paint() to work without GC (fixes post_ptd_event_wnd_switch
test) and fixed ds_cursor_paint() to render bitmap also when called
for the first time (found by the unit test).

File:

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

uspace/srv/hid/display/ddev.c

@@ -42 +42 @@
 #include "display.h"
 #include "ddev.h"
+
+/** Create display device object.
+ *
+ * @param display Parent display
+ * @param dd Display device
+ * @param info Display device info
+ * @param svc_id Display device service ID
+ * @param svc_name Display device service name
+ * @param gc Display device GC
+ * @param rddev Place to store pointer to new display device.
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t ds_ddev_create(ds_display_t *display, ddev_t *dd,
+    ddev_info_t *info, char *svc_name, service_id_t svc_id,
+    gfx_context_t *gc, ds_ddev_t **rddev)
+{
+        ds_ddev_t *ddev;
+
+        ddev = calloc(1, sizeof(ds_ddev_t));
+        if (ddev == NULL)
+                return ENOMEM;
+
+        ddev->svc_name = svc_name;
+        ddev->svc_id = svc_id;
+        ddev->dd = dd;
+        ddev->gc = gc;
+        ddev->info = *info;
+
+        ds_display_add_ddev(display, ddev);
+
+        *rddev = ddev;
+        return EOK;
+}
 
 /** Open display device.
@@ -95 +128 @@
         }
 
-        ddev = calloc(1, sizeof(ds_ddev_t));
-        if (ddev == NULL) {
+        rc = ds_ddev_create(display, dd, &info, name, svc_id, gc, &ddev);
+        if (rc != EOK) {
                 free(name);
                 ddev_close(dd);
-                return ENOMEM;
+                gfx_context_delete(gc);
+                return rc;
         }
-
-        ddev->svc_name = name;
-        ddev->svc_id = svc_id;
-        ddev->dd = dd;
-        ddev->gc = gc;
-        ddev->info = info;
-
-        ds_display_add_ddev(display, ddev);
 
         rc = ds_display_paint_bg(display, NULL);