Changeset 1af103e in mainline for uspace/lib/ui/test/wdecor.c

Timestamp:

2023-09-13T17:29:07Z (20 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

61643c8

Parents:

46bd63c9

Message:

System menu (WIP)

The system menu provides browsable, keyboard-accessible access to window
management functions (such as closing, minimizing, maximizing, resizing,
moving).

File:

• uspace/lib/ui/test/wdecor.c (modified) (7 diffs)

uspace/lib/ui/test/wdecor.c

@@ -62 +62 @@
 };
 
+static void test_wdecor_sysmenu(ui_wdecor_t *, void *, sysarg_t);
 static void test_wdecor_minimize(ui_wdecor_t *, void *);
 static void test_wdecor_maximize(ui_wdecor_t *, void *);
@@ -72 +73 @@
 
 static ui_wdecor_cb_t test_wdecor_cb = {
+        .sysmenu = test_wdecor_sysmenu,
         .minimize = test_wdecor_minimize,
         .maximize = test_wdecor_maximize,
@@ -102 +104 @@
 
 typedef struct {
+        bool sysmenu;
         bool minimize;
         bool maximize;
@@ -109 +112 @@
         gfx_coord2_t pos;
         sysarg_t pos_id;
+        sysarg_t idev_id;
         bool resize;
         ui_wdecor_rsztype_t rsztype;
@@ -241 +245 @@
         rc = gfx_context_delete(gc);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Test ui_wdecor_sysmenu() */
+PCUT_TEST(sysmenu)
+{
+        errno_t rc;
+        ui_wdecor_t *wdecor;
+        test_cb_resp_t resp;
+
+        rc = ui_wdecor_create(NULL, "Hello", ui_wds_none, &wdecor);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        /* Sysmenu callback with no callbacks set */
+        ui_wdecor_sysmenu(wdecor, 42);
+
+        /* Sysmenu callback with sysmenu callback not implemented */
+        ui_wdecor_set_cb(wdecor, &dummy_wdecor_cb, NULL);
+        ui_wdecor_sysmenu(wdecor, 42);
+
+        /* Sysmenu callback with real callback set */
+        resp.sysmenu = false;
+        resp.idev_id = 0;
+        ui_wdecor_set_cb(wdecor, &test_wdecor_cb, &resp);
+        ui_wdecor_sysmenu(wdecor, 42);
+        PCUT_ASSERT_TRUE(resp.sysmenu);
+        PCUT_ASSERT_INT_EQUALS(42, resp.idev_id);
+
+        ui_wdecor_destroy(wdecor);
 }
 
@@ -544 +576 @@
         PCUT_ASSERT_INT_EQUALS(event.hpos, resp.pos.x);
         PCUT_ASSERT_INT_EQUALS(event.vpos, resp.pos.y);
+
+        ui_wdecor_destroy(wdecor);
+        ui_resource_destroy(resource);
+
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Pressing F9 generates sysmenu event */
+PCUT_TEST(kbd_f9_sysmenu)
+{
+        errno_t rc;
+        gfx_rect_t rect;
+        kbd_event_t event;
+        gfx_context_t *gc = NULL;
+        test_gc_t tgc;
+        test_cb_resp_t resp;
+        ui_resource_t *resource = NULL;
+        ui_wdecor_t *wdecor;
+
+        memset(&tgc, 0, sizeof(tgc));
+        rc = gfx_context_new(&ops, &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_resource_create(gc, false, &resource);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(resource);
+
+        rc = ui_wdecor_create(resource, "Hello", ui_wds_decorated, &wdecor);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rect.p0.x = 10;
+        rect.p0.y = 20;
+        rect.p1.x = 100;
+        rect.p1.y = 200;
+
+        ui_wdecor_set_rect(wdecor, &rect);
+
+        ui_wdecor_set_cb(wdecor, &test_wdecor_cb, (void *) &resp);
+
+        resp.move = false;
+        resp.pos.x = 0;
+        resp.pos.y = 0;
+
+        event.type = KEY_PRESS;
+        event.mods = 0;
+        event.key = KC_F9;
+        event.kbd_id = 42;
+        ui_wdecor_kbd_event(wdecor, &event);
+
+        PCUT_ASSERT_TRUE(resp.sysmenu);
+        PCUT_ASSERT_INT_EQUALS(event.kbd_id, resp.idev_id);
 
         ui_wdecor_destroy(wdecor);
@@ -1111 +1195 @@
 }
 
+static void test_wdecor_sysmenu(ui_wdecor_t *wdecor, void *arg,
+    sysarg_t idev_id)
+{
+        test_cb_resp_t *resp = (test_cb_resp_t *) arg;
+
+        resp->sysmenu = true;
+        resp->idev_id = idev_id;
+}
+
 static void test_wdecor_minimize(ui_wdecor_t *wdecor, void *arg)
 {