Changes in uspace/srv/hid/display/main.c [1762ceb:913add60] in mainline

File:

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

uspace/srv/hid/display/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -47 +47 @@
 #include <stdio.h>
 #include <task.h>
+#include <wndmgt_srv.h>
 #include "client.h"
 #include "display.h"
@@ -55 +56 @@
 #include "seat.h"
 #include "window.h"
+#include "wmclient.h"
+#include "wmops.h"
 
 static void display_client_conn(ipc_call_t *, void *);
 static void display_client_ev_pending(void *);
+static void display_wmclient_ev_pending(void *);
+static void display_gc_conn(ipc_call_t *, void *);
+static void display_wndmgt_conn(ipc_call_t *, void *);
 
 #ifdef CONFIG_DISP_DOUBLE_BUF
@@ -76 +82 @@
 };
 
+static ds_wmclient_cb_t display_wmclient_cb = {
+        .ev_pending = display_wmclient_ev_pending
+};
+
 static void display_client_ev_pending(void *arg)
 {
@@ -81 +91 @@
 
         display_srv_ev_pending(srv);
+}
+
+static void display_wmclient_ev_pending(void *arg)
+{
+        wndmgt_srv_t *srv = (wndmgt_srv_t *) arg;
+
+        wndmgt_srv_ev_pending(srv);
 }
 
@@ -90 +107 @@
         ds_output_t *output = NULL;
         gfx_context_t *gc = NULL;
+        port_id_t disp_port;
+        port_id_t gc_port;
+        port_id_t wm_port;
         errno_t rc;
 
@@ -115 +135 @@
                 goto error;
 
-        async_set_fallback_port_handler(display_client_conn, disp);
+        rc = async_create_port(INTERFACE_DISPLAY, display_client_conn, disp,
+            &disp_port);
+        if (rc != EOK)
+                goto error;
+
+        rc = async_create_port(INTERFACE_GC, display_gc_conn, disp, &gc_port);
+        if (rc != EOK)
+                goto error;
+
+        rc = async_create_port(INTERFACE_WNDMGT, display_wndmgt_conn, disp,
+            &wm_port);
+        if (rc != EOK)
+                goto error;
 
         rc = loc_server_register(NAME);
@@ -135 +167 @@
         return EOK;
 error:
+        // XXX destroy disp_port
+        // XXX destroy gc_port
+        // XXX destroy wm_port
 #if 0
         if (disp->input != NULL)
@@ -154 +189 @@
 {
         display_srv_t srv;
-        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;
 
@@ -166 +198 @@
             ipc_get_arg4(icall));
 
-        (void) icall;
-        (void) arg;
-
         svc_id = ipc_get_arg2(icall);
-        wnd_id = ipc_get_arg3(icall);
 
         if (svc_id != 0) {
                 /* Create client object */
+                ds_display_lock(disp);
                 rc = ds_client_create(disp, &display_client_cb, &srv, &client);
+                ds_display_unlock(disp);
                 if (rc != EOK) {
                         async_answer_0(icall, ENOMEM);
@@ -191 +221 @@
                 ds_client_destroy(client);
                 ds_display_unlock(disp);
-        } else {
-                /* Window GC connection */
-
-                wnd = ds_display_find_window(disp, wnd_id);
-                if (wnd == NULL) {
-                        async_answer_0(icall, ENOENT);
-                        return;
-                }
-
-                /*
-                 * XXX We need a way to make sure that the connection does
-                 * not stay active after the window had been destroyed
-                 */
-                gc = ds_window_get_ctx(wnd);
-                gc_conn(icall, gc);
-        }
+        }
+}
+
+/** Handle GC connection to display server */
+static void display_gc_conn(ipc_call_t *icall, void *arg)
+{
+        sysarg_t wnd_id;
+        ds_window_t *wnd;
+        ds_display_t *disp = (ds_display_t *) arg;
+        gfx_context_t *gc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "display_gc_conn arg1=%zu arg2=%zu arg3=%zu arg4=%zu.",
+            ipc_get_arg1(icall), ipc_get_arg2(icall), ipc_get_arg3(icall),
+            ipc_get_arg4(icall));
+
+        wnd_id = ipc_get_arg3(icall);
+
+        /* Window GC connection */
+
+        wnd = ds_display_find_window(disp, wnd_id);
+        if (wnd == NULL) {
+                async_answer_0(icall, ENOENT);
+                return;
+        }
+
+        /*
+         * XXX We need a way to make sure that the connection does
+         * not stay active after the window had been destroyed
+         */
+        gc = ds_window_get_ctx(wnd);
+        gc_conn(icall, gc);
+}
+
+/** Handle window management connection to display server */
+static void display_wndmgt_conn(ipc_call_t *icall, void *arg)
+{
+        ds_display_t *disp = (ds_display_t *) arg;
+        errno_t rc;
+        wndmgt_srv_t srv;
+        ds_wmclient_t *wmclient = NULL;
+
+        /* Create WM client object */
+        ds_display_lock(disp);
+        rc = ds_wmclient_create(disp, &display_wmclient_cb, &srv, &wmclient);
+        ds_display_unlock(disp);
+        if (rc != EOK) {
+                async_answer_0(icall, ENOMEM);
+                return;
+        }
+
+        /* Set up protocol structure */
+        wndmgt_srv_initialize(&srv);
+        srv.ops = &wndmgt_srv_ops;
+        srv.arg = wmclient;
+
+        /* Handle connection */
+        wndmgt_conn(icall, &srv);
+
+        ds_display_lock(disp);
+        ds_wmclient_destroy(wmclient);
+        ds_display_unlock(disp);
 }