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

Timestamp:

2024-08-23T18:02:06Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

4af6fb1

Parents:

ca95ccd

Message:

Persistently store display/seat configuration.

File:

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

uspace/srv/hid/display/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -62 +62 @@
 #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 *);
@@ -137 +139 @@
                 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);