diff --git a/config/config.c b/config/config.c index 47485683..49fea26d 100644 --- a/config/config.c +++ b/config/config.c @@ -130,7 +130,7 @@ Settings config = { .scroll_method = 0, .window_format = "{w} {c} {t}", .click_to_exit = TRUE, - .global_kbindings = FALSE, + .global_kb = FALSE, .theme = NULL, .plugin_path = PLUGIN_PATH, .max_history_size = 25, diff --git a/include/settings.h b/include/settings.h index 0ce0fbbf..684fb6b2 100644 --- a/include/settings.h +++ b/include/settings.h @@ -156,7 +156,7 @@ typedef struct { int click_to_exit; /** Try to take over compositor's global bindings (on Wayland) */ - gboolean global_kbindings; + gboolean global_kb; char *theme; /** Path where plugins can be found. */ diff --git a/mkdocs/docs/1.7.0/rofi.1.markdown b/mkdocs/docs/1.7.0/rofi.1.markdown index 84ac12e8..d68301ae 100644 --- a/mkdocs/docs/1.7.0/rofi.1.markdown +++ b/mkdocs/docs/1.7.0/rofi.1.markdown @@ -768,8 +768,8 @@ Click the mouse outside the **rofi** window to exit. Default: *enabled* -`-global-kbindings` -`-no-global-kbindings` +`-global-kb` +`-no-global-kb` (wayland) Override the compositor's keybindings, so that **rofi** can re-use them. diff --git a/source/wayland/display.c b/source/wayland/display.c index 42733f97..56b4d370 100644 --- a/source/wayland/display.c +++ b/source/wayland/display.c @@ -1564,7 +1564,7 @@ static gboolean wayland_display_late_setup(void) { zwlr_layer_surface_v1_add_listener( wayland->wlr_surface, &wayland_layer_shell_surface_listener, NULL); - if (config.global_kbindings && wayland->kb_shortcuts_inhibit_manager) { + if (config.global_kb && wayland->kb_shortcuts_inhibit_manager) { g_debug("inhibit shortcuts from compositor"); GHashTableIter iter; wayland_seat *seat; diff --git a/source/xrmoptions.c b/source/xrmoptions.c index 8ef431a6..dd090dba 100644 --- a/source/xrmoptions.c +++ b/source/xrmoptions.c @@ -349,8 +349,8 @@ static XrmOption xrmOptions[] = { "Click outside the window to exit", CONFIG_DEFAULT}, {xrm_Boolean, - "global-kbindings", - {.snum = &config.global_kbindings}, + "global-kb", + {.snum = &config.global_kb}, NULL, "Click outside the window to exit", CONFIG_DEFAULT},