Changeset 5480d5e in mainline

Timestamp:

2020-05-19T21:51:11Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9242ad9

Parents:

4c4d6142

Message:

Add libdisplay method for setting window cursor

Location:

uspace/lib/display

Files:

• include/disp_srv.h (modified) (2 diffs)
• include/display.h (modified) (2 diffs)
• include/ipc/display.h (modified) (1 diff)
• src/disp_srv.c (modified) (2 diffs)
• src/display.c (modified) (1 diff)
• test/display.c (modified) (5 diffs)

uspace/lib/display/include/disp_srv.h

@@ -40 +40 @@
 #include <gfx/coord.h>
 #include "display/wndparams.h"
+#include "types/display/cursor.h"
 #include "types/display/event.h"
 #include "types/display/info.h"
@@ -61 +62 @@
         errno_t (*window_move)(void *, sysarg_t, gfx_coord2_t *);
         errno_t (*window_resize)(void *, sysarg_t, gfx_coord2_t *, gfx_rect_t *);
+        errno_t (*window_set_cursor)(void *, sysarg_t, display_stock_cursor_t);
         errno_t (*get_event)(void *, sysarg_t *, display_wnd_ev_t *);
         errno_t (*get_info)(void *, display_info_t *);

uspace/lib/display/include/display.h

@@ -43 +43 @@
 #include "display/wndresize.h"
 #include "types/display.h"
+#include "types/display/cursor.h"
 #include "types/display/info.h"
 
@@ -59 +60 @@
 extern errno_t display_window_resize(display_window_t *,
     gfx_coord2_t *, gfx_rect_t *);
+extern errno_t display_window_set_cursor(display_window_t *,
+    display_stock_cursor_t);
 
 #endif

uspace/lib/display/include/ipc/display.h

@@ -46 +46 @@
         DISPLAY_WINDOW_RESIZE,
         DISPLAY_WINDOW_RESIZE_REQ,
+        DISPLAY_WINDOW_SET_CURSOR,
         DISPLAY_GET_EVENT,
         DISPLAY_GET_INFO

uspace/lib/display/src/disp_srv.c

@@ -266 +266 @@
 }
 
+static void display_window_set_cursor_srv(display_srv_t *srv, ipc_call_t *icall)
+{
+        sysarg_t wnd_id;
+        display_stock_cursor_t cursor;
+        errno_t rc;
+
+        wnd_id = ipc_get_arg1(icall);
+        cursor = ipc_get_arg2(icall);
+
+        if (srv->ops->window_set_cursor == NULL) {
+                async_answer_0(icall, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->window_set_cursor(srv->arg, wnd_id, cursor);
+        async_answer_0(icall, rc);
+}
+
 static void display_get_event_srv(display_srv_t *srv, ipc_call_t *icall)
 {
@@ -386 +404 @@
                 case DISPLAY_WINDOW_RESIZE:
                         display_window_resize_srv(srv, &call);
+                        break;
+                case DISPLAY_WINDOW_SET_CURSOR:
+                        display_window_set_cursor_srv(srv, &call);
                         break;
                 case DISPLAY_GET_EVENT:

uspace/lib/display/src/display.c

@@ -416 +416 @@
 }
 
+/** Set window cursor.
+ *
+ * Set cursor that is displayed when pointer is over the window. The default
+ * is the arrow pointer.
+ *
+ * @param window Window
+ * @param cursor Cursor to display
+ * @return EOK on success or an error code
+ */
+errno_t display_window_set_cursor(display_window_t *window,
+    display_stock_cursor_t cursor)
+{
+        async_exch_t *exch;
+        errno_t rc;
+
+        exch = async_exchange_begin(window->display->sess);
+        rc = async_req_2_0(exch, DISPLAY_WINDOW_SET_CURSOR, window->id,
+            cursor);
+        async_exchange_end(exch);
+        return rc;
+}
+
 /** Get display event.
  *

uspace/lib/display/test/display.c

@@ -62 +62 @@
 static errno_t test_window_resize(void *, sysarg_t, gfx_coord2_t *,
     gfx_rect_t *);
+static errno_t test_window_set_cursor(void *, sysarg_t, display_stock_cursor_t);
 static errno_t test_get_event(void *, sysarg_t *, display_wnd_ev_t *);
 static errno_t test_get_info(void *, display_info_t *);
@@ -74 +75 @@
         .window_resize_req = test_window_resize_req,
         .window_resize = test_window_resize,
+        .window_set_cursor = test_window_set_cursor,
         .get_event = test_get_event,
         .get_info = test_get_info
@@ -122 +124 @@
         gfx_rect_t resize_nbound;
         sysarg_t resize_wnd_id;
+
+        bool window_set_cursor_called;
+        sysarg_t set_cursor_wnd_id;
+        display_stock_cursor_t set_cursor_cursor;
 
         bool get_event_called;
@@ -777 +783 @@
         PCUT_ASSERT_INT_EQUALS(nrect.p1.x, resp.resize_nbound.p1.x);
         PCUT_ASSERT_INT_EQUALS(nrect.p1.y, resp.resize_nbound.p1.y);
+
+        display_window_destroy(wnd);
+        display_close(disp);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** display_window_set_cursor() with server returning error response works. */
+PCUT_TEST(window_set_cursor_failure)
+{
+        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);
+
+        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.rc = EIO;
+        resp.window_set_cursor_called = false;
+
+        rc = display_window_set_cursor(wnd, dcurs_size_ud);
+        PCUT_ASSERT_INT_EQUALS(wnd->id, resp.set_cursor_wnd_id);
+        PCUT_ASSERT_TRUE(resp.window_set_cursor_called);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+        PCUT_ASSERT_INT_EQUALS(dcurs_size_ud, resp.set_cursor_cursor);
+
+        display_window_destroy(wnd);
+        display_close(disp);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** display_window_set_cursor() with server returning success response works. */
+PCUT_TEST(window_set_cursor_success)
+{
+        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);
+
+        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.rc = EOK;
+        resp.window_set_cursor_called = false;
+
+        rc = display_window_set_cursor(wnd, dcurs_size_ud);
+        PCUT_ASSERT_INT_EQUALS(wnd->id, resp.set_cursor_wnd_id);
+        PCUT_ASSERT_TRUE(resp.window_set_cursor_called);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, EOK);
+        PCUT_ASSERT_INT_EQUALS(dcurs_size_ud, resp.set_cursor_cursor);
 
         display_window_destroy(wnd);
@@ -1500 +1606 @@
 }
 
+static errno_t test_window_set_cursor(void *arg, sysarg_t wnd_id,
+    display_stock_cursor_t cursor)
+{
+        test_response_t *resp = (test_response_t *) arg;
+
+        resp->window_set_cursor_called = true;
+        resp->set_cursor_wnd_id = wnd_id;
+        resp->set_cursor_cursor = cursor;
+
+        return resp->rc;
+}
+
 static errno_t test_get_event(void *arg, sysarg_t *wnd_id,
     display_wnd_ev_t *event)