Changeset 39ab17c in mainline

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

e0377075

Parents:

c632c96

git-author:

Jiri Svoboda <jiri@…> (2021-10-21 17:44:55)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Activating panel using the mouse

Location:

uspace/app/nav

Files:

• nav.c (modified) (3 diffs)
• panel.c (modified) (3 diffs)
• panel.h (modified) (2 diffs)
• test/panel.c (modified) (3 diffs)
• types/panel.h (modified) (2 diffs)

uspace/app/nav/nav.c

@@ -63 +63 @@
 };
 
+static void navigator_panel_activate_req(void *, panel_t *);
+
+static panel_cb_t navigator_panel_cb = {
+        .activate_req = navigator_panel_activate_req
+};
+
 /** Window close button was clicked.
  *
@@ -183 +189 @@
                 panel_set_rect(navigator->panel[i], &rect);
 
+                panel_set_cb(navigator->panel[i], &navigator_panel_cb,
+                    navigator);
+
                 rc = ui_fixed_add(navigator->fixed,
                     panel_ctl(navigator->panel[i]));
@@ -307 +316 @@
 }
 
+/** Panel callback requesting panel activation.
+ *
+ * @param arg Argument (navigator_t *)
+ * @param panel Panel
+ */
+void navigator_panel_activate_req(void *arg, panel_t *panel)
+{
+        navigator_t *navigator = (navigator_t *)arg;
+
+        if (!panel_is_active(panel))
+                navigator_switch_panel(navigator);
+}
+
 /** @}
  */

uspace/app/nav/panel.c

@@ -142 +142 @@
         ui_control_delete(panel->control);
         free(panel);
+}
+
+/** Set panel callbacks.
+ *
+ * @param panel Panel
+ * @param cb Callbacks
+ * @param arg Argument to callback functions
+ */
+void panel_set_cb(panel_t *panel, panel_cb_t *cb, void *arg)
+{
+        panel->cb = cb;
+        panel->cb_arg = arg;
 }
 
@@ -311 +323 @@
 ui_evclaim_t panel_pos_event(panel_t *panel, pos_event_t *event)
 {
-        return ui_unclaimed;
+        gfx_coord2_t pos;
+
+        pos.x = event->hpos;
+        pos.y = event->vpos;
+        if (!gfx_pix_inside_rect(&pos, &panel->rect))
+                return ui_unclaimed;
+
+        if (!panel->active) {
+                panel_activate_req(panel);
+        }
+
+        return ui_claimed;
 }
 
@@ -1114 +1137 @@
 }
 
+/** Request panel activation.
+ *
+ * Call back to request panel activation.
+ *
+ * @param panel Panel
+ */
+void panel_activate_req(panel_t *panel)
+{
+        if (panel->cb != NULL && panel->cb->activate_req != NULL)
+                panel->cb->activate_req(panel->cb_arg, panel);
+}
+
 /** @}
  */

uspace/app/nav/panel.h

@@ -48 +48 @@
 extern errno_t panel_create(ui_window_t *, bool, panel_t **);
 extern void panel_destroy(panel_t *);
+extern void panel_set_cb(panel_t *, panel_cb_t *, void *);
 extern errno_t panel_entry_paint(panel_entry_t *, size_t);
 extern errno_t panel_paint(panel_t *);
@@ -79 +80 @@
 extern errno_t panel_open_dir(panel_t *, panel_entry_t *);
 extern errno_t panel_open_file(panel_t *, panel_entry_t *);
+extern void panel_activate_req(panel_t *);
+
 
 #endif

uspace/app/nav/test/panel.c

@@ -40 +40 @@
 PCUT_TEST_SUITE(panel);
 
+/** Test response */
+typedef struct {
+        bool activate_req;
+        panel_t *activate_req_panel;
+} test_resp_t;
+
+static void test_panel_activate_req(void *, panel_t *);
+
+static panel_cb_t test_cb = {
+        .activate_req = test_panel_activate_req
+};
+
 /** Create and destroy panel. */
 PCUT_TEST(create_destroy)
@@ -48 +60 @@
         rc = panel_create(NULL, true, &panel);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        panel_destroy(panel);
+}
+
+/** panel_set_cb() sets callback */
+PCUT_TEST(set_cb)
+{
+        panel_t *panel;
+        errno_t rc;
+        test_resp_t resp;
+
+        rc = panel_create(NULL, true, &panel);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        panel_set_cb(panel, &test_cb, &resp);
+        PCUT_ASSERT_EQUALS(&test_cb, panel->cb);
+        PCUT_ASSERT_EQUALS(&resp, panel->cb_arg);
 
         panel_destroy(panel);
@@ -1426 +1455 @@
 }
 
+/** panel_activate_req() sends activation request */
+PCUT_TEST(activate_req)
+{
+        panel_t *panel;
+        errno_t rc;
+        test_resp_t resp;
+
+        rc = panel_create(NULL, true, &panel);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        panel_set_cb(panel, &test_cb, &resp);
+
+        resp.activate_req = false;
+        resp.activate_req_panel = NULL;
+
+        panel_activate_req(panel);
+        PCUT_ASSERT_TRUE(resp.activate_req);
+        PCUT_ASSERT_EQUALS(panel, resp.activate_req_panel);
+
+        panel_destroy(panel);
+}
+
+static void test_panel_activate_req(void *arg, panel_t *panel)
+{
+        test_resp_t *resp = (test_resp_t *)arg;
+
+        resp->activate_req = true;
+        resp->activate_req_panel = panel;
+}
+
 PCUT_EXPORT(panel);

uspace/app/nav/types/panel.h

@@ -83 +83 @@
         ui_window_t *window;
 
+        /** Callbacks */
+        struct panel_cb *cb;
+
+        /** Callback argument */
+        void *cb_arg;
+
         /** Panel rectangle */
         gfx_rect_t rect;
@@ -126 +132 @@
 } panel_t;
 
+/** Panel callbacks */
+typedef struct panel_cb {
+        /** Request panel activation */
+        void (*activate_req)(void *, panel_t *);
+} panel_cb_t;
+
 #endif