dany/wvkbd
1
0
Fork 0
mirror of https://github.com/jjsullivan5196/wvkbd.git synced 2025-03-13 10:52:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow supplying layers through command line parameter or env var

Browse Source
This commit is contained in:
Maarten van Gompel 2021-08-24 14:26:34 +02:00 committed by John Sullivan
parent da06f514df
commit 19213688d1
3 changed files with 70 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
keyboard.h
View File

@ -1,3 +1,5 @@
#define MAX_LAYERS 25
enum key_type; enum key_type;
enum key_modifier_type; enum key_modifier_type;
struct clr_scheme; struct clr_scheme;
@ -80,8 +82,8 @@ struct kbd {
struct layout *prevlayout; struct layout *prevlayout;
size_t layer_index; size_t layer_index;
enum layout_ids *layers; struct layout *layouts;
struct layout **layouts; enum layout_id *layers;
struct drwsurf *surf; struct drwsurf *surf;
struct zwp_virtual_keyboard_v1 *vkbd; struct zwp_virtual_keyboard_v1 *vkbd;
@ -91,7 +93,7 @@ static inline void draw_inset(struct drwsurf *d, uint32_t x, uint32_t y,
uint32_t width, uint32_t height, uint32_t border, uint32_t width, uint32_t height, uint32_t border,
uint32_t color); uint32_t color);
static void kbd_init(struct kbd *kb); 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 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 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_unpress_key(struct kbd *kb, uint32_t time);
@ -132,8 +134,60 @@ kbd_get_rows(struct layout *l) {
} }
void kbd_init(struct kbd *kb) { void kbd_init(struct kbd *kb, struct layout * layouts, char * layer_names_list) {
kb->layout = kb->layouts[kb->layer_index]; char *s;
int i;
bool found;
fprintf(stderr, "Initializing keyboard\n");
kb->layouts = layouts;
struct layout * l = layouts;
for (i = 0; i < NumLayouts - 1; i++);
fprintf(stderr, "Found %d layers\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]];
/* upload keymap */ /* upload keymap */
create_and_upload_keymap(kb->layout->keymap_name, 0, 0); create_and_upload_keymap(kb->layout->keymap_name, 0, 0);
@ -142,7 +196,7 @@ void kbd_init(struct kbd *kb) {
void void
kbd_init_layout(struct layout *l, uint32_t width, uint32_t height) { kbd_init_layout(struct layout *l, uint32_t width, uint32_t height) {
uint32_t x = 0, y = 0; uint32_t x = 0, y = 0;
fprintf(stderr, "Init layout\n"); fprintf(stderr, "Init layout %s\n", l->name);
uint8_t rows = kbd_get_rows(l); uint8_t rows = kbd_get_rows(l);
l->keyheight = height / rows; l->keyheight = height / rows;
@ -157,8 +211,6 @@ kbd_init_layout(struct layout *l, uint32_t width, uint32_t height) {
} else if (k->width > 0) { } else if (k->width > 0) {
k->x = x; k->x = x;
k->y = y; k->y = y;
fprintf(stderr, "(%d/%f)*%f -> %s\n", width, rowlength, k->width,
k->label);
k->w = ((double)width / rowlength) * k->width; k->w = ((double)width / rowlength) * k->width;
x += k->w; x += k->w;
} }
@ -291,7 +343,7 @@ kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) {
if (kb->layers[kb->layer_index] == NumLayouts) { if (kb->layers[kb->layer_index] == NumLayouts) {
kb->layer_index = 0; kb->layer_index = 0;
} }
kbd_switch_layout(kb, kb->layouts[kb->layer_index]); kbd_switch_layout(kb, &kb->layouts[kb->layers[kb->layer_index]]);
break; break;
case BackLayer: case BackLayer:
//switch to the previously active layout //switch to the previously active layout
@ -351,7 +403,7 @@ kbd_print_key_stdout(struct kbd *kb, struct key *k) {
if (!handled) { if (!handled) {
if ((kb->mods & Shift) || (kb->mods & CapsLock)) if ((kb->mods & Shift) || (kb->mods & CapsLock))
printf("%s", k->shift_label); printf("%s", k->shift_label);
else if (!(kb->mods & Ctrl) && !(kb->mods & Alt) && (!kb->mods & Super)) else if (!(kb->mods & Ctrl) && !(kb->mods & Alt) && !(kb->mods & Super))
printf("%s", k->label); printf("%s", k->label);
} }
fflush(stdout); fflush(stdout);
@ -362,7 +414,7 @@ kbd_draw_key(struct kbd *kb, struct key *k, bool pressed) {
struct drwsurf *d = kb->surf; struct drwsurf *d = kb->surf;
const char *label = (kb->mods & Shift) ? k->shift_label : k->label; const char *label = (kb->mods & Shift) ? k->shift_label : k->label;
fprintf(stderr, "Draw key +%d+%d %dx%d -> %s\n", k->x, k->y, k->w, k->h, fprintf(stderr, "Draw key +%d+%d %dx%d -> %s\n", k->x, k->y, k->w, k->h,
k->label); label);
struct clr_scheme *scheme = (k->scheme == 0) ? &(kb->scheme) : &(kb->scheme1); struct clr_scheme *scheme = (k->scheme == 0) ? &(kb->scheme) : &(kb->scheme1);
Color *fill = pressed ? &scheme->high : &scheme->fg; Color *fill = pressed ? &scheme->high : &scheme->fg;
draw_inset(d, k->x, k->y, k->w, k->h, KBD_KEY_BORDER, fill->color); draw_inset(d, k->x, k->y, k->w, k->h, KBD_KEY_BORDER, fill->color);

11
layout.mobintl.h
View File

@ -10,7 +10,7 @@
#define KBD_KEY_BORDER 2 #define KBD_KEY_BORDER 2
/* layout declarations */ /* layout declarations */
enum layout_ids { enum layout_id {
Full = 0, Full = 0,
Special, Special,
Simple, Simple,
@ -58,7 +58,7 @@ enum layout_ids {
}; };
/* layers is an ordered list of layouts, used to cycle through */ /* layers is an ordered list of layouts, used to cycle through */
enum layout_ids layers[] = { static enum layout_id layers[] = {
Full, //First layout is the default layout on startup Full, //First layout is the default layout on startup
Special, Special,
Simple, Simple,
@ -138,7 +138,6 @@ static struct layout layouts[NumLayouts] = {
/* keyboard settings */ /* keyboard settings */
static struct kbd keyboard = { static struct kbd keyboard = {
/* default layout */ /* default layout */
.layouts = &layouts,
.layers = &layers, .layers = &layers,
.layer_index = 0, .layer_index = 0,
.scheme = .scheme =
@ -256,7 +255,7 @@ static struct key keys_full[] = {
{",", "'", 1.0, Code, KEY_COMMA}, {",", "'", 1.0, Code, KEY_COMMA},
{"", "", 4.0, Code, KEY_SPACE}, {"", "", 4.0, Code, KEY_SPACE},
{".", "?", 1.0, Code, KEY_DOT}, {".", "?", 1.0, Code, KEY_DOT},
{"Entr", "Entr", 2.0, Code, KEY_ENTER, .scheme = 1}, {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
/* end of layout */ /* end of layout */
{"", "", 0.0, Last}, {"", "", 0.0, Last},
@ -316,7 +315,7 @@ static struct key keys_special[] = {
{",", "'", 1.0, Code, KEY_COMMA}, {",", "'", 1.0, Code, KEY_COMMA},
{"", "", 4.0, Code, KEY_SPACE}, {"", "", 4.0, Code, KEY_SPACE},
{".", "?", 1.0, Code, KEY_DOT}, {".", "?", 1.0, Code, KEY_DOT},
{"Entr", "Entr", 2.0, Code, KEY_ENTER, .scheme = 1}, {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
/* end of layout */ /* end of layout */
{"", "", 0.0, Last}, {"", "", 0.0, Last},
@ -431,7 +430,7 @@ static struct key keys_cyrillic[] = {
{",", "'", 1.0, Code, KEY_EQUAL}, {",", "'", 1.0, Code, KEY_EQUAL},
{"", "", 4.0, Code, KEY_SPACE}, {"", "", 4.0, Code, KEY_SPACE},
{".", "?", 1.0, Code, KEY_SLASH}, {".", "?", 1.0, Code, KEY_SLASH},
{"Entr", "Entr", 2.0, Code, KEY_ENTER, .scheme = 1}, {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
/* end of layout */ /* end of layout */
{"", "", 0.0, Last}, {"", "", 0.0, Last},

4
main.c
View File

@ -312,7 +312,7 @@ create_and_upload_keymap(const char *name, uint32_t comp_unichr,
void void
usage(char *argv0) usage(char *argv0)
{ {
fprintf(stderr, "usage: %s [-hov] [-H height] [-fn font] [-l layers] [-s initial_layer]\n", argv0); fprintf(stderr, "usage: %s [-hov] [-H height] [-fn font] [-l layers]\n", argv0);
fprintf(stderr, "Options:\n"); fprintf(stderr, "Options:\n");
fprintf(stderr, " -D - Enable debug\n"); fprintf(stderr, " -D - Enable debug\n");
fprintf(stderr, " -o - Print press keys to standard output\n"); fprintf(stderr, " -o - Print press keys to standard output\n");
@ -393,7 +393,7 @@ main(int argc, char **argv) {
keyboard.vkbd = keyboard.vkbd =
zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkbd_mgr, seat); zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkbd_mgr, seat);
kbd_init(&keyboard); kbd_init(&keyboard, &layouts, layer_names_list);
/* assign kbd state */ /* assign kbd state */
keyboard.surf = &draw_surf; keyboard.surf = &draw_surf;