Changeset 9901f267 in mainline

Timestamp:

2020-05-22T10:38:52Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ef20a91

Parents:

9242ad9

git-author:

Jiri Svoboda <jiri@…> (2020-05-21 17:38:41)

git-committer:

Jiri Svoboda <jiri@…> (2020-05-22 10:38:52)

Message:

Display server needs to override cursor when resizing windows

Although the pointer moves, the window is not resized until button
is released. Therefore we need override the cursor from what it
would be just based on where the pointer is located.

Location:

uspace

Files:

• lib/display/include/display/wndresize.h (modified) (1 diff)
• lib/display/meson.build (modified) (2 diffs)
• lib/display/src/wndresize.c (added)
• lib/display/test/main.c (modified) (2 diffs)
• lib/display/test/wndresize.c (added)
• srv/hid/display/dsops.c (modified) (1 diff)
• srv/hid/display/seat.c (modified) (8 diffs)
• srv/hid/display/seat.h (modified) (1 diff)
• srv/hid/display/test/seat.c (modified) (1 diff)
• srv/hid/display/test/window.c (modified) (8 diffs)
• srv/hid/display/types/display/seat.h (modified) (1 diff)
• srv/hid/display/window.c (modified) (5 diffs)

uspace/lib/display/include/display/wndresize.h

@@ -36 +36 @@
 #define _LIBDISPLAY_DISPLAY_WNDRESIZE_H_
 
+#include <stdbool.h>
+#include "../types/display/cursor.h"
 #include "../types/display/wndresize.h"
+
+extern display_stock_cursor_t display_cursor_from_wrsz(display_wnd_rsztype_t);
+extern bool display_wndrsz_valid(display_wnd_rsztype_t);
 
 #endif

uspace/lib/display/meson.build

@@ -31 +31 @@
         'src/display.c',
         'src/disp_srv.c',
+        'src/wndresize.c',
 )
 
@@ -36 +37 @@
         'test/display.c',
         'test/main.c',
+        'test/wndresize.c',
 )

uspace/lib/display/test/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -32 +32 @@
 
 PCUT_IMPORT(display);
+PCUT_IMPORT(wndresize);
 
 PCUT_MAIN();

uspace/srv/hid/display/dsops.c

@@ -169 +169 @@
         ds_window_t *wnd;
 
+        if (!display_wndrsz_valid(rsztype))
+                return EINVAL;
+
         ds_display_lock(client->display);
 

uspace/srv/hid/display/seat.c

@@ -45 +45 @@
 #include "window.h"
 
+static errno_t ds_seat_clear_pointer(ds_seat_t *);
+static errno_t ds_seat_draw_pointer(ds_seat_t *);
+
 /** Create seat.
  *
@@ -63 +66 @@
         seat->pntpos.y = 0;
 
-        seat->cursor = display->cursor[dcurs_arrow];
+        seat->client_cursor = display->cursor[dcurs_arrow];
+        seat->wm_cursor = NULL;
 
         *rseat = seat;
@@ -145 +149 @@
 }
 
+/** Get current cursor used by seat.
+ *
+ * @param wmcurs WM curor
+ * @param ccurs Client cursor
+ * @return
+ */
+static ds_cursor_t *ds_seat_compute_cursor(ds_cursor_t *wmcurs, ds_cursor_t *ccurs)
+{
+        if (wmcurs != NULL)
+                return wmcurs;
+
+        return ccurs;
+}
+
+/** Get current cursor used by seat.
+ *
+ * @param seat Seat
+ * @return Current cursor
+ */
+static ds_cursor_t *ds_seat_get_cursor(ds_seat_t *seat)
+{
+        return ds_seat_compute_cursor(seat->wm_cursor, seat->client_cursor);
+}
+
+/** Set client cursor.
+ *
+ * Set cursor selected by client. This may update the actual cursor
+ * if WM is not overriding the cursor.
+ *
+ * @param seat Seat
+ * @param cursor Client cursor
+ */
+static void ds_seat_set_client_cursor(ds_seat_t *seat, ds_cursor_t *cursor)
+{
+        ds_cursor_t *old_cursor;
+        ds_cursor_t *new_cursor;
+
+        old_cursor = ds_seat_get_cursor(seat);
+        new_cursor = ds_seat_compute_cursor(seat->wm_cursor, cursor);
+
+        if (new_cursor != old_cursor)
+                ds_seat_clear_pointer(seat);
+
+        seat->client_cursor = cursor;
+
+        if (new_cursor != old_cursor)
+                ds_seat_draw_pointer(seat);
+}
+
+/** Set WM cursor.
+ *
+ * Set cursor override for window management.
+ *
+ * @param seat Seat
+ * @param cursor WM cursor override or @c NULL not to override the cursor
+ */
+void ds_seat_set_wm_cursor(ds_seat_t *seat, ds_cursor_t *cursor)
+{
+        ds_cursor_t *old_cursor;
+        ds_cursor_t *new_cursor;
+
+        old_cursor = ds_seat_get_cursor(seat);
+        new_cursor = ds_seat_compute_cursor(cursor, seat->client_cursor);
+
+        if (new_cursor != old_cursor)
+                ds_seat_clear_pointer(seat);
+
+        seat->wm_cursor = cursor;
+
+        if (new_cursor != old_cursor)
+                ds_seat_draw_pointer(seat);
+}
+
 /** Draw seat pointer
  *
@@ -153 +230 @@
 static errno_t ds_seat_draw_pointer(ds_seat_t *seat)
 {
-        return ds_cursor_paint(seat->cursor, &seat->pntpos);
+        ds_cursor_t *cursor;
+
+        cursor = ds_seat_get_cursor(seat);
+        return ds_cursor_paint(cursor, &seat->pntpos);
 }
 
@@ -165 +245 @@
 {
         gfx_rect_t rect;
+        ds_cursor_t *cursor;
+
+        cursor = ds_seat_get_cursor(seat);
 
         /* Get rectangle covered by cursor */
-        ds_cursor_get_rect(seat->cursor, &seat->pntpos, &rect);
+        ds_cursor_get_rect(cursor, &seat->pntpos, &rect);
 
         /* Repaint it */
@@ -182 +265 @@
  * @return EOK on success or an error code
  */
-#include <stdio.h>
 errno_t ds_seat_post_ptd_event(ds_seat_t *seat, ptd_event_t *event)
 {
@@ -279 +361 @@
         if (wnd != NULL) {
                 /* Moving over a window */
-                seat->cursor = wnd->cursor;
+                ds_seat_set_client_cursor(seat, wnd->cursor);
 
                 rc = ds_window_post_pos_event(wnd, event);
@@ -286 +368 @@
         } else {
                 /* Not over a window */
-                seat->cursor = seat->display->cursor[dcurs_arrow];
+                ds_seat_set_client_cursor(seat, seat->display->cursor[dcurs_arrow]);
         }
 

uspace/srv/hid/display/seat.h

@@ -52 +52 @@
 extern errno_t ds_seat_post_ptd_event(ds_seat_t *, ptd_event_t *);
 extern errno_t ds_seat_post_pos_event(ds_seat_t *, pos_event_t *);
+extern void ds_seat_set_wm_cursor(ds_seat_t *, ds_cursor_t *);
 
 #endif

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

@@ -353 +353 @@
 }
 
+/** Set WM cursor */
+PCUT_TEST(set_wm_cursor)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_seat_t *seat;
+        bool called_cb = false;
+        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);
+
+        rc = ds_seat_create(disp, &seat);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ds_seat_set_wm_cursor(seat, disp->cursor[dcurs_size_ud]);
+        ds_seat_set_wm_cursor(seat, NULL);
+
+        ds_seat_destroy(seat);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
 PCUT_EXPORT(seat);

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

@@ -36 +36 @@
 #include "../client.h"
 #include "../display.h"
+#include "../seat.h"
 #include "../window.h"
 
@@ -55 +56 @@
         ds_display_t *disp;
         ds_client_t *client;
+        ds_seat_t *seat;
         ds_window_t *wnd;
         display_wnd_params_t params;
@@ -65 +67 @@
 
         rc = ds_client_create(disp, NULL, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -89 +94 @@
 
         ds_window_destroy(wnd);
+        ds_seat_destroy(seat);
         ds_client_destroy(client);
         ds_display_destroy(disp);
@@ -288 +294 @@
         ds_display_t *disp;
         ds_client_t *client;
+        ds_seat_t *seat;
         ds_window_t *wnd;
         display_wnd_params_t params;
@@ -300 +307 @@
 
         rc = ds_client_create(disp, NULL, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -321 +331 @@
 
         ds_window_destroy(wnd);
+        ds_seat_destroy(seat);
         ds_client_destroy(client);
         ds_display_destroy(disp);
@@ -639 +650 @@
 }
 
-
 static errno_t dummy_set_color(void *arg, gfx_color_t *color)
 {

uspace/srv/hid/display/types/display/seat.h

@@ -48 +48 @@
         /** Window this seat is focused on */
         struct ds_window *focus;
-        /** Current seat cursor */
-        struct ds_cursor *cursor;
+        /** Cursor selected by client */
+        struct ds_cursor *client_cursor;
+        /** Cursor override for window management or @c NULL */
+        struct ds_cursor *wm_cursor;
         /** Pointer position */
         gfx_coord2_t pntpos;

uspace/srv/hid/display/window.c

@@ -45 +45 @@
 #include "client.h"
 #include "display.h"
+#include "seat.h"
 #include "window.h"
 
@@ -515 +516 @@
     display_wnd_rsztype_t rsztype, gfx_coord2_t *pos)
 {
+        ds_seat_t *seat;
+        display_stock_cursor_t ctype;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_start_resize (%d, %d)",
             (int) pos->x, (int) pos->y);
@@ -525 +529 @@
         wnd->rsztype = rsztype;
         wnd->preview_rect = wnd->rect;
+
+        // XXX Need client to tell us which seat started the resize!
+        seat = ds_display_first_seat(wnd->display);
+        ctype = display_cursor_from_wrsz(rsztype);
+        ds_seat_set_wm_cursor(seat, wnd->display->cursor[ctype]);
 }
 
@@ -536 +545 @@
         gfx_coord2_t dresize;
         gfx_rect_t nrect;
+        ds_seat_t *seat;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_finish_resize (%d, %d)",
@@ -552 +562 @@
         wnd->state = dsw_idle;
         ds_client_post_resize_event(wnd->client, wnd, &nrect);
+
+        // XXX Need to know which seat started the resize!
+        seat = ds_display_first_seat(wnd->display);
+        ds_seat_set_wm_cursor(seat, NULL);
 }