Changeset 5d466a1 in mainline

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

6aa85c1

Parents:

748c8bd

git-author:

Jiri Svoboda <jiri@…> (2021-10-03 17:33:47)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Add menu, make window full-screen

Location:

uspace/app/nav

Files:

• menu.c (added)
• menu.h (added)
• meson.build (modified) (1 diff)
• nav.c (modified) (3 diffs)
• nav.h (modified) (2 diffs)

uspace/app/nav/meson.build

@@ -29 +29 @@
 deps = [ 'ui' ]
 src = files(
+        'menu.c',
         'nav.c',
 )

uspace/app/nav/nav.c

@@ -37 +37 @@
 #include <gfx/coord.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <str.h>
 #include <ui/fixed.h>
-#include <ui/label.h>
 #include <ui/resource.h>
 #include <ui/ui.h>
 #include <ui/window.h>
+#include "menu.h"
 #include "nav.h"
+
+static errno_t navigator_create(const char *, navigator_t **);
+static void navigator_destroy(navigator_t *);
 
 static void wnd_close(ui_window_t *, void *);
@@ -63 +67 @@
 }
 
-/** Run navigator on the specified display. */
-static errno_t navigator_run(const char *display_spec)
+/** Create navigator.
+ *
+ * @param display_spec Display specification
+ * @param rnavigator Place to store pointer to new navigator
+ * @return EOK on success or ane error code
+ */
+static errno_t navigator_create(const char *display_spec,
+    navigator_t **rnavigator)
 {
-        ui_t *ui = NULL;
+        navigator_t *navigator;
         ui_wnd_params_t params;
-        ui_window_t *window = NULL;
-        navigator_t navigator;
-        gfx_rect_t rect;
-        ui_resource_t *ui_res;
         errno_t rc;
 
-        rc = ui_create(display_spec, &ui);
+        navigator = calloc(1, sizeof(navigator_t));
+        if (navigator == NULL)
+                return ENOMEM;
+
+        rc = ui_create(display_spec, &navigator->ui);
         if (rc != EOK) {
                 printf("Error creating UI on display %s.\n", display_spec);
-                return rc;
+                goto error;
         }
 
         ui_wnd_params_init(&params);
         params.caption = "Navigator";
-        if (ui_is_textmode(ui)) {
-                params.rect.p0.x = 0;
-                params.rect.p0.y = 0;
-                params.rect.p1.x = 24;
-                params.rect.p1.y = 5;
-        } else {
-                params.rect.p0.x = 0;
-                params.rect.p0.y = 0;
-                params.rect.p1.x = 200;
-                params.rect.p1.y = 60;
+        params.style &= ~ui_wds_decorated;
+        params.placement = ui_wnd_place_full_screen;
+
+        rc = ui_window_create(navigator->ui, &params, &navigator->window);
+        if (rc != EOK) {
+                printf("Error creating window.\n");
+                goto error;
         }
 
-        memset((void *) &navigator, 0, sizeof(navigator));
-        navigator.ui = ui;
+        ui_window_set_cb(navigator->window, &window_cb, (void *) navigator);
 
-        rc = ui_window_create(ui, &params, &window);
+        rc = ui_fixed_create(&navigator->fixed);
         if (rc != EOK) {
-                printf("Error creating window.\n");
-                return rc;
+                printf("Error creating fixed layout.\n");
+                goto error;
         }
 
-        ui_window_set_cb(window, &window_cb, (void *) &navigator);
-        navigator.window = window;
+        ui_window_add(navigator->window, ui_fixed_ctl(navigator->fixed));
 
-        ui_res = ui_window_get_res(window);
+        rc = nav_menu_create(navigator, &navigator->menu);
+        if (rc != EOK)
+                goto error;
 
-        rc = ui_fixed_create(&navigator.fixed);
+        rc = ui_window_paint(navigator->window);
         if (rc != EOK) {
-                printf("Error creating fixed layout.\n");
-                return rc;
+                printf("Error painting window.\n");
+                goto error;
         }
 
-        rc = ui_label_create(ui_res, "Hello!", &navigator.label);
-        if (rc != EOK) {
-                printf("Error creating label.\n");
+        *rnavigator = navigator;
+        return EOK;
+error:
+        navigator_destroy(navigator);
+        return rc;
+}
+
+static void navigator_destroy(navigator_t *navigator)
+{
+        if (navigator->menu != NULL)
+                nav_menu_destroy(navigator->menu);
+        if (navigator->window != NULL)
+                ui_window_destroy(navigator->window);
+        if (navigator->ui != NULL)
+                ui_destroy(navigator->ui);
+        free(navigator);
+}
+
+/** Run navigator on the specified display. */
+static errno_t navigator_run(const char *display_spec)
+{
+        navigator_t *navigator;
+        errno_t rc;
+
+        rc = navigator_create(display_spec, &navigator);
+        if (rc != EOK)
                 return rc;
-        }
 
-        ui_window_get_app_rect(window, &rect);
-        ui_label_set_rect(navigator.label, &rect);
-        ui_label_set_halign(navigator.label, gfx_halign_center);
-        ui_label_set_valign(navigator.label, gfx_valign_center);
+        ui_run(navigator->ui);
 
-        rc = ui_fixed_add(navigator.fixed, ui_label_ctl(navigator.label));
-        if (rc != EOK) {
-                printf("Error adding control to layout.\n");
-                return rc;
-        }
-
-        ui_window_add(window, ui_fixed_ctl(navigator.fixed));
-
-        rc = ui_window_paint(window);
-        if (rc != EOK) {
-                printf("Error painting window.\n");
-                return rc;
-        }
-
-        ui_run(ui);
-
-        ui_window_destroy(window);
-        ui_destroy(ui);
-
+        navigator_destroy(navigator);
         return EOK;
 }
@@ -149 +157 @@
 static void print_syntax(void)
 {
-        printf("Syntax: navigator [-d <display-spec>]\n");
+        printf("Syntax: nav [-d <display-spec>]\n");
 }
 

uspace/app/nav/nav.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <display.h>
 #include <ui/fixed.h>
-#include <ui/label.h>
 #include <ui/ui.h>
 #include <ui/window.h>
 
 /** Navigator */
-typedef struct {
+typedef struct navigator {
+        /** User interface */
         ui_t *ui;
+        /** Window */
         ui_window_t *window;
+        /** Fixed layout */
         ui_fixed_t *fixed;
-        ui_label_t *label;
+        /** Menu */
+        struct nav_menu *menu;
 } navigator_t;