Changes in uspace/srv/hid/display/display.c [5d380b6:6fbd1f9] in mainline

File:

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

uspace/srv/hid/display/display.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <memgfx/memgc.h>
 #include <stdlib.h>
+#include <str.h>
 #include "client.h"
 #include "clonegc.h"
@@ -46 +47 @@
 #include "cursor.h"
 #include "display.h"
+#include "idevcfg.h"
 #include "seat.h"
 #include "window.h"
@@ -100 +102 @@
         list_initialize(&disp->cfgclients);
         disp->next_wnd_id = 1;
+        disp->next_seat_id = 1;
         list_initialize(&disp->ddevs);
         list_initialize(&disp->idevcfgs);
+        list_initialize(&disp->ievents);
+        fibril_condvar_initialize(&disp->ievent_cv);
         list_initialize(&disp->seats);
         list_initialize(&disp->windows);
@@ -126 +131 @@
         assert(list_empty(&disp->ddevs));
         assert(list_empty(&disp->idevcfgs));
+        assert(list_empty(&disp->ievents));
         assert(list_empty(&disp->seats));
         assert(list_empty(&disp->windows));
@@ -137 +143 @@
         gfx_color_delete(disp->bg_color);
         free(disp);
+}
+
+/** Load display configuration from SIF file.
+ *
+ * @param display Display
+ * @param cfgpath Configuration file path
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ds_display_load_cfg(ds_display_t *display, const char *cfgpath)
+{
+        sif_doc_t *doc = NULL;
+        sif_node_t *rnode;
+        sif_node_t *ndisplay;
+        sif_node_t *nseats;
+        sif_node_t *nseat;
+        ds_seat_t *seat;
+        sif_node_t *nidevcfgs;
+        sif_node_t *nidevcfg;
+        const char *ntype;
+        ds_idevcfg_t *idevcfg;
+        errno_t rc;
+
+        rc = sif_load(cfgpath, &doc);
+        if (rc != EOK)
+                goto error;
+
+        rnode = sif_get_root(doc);
+        ndisplay = sif_node_first_child(rnode);
+        ntype = sif_node_get_type(ndisplay);
+        if (str_cmp(ntype, "display") != 0) {
+                rc = EIO;
+                goto error;
+        }
+
+        nseats = sif_node_first_child(ndisplay);
+        ntype = sif_node_get_type(nseats);
+        if (str_cmp(ntype, "seats") != 0) {
+                rc = EIO;
+                goto error;
+        }
+
+        /* Load individual seats */
+        nseat = sif_node_first_child(nseats);
+        while (nseat != NULL) {
+                ntype = sif_node_get_type(nseat);
+                if (str_cmp(ntype, "seat") != 0) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                rc = ds_seat_load(display, nseat, &seat);
+                if (rc != EOK)
+                        goto error;
+
+                (void)seat;
+                nseat = sif_node_next_child(nseat);
+        }
+
+        nidevcfgs = sif_node_next_child(nseats);
+        ntype = sif_node_get_type(nidevcfgs);
+        if (str_cmp(ntype, "idevcfgs") != 0) {
+                rc = EIO;
+                goto error;
+        }
+
+        /* Load individual input device configuration entries */
+        nidevcfg = sif_node_first_child(nidevcfgs);
+        while (nidevcfg != NULL) {
+                ntype = sif_node_get_type(nidevcfg);
+                if (str_cmp(ntype, "idevcfg") != 0) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                /*
+                 * Load device configuration entry. If the device
+                 * is not currently connected (ENOENT), skip it.
+                 */
+                rc = ds_idevcfg_load(display, nidevcfg, &idevcfg);
+                if (rc != EOK && rc != ENOENT)
+                        goto error;
+
+                (void)idevcfg;
+                nidevcfg = sif_node_next_child(nidevcfg);
+        }
+
+        sif_delete(doc);
+        return EOK;
+error:
+        if (doc != NULL)
+                sif_delete(doc);
+
+        seat = ds_display_first_seat(display);
+        while (seat != NULL) {
+                ds_seat_destroy(seat);
+                seat = ds_display_first_seat(display);
+        }
+        return rc;
+}
+
+/** Save display configuration to SIF file.
+ *
+ * @param display Display
+ * @param cfgpath Configuration file path
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ds_display_save_cfg(ds_display_t *display, const char *cfgpath)
+{
+        sif_doc_t *doc = NULL;
+        sif_node_t *rnode;
+        sif_node_t *ndisplay;
+        sif_node_t *nseats;
+        sif_node_t *nseat;
+        ds_seat_t *seat;
+        sif_node_t *nidevcfgs;
+        sif_node_t *nidevcfg;
+        ds_idevcfg_t *idevcfg;
+        errno_t rc;
+
+        rc = sif_new(&doc);
+        if (rc != EOK)
+                goto error;
+
+        rnode = sif_get_root(doc);
+        rc = sif_node_append_child(rnode, "display", &ndisplay);
+        if (rc != EOK)
+                goto error;
+
+        rc = sif_node_append_child(ndisplay, "seats", &nseats);
+        if (rc != EOK)
+                goto error;
+
+        /* Save individual seats */
+        seat = ds_display_first_seat(display);
+        while (seat != NULL) {
+                rc = sif_node_append_child(nseats, "seat", &nseat);
+                if (rc != EOK)
+                        goto error;
+
+                rc = ds_seat_save(seat, nseat);
+                if (rc != EOK)
+                        goto error;
+
+                seat = ds_display_next_seat(seat);
+        }
+
+        rc = sif_node_append_child(ndisplay, "idevcfgs", &nidevcfgs);
+        if (rc != EOK)
+                goto error;
+
+        /* Save individual input device configuration entries */
+        idevcfg = ds_display_first_idevcfg(display);
+        while (idevcfg != NULL) {
+                rc = sif_node_append_child(nidevcfgs, "idevcfg", &nidevcfg);
+                if (rc != EOK)
+                        goto error;
+
+                rc = ds_idevcfg_save(idevcfg, nidevcfg);
+                if (rc != EOK)
+                        goto error;
+
+                idevcfg = ds_display_next_idevcfg(idevcfg);
+        }
+
+        rc = sif_save(doc, cfgpath);
+        if (rc != EOK)
+                goto error;
+
+        sif_delete(doc);
+        return EOK;
+error:
+        if (doc != NULL)
+                sif_delete(doc);
+        return rc;
 }