From 5aac35a27a518d8d262d536e8583407451b694fe Mon Sep 17 00:00:00 2001
From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Fri, 18 Nov 2022 12:17:29 +0100
Subject: [PATCH] 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
---
 src/config/rcxml.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);