Changeset 20d2c6c in mainline for uspace/app/uidemo/uidemo.c

Timestamp:

2020-10-21T20:58:52Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

172188a

Parents:

ba09d06

Message:

Window close button

File:

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

uspace/app/uidemo/uidemo.c

@@ -66 +66 @@
 };
 
+static void wd_close(ui_wdecor_t *, void *);
 static void wd_move(ui_wdecor_t *, void *, gfx_coord2_t *);
 
 static ui_wdecor_cb_t wdecor_cb = {
+        .close = wd_close,
         .move = wd_move
 };
 
-static bool quit = false;
-
 /** Print syntax. */
 static void print_syntax(void)
@@ -83 +83 @@
 static void wnd_close_event(void *arg)
 {
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
         printf("Close event\n");
-        quit = true;
+        demo->quit = true;
 }
 
@@ -101 +103 @@
 static void wnd_kbd_event(void *arg, kbd_event_t *event)
 {
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) demo;
         printf("Keyboard event type=%d key=%d\n", event->type, event->key);
-        if (event->type == KEY_PRESS)
-                quit = true;
 }
 
@@ -156 +159 @@
 }
 
+/** Window decoration requested window closure.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (demo)
+ */
+static void wd_close(ui_wdecor_t *wdecor, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        printf("Close window requested\n");
+        demo->quit = true;
+}
+
 /** Window decoration requested window move.
  *
@@ -205 +221 @@
         }
 
+        demo.quit = false;
         demo.dwindow = window;
 
@@ -318 +335 @@
         }
 
-        while (!quit) {
+        while (!demo.quit) {
                 fibril_usleep(100 * 1000);
         }