From 519375a7f8588b0acf7690f2fabde2380db51529 Mon Sep 17 00:00:00 2001 From: Consolatis <35009135+Consolatis@users.noreply.github.com> Date: Tue, 26 Apr 2022 19:38:14 +0200 Subject: [PATCH] Revert "config: support " This reverts commit 3d337857b7b0edb76083b4e6a7e15abfb288182a. Revert for now until we have some infrastructure in place to selectively replace default {key,mouse}binds with custom ones. Fixes #304 Reported-by: @01micko --- docs/labwc-config.5.scd | 7 ------- src/config/rcxml.c | 4 ---- src/cursor.c | 3 +-- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd index f3a8aa5e..a58546cc 100644 --- a/docs/labwc-config.5.scd +++ b/docs/labwc-config.5.scd @@ -160,13 +160,6 @@ Configuration must be wrapped in a root-node. - DoubleClick: Two presses within the doubleClickTime. - Drag: Pressing the button within the context, then moving the cursor -** - Load default mousebinds. This is an addition to the openbox - specification and provides a way to keep config files simpler whilst - allowing user specific binds. Note that if no rc.xml is found, or if no - entries exist, the same default mousebinds will be - loaded even if the element is not provided. - # LIBINPUT ** diff --git a/src/config/rcxml.c b/src/config/rcxml.c index 176980a2..894ca5fa 100644 --- a/src/config/rcxml.c +++ b/src/config/rcxml.c @@ -41,7 +41,6 @@ enum font_place { }; static void load_default_key_bindings(void); -static void load_default_mouse_bindings(void); static void fill_keybind(char *nodename, char *content) @@ -334,9 +333,6 @@ entry(xmlNode *node, char *nodename, char *content) if (!strcmp(nodename, "default.keyboard")) { load_default_key_bindings(); return; - } else if (!strcmp(nodename, "default.mouse")) { - load_default_mouse_bindings(); - return; } /* handle the rest */ diff --git a/src/cursor.c b/src/cursor.c index 663ecb80..7d3669f3 100644 --- a/src/cursor.c +++ b/src/cursor.c @@ -619,7 +619,7 @@ handle_press_mousebinding(struct view *view, struct server *server, bool activated_any = false; bool activated_any_frame = false; - wl_list_for_each(mousebind, &rc.mousebinds, link) { + wl_list_for_each_reverse(mousebind, &rc.mousebinds, link) { if (ssd_part_contains(mousebind->context, view_area) && mousebind->button == button && modifiers == mousebind->modifiers) { @@ -655,7 +655,6 @@ handle_press_mousebinding(struct view *view, struct server *server, activated_any = true; activated_any_frame |= mousebind->context == LAB_SSD_FRAME; actions_run(view, server, &mousebind->actions, resize_edges); - break; } } return activated_any && activated_any_frame;