From a0d1003f28987fb9f5f4a3671d11416805dfc11d Mon Sep 17 00:00:00 2001 From: Consolatis <35009135+Consolatis@users.noreply.github.com> Date: Wed, 15 Jun 2022 01:19:31 +0200 Subject: [PATCH] src/keyboard.c: Make any_modifier_pressed() global --- include/labwc.h | 1 + src/keyboard.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/labwc.h b/include/labwc.h index 9ae30149..5cfb91b3 100644 --- a/include/labwc.h +++ b/include/labwc.h @@ -522,6 +522,7 @@ void cursor_init(struct seat *seat); void cursor_finish(struct seat *seat); void keyboard_init(struct seat *seat); +bool keyboard_any_modifiers_pressed(struct wlr_keyboard *keyboard); void keyboard_finish(struct seat *seat); void touch_init(struct seat *seat); diff --git a/src/keyboard.c b/src/keyboard.c index 7843739d..d6049f88 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -18,8 +18,8 @@ change_vt(struct server *server, unsigned int vt) } } -static bool -any_modifiers_pressed(struct wlr_keyboard *keyboard) +bool +keyboard_any_modifiers_pressed(struct wlr_keyboard *keyboard) { xkb_mod_index_t i; for (i = 0; i < xkb_keymap_num_mods(keyboard->keymap); i++) { @@ -42,7 +42,7 @@ keyboard_modifiers_notify(struct wl_listener *listener, void *data) struct wlr_keyboard_key_event *event = data; struct wlr_keyboard *keyboard = &seat->keyboard_group->keyboard; if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED - && !any_modifiers_pressed(keyboard)) { + && !keyboard_any_modifiers_pressed(keyboard)) { /* end cycle */ desktop_focus_and_activate_view(&server->seat, server->cycle_view); -- 2.52.0