Changeset 9901f267 in mainline for uspace/srv/hid/display/window.c

Timestamp:

2020-05-22T10:38:52Z (5 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.

File:

• uspace/srv/hid/display/window.c (modified) (5 diffs)

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);
 }