From 4607a2766afd2875696b7b7febd9dc63f778b8d7 Mon Sep 17 00:00:00 2001 From: makki_d Date: Thu, 4 Jun 2020 18:22:55 +0900 Subject: [PATCH] fix +unmap-buttons option having the opposite effect --- client/X11/xf_client.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c index 146c7feea..301820e64 100644 --- a/client/X11/xf_client.c +++ b/client/X11/xf_client.c @@ -1120,7 +1120,7 @@ static void xf_button_map_init(xfContext* xfc) x11_map[111] = 112; /* query system for actual remapping */ - if (!xfc->context.settings->UnmapButtons) + if (xfc->context.settings->UnmapButtons) { xf_get_x11_button_map(xfc, x11_map); } @@ -1142,8 +1142,8 @@ static void xf_button_map_init(xfContext* xfc) else { button_map* map = &xfc->button_map[pos++]; - map->button = physical + Button1; - map->flags = get_flags_for_button(logical); + map->button = logical; + map->flags = get_flags_for_button(physical + Button1); } } }