mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor: do not pass _press_ to client when alt held

Browse source
This commit is contained in:
Johan Malm 2021-07-09 22:29:48 +01:00
parent b194881ac2
commit 97a5695ccb
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/cursor.c
View file

@ -299,12 +299,6 @@ cursor_button(struct wl_listener *listener, void *data)
struct server *server = seat->server; struct server *server = seat->server;
struct wlr_event_pointer_button *event = data; struct wlr_event_pointer_button *event = data;
/*
* Notify the client with pointer focus that a button press has
* occurred.
*/
wlr_seat_pointer_notify_button(seat->seat, event->time_msec,
event->button, event->state);
double sx, sy; double sx, sy;
struct wlr_surface *surface; struct wlr_surface *surface;
int view_area; int view_area;
@ -312,6 +306,19 @@ cursor_button(struct wl_listener *listener, void *data)
struct view *view = desktop_view_at(server, server->seat.cursor->x, struct view *view = desktop_view_at(server, server->seat.cursor->x,
server->seat.cursor->y, &surface, &sx, &sy, &view_area); server->seat.cursor->y, &surface, &sx, &sy, &view_area);
/* handle alt + _press_ on view */
struct wlr_input_device *device = seat->keyboard_group->input_device;
uint32_t modifiers = wlr_keyboard_get_modifiers(device->keyboard);
if (modifiers & XKB_KEY_Alt_L && event->state == WLR_BUTTON_PRESSED) {
handle_cursor_button_with_meta_key(view, event->button,
server->seat.cursor->x, server->seat.cursor->y);
return;
};
/* Notify client with pointer focus of button press */
wlr_seat_pointer_notify_button(seat->seat, event->time_msec,
event->button, event->state);
/* handle _release_ */ /* handle _release_ */
if (event->state == WLR_BUTTON_RELEASED) { if (event->state == WLR_BUTTON_RELEASED) {
if (server->input_mode == LAB_INPUT_STATE_MENU) { if (server->input_mode == LAB_INPUT_STATE_MENU) {
@ -336,15 +343,6 @@ cursor_button(struct wl_listener *listener, void *data)
return; return;
} }
/* handle alt + _press_ on view */
struct wlr_input_device *device = seat->keyboard_group->input_device;
uint32_t modifiers = wlr_keyboard_get_modifiers(device->keyboard);
if (modifiers & XKB_KEY_Alt_L) {
handle_cursor_button_with_meta_key(view, event->button,
server->seat.cursor->x, server->seat.cursor->y);
return;
};
/* Handle _press_ on view */ /* Handle _press_ on view */
desktop_focus_view(&server->seat, view); desktop_focus_view(&server->seat, view);
damage_all_outputs(server); damage_all_outputs(server);