mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "config: support <mouse><default />"

Browse source 
This reverts commit 3d337857b7.

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
This commit is contained in:
Consolatis 2022-04-26 19:38:14 +02:00
parent bb2a98645b
commit 519375a7f8
3 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
docs/labwc-config.5.scd
View file

@ -160,13 +160,6 @@ Configuration must be wrapped in a <labwc_config> root-node.
- DoubleClick: Two presses within the doubleClickTime. - DoubleClick: Two presses within the doubleClickTime.
- Drag: Pressing the button within the context, then moving the cursor - Drag: Pressing the button within the context, then moving the cursor
*<mouse><default />*
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
<mouse><mousebind> entries exist, the same default mousebinds will be
loaded even if the <default /> element is not provided.
# LIBINPUT # LIBINPUT
*<libinput><device category="">* *<libinput><device category="">*

4
src/config/rcxml.c
View file

@ -41,7 +41,6 @@ enum font_place {
}; };
static void load_default_key_bindings(void); static void load_default_key_bindings(void);
static void load_default_mouse_bindings(void);
static void static void
fill_keybind(char *nodename, char *content) fill_keybind(char *nodename, char *content)
@ -334,9 +333,6 @@ entry(xmlNode *node, char *nodename, char *content)
if (!strcmp(nodename, "default.keyboard")) { if (!strcmp(nodename, "default.keyboard")) {
load_default_key_bindings(); load_default_key_bindings();
return; return;
} else if (!strcmp(nodename, "default.mouse")) {
load_default_mouse_bindings();
return;
} }
/* handle the rest */ /* handle the rest */

3
src/cursor.c
View file

@ -619,7 +619,7 @@ handle_press_mousebinding(struct view *view, struct server *server,
bool activated_any = false; bool activated_any = false;
bool activated_any_frame = 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) if (ssd_part_contains(mousebind->context, view_area)
&& mousebind->button == button && mousebind->button == button
&& modifiers == mousebind->modifiers) { && modifiers == mousebind->modifiers) {
@ -655,7 +655,6 @@ handle_press_mousebinding(struct view *view, struct server *server,
activated_any = true; activated_any = true;
activated_any_frame |= mousebind->context == LAB_SSD_FRAME; activated_any_frame |= mousebind->context == LAB_SSD_FRAME;
actions_run(view, server, &mousebind->actions, resize_edges); actions_run(view, server, &mousebind->actions, resize_edges);
break;
} }
} }
return activated_any && activated_any_frame; return activated_any && activated_any_frame;