Changeset 14cbf07 in mainline for uspace/app/display-cfg/seats.c

Timestamp:

2023-05-15T16:19:52Z (11 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2b5628c, 8a4ceaa

Parents:

aace43d8

Message:

Fill in tests seats_list_populate and avail_devices_insert

File:

• uspace/app/display-cfg/seats.c (modified) (9 diffs)

uspace/app/display-cfg/seats.c

@@ -50 +50 @@
 #include "seats.h"
 
-static errno_t dcfg_seats_list_populate(dcfg_seats_t *);
 static errno_t dcfg_seats_asgn_dev_list_populate(dcfg_seats_t *);
 static errno_t dcfg_seats_avail_dev_list_populate(dcfg_seats_t *,
@@ -118 +117 @@
         ui_resource_t *ui_res;
         dcfg_seats_t *seats;
-        dcfg_seats_entry_t *entry;
         gfx_rect_t rect;
-        char *caption = NULL;
-        errno_t rc;
-        int rv;
+        errno_t rc;
 
         ui_res = ui_window_get_res(dcfg->window);
@@ -204 +200 @@
         ui_list_set_cb(seats->seat_list, &dcfg_seats_list_cb, (void *)seats);
 
-        rc = dcfg_seats_list_populate(seats);
-        if (rc != EOK)
-                goto error;
-
         /* 'Add...' seat button */
 
@@ -272 +264 @@
         /* 'Devices assigned to seat 'xxx':' label */
 
-        entry = dcfg_seats_get_selected(seats);
-        rv = asprintf(&caption, "Devices assigned to seat '%s':", entry->name);
-        if (rv < 0) {
-                rc = ENOMEM;
-                goto error;
-        }
-
-        rc = ui_label_create(ui_res, caption, &seats->devices_label);
+        rc = ui_label_create(ui_res, "Devices assigned to seat 'xxx':",
+            &seats->devices_label);
         if (rc != EOK) {
                 printf("Error creating label.\n");
                 goto error;
         }
-
-        free(caption);
-        caption = NULL;
 
         if (ui_resource_is_textmode(ui_res)) {
@@ -400 +383 @@
         ui_tab_add(seats->tab, ui_fixed_ctl(seats->fixed));
 
-        rc = dcfg_seats_asgn_dev_list_populate(seats);
-        if (rc != EOK)
-                goto error;
-
         *rseats = seats;
         return EOK;
@@ -411 +390 @@
         if (seats->add_device != NULL)
                 ui_pbutton_destroy(seats->add_device);
-        if (caption != NULL)
-                free(caption);
         if (seats->devices_label != NULL)
                 ui_label_destroy(seats->devices_label);
@@ -431 +408 @@
 }
 
+/** Populate seats tab with display configuration service data
+ *
+ * @param dcfg Display configuration dialog
+ * @param rseats Place to store pointer to new seat configuration tab
+ * @return EOK on success or an error code
+ */
+errno_t dcfg_seats_populate(dcfg_seats_t *seats)
+{
+        dcfg_seats_entry_t *entry;
+        errno_t rc;
+
+        printf("seats list populate\n");
+        rc = dcfg_seats_list_populate(seats);
+        if (rc != EOK)
+                return rc;
+
+        /*
+         * Update "Devices assigned to seat 'xxx'" label and populate
+         * assigned devices list.
+         */
+        entry = dcfg_seats_get_selected(seats);
+        dcfg_seats_list_selected(entry->lentry, (void *)entry);
+        return EOK;
+}
+
 /** Destroy display configuration dialog.
  *
@@ -511 +513 @@
  * @return EOK on success or an error code
  */
-static errno_t dcfg_seats_list_populate(dcfg_seats_t *seats)
+errno_t dcfg_seats_list_populate(dcfg_seats_t *seats)
 {
         size_t i;
@@ -594 +596 @@
  * @return EOK on success or an error code
  */
-static errno_t dcfg_avail_devices_insert(dcfg_seats_t *seats,
+errno_t dcfg_avail_devices_insert(dcfg_seats_t *seats,
     ui_select_dialog_t *dialog, const char *name, service_id_t svc_id)
 {