Changeset 338d0935 in mainline for uspace/lib

Timestamp:

2020-03-02T11:22:01Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a2e104e

Parents:

7bb45e3

git-author:

Jiri Svoboda <jiri@…> (2020-02-01 11:18:50)

git-committer:

Jiri Svoboda <jiri@…> (2020-03-02 11:22:01)

Message:

Closing windows

Location:

uspace/lib

Files:

• display/include/types/display.h (modified) (1 diff)
• display/include/types/display/event.h (modified) (1 diff)
• display/src/display.c (modified) (1 diff)
• display/test/display.c (modified) (5 diffs)
• gui/window.c (modified) (4 diffs)

uspace/lib/display/include/types/display.h

@@ -62 +62 @@
 /** Display window callbacks */
 typedef struct {
+        /** Close event */
+        void (*close_event)(void *);
         /** Focus event */
         void (*focus_event)(void *);
-        /** Keyboard event callback */
+        /** Keyboard event */
         void (*kbd_event)(void *, kbd_event_t *);
-        /** Position event callback */
+        /** Position event */
         void (*pos_event)(void *, pos_event_t *);
         /** Unfocus event */

uspace/lib/display/include/types/display/event.h

@@ -41 +41 @@
 /** Display window event type */
 typedef enum {
+        /** Request to close window */
+        wev_close,
         /** Window gained focus */
         wev_focus,

uspace/lib/display/src/display.c

@@ -370 +370 @@
 
                 switch (event.etype) {
+                case wev_close:
+                        if (window->cb != NULL && window->cb->close_event != NULL) {
+                                window->cb->close_event(window->cb_arg);
+                        }
+                        break;
                 case wev_focus:
                         if (window->cb != NULL && window->cb->focus_event != NULL) {

uspace/lib/display/test/display.c

@@ -48 +48 @@
 static void test_display_conn(ipc_call_t *, void *);
 
+static void test_close_event(void *);
 static void test_focus_event(void *);
 static void test_kbd_event(void *, kbd_event_t *);
@@ -69 +70 @@
 
 static display_wnd_cb_t test_display_wnd_cb = {
+        .close_event = test_close_event,
         .focus_event = test_focus_event,
         .kbd_event = test_kbd_event,
@@ -100 +102 @@
         bool get_event_called;
         bool set_color_called;
+        bool close_event_called;
         bool focus_event_called;
         bool kbd_event_called;
@@ -526 +529 @@
 
         display_close(disp);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Close event can be delivered from server to client callback function */
+PCUT_TEST(close_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_close;
+        resp.wnd_id = wnd->id;
+        resp.close_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.close_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);
@@ -861 +929 @@
 }
 
+static void test_close_event(void *arg)
+{
+        test_response_t *resp = (test_response_t *) arg;
+
+        resp->revent.etype = wev_close;
+
+        fibril_mutex_lock(&resp->event_lock);
+        resp->close_event_called = true;
+        fibril_condvar_broadcast(&resp->event_cv);
+        fibril_mutex_unlock(&resp->event_lock);
+}
+
 static void test_focus_event(void *arg)
 {

uspace/lib/gui/window.c

@@ -83 +83 @@
 static pixel_t color_caption_unfocus = PIXEL(255, 207, 207, 207);
 
+static void window_close_event(void *);
 static void window_focus_event(void *);
 static void window_kbd_event(void *, kbd_event_t *);
@@ -89 +90 @@
 
 static display_wnd_cb_t window_cb = {
+        .close_event = window_close_event,
         .focus_event = window_focus_event,
         .kbd_event = window_kbd_event,
@@ -332 +334 @@
                         //win_grab(widget->window->osess, event.pos_id, flags);
                 } else if (close && btn_left) {
-                        //win_close_request(widget->window->osess);
+                        window_close(widget->window);
                 } else if (header && btn_left) {
                         window_grab_flags_t flags = GF_EMPTY;
@@ -766 +768 @@
 void window_close(window_t *win)
 {
-        /* Request compositor to init closing cascade. */
-        //win_close_request(win->osess);
+        window_event_t *event;
+
+        event = (window_event_t *) calloc(1, sizeof(window_event_t));
+        if (event == NULL)
+                return;
+
+        link_initialize(&event->link);
+        event->type = ET_WINDOW_CLOSE;
+        prodcons_produce(&win->events, &event->link);
+}
+
+static void window_close_event(void *arg)
+{
+        window_t *win = (window_t *) arg;
+
+        window_close(win);
 }