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

File:

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

uspace/srv/hid/display/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #include <async.h>
 #include <disp_srv.h>
+#include <dispcfg_srv.h>
 #include <errno.h>
 #include <gfx/context.h>
@@ -47 +48 @@
 #include <stdio.h>
 #include <task.h>
+#include <wndmgt_srv.h>
+#include "cfgclient.h"
+#include "cfgops.h"
 #include "client.h"
 #include "display.h"
 #include "dsops.h"
+#include "ievent.h"
 #include "input.h"
 #include "main.h"
@@ -55 +60 @@
 #include "seat.h"
 #include "window.h"
+#include "wmclient.h"
+#include "wmops.h"
+
+const char *cfg_file_path = "/w/cfg/display.sif";
 
 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_cfgclient_ev_pending(void *);
+static void display_gc_conn(ipc_call_t *, void *);
+static void display_wndmgt_conn(ipc_call_t *, void *);
+static void display_dispcfg_conn(ipc_call_t *, void *);
 
 #ifdef CONFIG_DISP_DOUBLE_BUF
@@ -76 +90 @@
 };
 
+static ds_wmclient_cb_t display_wmclient_cb = {
+        .ev_pending = display_wmclient_ev_pending
+};
+
+static ds_cfgclient_cb_t display_cfgclient_cb = {
+        .ev_pending = display_cfgclient_ev_pending
+};
+
 static void display_client_ev_pending(void *arg)
 {
@@ -81 +103 @@
 
         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);
+}
+
+static void display_cfgclient_ev_pending(void *arg)
+{
+        dispcfg_srv_t *srv = (dispcfg_srv_t *) arg;
+
+        dispcfg_srv_ev_pending(srv);
 }
 
@@ -90 +126 @@
         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;
+        port_id_t dc_port;
+        loc_srv_t *srv = NULL;
+        service_id_t sid = 0;
         errno_t rc;
 
@@ -98 +140 @@
                 goto error;
 
-        rc = ds_seat_create(disp, &seat);
-        if (rc != EOK)
-                goto error;
+        rc = ds_display_load_cfg(disp, cfg_file_path);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE,
+                    "Starting with fresh configuration.");
+
+                /* Create first seat */
+                rc = ds_seat_create(disp, "Alice", &seat);
+                if (rc != EOK)
+                        goto error;
+        }
 
         rc = ds_output_create(&output);
@@ -111 +160 @@
                 goto error;
 
+        rc = ds_ievent_init(disp);
+        if (rc != EOK)
+                goto error;
+
         rc = ds_input_open(disp);
         if (rc != EOK)
                 goto error;
 
-        async_set_fallback_port_handler(display_client_conn, disp);
-
-        rc = loc_server_register(NAME);
+        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 = async_create_port(INTERFACE_DISPCFG, display_dispcfg_conn, disp,
+            &dc_port);
+        if (rc != EOK)
+                goto error;
+
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
@@ -124 +194 @@
         }
 
-        service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_DISPLAY, &sid);
+        rc = loc_service_register(srv, SERVICE_NAME_DISPLAY, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
@@ -135 +204 @@
         return EOK;
 error:
+        if (sid != 0)
+                loc_service_unregister(srv, sid);
+        if (srv != NULL)
+                loc_server_unregister(srv);
+        // XXX destroy disp_port
+        // XXX destroy gc_port
+        // XXX destroy wm_port
+        // XXX destroy dc_port
 #if 0
         if (disp->input != NULL)
                 ds_input_close(disp);
 #endif
+        ds_ievent_fini(disp);
         if (output != NULL)
                 ds_output_destroy(output);
@@ -154 +232 @@
 {
         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 +241 @@
             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 +264 @@
                 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);
+}
+
+/** Handle configuration connection to display server */
+static void display_dispcfg_conn(ipc_call_t *icall, void *arg)
+{
+        ds_display_t *disp = (ds_display_t *) arg;
+        errno_t rc;
+        dispcfg_srv_t srv;
+        ds_cfgclient_t *cfgclient = NULL;
+
+        /* Create CFG client object */
+        ds_display_lock(disp);
+        rc = ds_cfgclient_create(disp, &display_cfgclient_cb, &srv, &cfgclient);
+        ds_display_unlock(disp);
+        if (rc != EOK) {
+                async_answer_0(icall, ENOMEM);
+                return;
+        }
+
+        /* Set up protocol structure */
+        dispcfg_srv_initialize(&srv);
+        srv.ops = &dispcfg_srv_ops;
+        srv.arg = cfgclient;
+
+        /* Handle connection */
+        dispcfg_conn(icall, &srv);
+
+        ds_display_lock(disp);
+        ds_cfgclient_destroy(cfgclient);
+        ds_display_unlock(disp);
 }