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

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.

File:

• uspace/srv/hid/display/seat.c (modified) (8 diffs)

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