Changeset f6df5a3 in mainline

Timestamp:

2020-10-13T20:06:47Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c9a7adc

Parents:

47728678

Message:

Button press visual feedback

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (10 diffs)
• app/uidemo/uidemo.h (added)
• lib/ui/include/ui/pbutton.h (modified) (1 diff)
• lib/ui/private/pbutton.h (modified) (2 diffs)
• lib/ui/src/pbutton.c (modified) (4 diffs)

uspace/app/uidemo/uidemo.c

@@ -39 +39 @@
 #include <ui/pbutton.h>
 #include <ui/resource.h>
+#include "uidemo.h"
 
 static void wnd_close_event(void *);
 static void wnd_kbd_event(void *, kbd_event_t *);
+static void wnd_pos_event(void *, pos_event_t *);
 
 static display_wnd_cb_t wnd_cb = {
         .close_event = wnd_close_event,
-        .kbd_event = wnd_kbd_event
+        .kbd_event = wnd_kbd_event,
+        .pos_event = wnd_pos_event
 };
 
 static bool quit = false;
 
+/** Print syntax. */
 static void print_syntax(void)
 {
@@ -55 +59 @@
 }
 
+/** Handle window close event. */
 static void wnd_close_event(void *arg)
 {
@@ -61 +66 @@
 }
 
+/** Handle window keyboard event */
 static void wnd_kbd_event(void *arg, kbd_event_t *event)
 {
@@ -66 +72 @@
         if (event->type == KEY_PRESS)
                 quit = true;
+}
+
+/** Handle window position event */
+static void wnd_pos_event(void *arg, pos_event_t *event)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+        gfx_rect_t rect1;
+        gfx_rect_t rect2;
+        gfx_coord2_t pos;
+
+        rect1.p0.x = 20;
+        rect1.p0.y = 50;
+        rect1.p1.x = 100;
+        rect1.p1.y = 80;
+
+        rect2.p0.x = 120;
+        rect2.p0.y = 50;
+        rect2.p1.x = 200;
+        rect2.p1.y = 80;
+
+        pos.x = event->hpos;
+        pos.y = event->vpos;
+
+        if (event->type == POS_PRESS) {
+                printf("Button press\n");
+
+                if (gfx_pix_inside_rect(&pos, &rect1)) {
+                        printf("Press button 1\n");
+                        ui_pbutton_press(demo->pb1);
+                        (void) ui_pbutton_paint(demo->pb1);
+                }
+                if (gfx_pix_inside_rect(&pos, &rect2)) {
+                        printf("Press button 2\n");
+                        ui_pbutton_press(demo->pb2);
+                        (void) ui_pbutton_paint(demo->pb2);
+                }
+        }
+
+        if (event->type == POS_RELEASE) {
+                printf("Button release\n");
+                if (gfx_pix_inside_rect(&pos, &rect1)) {
+                        printf("Release button 1\n");
+                        ui_pbutton_release(demo->pb1);
+                        (void) ui_pbutton_paint(demo->pb1);
+                }
+                if (gfx_pix_inside_rect(&pos, &rect2)) {
+                        printf("Release button 2\n");
+                        ui_pbutton_release(demo->pb2);
+                        (void) ui_pbutton_paint(demo->pb2);
+                }
+        }
 }
 
@@ -76 +133 @@
         display_window_t *window = NULL;
         ui_resource_t *ui_res;
-        ui_pbutton_t *pb1;
-        ui_pbutton_t *pb2;
+        ui_demo_t demo;
         gfx_rect_t rect;
         errno_t rc;
@@ -95 +151 @@
         params.rect.p1.y = 100;
 
-        rc = display_window_create(display, &params, &wnd_cb, NULL, &window);
+        rc = display_window_create(display, &params, &wnd_cb, (void *) &demo,
+            &window);
         if (rc != EOK) {
                 printf("Error creating window.\n");
@@ -112 +169 @@
         if (rc != EOK) {
                 printf("Error creating UI.\n");
-                return 1;
-        }
-
-        rc = ui_pbutton_create(ui_res, "Confirm", &pb1);
+                return rc;
+        }
+
+        rc = ui_pbutton_create(ui_res, "Confirm", &demo.pb1);
         if (rc != EOK) {
                 printf("Error creating button.\n");
-                return 1;
+                return rc;
         }
 
@@ -125 +182 @@
         rect.p1.x = 100;
         rect.p1.y = 80;
-        ui_pbutton_set_rect(pb1, &rect);
-
-        rc = ui_pbutton_create(ui_res, "Cancel", &pb2);
+        ui_pbutton_set_rect(demo.pb1, &rect);
+
+        rc = ui_pbutton_create(ui_res, "Cancel", &demo.pb2);
         if (rc != EOK) {
                 printf("Error creating button.\n");
-                return 1;
+                return rc;
         }
 
@@ -137 +194 @@
         rect.p1.x = 200;
         rect.p1.y = 80;
-        ui_pbutton_set_rect(pb2, &rect);
-
-        rc = ui_pbutton_paint(pb1);
+        ui_pbutton_set_rect(demo.pb2, &rect);
+
+        rc = ui_pbutton_paint(demo.pb1);
         if (rc != EOK) {
                 printf("Error painting button.\n");
-                return 1;
-        }
-
-        rc = ui_pbutton_paint(pb2);
+                return rc;
+        }
+
+        rc = ui_pbutton_paint(demo.pb2);
         if (rc != EOK) {
                 printf("Error painting button.\n");
-                return 1;
+                return rc;
         }
 
@@ -155 +212 @@
         }
 
-        ui_pbutton_destroy(pb1);
-        ui_pbutton_destroy(pb2);
+        ui_pbutton_destroy(demo.pb1);
+        ui_pbutton_destroy(demo.pb2);
 
         rc = gfx_context_delete(gc);

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

@@ -47 +47 @@
 extern void ui_pbutton_set_rect(ui_pbutton_t *, gfx_rect_t *);
 extern errno_t ui_pbutton_paint(ui_pbutton_t *);
+extern void ui_pbutton_press(ui_pbutton_t *);
+extern void ui_pbutton_release(ui_pbutton_t *);
 
 #endif

uspace/lib/ui/private/pbutton.h

@@ -40 +40 @@
 #include <gfx/context.h>
 #include <gfx/coord.h>
+#include <stdbool.h>
 
 /** Actual structure of push button.
@@ -52 +53 @@
         /** Caption */
         const char *caption;
+        /** Button is currently held down */
+        bool held;
 };
 

uspace/lib/ui/src/pbutton.c

@@ -44 +44 @@
 #include "../private/pbutton.h"
 #include "../private/resource.h"
+
+/** Caption movement when button is pressed down */
+enum {
+        ui_pb_press_dx = 2,
+        ui_pb_press_dy = 2
+};
 
 /** Create new push button.
@@ -106 +112 @@
         errno_t rc;
 
-        rc = gfx_color_new_rgb_i16(0xc8c8, 0xc8c8, 0xc8c8, &color);
-        if (rc != EOK)
-                goto error;
+        if (pbutton->held) {
+                rc = gfx_color_new_rgb_i16(0x8000, 0, 0, &color);
+                if (rc != EOK)
+                        goto error;
+        } else {
+                rc = gfx_color_new_rgb_i16(0xc8c8, 0xc8c8, 0xc8c8, &color);
+                if (rc != EOK)
+                        goto error;
+        }
 
         rc = gfx_set_color(pbutton->res->gc, color);
@@ -132 +144 @@
         pos.y = (pbutton->rect.p0.y + pbutton->rect.p1.y) / 2;
 
+        if (pbutton->held) {
+                pos.x += ui_pb_press_dx;
+                pos.y += ui_pb_press_dy;
+        }
+
         gfx_text_fmt_init(&fmt);
         fmt.halign = gfx_halign_center;
@@ -149 +166 @@
 }
 
+/** Press down button.
+ *
+ * This does not automatically repaint the button.
+ *
+ * @param pbutton Push button
+ */
+void ui_pbutton_press(ui_pbutton_t *pbutton)
+{
+        pbutton->held = true;
+}
+
+/** Release button.
+ *
+ * This does not automatically repaint the button.
+ *
+ * @param pbutton Push button
+ */
+void ui_pbutton_release(ui_pbutton_t *pbutton)
+{
+        pbutton->held = false;
+}
+
 /** @}
  */