Changeset 47728678 in mainline

Timestamp:

2020-10-13T09:24:56Z (4 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.

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (3 diffs)
• lib/ui/include/types/ui/resource.h (added)
• lib/ui/include/ui/pbutton.h (modified) (1 diff)
• lib/ui/include/ui/resource.h (added)
• lib/ui/meson.build (modified) (2 diffs)
• lib/ui/private/pbutton.h (modified) (2 diffs)
• lib/ui/private/resource.h (added)
• lib/ui/src/pbutton.c (modified) (3 diffs)
• lib/ui/src/resource.c (added)
• lib/ui/test/main.c (modified) (1 diff)
• lib/ui/test/pbutton.c (modified) (1 diff)
• lib/ui/test/resource.c (added)

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;
 }

uspace/lib/ui/include/ui/pbutton.h

@@ -38 +38 @@
 
 #include <errno.h>
+#include <gfx/coord.h>
 #include <types/ui/pbutton.h>
+#include <types/ui/resource.h>
 
-extern errno_t ui_pbutton_create(const char *, ui_pbutton_t **);
+extern errno_t ui_pbutton_create(ui_resource_t *, const char *,
+    ui_pbutton_t **);
 extern void ui_pbutton_destroy(ui_pbutton_t *);
+extern void ui_pbutton_set_rect(ui_pbutton_t *, gfx_rect_t *);
+extern errno_t ui_pbutton_paint(ui_pbutton_t *);
 
 #endif

uspace/lib/ui/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'gfx' ]
+deps = [ 'gfx', 'gfxfont' ]
 src = files(
         'src/pbutton.c',
+        'src/resource.c',
 )
 
@@ -35 +36 @@
         'test/main.c',
         'test/pbutton.c',
+        'test/resource.c',
 )

uspace/lib/ui/private/pbutton.h

@@ -38 +38 @@
 #define _UI_PRIVATE_PBUTTON_H
 
+#include <gfx/context.h>
+#include <gfx/coord.h>
+
 /** Actual structure of push button.
  *
@@ -43 +46 @@
  */
 struct ui_pbutton {
+        /** UI resource */
+        struct ui_resource *res;
+        /** Push button rectangle */
+        gfx_rect_t rect;
+        /** Caption */
         const char *caption;
 };

uspace/lib/ui/src/pbutton.c

@@ -35 +35 @@
 
 #include <errno.h>
+#include <gfx/color.h>
+#include <gfx/context.h>
+#include <gfx/render.h>
+#include <gfx/text.h>
 #include <stdlib.h>
+#include <str.h>
 #include <ui/pbutton.h>
 #include "../private/pbutton.h"
+#include "../private/resource.h"
 
 /** Create new push button.
  *
+ * @param resource UI resource
  * @param caption Caption
  * @param rpbutton Place to store pointer to new push button
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_pbutton_create(const char *caption, ui_pbutton_t **rpbutton)
+errno_t ui_pbutton_create(ui_resource_t *resource, const char *caption,
+    ui_pbutton_t **rpbutton)
 {
         ui_pbutton_t *pbutton;
@@ -53 +61 @@
                 return ENOMEM;
 
-        (void) caption;
+        pbutton->caption = str_dup(caption);
+        if (pbutton->caption == NULL) {
+                free(pbutton);
+                return ENOMEM;
+        }
+
+        pbutton->res = resource;
         *rpbutton = pbutton;
         return EOK;
@@ -70 +84 @@
 }
 
+/** Set button rectangle.
+ *
+ * @param pbutton Button
+ * @param rect New button rectanle
+ */
+void ui_pbutton_set_rect(ui_pbutton_t *pbutton, gfx_rect_t *rect)
+{
+        pbutton->rect = *rect;
+}
+
+/** Paint push button.
+ *
+ * @param pbutton Push button
+ * @return EOK on success or an error code
+ */
+errno_t ui_pbutton_paint(ui_pbutton_t *pbutton)
+{
+        gfx_color_t *color = NULL;
+        gfx_coord2_t pos;
+        gfx_text_fmt_t fmt;
+        errno_t rc;
+
+        rc = gfx_color_new_rgb_i16(0xc8c8, 0xc8c8, 0xc8c8, &color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_set_color(pbutton->res->gc, color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_fill_rect(pbutton->res->gc, &pbutton->rect);
+        if (rc != EOK)
+                goto error;
+
+        gfx_color_delete(color);
+
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_set_color(pbutton->res->gc, color);
+        if (rc != EOK)
+                goto error;
+
+        /* Center of button rectangle */
+        pos.x = (pbutton->rect.p0.x + pbutton->rect.p1.x) / 2;
+        pos.y = (pbutton->rect.p0.y + pbutton->rect.p1.y) / 2;
+
+        gfx_text_fmt_init(&fmt);
+        fmt.halign = gfx_halign_center;
+        fmt.valign = gfx_valign_center;
+
+        rc = gfx_puttext(pbutton->res->font, &pos, &fmt, pbutton->caption);
+        if (rc != EOK)
+                goto error;
+
+        gfx_color_delete(color);
+
+        return EOK;
+error:
+        if (color != NULL)
+                gfx_color_delete(color);
+        return rc;
+}
+
 /** @}
  */

uspace/lib/ui/test/main.c

@@ -32 +32 @@
 
 PCUT_IMPORT(pbutton);
+PCUT_IMPORT(resource);
 
 PCUT_MAIN();

uspace/lib/ui/test/pbutton.c

@@ -40 +40 @@
         errno_t rc;
 
-        rc = ui_pbutton_create("Hello", &pbutton);
+        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);