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

Timestamp:

2020-10-19T20:17:11Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba09d06

Parents:

de9992c

Message:

Window decoration

File:

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

uspace/app/uidemo/uidemo.c

@@ -42 +42 @@
 #include <ui/pbutton.h>
 #include <ui/resource.h>
+#include <ui/wdecor.h>
 #include "uidemo.h"
 
 static void wnd_close_event(void *);
+static void wnd_focus_event(void *);
 static void wnd_kbd_event(void *, kbd_event_t *);
 static void wnd_pos_event(void *, pos_event_t *);
+static void wnd_unfocus_event(void *);
 
 static display_wnd_cb_t wnd_cb = {
         .close_event = wnd_close_event,
+        .focus_event = wnd_focus_event,
         .kbd_event = wnd_kbd_event,
-        .pos_event = wnd_pos_event
+        .pos_event = wnd_pos_event,
+        .unfocus_event = wnd_unfocus_event
 };
 
@@ -60 +65 @@
 };
 
+static void wd_move(ui_wdecor_t *, void *, gfx_coord2_t *);
+
+static ui_wdecor_cb_t wdecor_cb = {
+        .move = wd_move
+};
+
 static bool quit = false;
 
@@ -73 +84 @@
         printf("Close event\n");
         quit = true;
+}
+
+/** Handle window focus event. */
+static void wnd_focus_event(void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        if (demo->wdecor != NULL) {
+                ui_wdecor_set_active(demo->wdecor, true);
+                ui_wdecor_paint(demo->wdecor);
+        }
 }
 
@@ -88 +110 @@
         ui_demo_t *demo = (ui_demo_t *) arg;
 
+        /* Make sure we don't process events until fully initialized */
+        if (demo->wdecor == NULL || demo->pb1 == NULL || demo->pb2 == NULL)
+                return;
+
+        ui_wdecor_pos_event(demo->wdecor, event);
         ui_pbutton_pos_event(demo->pb1, event);
         ui_pbutton_pos_event(demo->pb2, event);
+}
+
+/** Handle window unfocus event. */
+static void wnd_unfocus_event(void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        if (demo->wdecor != NULL) {
+                ui_wdecor_set_active(demo->wdecor, false);
+                ui_wdecor_paint(demo->wdecor);
+        }
 }
 
@@ -106 +144 @@
                 printf("Clicked 'Cancel' button\n");
         }
+}
+
+/** Window decoration requested window move.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (demo)
+ * @param pos Position where the title bar was pressed
+ */
+static void wd_move(ui_wdecor_t *wdecor, void *arg, gfx_coord2_t *pos)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) display_window_move_req(demo->dwindow, pos);
 }
 
@@ -135 +186 @@
         params.rect.p1.y = 100;
 
+        memset((void *) &demo, 0, sizeof(demo));
+
         rc = display_window_create(display, &params, &wnd_cb, (void *) &demo,
             &window);
@@ -142 +195 @@
         }
 
+        demo.dwindow = window;
+
         rc = display_window_get_gc(window, &gc);
         if (rc != EOK) {
@@ -155 +210 @@
                 return rc;
         }
+
+        printf("Create window decoration\n");
+        rc = ui_wdecor_create(ui_res, "UI Demo", &demo.wdecor);
+        if (rc != EOK) {
+                printf("Error creating window decoration.\n");
+                return rc;
+        }
+
+        ui_wdecor_set_rect(demo.wdecor, &params.rect);
+        ui_wdecor_set_cb(demo.wdecor, &wdecor_cb, (void *) &demo);
 
         rc = ui_pbutton_create(ui_res, "Confirm", &demo.pb1);
@@ -207 +272 @@
         color = NULL;
 
+        rc = ui_wdecor_paint(demo.wdecor);
+        if (rc != EOK) {
+                printf("Error painting window decoration.\n");
+                return rc;
+        }
+
         rc = ui_pbutton_paint(demo.pb1);
         if (rc != EOK) {
@@ -223 +294 @@
         }
 
+        ui_wdecor_destroy(demo.wdecor);
         ui_pbutton_destroy(demo.pb1);
         ui_pbutton_destroy(demo.pb2);