Changeset f7fb2b21 in mainline for uspace/srv/hid/display

Timestamp:

2020-02-10T19:01:42Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b43edabe

Parents:

287688f2

Message:

Propagate position event to display clients

Location:

uspace/srv/hid/display

Files:

• client.c (modified) (2 diffs)
• client.h (modified) (2 diffs)
• test/client.c (modified) (1 diff)
• test/display.c (modified) (6 diffs)
• test/seat.c (modified) (1 diff)
• window.c (modified) (2 diffs)

uspace/srv/hid/display/client.c

@@ -221 +221 @@
 
         wevent->window = ewindow;
-        wevent->event.kbd_event = *event;
+        wevent->event.etype = wev_kbd;
+        wevent->event.ev.kbd = *event;
         list_append(&wevent->levents, &client->events);
 
@@ -231 +232 @@
 }
 
+/** Post position event to the client's message queue.
+ *
+ * @param client Client
+ * @param ewindow Window that the message is targetted to
+ * @param event Event
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ds_client_post_pos_event(ds_client_t *client, ds_window_t *ewindow,
+    pos_event_t *event)
+{
+        ds_window_ev_t *wevent;
+
+        wevent = calloc(1, sizeof(ds_window_ev_t));
+        if (wevent == NULL)
+                return ENOMEM;
+
+        wevent->window = ewindow;
+        wevent->event.etype = wev_pos;
+        wevent->event.ev.pos = *event;
+        list_append(&wevent->levents, &client->events);
+
+        /* Notify the client */
+        // TODO Do not send more than once until client drains the queue
+        if (client->cb != NULL && client->cb->ev_pending != NULL)
+                client->cb->ev_pending(client->cb_arg);
+
+        return EOK;
+}
+
 /** @}
  */

uspace/srv/hid/display/client.h

@@ -39 +39 @@
 #include <errno.h>
 #include <io/kbd_event.h>
+#include <io/pos_event.h>
 #include "types/display/client.h"
 #include "types/display/display.h"
@@ -54 +55 @@
 extern errno_t ds_client_post_kbd_event(ds_client_t *, ds_window_t *,
     kbd_event_t *);
+extern errno_t ds_client_post_pos_event(ds_client_t *, ds_window_t *,
+    pos_event_t *);
 
 #endif

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

@@ -206 +206 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_EQUALS(wnd, rwindow);
-        PCUT_ASSERT_EQUALS(event.type, revent.kbd_event.type);
-        PCUT_ASSERT_EQUALS(event.key, revent.kbd_event.key);
-        PCUT_ASSERT_EQUALS(event.mods, revent.kbd_event.mods);
-        PCUT_ASSERT_EQUALS(event.c, revent.kbd_event.c);
+        PCUT_ASSERT_EQUALS(wev_kbd, revent.etype);
+        PCUT_ASSERT_EQUALS(event.type, revent.ev.kbd.type);
+        PCUT_ASSERT_EQUALS(event.key, revent.ev.kbd.key);
+        PCUT_ASSERT_EQUALS(event.mods, revent.ev.kbd.mods);
+        PCUT_ASSERT_EQUALS(event.c, revent.ev.kbd.c);
+
+        rc = ds_client_get_event(client, &rwindow, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
+        ds_window_destroy(wnd);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
+/** Test ds_client_get_event(), ds_client_post_pos_event(). */
+PCUT_TEST(client_get_post_pos_event)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_window_t *wnd;
+        display_wnd_params_t params;
+        pos_event_t event;
+        ds_window_t *rwindow;
+        display_wnd_ev_t revent;
+        bool called_cb = NULL;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, &test_ds_client_cb, &called_cb, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 1;
+
+        rc = ds_window_create(client, &params, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        event.type = POS_PRESS;
+        event.hpos = 1;
+        event.vpos = 2;
+
+        PCUT_ASSERT_FALSE(called_cb);
+
+        rc = ds_client_get_event(client, &rwindow, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
+        rc = ds_client_post_pos_event(client, wnd, &event);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_TRUE(called_cb);
+
+        rc = ds_client_get_event(client, &rwindow, &revent);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_EQUALS(wnd, rwindow);
+        PCUT_ASSERT_EQUALS(wev_pos, revent.etype);
+        PCUT_ASSERT_EQUALS(event.type, revent.ev.pos.type);
+        PCUT_ASSERT_EQUALS(event.hpos, revent.ev.pos.hpos);
+        PCUT_ASSERT_EQUALS(event.vpos, revent.ev.pos.vpos);
 
         rc = ds_client_get_event(client, &rwindow, &revent);

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

@@ -377 +377 @@
         w1->dpos.y = 400;
 
-        PCUT_ASSERT_FALSE(called_cb);
-
         ds_seat_set_focus(seat, w0);
 
@@ -386 +384 @@
         rc = ds_display_post_ptd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_FALSE(called_cb);
 
         event.type = PTD_PRESS;
@@ -392 +389 @@
         rc = ds_display_post_ptd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_FALSE(called_cb);
 
         PCUT_ASSERT_EQUALS(w1, seat->focus);
@@ -400 +396 @@
         rc = ds_display_post_ptd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_FALSE(called_cb);
 
         event.type = PTD_MOVE;
@@ -407 +402 @@
         rc = ds_display_post_ptd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_FALSE(called_cb);
 
         event.type = PTD_PRESS;
@@ -413 +407 @@
         rc = ds_display_post_ptd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_FALSE(called_cb);
 
         PCUT_ASSERT_EQUALS(w0, seat->focus);

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

@@ -232 +232 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_EQUALS(wnd, rwindow);
-        PCUT_ASSERT_EQUALS(event.type, revent.kbd_event.type);
-        PCUT_ASSERT_EQUALS(event.key, revent.kbd_event.key);
-        PCUT_ASSERT_EQUALS(event.mods, revent.kbd_event.mods);
-        PCUT_ASSERT_EQUALS(event.c, revent.kbd_event.c);
+        PCUT_ASSERT_EQUALS(wev_kbd, revent.etype);
+        PCUT_ASSERT_EQUALS(event.type, revent.ev.kbd.type);
+        PCUT_ASSERT_EQUALS(event.key, revent.ev.kbd.key);
+        PCUT_ASSERT_EQUALS(event.mods, revent.ev.kbd.mods);
+        PCUT_ASSERT_EQUALS(event.c, revent.ev.kbd.c);
 
         rc = ds_client_get_event(client, &rwindow, &revent);

uspace/srv/hid/display/window.c

@@ -489 +489 @@
 errno_t ds_window_post_pos_event(ds_window_t *wnd, pos_event_t *event)
 {
+        pos_event_t tevent;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG,
             "ds_window_post_pos_event type=%d pos=%d,%d\n", event->type,
@@ -508 +510 @@
         }
 
-        return EOK;
+        /* Transform event coordinates to window-local */
+        tevent = *event;
+        tevent.hpos -= wnd->dpos.x;
+        tevent.vpos -= wnd->dpos.y;
+
+        return ds_client_post_pos_event(wnd->client, wnd, &tevent);
 }