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

keyboard: add keyboard_get_all_modifiers()

Browse source 
And make mousebind handlers use that one.
Also remove keyboard_any_modifiers_pressed() and replace its usage
with the new function.

Without this patch we would only request the modifier state of the
keyboard group which makes mousebinds involving keyboard modifiers
break for virtual keyboards like when using wayvnc. Same story for
hiding the workspace overlay or snapping to regions.

Fixes: #2511
This commit is contained in:
Consolatis 2025-01-10 11:02:58 +01:00 • committed by Hiroaki Yamamoto
parent 577c24306f
commit 0627190060
6 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/input/cursor.c
View file

@ -17,9 +17,10 @@
#include "dnd.h"
#include "idle.h"
#include "input/gestures.h"
#include "input/touch.h"
#include "input/keyboard.h"
#include "input/tablet.h"
#include "input/tablet-tool.h"
#include "input/touch.h"
#include "labwc.h"
#include "layers.h"
#include "menu/menu.h"
@ -892,9 +893,7 @@ handle_release_mousebinding(struct server *server,
}
struct mousebind *mousebind;
uint32_t modifiers = wlr_keyboard_get_modifiers(
&server->seat.keyboard_group->keyboard);
uint32_t modifiers = keyboard_get_all_modifiers(&server->seat);
wl_list_for_each(mousebind, &rc.mousebinds, link) {
if (ssd_part_contains(mousebind->context, ctx->type)
@ -961,9 +960,7 @@ handle_press_mousebinding(struct server *server, struct cursor_context *ctx,
struct mousebind *mousebind;
bool double_click = is_double_click(rc.doubleclick_time, button, ctx);
bool consumed_by_frame_context = false;
uint32_t modifiers = wlr_keyboard_get_modifiers(
&server->seat.keyboard_group->keyboard);
uint32_t modifiers = keyboard_get_all_modifiers(&server->seat);
wl_list_for_each(mousebind, &rc.mousebinds, link) {
if (ssd_part_contains(mousebind->context, ctx->type)
@ -1287,9 +1284,7 @@ handle_cursor_axis(struct server *server, struct cursor_context *ctx,
{
struct mousebind *mousebind;
bool handled = false;
uint32_t modifiers = wlr_keyboard_get_modifiers(
&server->seat.keyboard_group->keyboard);
uint32_t modifiers = keyboard_get_all_modifiers(&server->seat);
enum direction direction = LAB_DIRECTION_INVALID;
if (event->orientation == WL_POINTER_AXIS_HORIZONTAL_SCROLL) {

31
src/input/keyboard.c
View file

@ -54,17 +54,30 @@ change_vt(struct server *server, unsigned int vt)
wlr_session_change_vt(server->session, vt);
}
bool
keyboard_any_modifiers_pressed(struct wlr_keyboard *keyboard)
uint32_t
keyboard_get_all_modifiers(struct seat *seat)
{
xkb_mod_index_t i;
for (i = 0; i < xkb_keymap_num_mods(keyboard->keymap); i++) {
if (xkb_state_mod_index_is_active(keyboard->xkb_state,
i, XKB_STATE_MODS_DEPRESSED)) {
return true;
/*
* As virtual keyboards like used by wayvnc are not part of the keyboard group,
* we need to additionally get the modifiers of the virtual keyboards in addition
* to the physical ones in the keyboard group. This ensures that mousebinds with
* keyboard modifiers are detected correctly when using for example a VNC client
* via wayvnc to control labwc. This function also gets called to decide when to
* hide the window switcher and workspace OSDs and to indicate if the user wants
* to snap a window to a region during a window move operation.
*/
struct input *input;
uint32_t modifiers = wlr_keyboard_get_modifiers(&seat->keyboard_group->keyboard);
wl_list_for_each(input, &seat->inputs, link) {
if (input->wlr_input_device->type != WLR_INPUT_DEVICE_KEYBOARD) {
continue;
}
struct keyboard *kb = wl_container_of(input, kb, base);
if (kb->is_virtual) {
modifiers |= wlr_keyboard_get_modifiers(kb->wlr_keyboard);
}
}
return false;
return modifiers;
}
static void
@ -139,7 +152,7 @@ keyboard_modifiers_notify(struct wl_listener *listener, void *data)
== LAB_INPUT_STATE_WINDOW_SWITCHER;
if (window_switcher_active || seat->workspace_osd_shown_by_modifier) {
if (!keyboard_any_modifiers_pressed(wlr_keyboard)) {
if (!keyboard_get_all_modifiers(seat)) {
if (window_switcher_active) {
if (key_state_nr_bound_keys()) {
should_cancel_cycling_on_next_key_release = true;