Changeset 47728678 in mainline for uspace/app/uidemo/uidemo.c

Timestamp:

2020-10-13T09:24:56Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f6df5a3

Parents:

f80690a

git-author:

Jiri Svoboda <jiri@…> (2020-10-12 21:24:39)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-13 09:24:56)

Message:

Push button - first light

Introduced ui_resource_t class to hold common UI resources such as font,
colors, etc. We don't want every button to load its own copy of the font.

File:

• uspace/app/uidemo/uidemo.c (modified) (3 diffs)

uspace/app/uidemo/uidemo.c

@@ -36 +36 @@
 #include <stdio.h>
 #include <str.h>
+#include <task.h>
 #include <ui/pbutton.h>
+#include <ui/resource.h>
+
+static void wnd_close_event(void *);
+static void wnd_kbd_event(void *, kbd_event_t *);
+
+static display_wnd_cb_t wnd_cb = {
+        .close_event = wnd_close_event,
+        .kbd_event = wnd_kbd_event
+};
+
+static bool quit = false;
 
 static void print_syntax(void)
@@ -43 +55 @@
 }
 
+static void wnd_close_event(void *arg)
+{
+        printf("Close event\n");
+        quit = true;
+}
+
+static void wnd_kbd_event(void *arg, kbd_event_t *event)
+{
+        printf("Keyboard event type=%d key=%d\n", event->type, event->key);
+        if (event->type == KEY_PRESS)
+                quit = true;
+}
+
+/** Run UI demo on display server. */
+static errno_t ui_demo_display(const char *display_svc)
+{
+        display_t *display = NULL;
+        gfx_context_t *gc;
+        display_wnd_params_t params;
+        display_window_t *window = NULL;
+        ui_resource_t *ui_res;
+        ui_pbutton_t *pb1;
+        ui_pbutton_t *pb2;
+        gfx_rect_t rect;
+        errno_t rc;
+
+        printf("Init display..\n");
+
+        rc = display_open(display_svc, &display);
+        if (rc != EOK) {
+                printf("Error opening display.\n");
+                return rc;
+        }
+
+        display_wnd_params_init(&params);
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p1.x = 220;
+        params.rect.p1.y = 100;
+
+        rc = display_window_create(display, &params, &wnd_cb, NULL, &window);
+        if (rc != EOK) {
+                printf("Error creating window.\n");
+                return rc;
+        }
+
+        rc = display_window_get_gc(window, &gc);
+        if (rc != EOK) {
+                printf("Error getting graphics context.\n");
+                return rc;
+        }
+
+        task_retval(0);
+
+        rc = ui_resource_create(gc, &ui_res);
+        if (rc != EOK) {
+                printf("Error creating UI.\n");
+                return 1;
+        }
+
+        rc = ui_pbutton_create(ui_res, "Confirm", &pb1);
+        if (rc != EOK) {
+                printf("Error creating button.\n");
+                return 1;
+        }
+
+        rect.p0.x = 20;
+        rect.p0.y = 50;
+        rect.p1.x = 100;
+        rect.p1.y = 80;
+        ui_pbutton_set_rect(pb1, &rect);
+
+        rc = ui_pbutton_create(ui_res, "Cancel", &pb2);
+        if (rc != EOK) {
+                printf("Error creating button.\n");
+                return 1;
+        }
+
+        rect.p0.x = 120;
+        rect.p0.y = 50;
+        rect.p1.x = 200;
+        rect.p1.y = 80;
+        ui_pbutton_set_rect(pb2, &rect);
+
+        rc = ui_pbutton_paint(pb1);
+        if (rc != EOK) {
+                printf("Error painting button.\n");
+                return 1;
+        }
+
+        rc = ui_pbutton_paint(pb2);
+        if (rc != EOK) {
+                printf("Error painting button.\n");
+                return 1;
+        }
+
+        while (!quit) {
+                fibril_usleep(100 * 1000);
+        }
+
+        ui_pbutton_destroy(pb1);
+        ui_pbutton_destroy(pb2);
+
+        rc = gfx_context_delete(gc);
+        if (rc != EOK)
+                return rc;
+
+        display_window_destroy(window);
+        display_close(display);
+
+        return EOK;
+}
+
 int main(int argc, char *argv[])
 {
         const char *display_svc = DISPLAY_DEFAULT;
-        ui_pbutton_t *pbutton;
         errno_t rc;
         int i;
@@ -73 +197 @@
         }
 
-        printf("Display service: %s\n", display_svc);
-
-        rc = ui_pbutton_create("Hello", &pbutton);
-        if (rc != EOK) {
-                printf("Error creating button.\n");
-                return 1;
-        }
-
-        ui_pbutton_destroy(pbutton);
+        rc = ui_demo_display(display_svc);
+        if (rc != EOK)
+                return 1;
+
         return 0;
 }