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

Timestamp:

2022-10-18T09:06:07Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7a05d924

Parents:

0761448

git-author:

Jiri Svoboda <jiri@…> (2022-10-17 17:05:56)

git-committer:

Jiri Svoboda <jiri@…> (2022-10-18 09:06:07)

Message:

Window management plumbing

File:

• uspace/srv/hid/display/main.c (modified) (9 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 "wmops.h"
 
 static void display_client_conn(ipc_call_t *, void *);
 static void display_client_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
@@ -90 +94 @@
         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 +122 @@
                 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 +154 @@
         return EOK;
 error:
+        // XXX destroy disp_port
+        // XXX destroy gc_port
+        // XXX destroy wm_port
 #if 0
         if (disp->input != NULL)
@@ -154 +176 @@
 {
         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 +185 @@
             ipc_get_arg4(icall));
 
-        (void) icall;
-        (void) arg;
-
         svc_id = ipc_get_arg2(icall);
-        wnd_id = ipc_get_arg3(icall);
 
         if (svc_id != 0) {
@@ -191 +206 @@
                 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)
+{
+        wndmgt_srv_t srv;
+
+        /* Set up protocol structure */
+        wndmgt_srv_initialize(&srv);
+        srv.ops = &wndmgt_srv_ops;
+        srv.arg = NULL; // XXX
+
+        /* Handle connection */
+        wndmgt_conn(icall, &srv);
 }