summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dwl.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/dwl.c b/dwl.c
index e7571fe..339ebe5 100644
--- a/dwl.c
+++ b/dwl.c
@@ -298,6 +298,7 @@ static void zoom(const Arg *arg);
/* variables */
static const char broken[] = "broken";
+static const char *cursor_image = "left_ptr";
static pid_t child_pid = -1;
static void *exclusive_focus;
static struct wl_display *dpy;
@@ -674,10 +675,13 @@ buttonpress(struct wl_listener *listener, void *data)
break;
case WLR_BUTTON_RELEASED:
/* If you released any buttons, we exit interactive move/resize mode. */
- /* TODO should reset to the pointer focus's current setcursor */
if (cursor_mode != CurNormal) {
- wlr_xcursor_manager_set_cursor_image(cursor_mgr, "left_ptr", cursor);
cursor_mode = CurNormal;
+ /* Clear the pointer focus, this way if the cursor is over a surface
+ * we will send an enter event after which the client will provide us
+ * a cursor surface */
+ wlr_seat_pointer_clear_focus(seat);
+ motionnotify(0);
/* Drop the window off on its new monitor */
selmon = xytomon(cursor->x, cursor->y);
setmon(grabc, selmon, 0);
@@ -1531,8 +1535,8 @@ motionnotify(uint32_t time)
/* If there's no client surface under the cursor, set the cursor image to a
* default. This is what makes the cursor image appear when you move it
* off of a client or over its border. */
- if (!surface)
- wlr_xcursor_manager_set_cursor_image(cursor_mgr, "left_ptr", cursor);
+ if (!surface && (!cursor_image || strcmp(cursor_image, "left_ptr")))
+ wlr_xcursor_manager_set_cursor_image(cursor_mgr, (cursor_image = "left_ptr"), cursor);
pointerfocus(c, surface, sx, sy, time);
}
@@ -1567,7 +1571,7 @@ moveresize(const Arg *arg)
case CurMove:
grabcx = cursor->x - grabc->geom.x;
grabcy = cursor->y - grabc->geom.y;
- wlr_xcursor_manager_set_cursor_image(cursor_mgr, "fleur", cursor);
+ wlr_xcursor_manager_set_cursor_image(cursor_mgr, (cursor_image = "fleur"), cursor);
break;
case CurResize:
/* Doesn't work for X11 output - the next absolute motion event
@@ -1576,7 +1580,7 @@ moveresize(const Arg *arg)
grabc->geom.x + grabc->geom.width,
grabc->geom.y + grabc->geom.height);
wlr_xcursor_manager_set_cursor_image(cursor_mgr,
- "bottom_right_corner", cursor);
+ (cursor_image = "bottom_right_corner"), cursor);
break;
}
}
@@ -1702,7 +1706,6 @@ pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy,
* wlroots makes this a no-op if surface is already focused */
wlr_seat_pointer_notify_enter(seat, surface, sx, sy);
wlr_seat_pointer_notify_motion(seat, time, sx, sy);
-
}
void
@@ -1867,7 +1870,7 @@ run(char *startup_cmd)
* initialized, as the image/coordinates are not transformed for the
* monitor when displayed here */
wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y);
- wlr_xcursor_manager_set_cursor_image(cursor_mgr, "left_ptr", cursor);
+ wlr_xcursor_manager_set_cursor_image(cursor_mgr, cursor_image, cursor);
/* Run the Wayland event loop. This does not return until you exit the
* compositor. Starting the backend rigged up all of the necessary event
@@ -1890,10 +1893,12 @@ setcursor(struct wl_listener *listener, void *data)
{
/* This event is raised by the seat when a client provides a cursor image */
struct wlr_seat_pointer_request_set_cursor_event *event = data;
- /* If we're "grabbing" the cursor, don't use the client's image */
- /* TODO still need to save the provided surface to restore later */
+ /* If we're "grabbing" the cursor, don't use the client's image, we will
+ * restore it after "grabbing" sending a leave event, followed by a enter
+ * event, which will result in the client requesting set the cursor surface */
if (cursor_mode != CurNormal)
return;
+ cursor_image = NULL;
/* This can be sent by any client, so we check to make sure this one is
* actually has pointer focus first. If so, we can tell the cursor to
* use the provided surface as the cursor image. It will set the