mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor.c: Keep sending adjusted motion events while button is pressed

Browse source 
This allows to keep dragging a scrollbar or selecting text even when
moving outside of the window. Fixes #241
This commit is contained in:
Consolatis 2022-02-26 01:21:39 +01:00 • committed by Johan Malm
parent afa3eb1572
commit 00b2925461
4 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/labwc.h
View file

@ -79,6 +79,18 @@ struct seat {
/* if set, views cannot receive focus */ /* if set, views cannot receive focus */
struct wlr_layer_surface_v1 *focused_layer; struct wlr_layer_surface_v1 *focused_layer;
/**
* active_view will usually be NULL and is only set on button press
* while the mouse is over a view surface and reset to NULL on button
* release.
* It is used to send cursor motion events to a surface even though
* the cursor has left the surface in the meantime.
*
* This allows to keep dragging a scrollbar or selecting text even
* when moving outside of the window.
*/
struct view *active_view;
struct wl_client *active_client_while_inhibited; struct wl_client *active_client_while_inhibited;
struct wl_list inputs; struct wl_list inputs;
struct wl_listener new_input; struct wl_listener new_input;

17
src/cursor.c
View file

@ -213,6 +213,15 @@ process_cursor_motion(struct server *server, uint32_t time)
server->seat.cursor->x, server->seat.cursor->y); server->seat.cursor->x, server->seat.cursor->y);
damage_all_outputs(server); damage_all_outputs(server);
return; return;
} else if (server->seat.active_view && !server->seat.drag_icon) {
/* Button has been pressed while over a view surface */
struct view *view = server->seat.active_view;
double sx = server->seat.cursor->x - view->x;
double sy = server->seat.cursor->y - view->y;
sx = sx < 0 ? 0 : (sx > view->w ? view->w : sx);
sy = sy < 0 ? 0 : (sy > view->h ? view->h : sy);
wlr_seat_pointer_notify_motion(server->seat.seat, time, sx, sy);
return;
} }
/* Otherwise, find view under the pointer and send the event along */ /* Otherwise, find view under the pointer and send the event along */
@ -321,6 +330,7 @@ start_drag(struct wl_listener *listener, void *data)
{ {
struct seat *seat = wl_container_of(listener, seat, start_drag); struct seat *seat = wl_container_of(listener, seat, start_drag);
struct wlr_drag *wlr_drag = data; struct wlr_drag *wlr_drag = data;
seat->active_view = NULL;
seat->drag_icon = wlr_drag->icon; seat->drag_icon = wlr_drag->icon;
wl_signal_add(&seat->drag_icon->events.destroy, &seat->destroy_drag); wl_signal_add(&seat->drag_icon->events.destroy, &seat->destroy_drag);
} }
@ -627,6 +637,8 @@ cursor_button(struct wl_listener *listener, void *data)
/* handle _release_ */ /* handle _release_ */
if (event->state == WLR_BUTTON_RELEASED) { if (event->state == WLR_BUTTON_RELEASED) {
server->seat.active_view = NULL;
if (server->input_mode == LAB_INPUT_STATE_MENU) { if (server->input_mode == LAB_INPUT_STATE_MENU) {
return; return;
} }
@ -658,6 +670,11 @@ cursor_button(struct wl_listener *listener, void *data)
goto mousebindings; goto mousebindings;
} }
/* Handle _press */
if (view_area == LAB_SSD_CLIENT) {
server->seat.active_view = view;
}
if (server->input_mode == LAB_INPUT_STATE_MENU) { if (server->input_mode == LAB_INPUT_STATE_MENU) {
if (server->rootmenu->visible) { if (server->rootmenu->visible) {
menu_action_selected(server, server->rootmenu); menu_action_selected(server, server->rootmenu);

3
src/xdg.c
View file

@ -96,6 +96,9 @@ handle_destroy(struct wl_listener *listener, void *data)
wlr_foreign_toplevel_handle_v1_destroy(view->toplevel_handle); wlr_foreign_toplevel_handle_v1_destroy(view->toplevel_handle);
} }
interactive_end(view); interactive_end(view);
if (view->server->seat.active_view == view) {
view->server->seat.active_view = NULL;
}
wl_list_remove(&view->link); wl_list_remove(&view->link);
wl_list_remove(&view->destroy.link); wl_list_remove(&view->destroy.link);
ssd_destroy(view); ssd_destroy(view);

3
src/xwayland.c
View file

@ -82,6 +82,9 @@ handle_destroy(struct wl_listener *listener, void *data)
wlr_foreign_toplevel_handle_v1_destroy(view->toplevel_handle); wlr_foreign_toplevel_handle_v1_destroy(view->toplevel_handle);
} }
interactive_end(view); interactive_end(view);
if (view->server->seat.active_view == view) {
view->server->seat.active_view = NULL;
}
view->xwayland_surface = NULL; view->xwayland_surface = NULL;
wl_list_remove(&view->link); wl_list_remove(&view->link);
wl_list_remove(&view->map.link); wl_list_remove(&view->map.link);