Changeset b3c185b6 in mainline for uspace/srv/hid/display/display.c

Timestamp:

2019-11-04T14:05:35Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

be15256

Parents:

22faaf2

git-author:

Jiri Svoboda <jiri@…> (2019-10-03 18:05:09)

git-committer:

Jiri Svoboda <jiri@…> (2019-11-04 14:05:35)

Message:

Window event delivery mechanism

File:

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

uspace/srv/hid/display/display.c

@@ -39 +39 @@
 #include <io/log.h>
 #include <stdlib.h>
+#include "client.h"
+#include "window.h"
 #include "display.h"
-#include "window.h"
 
 static errno_t disp_window_create(void *, sysarg_t *);
 static errno_t disp_window_destroy(void *, sysarg_t);
+static errno_t disp_get_event(void *, sysarg_t *, display_wnd_ev_t *);
 
 display_ops_t display_srv_ops = {
         .window_create = disp_window_create,
-        .window_destroy = disp_window_destroy
+        .window_destroy = disp_window_destroy,
+        .get_event = disp_get_event
 };
 
@@ -53 +56 @@
 {
         errno_t rc;
-        ds_display_t *disp = (ds_display_t *) arg;
+        ds_client_t *client = (ds_client_t *) arg;
         ds_window_t *wnd;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_create()");
 
-        rc = ds_window_create(disp, &wnd);
+        rc = ds_window_create(client, &wnd);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_create() - ds_window_create -> %d", rc);
         if (rc != EOK)
@@ -75 +78 @@
 static errno_t disp_window_destroy(void *arg, sysarg_t wnd_id)
 {
-        ds_display_t *disp = (ds_display_t *) arg;
-        ds_window_t *wnd;
-
-        wnd = ds_display_find_window(disp, wnd_id);
+        ds_client_t *client = (ds_client_t *) arg;
+        ds_window_t *wnd;
+
+        wnd = ds_client_find_window(client, wnd_id);
         if (wnd == NULL)
                 return ENOENT;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_destroy()");
-        ds_display_remove_window(wnd);
+        ds_client_remove_window(wnd);
         ds_window_delete(wnd);
+        return EOK;
+}
+
+static errno_t disp_get_event(void *arg, sysarg_t *wnd_id,
+    display_wnd_ev_t *event)
+{
+        ds_client_t *client = (ds_client_t *) arg;
+        ds_window_t *wnd;
+        errno_t rc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_get_event()");
+
+        rc = ds_client_get_event(client, &wnd, event);
+        if (rc != EOK)
+                return rc;
+
+        *wnd_id = wnd->id;
         return EOK;
 }
@@ -102 +122 @@
                 return ENOMEM;
 
-        list_initialize(&disp->windows);
+        list_initialize(&disp->clients);
+        disp->gc = gc;
         disp->next_wnd_id = 1;
-        disp->gc = gc;
         *rdisp = disp;
         return EOK;
@@ -115 +135 @@
 void ds_display_destroy(ds_display_t *disp)
 {
-        assert(list_empty(&disp->windows));
+        assert(list_empty(&disp->clients));
         free(disp);
 }
 
-/** Add window to display.
+/** Add client to display.
  *
  * @param disp Display
- * @param wnd Window
- * @return EOK on success, ENOMEM if there are no free window identifiers
- */
-errno_t ds_display_add_window(ds_display_t *disp, ds_window_t *wnd)
-{
-        assert(wnd->display == NULL);
-        assert(!link_used(&wnd->lwindows));
-
-        wnd->display = disp;
-        wnd->id = disp->next_wnd_id++;
-        list_append(&wnd->lwindows, &disp->windows);
-
-        return EOK;
-}
-
-/** Remove window from display.
- *
- * @param wnd Window
- */
-void ds_display_remove_window(ds_window_t *wnd)
-{
-        list_remove(&wnd->lwindows);
-        wnd->display = NULL;
-}
-
-/** Find window by ID.
+ * @param client client
+ */
+void ds_display_add_client(ds_display_t *disp, ds_client_t *client)
+{
+        assert(client->display == NULL);
+        assert(!link_used(&client->lclients));
+
+        client->display = disp;
+        list_append(&client->lclients, &disp->clients);
+}
+
+/** Remove client from display.
+ *
+ * @param client client
+ */
+void ds_display_remove_client(ds_client_t *client)
+{
+        list_remove(&client->lclients);
+        client->display = NULL;
+}
+
+/** Get first client in display.
  *
  * @param disp Display
- * @param id Window ID
- */
-ds_window_t *ds_display_find_window(ds_display_t *disp, ds_wnd_id_t id)
-{
-        ds_window_t *wnd;
-
-        // TODO Make this faster
-        wnd = ds_display_first_window(disp);
-        while (wnd != NULL) {
-                if (wnd->id == id)
-                        return wnd;
-                wnd = ds_display_next_window(wnd);
-        }
-
-        return NULL;
-}
-
-/** Get first window in display.
- *
- * @param disp Display
- * @return First window or @c NULL if there is none
- */
-ds_window_t *ds_display_first_window(ds_display_t *disp)
-{
-        link_t *link = list_first(&disp->windows);
+ * @return First client or @c NULL if there is none
+ */
+ds_client_t *ds_display_first_client(ds_display_t *disp)
+{
+        link_t *link = list_first(&disp->clients);
 
         if (link == NULL)
                 return NULL;
 
-        return list_get_instance(link, ds_window_t, lwindows);
-}
-
-/** Get next window in display.
- *
- * @param wnd Current window
- * @return Next window or @c NULL if there is none
- */
-ds_window_t *ds_display_next_window(ds_window_t *wnd)
-{
-        link_t *link = list_next(&wnd->lwindows, &wnd->display->windows);
+        return list_get_instance(link, ds_client_t, lclients);
+}
+
+/** Get next client in display.
+ *
+ * @param client Current client
+ * @return Next client or @c NULL if there is none
+ */
+ds_client_t *ds_display_next_client(ds_client_t *client)
+{
+        link_t *link = list_next(&client->lclients, &client->display->clients);
 
         if (link == NULL)
                 return NULL;
 
-        return list_get_instance(link, ds_window_t, lwindows);
+        return list_get_instance(link, ds_client_t, lclients);
+}
+
+/** Find window in all clients by ID.
+ *
+ * XXX This is just a hack needed to match GC connection to a window,
+ * as we don't have a good safe way to pass the GC endpoint to our client
+ * on demand.
+ *
+ * @param display Display
+ * @param id Window ID
+ */
+#include <stdio.h>
+ds_window_t *ds_display_find_window(ds_display_t *display, ds_wnd_id_t id)
+{
+        ds_client_t *client;
+        ds_window_t *wnd;
+
+        printf("ds_display_find_window: id=0x%lx\n", id);
+
+        client = ds_display_first_client(display);
+        while (client != NULL) {
+                printf("ds_display_find_window: client=%p\n", client);
+                wnd = ds_client_find_window(client, id);
+                if (wnd != NULL) {
+                        printf("ds_display_find_window: found wnd=%p id=0x%lx\n",
+                            wnd, wnd->id);
+                        return wnd;
+                }
+                client = ds_display_next_client(client);
+        }
+
+        printf("ds_display_find_window: not found\n");
+        return NULL;
+}
+
+errno_t ds_display_post_kbd_event(ds_display_t *display, kbd_event_t *event)
+{
+        ds_client_t *client;
+        ds_window_t *wnd;
+
+        // XXX Correctly determine destination window
+
+        client = ds_display_first_client(display);
+        if (client == NULL)
+                return EOK;
+
+        wnd = ds_client_first_window(client);
+        if (wnd == NULL)
+                return EOK;
+
+        return ds_client_post_kbd_event(client, wnd, event);
 }