Changeset f1f433d in mainline for uspace/lib

Timestamp:

2022-11-04T20:54:04Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3a6d44b7

Parents:

fc00f0d

Message:

Update window button when window caption changes

Location:

uspace/lib

Files:

• ui/include/ui/pbutton.h (modified) (1 diff)
• ui/private/pbutton.h (modified) (1 diff)
• ui/src/pbutton.c (modified) (2 diffs)
• ui/test/pbutton.c (modified) (1 diff)
• wndmgt/include/types/wndmgt.h (modified) (2 diffs)
• wndmgt/src/wndmgt.c (modified) (1 diff)
• wndmgt/test/wndmgt.c (modified) (5 diffs)

uspace/lib/ui/include/ui/pbutton.h

@@ -56 +56 @@
 extern void ui_pbutton_set_rect(ui_pbutton_t *, gfx_rect_t *);
 extern void ui_pbutton_set_default(ui_pbutton_t *, bool);
+extern errno_t ui_pbutton_set_caption(ui_pbutton_t *, const char *);
 extern errno_t ui_pbutton_paint(ui_pbutton_t *);
 extern void ui_pbutton_press(ui_pbutton_t *);

uspace/lib/ui/private/pbutton.h

@@ -62 +62 @@
         gfx_rect_t rect;
         /** Caption */
-        const char *caption;
+        char *caption;
         /** Button is selected as default */
         bool isdefault;

uspace/lib/ui/src/pbutton.c

@@ -114 +114 @@
 
         ui_control_delete(pbutton->control);
+        free(pbutton->caption);
         free(pbutton);
 }
@@ -183 +184 @@
 {
         pbutton->isdefault = isdefault;
+}
+
+/** Set push button caption.
+ *
+ * @param pbutton Button
+ * @param caption New caption
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t ui_pbutton_set_caption(ui_pbutton_t *pbutton, const char *caption)
+{
+        char *dcaption;
+
+        dcaption = str_dup(caption);
+        if (dcaption == NULL)
+                return ENOMEM;
+
+        free(pbutton->caption);
+        pbutton->caption = dcaption;
+        return EOK;
 }
 

uspace/lib/ui/test/pbutton.c

@@ -190 +190 @@
 }
 
+/** Set caption sets internal field */
+PCUT_TEST(set_caption)
+{
+        ui_pbutton_t *pbutton;
+        errno_t rc;
+
+        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_STR_EQUALS("Hello", pbutton->caption);
+
+        rc = ui_pbutton_set_caption(pbutton, "World");
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_STR_EQUALS("World", pbutton->caption);
+
+        ui_pbutton_destroy(pbutton);
+}
+
 /** Paint button */
 PCUT_TEST(paint)

uspace/lib/wndmgt/include/types/wndmgt.h

@@ -53 +53 @@
         /** Window removed */
         void (*window_removed)(void *, sysarg_t);
+        /** Window changed */
+        void (*window_changed)(void *, sysarg_t);
 } wndmgt_cb_t;
 
@@ -60 +62 @@
         wmev_window_added,
         /** Window removed */
-        wmev_window_removed
+        wmev_window_removed,
+        /** Window changed */
+        wmev_window_changed
 } wndmgt_ev_type_t;
 

uspace/lib/wndmgt/src/wndmgt.c

@@ -387 +387 @@
                         }
                         break;
+                case wmev_window_changed:
+                        if (wndmgt->cb != NULL &&
+                            wndmgt->cb->window_changed != NULL) {
+                                wndmgt->cb->window_changed(wndmgt->cb_arg,
+                                    event.wnd_id);
+                        }
+                        break;
                 }
         }

uspace/lib/wndmgt/test/wndmgt.c

@@ -54 +54 @@
 static void test_window_added(void *, sysarg_t);
 static void test_window_removed(void *, sysarg_t);
+static void test_window_changed(void *, sysarg_t);
 
 static wndmgt_ops_t test_wndmgt_srv_ops = {
@@ -65 +66 @@
 static wndmgt_cb_t test_wndmgt_cb = {
         .window_added = test_window_added,
-        .window_removed = test_window_removed
+        .window_removed = test_window_removed,
+        .window_changed = test_window_changed
 };
 
@@ -98 +100 @@
         bool window_removed_called;
         sysarg_t window_removed_wnd_id;
+
+        bool window_changed_called;
+        sysarg_t window_changed_wnd_id;
 
         fibril_condvar_t event_cv;
@@ -529 +534 @@
 }
 
+/** Window changed event can be delivered from server to client callback function */
+PCUT_TEST(window_changed_deliver)
+{
+        errno_t rc;
+        service_id_t sid;
+        wndmgt_t *wndmgt = NULL;
+        test_response_t resp;
+
+        async_set_fallback_port_handler(test_wndmgt_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_wndmgt_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_wndmgt_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = wndmgt_open(test_wndmgt_svc, &test_wndmgt_cb, &resp, &wndmgt);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(wndmgt);
+        PCUT_ASSERT_NOT_NULL(resp.srv);
+
+        resp.event_cnt = 1;
+        resp.event.etype = wmev_window_changed;
+        resp.event.wnd_id = 42;
+        resp.window_changed_called = false;
+        fibril_mutex_initialize(&resp.event_lock);
+        fibril_condvar_initialize(&resp.event_cv);
+        wndmgt_srv_ev_pending(resp.srv);
+
+        /* Wait for the event handler to be called. */
+        fibril_mutex_lock(&resp.event_lock);
+        while (!resp.window_changed_called) {
+                fibril_condvar_wait(&resp.event_cv, &resp.event_lock);
+        }
+        fibril_mutex_unlock(&resp.event_lock);
+
+        /* Verify that the event was delivered correctly */
+        PCUT_ASSERT_INT_EQUALS(resp.event.etype,
+            resp.revent.etype);
+
+        wndmgt_close(wndmgt);
+
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 /** Test window management service connection. */
 static void test_wndmgt_conn(ipc_call_t *icall, void *arg)
@@ -569 +621 @@
         resp->window_removed_called = true;
         resp->window_removed_wnd_id = wnd_id;
+        fibril_condvar_broadcast(&resp->event_cv);
+        fibril_mutex_unlock(&resp->event_lock);
+}
+
+static void test_window_changed(void *arg, sysarg_t wnd_id)
+{
+        test_response_t *resp = (test_response_t *) arg;
+
+        resp->revent.etype = wmev_window_changed;
+
+        fibril_mutex_lock(&resp->event_lock);
+        resp->window_changed_called = true;
+        resp->window_changed_wnd_id = wnd_id;
         fibril_condvar_broadcast(&resp->event_cv);
         fibril_mutex_unlock(&resp->event_lock);