mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-07-10 11:04:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1148 from WeraPea/fix-get_keyboard_grab

Browse source 
fix: correct get_keyboard_grab judge
This commit is contained in:
DreamMaoMao 2026-07-10 08:10:47 +08:00 • committed by GitHub
commit 10cdba3e8a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ext-protocol/text-input.h
View file

@ -103,11 +103,7 @@ get_keyboard_grab(KeyboardGroup *keyboard) {
return NULL; return NULL;
} }
// kb_group是一个物理键盘组，它不应该被过滤掉 if (is_keyboard_emulated_by_input_method(keyboard->virtual_keyboard,
if (keyboard != kb_group)
return NULL;
if (is_keyboard_emulated_by_input_method(&keyboard->wlr_group->keyboard,
input_method)) { input_method)) {
return NULL; return NULL;
} }

2
src/mango.c
View file

@ -493,6 +493,7 @@ typedef struct {
typedef struct { typedef struct {
struct wlr_keyboard_group *wlr_group; struct wlr_keyboard_group *wlr_group;
struct wlr_keyboard *virtual_keyboard;
int32_t nsyms; int32_t nsyms;
const xkb_keysym_t *keysyms; /* invalid if nsyms == 0 */ const xkb_keysym_t *keysyms; /* invalid if nsyms == 0 */
@ -7271,6 +7272,7 @@ void virtualkeyboard(struct wl_listener *listener, void *data) {
wlr_seat_set_capabilities(seat, wlr_seat_set_capabilities(seat,
seat->capabilities | WL_SEAT_CAPABILITY_KEYBOARD); seat->capabilities | WL_SEAT_CAPABILITY_KEYBOARD);
KeyboardGroup *group = createkeyboardgroup(); KeyboardGroup *group = createkeyboardgroup();
group->virtual_keyboard = &kb->keyboard;
/* Set the keymap to match the group keymap */ /* Set the keymap to match the group keymap */
wlr_keyboard_set_keymap(&kb->keyboard, group->wlr_group->keyboard.keymap); wlr_keyboard_set_keymap(&kb->keyboard, group->wlr_group->keyboard.keymap);
LISTEN(&kb->keyboard.base.events.destroy, &group->destroy, LISTEN(&kb->keyboard.base.events.destroy, &group->destroy,