Changeset b0a94854 in mainline for uspace/lib/display/test/display.c

Timestamp:

2020-02-19T13:28:34Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0a052b0

Parents:

e1f2079

git-author:

Jiri Svoboda <jiri@…> (2020-01-18 18:28:21)

git-committer:

Jiri Svoboda <jiri@…> (2020-02-19 13:28:34)

Message:

Deliver window focus and unfocus events

File:

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

uspace/lib/display/test/display.c

@@ -47 +47 @@
 
 static void test_display_conn(ipc_call_t *, void *);
+
+static void test_focus_event(void *);
 static void test_kbd_event(void *, kbd_event_t *);
 static void test_pos_event(void *, pos_event_t *);
+static void test_unfocus_event(void *);
 
 static errno_t test_window_create(void *, display_wnd_params_t *, sysarg_t *);
@@ -63 +66 @@
 
 static display_wnd_cb_t test_display_wnd_cb = {
+        .focus_event = test_focus_event,
         .kbd_event = test_kbd_event,
-        .pos_event = test_pos_event
+        .pos_event = test_pos_event,
+        .unfocus_event = test_unfocus_event
 };
 
@@ -85 +90 @@
         bool get_event_called;
         bool set_color_called;
+        bool focus_event_called;
         bool kbd_event_called;
         bool pos_event_called;
+        bool unfocus_event_called;
         fibril_condvar_t event_cv;
         fibril_mutex_t event_lock;
@@ -382 +389 @@
 
         display_close(disp);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Focus event can be delivered from server to client callback function */
+PCUT_TEST(focus_event_deliver)
+{
+        errno_t rc;
+        service_id_t sid;
+        display_t *disp = NULL;
+        display_wnd_params_t params;
+        display_window_t *wnd;
+        test_response_t resp;
+
+        async_set_fallback_port_handler(test_display_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_display_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_display_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = display_open(test_display_svc, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(disp);
+        PCUT_ASSERT_NOT_NULL(resp.srv);
+
+        wnd = NULL;
+        resp.rc = EOK;
+        display_wnd_params_init(&params);
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p0.x = 100;
+        params.rect.p0.y = 100;
+
+        rc = display_window_create(disp, &params, &test_display_wnd_cb,
+            (void *) &resp, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(wnd);
+
+        resp.event_cnt = 1;
+        resp.event.etype = wev_focus;
+        resp.wnd_id = wnd->id;
+        resp.focus_event_called = false;
+        fibril_mutex_initialize(&resp.event_lock);
+        fibril_condvar_initialize(&resp.event_cv);
+        display_srv_ev_pending(resp.srv);
+
+        /* Wait for the event handler to be called. */
+        fibril_mutex_lock(&resp.event_lock);
+        while (!resp.focus_event_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_EQUALS(resp.event.etype,
+            resp.revent.etype);
+
+        rc = display_window_destroy(wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_close(disp);
+
         rc = loc_service_unregister(sid);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -540 +612 @@
 }
 
+/** Unfocus event can be delivered from server to client callback function */
+PCUT_TEST(unfocus_event_deliver)
+{
+        errno_t rc;
+        service_id_t sid;
+        display_t *disp = NULL;
+        display_wnd_params_t params;
+        display_window_t *wnd;
+        test_response_t resp;
+
+        async_set_fallback_port_handler(test_display_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_display_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_display_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = display_open(test_display_svc, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(disp);
+        PCUT_ASSERT_NOT_NULL(resp.srv);
+
+        wnd = NULL;
+        resp.rc = EOK;
+        display_wnd_params_init(&params);
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p0.x = 100;
+        params.rect.p0.y = 100;
+
+        rc = display_window_create(disp, &params, &test_display_wnd_cb,
+            (void *) &resp, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(wnd);
+
+        resp.event_cnt = 1;
+        resp.event.etype = wev_unfocus;
+        resp.wnd_id = wnd->id;
+        resp.focus_event_called = false;
+        fibril_mutex_initialize(&resp.event_lock);
+        fibril_condvar_initialize(&resp.event_cv);
+        display_srv_ev_pending(resp.srv);
+
+        /* Wait for the event handler to be called. */
+        fibril_mutex_lock(&resp.event_lock);
+        while (!resp.unfocus_event_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_EQUALS(resp.event.etype,
+            resp.revent.etype);
+
+        rc = display_window_destroy(wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_close(disp);
+
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 /** Test display service connection.
  *
@@ -587 +724 @@
 }
 
+static void test_focus_event(void *arg)
+{
+        test_response_t *resp = (test_response_t *) arg;
+
+        resp->revent.etype = wev_focus;
+
+        fibril_mutex_lock(&resp->event_lock);
+        resp->focus_event_called = true;
+        fibril_condvar_broadcast(&resp->event_cv);
+        fibril_mutex_unlock(&resp->event_lock);
+}
+
 static void test_kbd_event(void *arg, kbd_event_t *event)
 {
@@ -609 +758 @@
         fibril_mutex_lock(&resp->event_lock);
         resp->pos_event_called = true;
+        fibril_condvar_broadcast(&resp->event_cv);
+        fibril_mutex_unlock(&resp->event_lock);
+}
+
+static void test_unfocus_event(void *arg)
+{
+        test_response_t *resp = (test_response_t *) arg;
+
+        resp->revent.etype = wev_unfocus;
+
+        fibril_mutex_lock(&resp->event_lock);
+        resp->unfocus_event_called = true;
         fibril_condvar_broadcast(&resp->event_cv);
         fibril_mutex_unlock(&resp->event_lock);