Changeset 0ffa40a7 in mainline

Timestamp:

2024-03-08T13:30:18Z (7 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

3f81cdc

Parents:

0a411bbf

git-author:

Jiri Svoboda <jiri@…> (2024-03-07 20:29:50)

git-committer:

Jiri Svoboda <jiri@…> (2024-03-08 13:30:18)

Message:

Viewer should support console mode

File:

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

uspace/app/viewer/viewer.c

@@ -56 +56 @@
 static char **imgs;
 
-static ui_window_t *window;
+static ui_window_t *window = NULL;
 static gfx_bitmap_t *bitmap = NULL;
 static ui_image_t *image = NULL;
@@ -90 +90 @@
     kbd_event_t *event)
 {
+        viewer_t *viewer = (viewer_t *)arg;
         bool update = false;
 
         if ((event->type == KEY_PRESS) && (event->c == 'q'))
-                exit(0);
+                ui_quit(viewer->ui);
 
         if ((event->type == KEY_PRESS) && (event->key == KC_PAGE_DOWN)) {
@@ -216 +217 @@
 int main(int argc, char *argv[])
 {
-        const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *display_spec = UI_ANY_DEFAULT;
         gfx_bitmap_t *lbitmap;
         gfx_rect_t lrect;
@@ -277 +278 @@
         }
 
+        if (ui_is_fullscreen(ui))
+                fullscreen = true;
+
         viewer.ui = ui;
 
@@ -298 +302 @@
         if (rc != EOK) {
                 printf("Error creating window.\n");
-                return 1;
+                goto error;
         }
 
@@ -307 +311 @@
         if (!img_load(window_gc, imgs[imgs_current], &lbitmap, &lrect)) {
                 printf("Cannot load image \"%s\".\n", imgs[imgs_current]);
-                return 1;
+                goto error;
         }
 
@@ -322 +326 @@
                 if (rc != EOK) {
                         printf("Error resizing window.\n");
-                        return 1;
+                        goto error;
                 }
         }
@@ -328 +332 @@
         if (!img_setup(window_gc, lbitmap, &lrect)) {
                 printf("Cannot setup image \"%s\".\n", imgs[imgs_current]);
-                return 1;
+                goto error;
         }
 
@@ -334 +338 @@
         if (rc != EOK) {
                 printf("Error painting window.\n");
-                return 1;
+                goto error;
         }
 
         ui_run(ui);
 
+        ui_window_destroy(window);
+        ui_destroy(ui);
+
         return 0;
+error:
+        if (window != NULL)
+                ui_window_destroy(window);
+        ui_destroy(ui);
+        return 1;
 }