diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd index 6df9f994..1aaf5780 100644 --- a/docs/labwc-config.5.scd +++ b/docs/labwc-config.5.scd @@ -931,8 +931,7 @@ situation. ** The number of times by which the magnified image is scaled. This is the default value at boot time; this can be modified at run-time - in a keyboard or mouse binding by calling 'SetMagnification scale up' - or 'SetMagnification scale down'. + in a keyboard or mouse binding by calling 'ZoomIn' or 'ZoomOut'. ** [#RRGGBB] The colour of the magnfier border as an RGB value. diff --git a/src/action.c b/src/action.c index 29407b03..dd90e71e 100644 --- a/src/action.c +++ b/src/action.c @@ -112,7 +112,8 @@ enum action_type { ACTION_TYPE_UNSHADE, ACTION_TYPE_TOGGLE_SHADE, ACTION_TYPE_TOGGLE_MAGNIFY, - ACTION_TYPE_SET_MAGNIFICATION + ACTION_TYPE_ZOOM_IN, + ACTION_TYPE_ZOOM_OUT }; const char *action_names[] = { @@ -167,7 +168,8 @@ const char *action_names[] = { "Unshade", "ToggleShade", "ToggleMagnify", - "SetMagnification", + "ZoomIn", + "ZoomOut" NULL }; @@ -420,12 +422,6 @@ action_arg_from_xml_node(struct action *action, const char *nodename, const char goto cleanup; } break; - case ACTION_TYPE_SET_MAGNIFICATION: - if (!strcmp(argument, "scale")) { - action_arg_add_str(action, argument, content); - goto cleanup; - } - break; } wlr_log(WLR_ERROR, "Invalid argument for action %s: '%s'", @@ -1060,15 +1056,11 @@ actions_run(struct view *activator, struct server *server, case ACTION_TYPE_TOGGLE_MAGNIFY: magnify_toggle(); break; - case ACTION_TYPE_SET_MAGNIFICATION: - { - const char *dir = action_get_str(action, "scale", NULL); - if (!strcmp(dir, "up")) { - magnify_set_scale(MAGNIFY_INCREASE); - } else if (!strcmp(dir, "down")) { - magnify_set_scale(MAGNIFY_DECREASE); - } - } + case ACTION_TYPE_ZOOM_IN: + magnify_set_scale(MAGNIFY_INCREASE); + break; + case ACTION_TYPE_ZOOM_OUT: + magnify_set_scale(MAGNIFY_DECREASE); break; case ACTION_TYPE_INVALID: wlr_log(WLR_ERROR, "Not executing unknown action");