Changeset f03d1308 in mainline for uspace/lib

Timestamp:

2020-10-28T12:42:11Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8009dc27

Parents:

d284ce9

git-author:

Jiri Svoboda <jiri@…> (2020-10-28 12:41:11)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-28 12:42:11)

Message:

Convert terminal to using ui_window

Location:

uspace/lib/ui

Files:

• include/types/ui/window.h (modified) (2 diffs)
• private/window.h (modified) (2 diffs)
• src/window.c (modified) (6 diffs)
• test/window.c (modified) (7 diffs)

uspace/lib/ui/include/types/ui/window.h

@@ -37 +37 @@
 #define _UI_TYPES_WINDOW_H
 
+#include <io/kbd_event.h>
 #include <io/pos_event.h>
 
@@ -53 +54 @@
 typedef struct ui_window_cb {
         void (*close)(ui_window_t *, void *);
+        void (*focus)(ui_window_t *, void *);
+        void (*kbd)(ui_window_t *, void *, kbd_event_t *);
         void (*pos)(ui_window_t *, void *, pos_event_t *);
+        void (*unfocus)(ui_window_t *, void *);
 } ui_window_cb_t;
 

uspace/lib/ui/private/window.h

@@ -40 +40 @@
 #include <display.h>
 #include <gfx/context.h>
+#include <io/kbd_event.h>
 #include <io/pos_event.h>
 
@@ -64 +65 @@
 
 extern void ui_window_close(ui_window_t *);
+extern void ui_window_focus(ui_window_t *);
+extern void ui_window_kbd(ui_window_t *, kbd_event_t *);
 extern void ui_window_pos(ui_window_t *, pos_event_t *);
+extern void ui_window_unfocus(ui_window_t *);
 
 #endif

uspace/lib/ui/src/window.c

@@ -37 +37 @@
 #include <errno.h>
 #include <gfx/context.h>
+#include <io/kbd_event.h>
 #include <io/pos_event.h>
 #include <mem.h>
@@ -221 +222 @@
                 ui_wdecor_paint(window->wdecor);
         }
+
+        ui_window_focus(window);
 }
 
@@ -229 +232 @@
 
         (void) window;
-        (void) kbd_event;
+        ui_window_kbd(window, kbd_event);
 }
 
@@ -254 +257 @@
                 ui_wdecor_paint(window->wdecor);
         }
+
+        ui_window_unfocus(window);
 }
 
@@ -291 +296 @@
 }
 
+/** Send window focus event.
+ *
+ * @param window Window
+ */
+void ui_window_focus(ui_window_t *window)
+{
+        if (window->cb != NULL && window->cb->focus != NULL)
+                window->cb->focus(window, window->arg);
+}
+
+/** Send window keyboard event.
+ *
+ * @param window Window
+ */
+void ui_window_kbd(ui_window_t *window, kbd_event_t *kbd)
+{
+        if (window->cb != NULL && window->cb->kbd != NULL)
+                window->cb->kbd(window, window->arg, kbd);
+}
+
 /** Send window position event.
  *
@@ -301 +326 @@
 }
 
+/** Send window unfocus event.
+ *
+ * @param window Window
+ */
+void ui_window_unfocus(ui_window_t *window)
+{
+        if (window->cb != NULL && window->cb->unfocus != NULL)
+                window->cb->unfocus(window, window->arg);
+}
+
 /** @}
  */

uspace/lib/ui/test/window.c

@@ -29 +29 @@
 #include <gfx/context.h>
 #include <gfx/coord.h>
+#include <io/kbd_event.h>
 #include <io/pos_event.h>
 #include <mem.h>
@@ -43 +44 @@
 
 static void test_window_close(ui_window_t *, void *);
+static void test_window_focus(ui_window_t *, void *);
+static void test_window_kbd(ui_window_t *, void *, kbd_event_t *);
 static void test_window_pos(ui_window_t *, void *, pos_event_t *);
+static void test_window_unfocus(ui_window_t *, void *);
 
 static ui_window_cb_t test_window_cb = {
         .close = test_window_close,
-        .pos = test_window_pos
+        .focus = test_window_focus,
+        .kbd = test_window_kbd,
+        .pos = test_window_pos,
+        .unfocus = test_window_unfocus
 };
 
@@ -55 +62 @@
 typedef struct {
         bool close;
+        bool focus;
+        bool kbd;
+        kbd_event_t kbd_event;
         bool pos;
         pos_event_t pos_event;
+        bool unfocus;
 } test_cb_resp_t;
 
@@ -151 +162 @@
         ui_window_close(window);
         PCUT_ASSERT_TRUE(resp.close);
+
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** ui_window_focus() calls focus callback set via ui_window_set_cb() */
+PCUT_TEST(focus)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_wnd_params_t params;
+        ui_window_t *window = NULL;
+        test_cb_resp_t resp;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Hello";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(window);
+
+        /* Focus callback with no callbacks set */
+        ui_window_focus(window);
+
+        /* Focus callback with focus callback not implemented */
+        ui_window_set_cb(window, &dummy_window_cb, NULL);
+        ui_window_focus(window);
+
+        /* Focus callback with real callback set */
+        resp.close = false;
+        ui_window_set_cb(window, &test_window_cb, &resp);
+        ui_window_focus(window);
+        PCUT_ASSERT_TRUE(resp.focus);
+
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** ui_window_kbd() calls kbd callback set via ui_window_set_cb() */
+PCUT_TEST(kbd)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_wnd_params_t params;
+        ui_window_t *window = NULL;
+        kbd_event_t kbd_event;
+        test_cb_resp_t resp;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Hello";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(window);
+
+        kbd_event.type = POS_PRESS;
+        kbd_event.key = KC_X;
+        kbd_event.mods = 0;
+        kbd_event.c = 'x';
+
+        /* Kbd callback with no callbacks set */
+        ui_window_kbd(window, &kbd_event);
+
+        /* Kbd callback with kbd callback not implemented */
+        ui_window_set_cb(window, &dummy_window_cb, NULL);
+        ui_window_kbd(window, &kbd_event);
+
+        /* Kbd callback with real callback set */
+        resp.kbd = false;
+        ui_window_set_cb(window, &test_window_cb, &resp);
+        ui_window_kbd(window, &kbd_event);
+        PCUT_ASSERT_TRUE(resp.kbd);
+        PCUT_ASSERT_EQUALS(kbd_event.type, resp.kbd_event.type);
+        PCUT_ASSERT_INT_EQUALS(kbd_event.key, resp.kbd_event.key);
+        PCUT_ASSERT_INT_EQUALS(kbd_event.mods, resp.kbd_event.mods);
+        PCUT_ASSERT_INT_EQUALS(kbd_event.c, resp.kbd_event.c);
 
         ui_window_destroy(window);
@@ -204 +297 @@
 }
 
+/** ui_window_unfocus() calls unfocus callback set via ui_window_set_cb() */
+PCUT_TEST(unfocus)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_wnd_params_t params;
+        ui_window_t *window = NULL;
+        test_cb_resp_t resp;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Hello";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(window);
+
+        /* Unfocus callback with no callbacks set */
+        ui_window_unfocus(window);
+
+        /* Unfocus callback with unfocus callback not implemented */
+        ui_window_set_cb(window, &dummy_window_cb, NULL);
+        ui_window_unfocus(window);
+
+        /* Unfocus callback with real callback set */
+        resp.close = false;
+        ui_window_set_cb(window, &test_window_cb, &resp);
+        ui_window_unfocus(window);
+        PCUT_ASSERT_TRUE(resp.unfocus);
+
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 static void test_window_close(ui_window_t *window, void *arg)
 {
@@ -209 +338 @@
 
         resp->close = true;
+}
+
+static void test_window_focus(ui_window_t *window, void *arg)
+{
+        test_cb_resp_t *resp = (test_cb_resp_t *) arg;
+
+        resp->focus = true;
+}
+
+static void test_window_kbd(ui_window_t *window, void *arg,
+    kbd_event_t *event)
+{
+        test_cb_resp_t *resp = (test_cb_resp_t *) arg;
+
+        resp->kbd = true;
+        resp->kbd_event = *event;
 }
 
@@ -220 +365 @@
 }
 
+static void test_window_unfocus(ui_window_t *window, void *arg)
+{
+        test_cb_resp_t *resp = (test_cb_resp_t *) arg;
+
+        resp->unfocus = true;
+}
+
 PCUT_EXPORT(window);