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

File:

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

uspace/srv/hid/display/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -54 +54 @@
 #include "display.h"
 #include "dsops.h"
+#include "ievent.h"
 #include "input.h"
 #include "main.h"
@@ -61 +62 @@
 #include "wmclient.h"
 #include "wmops.h"
+
+const char *cfg_file_path = "/w/cfg/display.sif";
 
 static void display_client_conn(ipc_call_t *, void *);
@@ -137 +140 @@
                 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);
@@ -147 +157 @@
         output->def_display = disp;
         rc = ds_output_start_discovery(output);
+        if (rc != EOK)
+                goto error;
+
+        rc = ds_ievent_init(disp);
         if (rc != EOK)
                 goto error;
@@ -202 +216 @@
                 ds_input_close(disp);
 #endif
+        ds_ievent_fini(disp);
         if (output != NULL)
                 ds_output_destroy(output);