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

Timestamp:

2019-11-04T14:05:35Z (4 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/main.c (modified) (6 diffs)

uspace/srv/hid/display/main.c

@@ -45 +45 @@
 #include <stdio.h>
 #include <task.h>
+#include "client.h"
 #include "display.h"
+#include "main.h"
 #include "output.h"
 #include "window.h"
 
-#define NAME  "display"
+static void display_client_conn(ipc_call_t *, void *);
 
-static void display_client_conn(ipc_call_t *, void *);
+static void display_kbd_event(void *arg, kbd_event_t *event)
+{
+        ds_display_t *disp = (ds_display_t *) arg;
+
+        printf("display_kbd_event\n");
+        ds_display_post_kbd_event(disp, event);
+}
 
 /** Initialize display server */
@@ -60 +68 @@
         errno_t rc;
 
-        rc = output_init(&gc);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "display_srv_init()");
+
+        rc = ds_display_create(NULL, &disp);
         if (rc != EOK)
                 goto error;
 
-        rc = ds_display_create(gc, &disp);
+        rc = output_init(display_kbd_event, (void *) disp, &gc);
         if (rc != EOK)
                 goto error;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "display_srv_init()");
-
+        disp->gc = gc;
+#if 0
+        rc = ds_input_open(disp);
+        if (rc != EOK)
+                goto error;
+#endif
         async_set_fallback_port_handler(display_client_conn, disp);
 
@@ -88 +102 @@
         return EOK;
 error:
+#if 0
+        if (disp->input != NULL)
+                ds_input_close(disp);
+#endif
         if (gc != NULL)
                 gfx_context_delete(gc);
@@ -101 +119 @@
         sysarg_t wnd_id;
         sysarg_t svc_id;
+        ds_client_t *client = NULL;
         ds_window_t *wnd;
         ds_display_t *disp = (ds_display_t *) arg;
         gfx_context_t *gc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "display_client_conn arg1=%zu arg2=%zu arg3=%zu arg4=%zu.",
@@ -116 +136 @@
 
         if (svc_id != 0) {
-                /* Display management */
+                /* Create client object */
+                rc = ds_client_create(disp, &srv, &client);
+                if (rc != EOK) {
+                        async_answer_0(icall, ENOMEM);
+                        return;
+                }
+
+                /* Set up protocol structure */
                 srv.ops = &display_srv_ops;
-                srv.arg = disp;
+                srv.arg = client;
 
+                /* Handle connection */
                 display_conn(icall, &srv);
+
+                ds_client_destroy(client);
         } else {
-                /* Window GC */
+                /* Window GC connection */
+
                 wnd = ds_display_find_window(disp, wnd_id);
                 if (wnd == NULL) {
@@ -132 +163 @@
                 gc_conn(icall, gc);
         }
+
 }