Changeset f1f433d in mainline for uspace/srv

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/srv/hid/display

Files:

• test/wmclient.c (modified) (1 diff)
• window.c (modified) (3 diffs)
• wmclient.c (modified) (1 diff)
• wmclient.h (modified) (1 diff)

uspace/srv/hid/display/test/wmclient.c

@@ -107 +107 @@
 }
 
+/** Test ds_wmclient_get_event(), ds_wmclient_post_wnd_removed_event(). */
+PCUT_TEST(client_get_post_wnd_removed_event)
+{
+        ds_display_t *disp;
+        ds_wmclient_t *wmclient;
+        wndmgt_ev_t revent;
+        bool called_cb = NULL;
+        sysarg_t wnd_id;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_wmclient_create(disp, &test_ds_wmclient_cb, &called_cb,
+            &wmclient);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        called_cb = false;
+        wnd_id = 42;
+
+        rc = ds_wmclient_get_event(wmclient, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
+        rc = ds_wmclient_post_wnd_removed_event(wmclient, wnd_id);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_TRUE(called_cb);
+
+        rc = ds_wmclient_get_event(wmclient, &revent);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_EQUALS(wnd_id, revent.wnd_id);
+        PCUT_ASSERT_EQUALS(wmev_window_removed, revent.etype);
+
+        rc = ds_wmclient_get_event(wmclient, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
+        ds_wmclient_destroy(wmclient);
+        ds_display_destroy(disp);
+}
+
+/** Test ds_wmclient_get_event(), ds_wmclient_post_wnd_changed_event(). */
+PCUT_TEST(client_get_post_wnd_changed_event)
+{
+        ds_display_t *disp;
+        ds_wmclient_t *wmclient;
+        wndmgt_ev_t revent;
+        bool called_cb = NULL;
+        sysarg_t wnd_id;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_wmclient_create(disp, &test_ds_wmclient_cb, &called_cb,
+            &wmclient);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        called_cb = false;
+        wnd_id = 42;
+
+        rc = ds_wmclient_get_event(wmclient, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
+        rc = ds_wmclient_post_wnd_changed_event(wmclient, wnd_id);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_TRUE(called_cb);
+
+        rc = ds_wmclient_get_event(wmclient, &revent);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_EQUALS(wnd_id, revent.wnd_id);
+        PCUT_ASSERT_EQUALS(wmev_window_changed, revent.etype);
+
+        rc = ds_wmclient_get_event(wmclient, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
+        ds_wmclient_destroy(wmclient);
+        ds_display_destroy(disp);
+}
+
 /** Test ds_wmclient_purge_events() */
 PCUT_TEST(purge_events)

uspace/srv/hid/display/window.c

@@ -45 +45 @@
 #include <stdlib.h>
 #include <str.h>
+#include <wndmgt.h>
 #include "client.h"
 #include "display.h"
 #include "seat.h"
 #include "window.h"
+#include "wmclient.h"
 
 static void ds_window_invalidate_cb(void *, gfx_rect_t *);
@@ -933 +935 @@
 {
         char *dcaption;
+        ds_wmclient_t *wmclient;
 
         dcaption = str_dup(caption);
@@ -940 +943 @@
         free(wnd->caption);
         wnd->caption = dcaption;
+
+        /* Notify window managers about window information change */
+        wmclient = ds_display_first_wmclient(wnd->display);
+        while (wmclient != NULL) {
+                ds_wmclient_post_wnd_changed_event(wmclient, wnd->id);
+                wmclient = ds_display_next_wmclient(wmclient);
+        }
 
         return EOK;

uspace/srv/hid/display/wmclient.c

@@ -184 +184 @@
 }
 
+/** Post window changed event to the WM client's message queue.
+ *
+ * @param wmclient WM client
+ * @param wnd_id Window ID of the added window
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ds_wmclient_post_wnd_changed_event(ds_wmclient_t *wmclient,
+    sysarg_t wnd_id)
+{
+        ds_wmclient_ev_t *wevent;
+
+        wevent = calloc(1, sizeof(ds_wmclient_ev_t));
+        if (wevent == NULL)
+                return ENOMEM;
+
+        wevent->wmclient = wmclient;
+        wevent->event.etype = wmev_window_changed;
+        wevent->event.wnd_id = wnd_id;
+        list_append(&wevent->levents, &wmclient->events);
+
+        /* Notify the client */
+        // TODO Do not send more than once until client drains the queue
+        if (wmclient->cb != NULL && wmclient->cb->ev_pending != NULL)
+                wmclient->cb->ev_pending(wmclient->cb_arg);
+
+        return EOK;
+}
+
 /** @}
  */

uspace/srv/hid/display/wmclient.h

@@ -48 +48 @@
 extern errno_t ds_wmclient_post_wnd_added_event(ds_wmclient_t *, sysarg_t);
 extern errno_t ds_wmclient_post_wnd_removed_event(ds_wmclient_t *, sysarg_t);
+extern errno_t ds_wmclient_post_wnd_changed_event(ds_wmclient_t *, sysarg_t);
 extern void ds_wmclient_purge_events(ds_wmclient_t *);