mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore SnapToEdge and MoveToEdge default keybinds

Browse source 
When adding the fallback keybinds we add them as string but expect them being an int.
This commit fixes that by using the same parsing routines that are used when parsing
user supplied configuration.

Fixes 1ee8715d57
actions: use enum for _ToEdge action
This commit is contained in:
Consolatis 2023-08-06 10:26:04 +02:00
parent 8d0ee4811b
commit 43db75f43c
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/action.h
View file

@ -24,7 +24,7 @@ bool action_is_valid(struct action *action);
void action_arg_add_str(struct action *action, const char *key, const char *value);
void action_arg_from_xml_node(struct action *action, char *nodename, char *content);
void action_arg_from_xml_node(struct action *action, const char *nodename, const char *content);
bool actions_contain_toggle_keybinds(struct wl_list *action_list);

2
src/action.c
View file

@ -159,7 +159,7 @@ action_arg_add_int(struct action *action, const char *key, int value)
}
void
action_arg_from_xml_node(struct action *action, char *nodename, char *content)
action_arg_from_xml_node(struct action *action, const char *nodename, const char *content)
{
assert(action);

6
src/config/rcxml.c
View file

@ -847,7 +847,8 @@ load_default_key_bindings(void)
wl_list_append(&k->actions, &action->link);
if (key_combos[i].attribute && key_combos[i].value) {
action_arg_add_str(action, key_combos[i].attribute, key_combos[i].value);
action_arg_from_xml_node(action,
key_combos[i].attribute, key_combos[i].value);
}
}
}
@ -956,7 +957,8 @@ load_default_mouse_bindings(void)
* slightly more sophisticated approach will be needed.
*/
if (current->attribute && current->value) {
action_arg_add_str(action, current->attribute, current->value);
action_arg_from_xml_node(action,
current->attribute, current->value);
}
}
wlr_log(WLR_DEBUG, "Loaded %u merged mousebinds", count);