Changeset 5e109e1 in mainline

Timestamp:

2021-08-10T09:49:21Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

307d4d2, 3a4a944f

Parents:

edeee9f

git-author:

Jiri Svoboda <jiri@…> (2021-08-09 18:49:14)

git-committer:

Jiri Svoboda <jiri@…> (2021-08-10 09:49:21)

Message:

File dialog prototype

This only contains a text entry for entering the file path and
OK / Cancel buttons.

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (8 diffs)
• lib/ui/include/types/ui/filedialog.h (added)
• lib/ui/include/ui/entry.h (modified) (1 diff)
• lib/ui/include/ui/filedialog.h (added)
• lib/ui/include/ui/msgdialog.h (modified) (1 diff)
• lib/ui/meson.build (modified) (2 diffs)
• lib/ui/private/filedialog.h (added)
• lib/ui/src/entry.c (modified) (1 diff)
• lib/ui/src/filedialog.c (added)
• lib/ui/src/msgdialog.c (modified) (2 diffs)
• lib/ui/test/filedialog.c (added)
• lib/ui/test/main.c (modified) (2 diffs)
• lib/ui/test/msgdialog.c (modified) (1 diff)

uspace/app/uidemo/uidemo.c

@@ -40 +40 @@
 #include <str.h>
 #include <ui/entry.h>
+#include <ui/filedialog.h>
 #include <ui/fixed.h>
 #include <ui/image.h>
@@ -85 +86 @@
 };
 
+static void uidemo_file_load(ui_menu_entry_t *, void *);
 static void uidemo_file_message(ui_menu_entry_t *, void *);
 static void uidemo_file_exit(ui_menu_entry_t *, void *);
+
+static void file_dialog_bok(ui_file_dialog_t *, void *, const char *);
+static void file_dialog_bcancel(ui_file_dialog_t *, void *);
+static void file_dialog_close(ui_file_dialog_t *, void *);
+
+static ui_file_dialog_cb_t file_dialog_cb = {
+        .bok = file_dialog_bok,
+        .bcancel = file_dialog_bcancel,
+        .close = file_dialog_close
+};
 
 static void msg_dialog_button(ui_msg_dialog_t *, void *, unsigned);
@@ -191 +203 @@
 }
 
-/** File/message menu entry selected.
- *
- * @param mentry Menu entry
- * @param arg Argument (demo)
- */
-static void uidemo_file_message(ui_menu_entry_t *mentry, void *arg)
-{
-        ui_demo_t *demo = (ui_demo_t *) arg;
+/** Display a message window.
+ *
+ * @param demo UI demo
+ * @param caption Window caption
+ * @param text Message text
+ */
+static void uidemo_show_message(ui_demo_t *demo, const char *caption,
+    const char *text)
+{
         ui_msg_dialog_params_t mdparams;
         ui_msg_dialog_t *dialog;
@@ -204 +217 @@
 
         ui_msg_dialog_params_init(&mdparams);
+        mdparams.caption = caption;
+        mdparams.text = text;
+
+        rc = ui_msg_dialog_create(demo->ui, &mdparams, &dialog);
+        if (rc != EOK) {
+                printf("Error creating message dialog.\n");
+                return;
+        }
+
+        ui_msg_dialog_set_cb(dialog, &msg_dialog_cb, &demo);
+}
+
+
+/** File/load menu entry selected.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (demo)
+ */
+static void uidemo_file_load(ui_menu_entry_t *mentry, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+        ui_file_dialog_params_t fdparams;
+        ui_file_dialog_t *dialog;
+        errno_t rc;
+
+        ui_file_dialog_params_init(&fdparams);
+        fdparams.caption = "Load File";
+
+        rc = ui_file_dialog_create(demo->ui, &fdparams, &dialog);
+        if (rc != EOK) {
+                printf("Error creating message dialog.\n");
+                return;
+        }
+
+        ui_file_dialog_set_cb(dialog, &file_dialog_cb, demo);
+}
+
+/** File/message menu entry selected.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (demo)
+ */
+static void uidemo_file_message(ui_menu_entry_t *mentry, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+        ui_msg_dialog_params_t mdparams;
+        ui_msg_dialog_t *dialog;
+        errno_t rc;
+
+        ui_msg_dialog_params_init(&mdparams);
         mdparams.caption = "Message For You";
         mdparams.text = "Hello, world!";
@@ -214 +277 @@
 
         ui_msg_dialog_set_cb(dialog, &msg_dialog_cb, &demo);
-
 }
 
@@ -227 +289 @@
 
         ui_quit(demo->ui);
+}
+
+/** File dialog OK button press.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ * @param fname File name
+ */
+static void file_dialog_bok(ui_file_dialog_t *dialog, void *arg,
+    const char *fname)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+        char buf[128];
+        char *p;
+        FILE *f;
+
+        ui_file_dialog_destroy(dialog);
+
+        f = fopen(fname, "rt");
+        if (f == NULL) {
+                uidemo_show_message(demo, "Error", "Error opening file.");
+                return;
+        }
+
+        p = fgets(buf, sizeof(buf), f);
+        if (p == NULL) {
+                uidemo_show_message(demo, "Error", "Error reading file.");
+                fclose(f);
+                return;
+        }
+
+        /* Cut string off at the first non-printable character */
+        p = buf;
+        while (*p != '\0') {
+                if (*p < ' ') {
+                        *p = '\0';
+                        break;
+                }
+                ++p;
+        }
+
+        ui_entry_set_text(demo->entry, buf);
+        fclose(f);
+}
+
+/** File dialog cancel button press.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void file_dialog_bcancel(ui_file_dialog_t *dialog, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) demo;
+        ui_file_dialog_destroy(dialog);
+}
+
+/** Message dialog close request.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void file_dialog_close(ui_file_dialog_t *dialog, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) demo;
+        ui_file_dialog_destroy(dialog);
 }
 
@@ -271 +402 @@
         gfx_coord2_t off;
         ui_menu_entry_t *mmsg;
+        ui_menu_entry_t *mload;
         ui_menu_entry_t *mfoo;
         ui_menu_entry_t *mbar;
@@ -342 +474 @@
         ui_menu_entry_set_cb(mmsg, uidemo_file_message, (void *) &demo);
 
+        rc = ui_menu_entry_create(demo.mfile, "Load", "", &mload);
+        if (rc != EOK) {
+                printf("Error creating menu.\n");
+                return rc;
+        }
+
+        ui_menu_entry_set_cb(mload, uidemo_file_load, (void *) &demo);
+
         rc = ui_menu_entry_create(demo.mfile, "Foo", "Ctrl-Alt-Del", &mfoo);
         if (rc != EOK) {

uspace/lib/ui/include/ui/entry.h

@@ -52 +52 @@
 extern void ui_entry_set_read_only(ui_entry_t *, bool);
 extern errno_t ui_entry_set_text(ui_entry_t *, const char *);
+extern const char *ui_entry_get_text(ui_entry_t *);
 extern errno_t ui_entry_paint(ui_entry_t *);
 extern void ui_entry_backspace(ui_entry_t *);

uspace/lib/ui/include/ui/msgdialog.h

@@ -31 +31 @@
  */
 /**
- * @file Message Dialog
+ * @file Message dialog
  */
 
-#ifndef _UI_MSG_DIALOG_H
-#define _UI_MSG_DIALOG_H
+#ifndef _UI_MSGDIALOG_H
+#define _UI_MSGDIALOG_H
 
 #include <errno.h>

uspace/lib/ui/meson.build

@@ -33 +33 @@
         'src/dummygc.c',
         'src/entry.c',
+        'src/filedialog.c',
         'src/fixed.c',
         'src/image.c',
@@ -55 +56 @@
         'test/control.c',
         'test/entry.c',
+        'test/filedialog.c',
         'test/fixed.c',
         'test/image.c',

uspace/lib/ui/src/entry.c

@@ -190 +190 @@
         entry->pos = str_size(text);
         entry->sel_start = entry->pos;
+
         ui_entry_scroll_update(entry, false);
         ui_entry_paint(entry);
 
         return EOK;
+}
+
+/** Get entry text.
+ *
+ * @return Pointer to entry text.
+ */
+const char *ui_entry_get_text(ui_entry_t *entry)
+{
+        return entry->text;
 }
 

uspace/lib/ui/src/msgdialog.c

@@ -177 +177 @@
                 goto error;
 
+        dialog->bok = bok;
         bok = NULL;
 
@@ -187 +188 @@
 
         dialog->window = window;
-        dialog->bok = bok;
         *rdialog = dialog;
         return EOK;
 error:
+        if (bok != NULL)
+                ui_pbutton_destroy(bok);
         if (label != NULL)
                 ui_label_destroy(label);

uspace/lib/ui/test/main.c

@@ -34 +34 @@
 PCUT_IMPORT(checkbox);
 PCUT_IMPORT(entry);
+PCUT_IMPORT(file_dialog);
 PCUT_IMPORT(fixed);
 PCUT_IMPORT(image);
@@ -40 +41 @@
 PCUT_IMPORT(menubar);
 PCUT_IMPORT(menuentry);
+PCUT_IMPORT(msg_dialog);
 PCUT_IMPORT(paint);
 PCUT_IMPORT(pbutton);

uspace/lib/ui/test/msgdialog.c

@@ -108 +108 @@
         ui_pbutton_clicked(dialog->bok);
 
-        /* Button callback with unfocus callback not implemented */
+        /* Button callback with callback not implemented */
         ui_msg_dialog_set_cb(dialog, &dummy_msg_dialog_cb, NULL);
         ui_pbutton_clicked(dialog->bok);