dany/wvkbd
1
0
Fork 0
mirror of https://github.com/jjsullivan5196/wvkbd.git synced 2025-07-12 22:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

added cyrillic compose layers and made compose work with non-code keys

Browse Source
This commit is contained in:
Maarten van Gompel
2021-08-23 23:31:51 +02:00
committed by John Sullivan
parent e3f414536e
commit 8abc3326df
2 changed files with 247 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
keyboard.h
View File

@ -180,6 +180,19 @@ kbd_unpress_key(struct kbd *kb, uint32_t time) {
void
kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) {
if ((compose == 1) && (k->type != Compose) && (k->type != Mod) && (k->layout)) {
compose++;
fprintf(stderr,"showing compose %d\n", compose);
if ((!kb->prevlayout) || (strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) {
create_and_upload_keymap(kb->layout->keymap_name, 0, 0);
}
kb->prevlayout = kb->layout;
kb->layout = k->layout;
kbd_draw_layout(kb);
kb->surf->dirty = true;
return;
}
switch (k->type) {
case Code:
if (k->code_mod) {
@ -191,28 +204,13 @@ kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) {
} else {
zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods, 0, 0, 0);
}
if (compose == 1) {
if (k->layout) {
compose++;
if (compose) {
fprintf(stderr,"showing compose %d\n", compose);
}
if ((!kb->prevlayout) || (strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) {
create_and_upload_keymap(kb->layout->keymap_name, 0, 0);
}
kb->prevlayout = kb->layout;
kb->layout = k->layout;
kbd_draw_layout(kb);
}
} else {
kb->last_press = k;
kbd_draw_key(kb, k, true);
zwp_virtual_keyboard_v1_key(kb->vkbd, time, kb->last_press->code,
WL_KEYBOARD_KEY_STATE_PRESSED);
if (compose) {
fprintf(stderr,"pressing composed key\n");
compose++;
}
kb->last_press = k;
kbd_draw_key(kb, k, true);
zwp_virtual_keyboard_v1_key(kb->vkbd, time, kb->last_press->code,
WL_KEYBOARD_KEY_STATE_PRESSED);
if (compose) {
fprintf(stderr,"pressing composed key\n");
compose++;
}
break;
case Mod: