Changes in uspace/srv/hid/display/main.c [4c6fd56:ca48672] in mainline

File:

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

uspace/srv/hid/display/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -54 +54 @@
 #include "display.h"
 #include "dsops.h"
+#include "ievent.h"
 #include "input.h"
 #include "main.h"
@@ -62 +63 @@
 #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 *);
@@ -123 +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;
+        port_id_t port = 0;
         loc_srv_t *srv = NULL;
         service_id_t sid = 0;
@@ -137 +137 @@
                 goto error;
 
-        rc = ds_seat_create(disp, "Alice", &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);
@@ -150 +157 @@
                 goto error;
 
+        rc = ds_ievent_init(disp);
+        if (rc != EOK)
+                goto error;
+
         rc = ds_input_open(disp);
         if (rc != EOK)
@@ -155 +166 @@
 
         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);
+            &port);
+        if (rc != EOK)
+                goto error;
+
+        rc = async_port_create_interface(port, INTERFACE_GC, display_gc_conn,
+            disp);
+        if (rc != EOK)
+                goto error;
+
+        rc = async_port_create_interface(port, INTERFACE_WNDMGT,
+            display_wndmgt_conn, disp);
+        if (rc != EOK)
+                goto error;
+
+        rc = async_port_create_interface(port, INTERFACE_DISPCFG,
+            display_dispcfg_conn, disp);
         if (rc != EOK)
                 goto error;
@@ -180 +192 @@
         }
 
-        rc = loc_service_register(srv, SERVICE_NAME_DISPLAY, &sid);
+        rc = loc_service_register(srv, SERVICE_NAME_DISPLAY, port, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
@@ -194 +206 @@
         if (srv != NULL)
                 loc_server_unregister(srv);
-        // XXX destroy disp_port
-        // XXX destroy gc_port
-        // XXX destroy wm_port
-        // XXX destroy dc_port
+        if (port != 0)
+                async_port_destroy(port);
 #if 0
         if (disp->input != NULL)
                 ds_input_close(disp);
 #endif
+        ds_ievent_fini(disp);
         if (output != NULL)
                 ds_output_destroy(output);