Changeset 45208e22 in mainline

Timestamp:

2024-03-13T09:07:04Z (7 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

41e1258

Parents:

c3d4b39b

Message:

Viewer to let user browse for image file if not specified as argument

File:

• uspace/app/viewer/viewer.c (modified) (10 diffs)

uspace/app/viewer/viewer.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <str.h>
+#include <ui/filedialog.h>
 #include <ui/image.h>
 #include <ui/ui.h>
@@ -60 +61 @@
         ui_image_t *image;
         gfx_context_t *window_gc;
+        ui_file_dialog_t *dialog;
 
         gfx_rect_t img_rect;
@@ -67 +69 @@
     gfx_rect_t *);
 static bool viewer_img_setup(viewer_t *, gfx_bitmap_t *, gfx_rect_t *);
+static errno_t viewer_window_create(viewer_t *);
 static void viewer_window_destroy(viewer_t *);
 
@@ -75 +78 @@
         .close = wnd_close,
         .kbd = wnd_kbd_event
+};
+
+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
 };
 
@@ -132 +145 @@
                 }
         }
+}
+
+/** File dialog OK button press.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (viewer_t *)
+ * @param fname File name
+ */
+static void file_dialog_bok(ui_file_dialog_t *dialog, void *arg,
+    const char *fname)
+{
+        viewer_t *viewer = (viewer_t *) arg;
+        errno_t rc;
+
+        viewer->imgs_count = 1;
+        viewer->imgs = calloc(viewer->imgs_count, sizeof(char *));
+        if (viewer->imgs == NULL) {
+                printf("Out of memory.\n");
+                ui_quit(viewer->ui);
+                return;
+        }
+
+        viewer->imgs[0] = str_dup(fname);
+        if (viewer->imgs[0] == NULL) {
+                printf("Out of memory.\n");
+                ui_quit(viewer->ui);
+                return;
+        }
+
+        rc = viewer_window_create(viewer);
+        if (rc != EOK)
+                ui_quit(viewer->ui);
+
+        ui_file_dialog_destroy(dialog);
+        viewer->dialog = NULL;
+}
+
+/** File dialog cancel button press.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (viewer_t *)
+ */
+static void file_dialog_bcancel(ui_file_dialog_t *dialog, void *arg)
+{
+        viewer_t *viewer = (viewer_t *) arg;
+
+        ui_file_dialog_destroy(dialog);
+        ui_quit(viewer->ui);
+}
+
+/** File dialog close request.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (viewer_t *)
+ */
+static void file_dialog_close(ui_file_dialog_t *dialog, void *arg)
+{
+        viewer_t *viewer = (viewer_t *) arg;
+
+        ui_file_dialog_destroy(dialog);
+        ui_quit(viewer->ui);
 }
 
@@ -295 +369 @@
 error:
         viewer_window_destroy(viewer);
+        ui_quit(viewer->ui);
         return rc;
 }
@@ -313 +388 @@
         int i;
         unsigned u;
+        ui_file_dialog_params_t fdparams;
 
         viewer = calloc(1, sizeof(viewer_t));
@@ -341 +417 @@
         }
 
-        if (i >= argc) {
-                printf("No image files specified.\n");
-                print_syntax();
-                goto error;
-        }
-
-        viewer->imgs_count = argc - i;
-        viewer->imgs = calloc(viewer->imgs_count, sizeof(char *));
-        if (viewer->imgs == NULL) {
-                printf("Out of memory.\n");
-                goto error;
-        }
-
-        for (int j = 0; j < argc - i; j++) {
-                viewer->imgs[j] = str_dup(argv[i + j]);
-                if (viewer->imgs[j] == NULL) {
+        /* Images specified? */
+        if (i < argc) {
+                viewer->imgs_count = argc - i;
+                viewer->imgs = calloc(viewer->imgs_count, sizeof(char *));
+                if (viewer->imgs == NULL) {
                         printf("Out of memory.\n");
                         goto error;
+                }
+
+                for (int j = 0; j < argc - i; j++) {
+                        viewer->imgs[j] = str_dup(argv[i + j]);
+                        if (viewer->imgs[j] == NULL) {
+                                printf("Out of memory.\n");
+                                goto error;
+                        }
                 }
         }
@@ -373 +446 @@
         viewer->ui = ui;
 
-        rc = viewer_window_create(viewer);
-        if (rc != EOK)
-                goto error;
+        if (viewer->imgs != NULL) {
+                /* We have images, create viewer window. */
+                rc = viewer_window_create(viewer);
+                if (rc != EOK)
+                        goto error;
+        } else {
+                /* No images specified, browse for one. */
+                ui_file_dialog_params_init(&fdparams);
+                fdparams.caption = "Open Image";
+
+                rc = ui_file_dialog_create(viewer->ui, &fdparams,
+                    &viewer->dialog);
+                if (rc != EOK) {
+                        printf("Error creating file dialog.\n");
+                        goto error;
+                }
+
+                ui_file_dialog_set_cb(viewer->dialog, &file_dialog_cb,
+                    (void *)viewer);
+        }
 
         ui_run(ui);
@@ -385 +475 @@
         return 0;
 error:
+        if (viewer != NULL && viewer->dialog != NULL)
+                ui_file_dialog_destroy(viewer->dialog);
         if (viewer != NULL && viewer->imgs != NULL) {
                 for (u = 0; u < viewer->imgs_count; u++) {