Changeset 87a7cdb in mainline for uspace/srv/hid/display/display.c

Timestamp:

2019-12-05T19:35:12Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

71cbe5c

Parents:

973efd36

Message:

Enumerate display devices for output, RFB conversion (WIP)

Currently we can only have one active output device. Bitmaps
do not work as ipcgfx does not accept alloc != NULL.
Need to fill in tests.

File:

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

uspace/srv/hid/display/display.c

@@ -58 +58 @@
 
         list_initialize(&disp->clients);
-        disp->gc = gc;
         disp->next_wnd_id = 1;
+        list_initialize(&disp->ddevs);
         list_initialize(&disp->seats);
         list_initialize(&disp->windows);
@@ -347 +347 @@
 }
 
+/** Add display device to display.
+ *
+ * @param disp Display
+ * @param ddev Display device
+ */
+void ds_display_add_ddev(ds_display_t *disp, ds_ddev_t *ddev)
+{
+        assert(ddev->display == NULL);
+        assert(!link_used(&ddev->lddevs));
+
+        ddev->display = disp;
+        list_append(&ddev->lddevs, &disp->ddevs);
+}
+
+/** Remove display device from display.
+ *
+ * @param ddev Display device
+ */
+void ds_display_remove_ddev(ds_ddev_t *ddev)
+{
+        list_remove(&ddev->lddevs);
+        ddev->display = NULL;
+}
+
+/** Get first display device in display.
+ *
+ * @param disp Display
+ * @return First display device or @c NULL if there is none
+ */
+ds_ddev_t *ds_display_first_ddev(ds_display_t *disp)
+{
+        link_t *link = list_first(&disp->ddevs);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_ddev_t, lddevs);
+}
+
+/** Get next display device in display.
+ *
+ * @param ddev Current display device
+ * @return Next display device or @c NULL if there is none
+ */
+ds_ddev_t *ds_display_next_ddev(ds_ddev_t *ddev)
+{
+        link_t *link = list_next(&ddev->lddevs, &ddev->display->ddevs);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_ddev_t, lddevs);
+}
+
+// XXX
+gfx_context_t *ds_display_get_gc(ds_display_t *display)
+{
+        ds_ddev_t *ddev;
+
+        ddev = ds_display_first_ddev(display);
+        if (ddev == NULL)
+                abort();
+
+        return ddev->gc;
+}
+
 /** @}
  */