From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Fri, 18 Nov 2022 11:17:29 +0000 (+0100)
Subject: src/config/rcxml.c: Check for modifiers when merging mousebinds
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=5aac35a27a518d8d262d536e8583407451b694fe;p=proto%2Flabwc.git

src/config/rcxml.c: Check for modifiers when merging mousebinds

Previously mosuebinds for the same context using the same button
but different modifiers would be merged, e.g. only the last one
would survive the merge. This commit adds the missing check for
keyboard modifiers.

Fixes #630

Reported-by: @lidgnulinux
---

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index e5db0f6a..0278bbb8 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -658,7 +658,8 @@ merge_mouse_bindings(void)
 			if (existing->context == current->context
 					&& existing->button == current->button
 					&& existing->direction == current->direction
-					&& existing->mouse_event == current->mouse_event) {
+					&& existing->mouse_event == current->mouse_event
+					&& existing->modifiers == current->modifiers) {
 				wl_list_remove(&existing->link);
 				action_list_free(&existing->actions);
 				free(existing);