Changeset c0757e1f in mainline for uspace/app

Timestamp:

2023-04-19T11:13:06Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

37087c8

Parents:

ec8ef12

Message:

UI display configuration utility

In addition to the command-line utility 'disp', we introduce its UI
equivalent 'display-cfg'. Currently this allows the user to configure
seats in a very comfortable way.

Location:

uspace/app

Files:

• disp/disp.c (modified) (3 diffs)
• display-cfg/display-cfg.c (added)
• display-cfg/display-cfg.h (added)
• display-cfg/doc/doxygroups.h (added)
• display-cfg/meson.build (added)
• display-cfg/seats.c (added)
• display-cfg/seats.h (added)
• display-cfg/test/display-cfg.c (added)
• display-cfg/test/main.c (added)
• display-cfg/test/seats.c (added)
• display-cfg/types/display-cfg.h (added)
• display-cfg/types/seats.h (added)
• meson.build (modified) (1 diff)
• uidemo/uidemo.c (modified) (9 diffs)

uspace/app/disp/disp.c

@@ -56 +56 @@
         printf("  %s assign-dev <device> <seat>\n", NAME);
         printf("  %s unassign-dev <device>\n", NAME);
+        printf("  %s list-dev <seat>\n", NAME);
 }
 
@@ -393 +394 @@
 }
 
+/** List dev subcommand.
+ *
+ * @param dcfg_svc Display configuration service name
+ * @param argc Number of arguments
+ * @param argv Arguments
+ * @return EOK on success or an erro code
+ */
+static errno_t list_dev(const char *dcfg_svc, int argc, char *argv[])
+{
+        dispcfg_t *dispcfg;
+        char *seat_name;
+        sysarg_t seat_id;
+        dispcfg_dev_list_t *dev_list;
+        size_t i;
+        char *svc_name;
+        table_t *table = NULL;
+        errno_t rc;
+
+        if (argc < 1) {
+                printf(NAME ": Missing arguments.\n");
+                print_syntax();
+                return EINVAL;
+        }
+
+        if (argc > 1) {
+                printf(NAME ": Too many arguments.\n");
+                print_syntax();
+                return EINVAL;
+        }
+
+        seat_name = argv[0];
+
+        rc = dispcfg_open(dcfg_svc, NULL, NULL, &dispcfg);
+        if (rc != EOK) {
+                printf(NAME ": Failed connecting to display configuration "
+                    "service: %s.\n", str_error(rc));
+                return rc;
+        }
+
+        rc = seat_find_by_name(dispcfg, seat_name, &seat_id);
+        if (rc != EOK) {
+                printf(NAME ": Seat '%s' not found.\n", seat_name);
+                dispcfg_close(dispcfg);
+                return ENOENT;
+        }
+
+        rc = dispcfg_get_asgn_dev_list(dispcfg, seat_id, &dev_list);
+        if (rc != EOK) {
+                printf(NAME ": Failed getting seat list.\n");
+                dispcfg_close(dispcfg);
+                return rc;
+        }
+
+        rc = table_create(&table);
+        if (rc != EOK) {
+                printf("Memory allocation failed.\n");
+                dispcfg_free_dev_list(dev_list);
+                dispcfg_close(dispcfg);
+                return rc;
+        }
+
+        table_header_row(table);
+        table_printf(table, "Device Name\n");
+
+        for (i = 0; i < dev_list->ndevs; i++) {
+                rc = loc_service_get_name(dev_list->devs[i], &svc_name);
+                if (rc != EOK) {
+                        printf("Failed getting name of service %zu\n",
+                            (size_t)dev_list->devs[i]);
+                        continue;
+                }
+
+                table_printf(table, "%s\n", svc_name);
+                free(svc_name);
+        }
+
+        if (dev_list->ndevs != 0) {
+                rc = table_print_out(table, stdout);
+                if (rc != EOK) {
+                        printf("Error printing table.\n");
+                        table_destroy(table);
+                        dispcfg_free_dev_list(dev_list);
+                        dispcfg_close(dispcfg);
+                        return rc;
+                }
+        }
+
+        dispcfg_close(dispcfg);
+        return EOK;
+}
+
 int main(int argc, char *argv[])
 {
@@ -423 +515 @@
                 if (rc != EOK)
                         return 1;
+        } else if (str_cmp(argv[1], "list-dev") == 0) {
+                rc = list_dev(dispcfg_svc, argc - 2, argv + 2);
+                if (rc != EOK)
+                        return 1;
         } else {
                 printf(NAME ": Unknown command '%s'.\n", argv[1]);

uspace/app/meson.build

@@ -40 +40 @@
         'df',
         'disp',
+        'display-cfg',
         'dnscfg',
         'dnsres',

uspace/app/uidemo/uidemo.c

@@ -52 +52 @@
 #include <ui/promptdialog.h>
 #include <ui/resource.h>
+#include <ui/selectdialog.h>
 #include <ui/tab.h>
 #include <ui/tabset.h>
@@ -108 +109 @@
 static void uidemo_file_exit(ui_menu_entry_t *, void *);
 static void uidemo_edit_modify(ui_menu_entry_t *, void *);
+static void uidemo_edit_insert_character(ui_menu_entry_t *, void *);
 
 static void file_dialog_bok(ui_file_dialog_t *, void *, const char *);
@@ -127 +129 @@
         .bcancel = prompt_dialog_bcancel,
         .close = prompt_dialog_close
+};
+
+static void select_dialog_bok(ui_select_dialog_t *, void *, void *);
+static void select_dialog_bcancel(ui_select_dialog_t *, void *);
+static void select_dialog_close(ui_select_dialog_t *, void *);
+
+static ui_select_dialog_cb_t select_dialog_cb = {
+        .bok = select_dialog_bok,
+        .bcancel = select_dialog_bcancel,
+        .close = select_dialog_close
 };
 
@@ -432 +444 @@
         rc = ui_prompt_dialog_create(demo->ui, &pdparams, &dialog);
         if (rc != EOK) {
-                printf("Error creating message dialog.\n");
+                printf("Error creating prompt dialog.\n");
                 return;
         }
 
         ui_prompt_dialog_set_cb(dialog, &prompt_dialog_cb, demo);
+}
+
+/** Edit / Insert Character menu entry selected.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (demo)
+ */
+static void uidemo_edit_insert_character(ui_menu_entry_t *mentry, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+        ui_select_dialog_params_t sdparams;
+        ui_select_dialog_t *dialog;
+        ui_list_entry_attr_t attr;
+        errno_t rc;
+
+        ui_select_dialog_params_init(&sdparams);
+        sdparams.caption = "Insert Character";
+        sdparams.prompt = "Select character to insert";
+
+        rc = ui_select_dialog_create(demo->ui, &sdparams, &dialog);
+        if (rc != EOK) {
+                printf("Error creating select dialog.\n");
+                return;
+        }
+
+        ui_list_entry_attr_init(&attr);
+        attr.caption = "Dollar sign ($)";
+        attr.arg = (void *)'$';
+        rc = ui_select_dialog_append(dialog, &attr);
+        if (rc != EOK) {
+                printf("Error appending entry to list.\n");
+                return;
+        }
+
+        ui_list_entry_attr_init(&attr);
+        attr.caption = "Hash sign (#)";
+        attr.arg = (void *)'#';
+        rc = ui_select_dialog_append(dialog, &attr);
+        if (rc != EOK) {
+                printf("Error appending entry to list.\n");
+                return;
+        }
+
+        ui_list_entry_attr_init(&attr);
+        attr.caption = "Question mark (?)";
+        attr.arg = (void *)'?';
+        rc = ui_select_dialog_append(dialog, &attr);
+        if (rc != EOK) {
+                printf("Error appending entry to list.\n");
+                return;
+        }
+
+        ui_select_dialog_set_cb(dialog, &select_dialog_cb, demo);
+
+        (void) ui_select_dialog_paint(dialog);
 }
 
@@ -525 +592 @@
 /** Prompt dialog cancel button press.
  *
- * @param dialog File dialog
+ * @param dialog Prompt dialog
  * @param arg Argument (ui_demo_t *)
  */
@@ -538 +605 @@
 /** Prompt dialog close request.
  *
- * @param dialog File dialog
+ * @param dialog Prompt dialog
  * @param arg Argument (ui_demo_t *)
  */
@@ -547 +614 @@
         (void) demo;
         ui_prompt_dialog_destroy(dialog);
+}
+
+/** Select dialog OK button press.
+ *
+ * @param dialog Select dialog
+ * @param arg Argument (ui_demo_t *)
+ * @param text Submitted text
+ */
+static void select_dialog_bok(ui_select_dialog_t *dialog, void *arg,
+    void *earg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+        char str[2];
+
+        ui_select_dialog_destroy(dialog);
+        str[0] = (char)(intptr_t)earg;
+        str[1] = '\0';
+        (void) ui_entry_insert_str(demo->entry, str);
+}
+
+/** Select dialog cancel button press.
+ *
+ * @param dialog Select dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void select_dialog_bcancel(ui_select_dialog_t *dialog, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) demo;
+        ui_select_dialog_destroy(dialog);
+}
+
+/** Select dialog close request.
+ *
+ * @param dialog Select dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void select_dialog_close(ui_select_dialog_t *dialog, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) demo;
+        ui_select_dialog_destroy(dialog);
 }
 
@@ -598 +709 @@
         ui_menu_entry_t *mexit;
         ui_menu_entry_t *mmodify;
+        ui_menu_entry_t *minsert_char;
         ui_menu_entry_t *mabout;
         ui_list_entry_attr_t eattr;
@@ -719 +831 @@
 
         ui_menu_entry_set_cb(mmodify, uidemo_edit_modify, (void *) &demo);
+
+        rc = ui_menu_entry_create(demo.medit, "~I~nsert Character",
+            "", &minsert_char);
+        if (rc != EOK) {
+                printf("Error creating menu.\n");
+                return rc;
+        }
+
+        ui_menu_entry_set_cb(minsert_char, uidemo_edit_insert_character,
+            (void *) &demo);
 
         rc = ui_menu_create(demo.mbar, "~P~references", &demo.mpreferences);