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

parse and respect modifiers for mouse bindings

Browse source
This commit is contained in:
bi4k8 2021-12-01 02:32:24 +00:00 • committed by ARDiDo
parent c34a2fc976
commit 8eab1e8132
4 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cursor.c
View file

@ -443,12 +443,13 @@ handle_cursor_button_with_meta_key(struct view *view, uint32_t button,
}
static void
handle_release_mousebinding(struct server *server, uint32_t button, enum ssd_part_type view_area)
handle_release_mousebinding(struct server *server, uint32_t button, uint32_t modifiers, enum ssd_part_type view_area)
{
struct mousebind *mousebind;
wl_list_for_each_reverse(mousebind, &rc.mousebinds, link) {
if (mousebind->context == view_area
&& mousebind->button == button) {
&& mousebind->button == button
&& modifiers == mousebind->modifiers) {
if (mousebind->mouse_event
== MOUSE_ACTION_RELEASE) {
action(server, mousebind->action,
@ -487,7 +488,7 @@ is_double_click(long double_click_speed, uint32_t button)
}
static bool
handle_press_mousebinding(struct server *server, uint32_t button, enum ssd_part_type view_area)
handle_press_mousebinding(struct server *server, uint32_t button, uint32_t modifiers, enum ssd_part_type view_area)
{
struct mousebind *mousebind;
bool double_click = is_double_click(rc.doubleclick_time, button);
@ -495,7 +496,8 @@ handle_press_mousebinding(struct server *server, uint32_t button, enum ssd_part_
wl_list_for_each_reverse(mousebind, &rc.mousebinds, link) {
if (mousebind->context == view_area
&& mousebind->button == button) {
&& mousebind->button == button
&& modifiers == mousebind->modifiers) {
if (mousebind->mouse_event
== MOUSE_ACTION_PRESS) {
bound = true;
@ -605,9 +607,9 @@ cursor_button(struct wl_listener *listener, void *data)
mousebindings:
if (event->state == WLR_BUTTON_RELEASED) {
handle_release_mousebinding(server, event->button, view_area);
handle_release_mousebinding(server, event->button, modifiers, view_area);
} else if (event->state == WLR_BUTTON_PRESSED) {
handle_press_mousebinding(server, event->button, view_area);
handle_press_mousebinding(server, event->button, modifiers, view_area);
}
}