diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | keyboard.c | 371 | ||||
| -rw-r--r-- | keyboard.h | 382 | ||||
| -rw-r--r-- | main.c | 34 |
5 files changed, 410 insertions, 383 deletions
diff --git a/.gitignore b/.gitignore index 3af2a48..d86ee5f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ include/config.h .gdb_history *.log wvkbd +config.def.h diff --git a/Makefile b/Makefile index a498597..1348b31 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,9 @@ OBJECTS = $(SOURCES:.c=.o) all: ${BIN} +config.h: config.def.h + cp config.def.h config.h + proto/%-client-protocol.c: proto/%.xml wayland-scanner code < $? > $@ @@ -31,7 +34,7 @@ proto/%-client-protocol.h: proto/%.xml $(OBJECTS): $(HDRS) $(WVKBD_HEADERS) -wvkbd-${LAYOUT}: $(OBJECTS) layout.${LAYOUT}.h +wvkbd-${LAYOUT}: config.h $(OBJECTS) layout.${LAYOUT}.h $(CC) -o wvkbd-${LAYOUT} $(OBJECTS) $(LDFLAGS) clean: diff --git a/keyboard.c b/keyboard.c new file mode 100644 index 0000000..f0a89c4 --- /dev/null +++ b/keyboard.c @@ -0,0 +1,371 @@ +#include "proto/virtual-keyboard-unstable-v1-client-protocol.h" +#include <linux/input-event-codes.h> +#include <stdio.h> +#include <sys/mman.h> +#include "keyboard.h" +#include "drw.h" +#include "os-compatibility.h" + +#define MAX_LAYERS 25 + +/* lazy die macro */ +#define die(...) \ + fprintf(stderr, __VA_ARGS__); \ + exit(1) + +void +kbd_switch_layout(struct kbd *kb, struct layout *l) { + kb->prevlayout = kb->layout; + kb->layout = l; + if (kb->debug) fprintf(stderr, "Switching to layout %s)\n", kb->layout->name); + if ((!kb->prevlayout) || + (strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) { + fprintf(stderr, "Switching to keymap %s\n", kb->layout->keymap_name); + create_and_upload_keymap(kb->layout->keymap_name, 0, 0); + } + kbd_draw_layout(kb); +} + +uint8_t +kbd_get_rows(struct layout *l) { + uint8_t rows = 0; + struct key *k = l->keys; + while (k->type != Last) { + if (k->type == EndRow) { + rows++; + } + k++; + } + return rows + 1; +} + + +void kbd_init(struct kbd *kb, struct layout * layouts, char * layer_names_list) { + char *s; + int i; + bool found; + + fprintf(stderr, "Initializing keyboard\n"); + + kb->layouts = layouts; + + for (i = 0; i < NumLayouts - 1; i++); + fprintf(stderr, "Found %d layouts\n",i); + + kb->layer_index = 0; + + if (layer_names_list) { + uint8_t numlayers = 0; + kb->layers = malloc(MAX_LAYERS * sizeof(enum layout_id)); + s = strtok(layer_names_list, ","); + while (s != NULL) { + if (numlayers + 1 == MAX_LAYERS) { + fprintf(stderr, "too many layers specified"); + exit(3); + } + found = false; + for (i = 0; i < NumLayouts - 1; i++) { + if (kb->layouts[i].name && strcmp(kb->layouts[i].name, s) == 0) { + fprintf(stderr, "layer #%d = %s\n", numlayers + 1, s); + kb->layers[numlayers++] = i; + found = true; + break; + } + } + if (!found) { + fprintf(stderr, "No such layer: %s\n", s); + exit(3); + } + s = strtok(NULL,","); + } + kb->layers[numlayers] = NumLayouts; //mark the end of the sequence + if (numlayers == 0) { + fprintf(stderr, "No layers defined\n"); + exit(3); + } + } + + i = 0; + enum layout_id lid = kb->layers[0]; + while (lid != NumLayouts) { + lid = kb->layers[++i]; + } + fprintf(stderr, "Found %d layers\n",i); + + kb->layout = &kb->layouts[kb->layers[kb->layer_index]]; + kb->prevlayout = kb->layout; + + /* upload keymap */ + create_and_upload_keymap(kb->layout->keymap_name, 0, 0); +} + +void +kbd_init_layout(struct layout *l, uint32_t width, uint32_t height) { + uint32_t x = 0, y = 0; + uint8_t rows = kbd_get_rows(l); + + l->keyheight = height / rows; + + struct key *k = l->keys; + double rowlength = kbd_get_row_length(k); + while (k->type != Last) { + if (k->type == EndRow) { + y += l->keyheight; + x = 0; + rowlength = kbd_get_row_length(k + 1); + } else if (k->width > 0) { + k->x = x; + k->y = y; + k->w = ((double)width / rowlength) * k->width; + x += k->w; + } + k->h = l->keyheight; + k++; + } +} + +double +kbd_get_row_length(struct key *k) { + double l = 0.0; + while ((k->type != Last) && (k->type != EndRow)) { + l += k->width; + k++; + } + return l; +} + +struct key * +kbd_get_key(struct kbd *kb, uint32_t x, uint32_t y) { + struct layout *l = kb->layout; + struct key *k = l->keys; + if (kb->debug) fprintf(stderr, "get key: +%d+%d\n", x, y); + while (k->type != Last) { + if ((k->type != EndRow) && (k->type != Pad) && (k->type != Pad) && + (x >= k->x) && (y >= k->y) && (x < k->x + k->w) && (y < k->y + k->h)) { + return k; + } + k++; + } + return NULL; +} + +void +kbd_unpress_key(struct kbd *kb, uint32_t time) { + if (kb->last_press) { + kbd_draw_key(kb, kb->last_press, false); + if (kb->last_press->type == Copy) { + zwp_virtual_keyboard_v1_key(kb->vkbd, time, 127, // COMP key + WL_KEYBOARD_KEY_STATE_RELEASED); + } else { + zwp_virtual_keyboard_v1_key(kb->vkbd, time, kb->last_press->code, + WL_KEYBOARD_KEY_STATE_RELEASED); + } + kb->last_press = NULL; + + if (kb->compose >= 2) { + kb->compose = 0; + kbd_switch_layout(kb, kb->prevlayout); + if ((kb->mods & Shift) == Shift) + kb->mods ^= Shift; + } else if ((kb->mods & Shift) == Shift) { + kb->mods ^= Shift; + kbd_draw_layout(kb); + } + } +} + +void +kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) { + if ((kb->compose == 1) && (k->type != Compose) && (k->type != Mod) && + (k->layout)) { + kb->compose++; + if (kb->debug) fprintf(stderr, "showing compose %d\n", kb->compose); + kbd_switch_layout(kb, k->layout); + return; + } + + switch (k->type) { + case Code: + if (k->code_mod) { + if (k->reset_mod) { + zwp_virtual_keyboard_v1_modifiers(kb->vkbd, k->code_mod, 0, 0, 0); + } else { + zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods ^ k->code_mod, 0, + 0, 0); + } + } else { + zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods, 0, 0, 0); + } + 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 (kb->print) + kbd_print_key_stdout(kb, k); + if (kb->compose) { + if (kb->debug) fprintf(stderr, "pressing composed key\n"); + kb->compose++; + } + break; + case Mod: + kb->mods ^= k->code; + if (k->code == Shift) { + kbd_draw_layout(kb); + } + kbd_draw_key(kb, k, kb->mods & k->code); + zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods, 0, 0, 0); + break; + case Layout: + //switch to the layout determined by the key + kbd_switch_layout(kb, k->layout); + break; + case Compose: + //switch to the associated layout determined by the *next* keypress + if (kb->compose == 0) { + kb->compose = 1; + } else { + kb->compose = 0; + } + kbd_draw_key(kb, k, (bool)kb->compose); + break; + case NextLayer: + //switch to the next layout in the layer sequence + kb->layer_index++; + if (kb->layers[kb->layer_index] == NumLayouts) { + kb->layer_index = 0; + } + kbd_switch_layout(kb, &kb->layouts[kb->layers[kb->layer_index]]); + break; + case BackLayer: + //switch to the previously active layout + if (kb->prevlayout) + kbd_switch_layout(kb, kb->prevlayout); + break; + case Copy: + //copy code as unicode chr by setting a temporary keymap + kb->last_press = k; + kbd_draw_key(kb, k, true); + if (kb->debug) fprintf(stderr, "pressing copy key\n"); + create_and_upload_keymap(kb->layout->keymap_name, k->code, k->code_mod); + zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods, 0, 0, 0); + zwp_virtual_keyboard_v1_key(kb->vkbd, time, 127, // COMP key + WL_KEYBOARD_KEY_STATE_PRESSED); + if (kb->print) + kbd_print_key_stdout(kb, k); + break; + default: + break; + } +} + + +void +kbd_print_key_stdout(struct kbd *kb, struct key *k) { + /* printed keys may slightly differ from the actual output + * we generally print what is on the key LABEL and only support the normal + * and shift layers. Other modifiers produce no output (Ctrl,Alt) + * */ + + bool handled = true; + if (k->type == Code) { + switch (k->code) { + case KEY_SPACE: + printf(" "); + break; + case KEY_ENTER: + printf("\n"); + break; + case KEY_BACKSPACE: + printf("\b"); + break; + case KEY_TAB: + printf("\t"); + break; + default: + handled = false; + break; + } + } else if (k->type != Copy) { + return; + } + + if (!handled) { + if ((kb->mods & Shift) || (kb->mods & CapsLock)) + printf("%s", k->shift_label); + else if (!(kb->mods & Ctrl) && !(kb->mods & Alt) && !(kb->mods & Super)) + printf("%s", k->label); + } + fflush(stdout); +} + +void +kbd_draw_key(struct kbd *kb, struct key *k, bool pressed) { + struct drwsurf *d = kb->surf; + const char *label = (kb->mods & Shift) ? k->shift_label : k->label; + if (kb->debug) fprintf(stderr, "Draw key +%d+%d %dx%d -> %s\n", k->x, k->y, k->w, k->h, + label); + struct clr_scheme *scheme = (k->scheme == 0) ? &(kb->scheme) : &(kb->scheme1); + Color *fill = pressed ? &scheme->high : &scheme->fg; + draw_inset(d, k->x, k->y, k->w, k->h, KBD_KEY_BORDER, *fill); + drw_draw_text(d, scheme->text, k->x, k->y, k->w, k->h, label); +} + +void +kbd_draw_layout(struct kbd *kb) { + struct drwsurf *d = kb->surf; + struct key *next_key = kb->layout->keys; + bool pressed = false; + if (kb->debug) fprintf(stderr, "Draw layout"); + + drw_fill_rectangle(d, kb->scheme.bg, 0, 0, kb->w, kb->h); + + while (next_key->type != Last) { + if ((next_key->type == Pad) || (next_key->type == EndRow)) { + next_key++; + continue; + } + pressed = next_key->type == Mod && kb->mods & next_key->code; + kbd_draw_key(kb, next_key, pressed); + next_key++; + } +} + +void +kbd_resize(struct kbd *kb, struct layout *layouts, uint8_t layoutcount) { + struct drwsurf *d = kb->surf; + + fprintf(stderr, "Resize %dx%d %d, %d layouts\n", kb->w, kb->h, kb->s, layoutcount); + + drwsurf_resize(d, kb->w, kb->h, kb->s); + for (int i = 0; i < layoutcount; i++) { + kbd_init_layout(&layouts[i], kb->w, kb->h); + } + kbd_draw_layout(kb); +} + +void +draw_inset(struct drwsurf *ds, uint32_t x, uint32_t y, uint32_t width, + uint32_t height, uint32_t border, Color color) { + drw_fill_rectangle(ds, color, x + border, y + border, width - border, + height - border); +} + +void +create_and_upload_keymap(const char *name, uint32_t comp_unichr, + uint32_t comp_shift_unichr) { + const char *keymap_str = get_keymap(name, comp_unichr, comp_shift_unichr); + size_t keymap_size = strlen(keymap_str) + 1; + int keymap_fd = os_create_anonymous_file(keymap_size); + if (keymap_fd < 0) { + die("could not create keymap fd\n"); + } + void *ptr = + mmap(NULL, keymap_size, PROT_READ | PROT_WRITE, MAP_SHARED, keymap_fd, 0); + if (ptr == (void *)-1) { + die("could not map keymap data\n"); + } + strcpy(ptr, keymap_str); + zwp_virtual_keyboard_v1_keymap( + keyboard.vkbd, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, keymap_fd, keymap_size); + free((void *)keymap_str); +} diff --git a/keyboard.h b/keyboard.h index 9f89597..8940608 100644 --- a/keyboard.h +++ b/keyboard.h @@ -1,3 +1,8 @@ +#ifndef __KEYBOARD_H +#define __KEYBOARD_H + +#include "drw.h" + #define MAX_LAYERS 25 enum key_type; @@ -71,6 +76,8 @@ struct layout { }; struct kbd { + bool debug; + struct layout *layout; struct clr_scheme scheme; struct clr_scheme scheme1; @@ -78,6 +85,7 @@ struct kbd { bool print; uint32_t w, h, s; uint8_t mods; + uint8_t compose; struct key *last_press; struct layout *prevlayout; size_t layer_index; @@ -89,357 +97,29 @@ struct kbd { struct zwp_virtual_keyboard_v1 *vkbd; }; -static inline void draw_inset(struct drwsurf *ds, uint32_t x, uint32_t y, +void draw_inset(struct drwsurf *ds, uint32_t x, uint32_t y, uint32_t width, uint32_t height, uint32_t border, Color color); -static void kbd_init(struct kbd *kb, struct layout * layouts, char * layer_names_list); -static void kbd_init_layout(struct layout *l, uint32_t width, uint32_t height); -static struct key *kbd_get_key(struct kbd *kb, uint32_t x, uint32_t y); -static void kbd_unpress_key(struct kbd *kb, uint32_t time); -static void kbd_press_key(struct kbd *kb, struct key *k, uint32_t time); -static void kbd_print_key_stdout(struct kbd *kb, struct key *k); -static void kbd_draw_key(struct kbd *kb, struct key *k, bool pressed); -static void kbd_draw_layout(struct kbd *kb); -static void kbd_resize(struct kbd *kb, struct layout *layouts, uint8_t layoutcount); -static uint8_t kbd_get_rows(struct layout *l); -static double kbd_get_row_length(struct key *k); -static void kbd_switch_layout(struct kbd *kb, struct layout *l); - -void -kbd_switch_layout(struct kbd *kb, struct layout *l) { - kb->prevlayout = kb->layout; - kb->layout = l; - if (debug) fprintf(stderr, "Switching to layout %s)\n", kb->layout->name); - if ((!kb->prevlayout) || - (strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) { - fprintf(stderr, "Switching to keymap %s\n", kb->layout->keymap_name); - create_and_upload_keymap(kb->layout->keymap_name, 0, 0); - } - kbd_draw_layout(kb); -} - -uint8_t -kbd_get_rows(struct layout *l) { - uint8_t rows = 0; - struct key *k = l->keys; - while (k->type != Last) { - if (k->type == EndRow) { - rows++; - } - k++; - } - return rows + 1; -} - - -void kbd_init(struct kbd *kb, struct layout * layouts, char * layer_names_list) { - char *s; - int i; - bool found; - - fprintf(stderr, "Initializing keyboard\n"); - - kb->layouts = layouts; - - for (i = 0; i < NumLayouts - 1; i++); - fprintf(stderr, "Found %d layouts\n",i); - - kb->layer_index = 0; - - if (layer_names_list) { - uint8_t numlayers = 0; - kb->layers = malloc(MAX_LAYERS * sizeof(enum layout_id)); - s = strtok(layer_names_list, ","); - while (s != NULL) { - if (numlayers + 1 == MAX_LAYERS) { - fprintf(stderr, "too many layers specified"); - exit(3); - } - found = false; - for (i = 0; i < NumLayouts - 1; i++) { - if (kb->layouts[i].name && strcmp(kb->layouts[i].name, s) == 0) { - fprintf(stderr, "layer #%d = %s\n", numlayers + 1, s); - kb->layers[numlayers++] = i; - found = true; - break; - } - } - if (!found) { - fprintf(stderr, "No such layer: %s\n", s); - exit(3); - } - s = strtok(NULL,","); - } - kb->layers[numlayers] = NumLayouts; //mark the end of the sequence - if (numlayers == 0) { - fprintf(stderr, "No layers defined\n"); - exit(3); - } - } - - i = 0; - enum layout_id lid = kb->layers[0]; - while (lid != NumLayouts) { - lid = kb->layers[++i]; - } - fprintf(stderr, "Found %d layers\n",i); - - kb->layout = &kb->layouts[kb->layers[kb->layer_index]]; - kb->prevlayout = kb->layout; - - /* upload keymap */ - create_and_upload_keymap(kb->layout->keymap_name, 0, 0); -} - -void -kbd_init_layout(struct layout *l, uint32_t width, uint32_t height) { - uint32_t x = 0, y = 0; - if (debug) fprintf(stderr, "Init layout %s\n", l->name); - uint8_t rows = kbd_get_rows(l); - - l->keyheight = height / rows; - - struct key *k = l->keys; - double rowlength = kbd_get_row_length(k); - while (k->type != Last) { - if (k->type == EndRow) { - y += l->keyheight; - x = 0; - rowlength = kbd_get_row_length(k + 1); - } else if (k->width > 0) { - k->x = x; - k->y = y; - k->w = ((double)width / rowlength) * k->width; - x += k->w; - } - k->h = l->keyheight; - k++; - } -} - -double -kbd_get_row_length(struct key *k) { - double l = 0.0; - while ((k->type != Last) && (k->type != EndRow)) { - l += k->width; - k++; - } - return l; -} - -struct key * -kbd_get_key(struct kbd *kb, uint32_t x, uint32_t y) { - struct layout *l = kb->layout; - struct key *k = l->keys; - if (debug) fprintf(stderr, "get key: +%d+%d\n", x, y); - while (k->type != Last) { - if ((k->type != EndRow) && (k->type != Pad) && (k->type != Pad) && - (x >= k->x) && (y >= k->y) && (x < k->x + k->w) && (y < k->y + k->h)) { - return k; - } - k++; - } - return NULL; -} - -void -kbd_unpress_key(struct kbd *kb, uint32_t time) { - if (kb->last_press) { - kbd_draw_key(kb, kb->last_press, false); - if (kb->last_press->type == Copy) { - zwp_virtual_keyboard_v1_key(kb->vkbd, time, 127, // COMP key - WL_KEYBOARD_KEY_STATE_RELEASED); - } else { - zwp_virtual_keyboard_v1_key(kb->vkbd, time, kb->last_press->code, - WL_KEYBOARD_KEY_STATE_RELEASED); - } - kb->last_press = NULL; - - if (compose >= 2) { - compose = 0; - kbd_switch_layout(kb, kb->prevlayout); - if ((kb->mods & Shift) == Shift) - kb->mods ^= Shift; - } else if ((kb->mods & Shift) == Shift) { - kb->mods ^= Shift; - kbd_draw_layout(kb); - } - } -} - -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++; - if (debug) fprintf(stderr, "showing compose %d\n", compose); - kbd_switch_layout(kb, k->layout); - return; - } - - switch (k->type) { - case Code: - if (k->code_mod) { - if (k->reset_mod) { - zwp_virtual_keyboard_v1_modifiers(kb->vkbd, k->code_mod, 0, 0, 0); - } else { - zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods ^ k->code_mod, 0, - 0, 0); - } - } else { - zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods, 0, 0, 0); - } - 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 (kb->print) - kbd_print_key_stdout(kb, k); - if (compose) { - if (debug) fprintf(stderr, "pressing composed key\n"); - compose++; - } - break; - case Mod: - kb->mods ^= k->code; - if (k->code == Shift) { - kbd_draw_layout(kb); - } - kbd_draw_key(kb, k, kb->mods & k->code); - zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods, 0, 0, 0); - break; - case Layout: - //switch to the layout determined by the key - kbd_switch_layout(kb, k->layout); - break; - case Compose: - //switch to the associated layout determined by the *next* keypress - if (compose == 0) { - compose = 1; - } else { - compose = 0; - } - kbd_draw_key(kb, k, (bool)compose); - break; - case NextLayer: - //switch to the next layout in the layer sequence - kb->layer_index++; - if (kb->layers[kb->layer_index] == NumLayouts) { - kb->layer_index = 0; - } - kbd_switch_layout(kb, &kb->layouts[kb->layers[kb->layer_index]]); - break; - case BackLayer: - //switch to the previously active layout - if (kb->prevlayout) - kbd_switch_layout(kb, kb->prevlayout); - break; - case Copy: - //copy code as unicode chr by setting a temporary keymap - kb->last_press = k; - kbd_draw_key(kb, k, true); - if (debug) fprintf(stderr, "pressing copy key\n"); - create_and_upload_keymap(kb->layout->keymap_name, k->code, k->code_mod); - zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods, 0, 0, 0); - zwp_virtual_keyboard_v1_key(kb->vkbd, time, 127, // COMP key - WL_KEYBOARD_KEY_STATE_PRESSED); - if (kb->print) - kbd_print_key_stdout(kb, k); - break; - default: - break; - } -} - - -void -kbd_print_key_stdout(struct kbd *kb, struct key *k) { - /* printed keys may slightly differ from the actual output - * we generally print what is on the key LABEL and only support the normal - * and shift layers. Other modifiers produce no output (Ctrl,Alt) - * */ - - bool handled = true; - if (k->type == Code) { - switch (k->code) { - case KEY_SPACE: - printf(" "); - break; - case KEY_ENTER: - printf("\n"); - break; - case KEY_BACKSPACE: - printf("\b"); - break; - case KEY_TAB: - printf("\t"); - break; - default: - handled = false; - break; - } - } else if (k->type != Copy) { - return; - } - - if (!handled) { - if ((kb->mods & Shift) || (kb->mods & CapsLock)) - printf("%s", k->shift_label); - else if (!(kb->mods & Ctrl) && !(kb->mods & Alt) && !(kb->mods & Super)) - printf("%s", k->label); - } - fflush(stdout); -} - -void -kbd_draw_key(struct kbd *kb, struct key *k, bool pressed) { - struct drwsurf *d = kb->surf; - const char *label = (kb->mods & Shift) ? k->shift_label : k->label; - if (debug) fprintf(stderr, "Draw key +%d+%d %dx%d -> %s\n", k->x, k->y, k->w, k->h, - label); - struct clr_scheme *scheme = (k->scheme == 0) ? &(kb->scheme) : &(kb->scheme1); - Color *fill = pressed ? &scheme->high : &scheme->fg; - draw_inset(d, k->x, k->y, k->w, k->h, KBD_KEY_BORDER, *fill); - drw_draw_text(d, scheme->text, k->x, k->y, k->w, k->h, label); -} - -void -kbd_draw_layout(struct kbd *kb) { - struct drwsurf *d = kb->surf; - struct key *next_key = kb->layout->keys; - bool pressed = false; - if (debug) fprintf(stderr, "Draw layout"); - - drw_fill_rectangle(d, kb->scheme.bg, 0, 0, kb->w, kb->h); - - while (next_key->type != Last) { - if ((next_key->type == Pad) || (next_key->type == EndRow)) { - next_key++; - continue; - } - pressed = next_key->type == Mod && kb->mods & next_key->code; - kbd_draw_key(kb, next_key, pressed); - next_key++; - } -} - -void -kbd_resize(struct kbd *kb, struct layout *layouts, uint8_t layoutcount) { - struct drwsurf *d = kb->surf; - - fprintf(stderr, "Resize %dx%d %d, %d layouts\n", kb->w, kb->h, kb->s, layoutcount); - - drwsurf_resize(d, kb->w, kb->h, kb->s); - for (int i = 0; i < layoutcount; i++) { - kbd_init_layout(&layouts[i], kb->w, kb->h); - } - kbd_draw_layout(kb); -} - -void -draw_inset(struct drwsurf *ds, uint32_t x, uint32_t y, uint32_t width, - uint32_t height, uint32_t border, Color color) { - drw_fill_rectangle(ds, color, x + border, y + border, width - border, - height - border); -} +void kbd_init(struct kbd *kb, struct layout * layouts, char * layer_names_list); +void kbd_init_layout(struct layout *l, uint32_t width, uint32_t height); +struct key *kbd_get_key(struct kbd *kb, uint32_t x, uint32_t y); +void kbd_unpress_key(struct kbd *kb, uint32_t time); +void kbd_press_key(struct kbd *kb, struct key *k, uint32_t time); +void kbd_print_key_stdout(struct kbd *kb, struct key *k); +void kbd_draw_key(struct kbd *kb, struct key *k, bool pressed); +void kbd_draw_layout(struct kbd *kb); +void kbd_resize(struct kbd *kb, struct layout *layouts, uint8_t layoutcount); +uint8_t kbd_get_rows(struct layout *l); +double kbd_get_row_length(struct key *k); +void kbd_switch_layout(struct kbd *kb, struct layout *l); + +void create_and_upload_keymap(const char *name, uint32_t comp_unichr, + uint32_t comp_shift_unichr); + +#ifndef LAYOUT +#error "make sure to define LAYOUT" +#endif +#include LAYOUT + +#endif diff --git a/main.c b/main.c index f5ffbb7..804abe6 100644 --- a/main.c +++ b/main.c @@ -9,7 +9,8 @@ #include <wchar.h> #include "drw.h" -#include "os-compatibility.h" +#include "keyboard.h" +#include "config.h" /* lazy die macro */ #define die(...) \ @@ -41,7 +42,6 @@ static uint32_t anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | /* application state */ static bool run_display = true; static int cur_x = -1, cur_y = -1; -static int compose = 0; /* event handler prototypes */ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer, @@ -88,8 +88,6 @@ static void layer_surface_configure(void *data, uint32_t serial, uint32_t w, uint32_t h); static void layer_surface_closed(void *data, struct zwlr_layer_surface_v1 *surface); -static void create_and_upload_keymap(const char *name, uint32_t comp_unichr, - uint32_t comp_shift_unichr); /* event handlers */ static const struct wl_pointer_listener pointer_listener = { @@ -124,13 +122,7 @@ static const struct zwlr_layer_surface_v1_listener layer_surface_listener = { .closed = layer_surface_closed, }; -bool debug = false; - /* configuration, allows nested code to access above variables */ -#ifndef LAYOUT -#error "make sure to define LAYOUT" -#endif -#include LAYOUT char * estrdup(const char *s) @@ -317,26 +309,6 @@ layer_surface_closed(void *data, struct zwlr_layer_surface_v1 *surface) { } void -create_and_upload_keymap(const char *name, uint32_t comp_unichr, - uint32_t comp_shift_unichr) { - const char *keymap_str = get_keymap(name, comp_unichr, comp_shift_unichr); - size_t keymap_size = strlen(keymap_str) + 1; - int keymap_fd = os_create_anonymous_file(keymap_size); - if (keymap_fd < 0) { - die("could not create keymap fd\n"); - } - void *ptr = - mmap(NULL, keymap_size, PROT_READ | PROT_WRITE, MAP_SHARED, keymap_fd, 0); - if (ptr == (void *)-1) { - die("could not map keymap data\n"); - } - strcpy(ptr, keymap_str); - zwp_virtual_keyboard_v1_keymap( - keyboard.vkbd, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, keymap_fd, keymap_size); - free((void *)keymap_str); -} - -void usage(char *argv0) { fprintf(stderr, "usage: %s [-hov] [-H height] [-fn font] [-l layers]\n", argv0); @@ -384,7 +356,7 @@ main(int argc, char **argv) { } height = atoi(argv[++i]); } else if (!strcmp(argv[i], "-D")) { - debug = true; + keyboard.debug = true; } else if ((!strcmp(argv[i], "-fn")) || (!strcmp(argv[i], "--fn"))) { fc_font_pattern = estrdup(argv[++i]); } else if (!strcmp(argv[i], "-o")) { |