dany/wvkbd
1
0
Fork 0
mirror of https://github.com/jjsullivan5196/wvkbd.git synced 2025-04-15 13:26:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

ran make format

Browse Source
This commit is contained in:
Maarten van Gompel 2021-08-24 09:53:34 +02:00 committed by John Sullivan
parent 878b16b997
commit 07f153fe32
4 changed files with 1148 additions and 1163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
keyboard.h
View File

@ -37,28 +37,31 @@ struct clr_scheme {
}; };
struct key { struct key {
const char *label; //primary label const char *label; // primary label
const char *shift_label; //secondary label const char *shift_label; // secondary label
const double width; //relative width (1.0) const double width; // relative width (1.0)
const enum key_type type; const enum key_type type;
const uint32_t code; /* code: key scancode or modifier name (see const uint32_t
* `/usr/include/linux/input-event-codes.h` for scancode names, and code; /* code: key scancode or modifier name (see
* `keyboard.h` for modifiers) * `/usr/include/linux/input-event-codes.h` for scancode names, and
* XKB keycodes are +8 */ * `keyboard.h` for modifiers)
struct layout *layout; //pointer back to the parent layout that holds this key * XKB keycodes are +8 */
struct layout *layout; // pointer back to the parent layout that holds this
// key
const uint32_t code_mod; /* modifier to force when this key is pressed */ const uint32_t code_mod; /* modifier to force when this key is pressed */
uint8_t scheme; //index of the scheme to use uint8_t scheme; // index of the scheme to use
bool reset_mod; /* reset modifiers when clicked */ bool reset_mod; /* reset modifiers when clicked */
//actual coordinates on the surface (pixels), will be computed automatically for all keys // actual coordinates on the surface (pixels), will be computed automatically
// for all keys
uint32_t x, y, w, h; uint32_t x, y, w, h;
}; };
struct layout { struct layout {
struct key *keys; struct key *keys;
const char * keymap_name; const char *keymap_name;
uint32_t keyheight; //absolute height (pixels) uint32_t keyheight; // absolute height (pixels)
}; };
struct kbd { struct kbd {
@ -85,11 +88,13 @@ 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_press_key(struct kbd *kb, struct key *k, uint32_t time);
static void kbd_draw_key(struct kbd *kb, struct key *k, bool pressed); static void kbd_draw_key(struct kbd *kb, struct key *k, bool pressed);
static void kbd_draw_layout(struct kbd *kb); static void kbd_draw_layout(struct kbd *kb);
static void kbd_resize(struct kbd *kb, uint32_t w, uint32_t h, struct layout * layouts, uint8_t layoutcount); static void kbd_resize(struct kbd *kb, uint32_t w, uint32_t h,
struct layout *layouts, uint8_t layoutcount);
static uint8_t kbd_get_rows(struct layout *l); static uint8_t kbd_get_rows(struct layout *l);
static double kbd_get_row_length(struct key *k); static double kbd_get_row_length(struct key *k);
uint8_t kbd_get_rows(struct layout *l) { uint8_t
kbd_get_rows(struct layout *l) {
uint8_t rows = 0; uint8_t rows = 0;
struct key *k = l->keys; struct key *k = l->keys;
while (k->type != Last) { while (k->type != Last) {
@ -115,12 +120,13 @@ kbd_init_layout(struct layout *l, uint32_t width, uint32_t height) {
if (k->type == EndRow) { if (k->type == EndRow) {
y += l->keyheight; y += l->keyheight;
x = 0; x = 0;
rowlength = kbd_get_row_length(k+1); rowlength = kbd_get_row_length(k + 1);
} 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); fprintf(stderr, "(%d/%f)*%f -> %s\n", width, rowlength, k->width,
k->w = ((double) width / rowlength) * k->width; k->label);
k->w = ((double)width / rowlength) * k->width;
x += k->w; x += k->w;
} }
k->h = l->keyheight; k->h = l->keyheight;
@ -142,9 +148,10 @@ struct key *
kbd_get_key(struct kbd *kb, uint32_t x, uint32_t y) { kbd_get_key(struct kbd *kb, uint32_t x, uint32_t y) {
struct layout *l = kb->layout; struct layout *l = kb->layout;
struct key *k = l->keys; struct key *k = l->keys;
fprintf(stderr,"get key: +%d+%d\n",x,y); fprintf(stderr, "get key: +%d+%d\n", x, y);
while (k->type != Last) { 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)) { 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; return k;
} }
k++; k++;
@ -159,22 +166,23 @@ kbd_unpress_key(struct kbd *kb, uint32_t time) {
kb->surf->dirty = true; kb->surf->dirty = true;
if (kb->last_press->type == Copy) { if (kb->last_press->type == Copy) {
zwp_virtual_keyboard_v1_key(kb->vkbd, time, 127, //COMP key zwp_virtual_keyboard_v1_key(kb->vkbd, time, 127, // COMP key
WL_KEYBOARD_KEY_STATE_RELEASED); WL_KEYBOARD_KEY_STATE_RELEASED);
} else { } else {
zwp_virtual_keyboard_v1_key(kb->vkbd, time, kb->last_press->code, zwp_virtual_keyboard_v1_key(kb->vkbd, time, kb->last_press->code,
WL_KEYBOARD_KEY_STATE_RELEASED); WL_KEYBOARD_KEY_STATE_RELEASED);
} }
kb->last_press = NULL; kb->last_press = NULL;
if (compose >= 2) { if (compose >= 2) {
compose = 0; compose = 0;
if ((!kb->prevlayout) || (strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) { if ((!kb->prevlayout) ||
(strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) {
create_and_upload_keymap(kb->layout->keymap_name, 0, 0); create_and_upload_keymap(kb->layout->keymap_name, 0, 0);
} }
kb->layout = kb->prevlayout; kb->layout = kb->prevlayout;
if ((kb->mods & Shift) == Shift) kb->mods ^= Shift; if ((kb->mods & Shift) == Shift)
kb->mods ^= Shift;
kbd_draw_layout(kb); kbd_draw_layout(kb);
} else if ((kb->mods & Shift) == Shift) { } else if ((kb->mods & Shift) == Shift) {
kb->mods ^= Shift; kb->mods ^= Shift;
@ -185,10 +193,12 @@ kbd_unpress_key(struct kbd *kb, uint32_t time) {
void void
kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) { kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) {
if ((compose == 1) && (k->type != Compose) && (k->type != Mod) && (k->layout)) { if ((compose == 1) && (k->type != Compose) && (k->type != Mod) &&
(k->layout)) {
compose++; compose++;
fprintf(stderr,"showing compose %d\n", compose); fprintf(stderr, "showing compose %d\n", compose);
if ((!kb->prevlayout) || (strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) { if ((!kb->prevlayout) ||
(strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) {
create_and_upload_keymap(kb->layout->keymap_name, 0, 0); create_and_upload_keymap(kb->layout->keymap_name, 0, 0);
} }
kb->prevlayout = kb->layout; kb->prevlayout = kb->layout;
@ -204,7 +214,8 @@ kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) {
if (k->reset_mod) { if (k->reset_mod) {
zwp_virtual_keyboard_v1_modifiers(kb->vkbd, k->code_mod, 0, 0, 0); zwp_virtual_keyboard_v1_modifiers(kb->vkbd, k->code_mod, 0, 0, 0);
} else { } else {
zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods ^ k->code_mod, 0, 0, 0); zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods ^ k->code_mod, 0,
0, 0);
} }
} else { } else {
zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods, 0, 0, 0); zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods, 0, 0, 0);
@ -212,9 +223,9 @@ kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) {
kb->last_press = k; kb->last_press = k;
kbd_draw_key(kb, k, true); kbd_draw_key(kb, k, true);
zwp_virtual_keyboard_v1_key(kb->vkbd, time, kb->last_press->code, zwp_virtual_keyboard_v1_key(kb->vkbd, time, kb->last_press->code,
WL_KEYBOARD_KEY_STATE_PRESSED); WL_KEYBOARD_KEY_STATE_PRESSED);
if (compose) { if (compose) {
fprintf(stderr,"pressing composed key\n"); fprintf(stderr, "pressing composed key\n");
compose++; compose++;
} }
break; break;
@ -232,11 +243,12 @@ kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) {
} else { } else {
compose = 0; compose = 0;
} }
kbd_draw_key(kb, k, (bool) compose); kbd_draw_key(kb, k, (bool)compose);
break; break;
case Layout: case Layout:
kb->layout = k->layout; kb->layout = k->layout;
if ((!kb->prevlayout) || (strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) { if ((!kb->prevlayout) ||
(strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) {
fprintf(stderr, "Switching to keymap %s\n", kb->layout->keymap_name); fprintf(stderr, "Switching to keymap %s\n", kb->layout->keymap_name);
create_and_upload_keymap(kb->layout->keymap_name, 0, 0); create_and_upload_keymap(kb->layout->keymap_name, 0, 0);
} }
@ -245,11 +257,11 @@ kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) {
case Copy: case Copy:
kb->last_press = k; kb->last_press = k;
kbd_draw_key(kb, k, true); kbd_draw_key(kb, k, true);
fprintf(stderr,"pressing copy key\n"); fprintf(stderr, "pressing copy key\n");
create_and_upload_keymap(kb->layout->keymap_name, k->code, k->code_mod); 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_modifiers(kb->vkbd, kb->mods, 0, 0, 0);
zwp_virtual_keyboard_v1_key(kb->vkbd, time, 127, //COMP key zwp_virtual_keyboard_v1_key(kb->vkbd, time, 127, // COMP key
WL_KEYBOARD_KEY_STATE_PRESSED); WL_KEYBOARD_KEY_STATE_PRESSED);
break; break;
default: default:
break; break;
@ -262,14 +274,15 @@ void
kbd_draw_key(struct kbd *kb, struct key *k, bool pressed) { 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, k->label); fprintf(stderr, "Draw key +%d+%d %dx%d -> %s\n", k->x, k->y, k->w, k->h,
struct clr_scheme * scheme = (k->scheme == 0) ? &(kb->scheme) : &(kb->scheme1); k->label);
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);
uint32_t xoffset = k->w / (strlen(label) + 2); uint32_t xoffset = k->w / (strlen(label) + 2);
fprintf(stderr, " xoffset=%d\n", xoffset); fprintf(stderr, " xoffset=%d\n", xoffset);
wld_draw_text(d->render, d->ctx->font, scheme->text.color, wld_draw_text(d->render, d->ctx->font, scheme->text.color, k->x + xoffset,
k->x + xoffset, k->y + (k->h / 2), label, -1, NULL); k->y + (k->h / 2), label, -1, NULL);
} }
void void
@ -293,17 +306,18 @@ kbd_draw_layout(struct kbd *kb) {
} }
void void
kbd_resize(struct kbd *kb, uint32_t w, uint32_t h, struct layout * layouts, uint8_t layoutcount) { kbd_resize(struct kbd *kb, uint32_t w, uint32_t h, struct layout *layouts,
struct drwsurf *d = kb->surf; uint8_t layoutcount) {
struct drwsurf *d = kb->surf;
kb->w = w; kb->w = w;
kb->h = h; kb->h = h;
fprintf(stderr, "Resize %dx%d, %d layouts\n",w,h,layoutcount); fprintf(stderr, "Resize %dx%d, %d layouts\n", w, h, layoutcount);
drwsurf_resize(d, w, h); drwsurf_resize(d, w, h);
for (int i = 0; i < layoutcount; i++) { for (int i = 0; i < layoutcount; i++) {
fprintf(stderr,"i=%d\n",i ); fprintf(stderr, "i=%d\n", i);
kbd_init_layout(&layouts[i], w, h); kbd_init_layout(&layouts[i], w, h);
} }
kbd_draw_layout(kb); kbd_draw_layout(kb);
@ -316,5 +330,3 @@ draw_inset(struct drwsurf *d, uint32_t x, uint32_t y, uint32_t width,
wld_fill_rectangle(d->render, color, x + border, y + border, width - border, wld_fill_rectangle(d->render, color, x + border, y + border, width - border,
height - border); height - border);
} }

21
keymap.h
View File

@ -1,7 +1,8 @@
static const char * get_keymap(const char * name, uint32_t comp_unichr, uint32_t comp_shift_unichr) { static const char *
char * keymap = malloc(65000); get_keymap(const char *name, uint32_t comp_unichr, uint32_t comp_shift_unichr) {
if (strcmp(name,"latin") == 0) { char *keymap = malloc(65000);
sprintf(keymap, "xkb_keymap {\ if (strcmp(name, "latin") == 0) {
sprintf(keymap, "xkb_keymap {\
xkb_keycodes \"(unnamed)\" {\ xkb_keycodes \"(unnamed)\" {\
minimum = 8;\ minimum = 8;\
maximum = 255;\ maximum = 255;\
@ -1463,10 +1464,11 @@ xkb_symbols \"(unnamed)\" {\
};\ };\
\ \
};\ };\
", comp_unichr, comp_shift_unichr); ",
comp_unichr, comp_shift_unichr);
return keymap; return keymap;
} else if (strcmp("name","cyrillic")) { } else if (strcmp("name", "cyrillic")) {
sprintf(keymap, "xkb_keymap {\ sprintf(keymap, "xkb_keymap {\
xkb_keycodes \"(unnamed)\" {\ xkb_keycodes \"(unnamed)\" {\
minimum = 8;\ minimum = 8;\
maximum = 255;\ maximum = 255;\
@ -2927,10 +2929,11 @@ xkb_symbols \"(unnamed)\" {\
};\ };\
\ \
};\ };\
", comp_unichr, comp_shift_unichr); ",
comp_unichr, comp_shift_unichr);
return keymap; return keymap;
} else { } else {
fprintf(stderr,"No such keymap: %s", name); fprintf(stderr, "No such keymap: %s", name);
exit(2); exit(2);
} }
} }

2134
layout.mobile.h
View File

File diff suppressed because it is too large Load Diff

48
main.c
View File

@ -6,9 +6,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <wchar.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <wayland-client.h> #include <wayland-client.h>
#include <wchar.h>
#include "drw.h" #include "drw.h"
#include "keymap.h" #include "keymap.h"
@ -94,39 +94,40 @@ static void layer_surface_configure(void *data,
uint32_t serial, uint32_t w, uint32_t h); uint32_t serial, uint32_t w, uint32_t h);
static void layer_surface_closed(void *data, static void layer_surface_closed(void *data,
struct zwlr_layer_surface_v1 *surface); struct zwlr_layer_surface_v1 *surface);
static void create_and_upload_keymap(const char * name, uint32_t comp_unichr, uint32_t comp_shift_unichr); static void create_and_upload_keymap(const char *name, uint32_t comp_unichr,
uint32_t comp_shift_unichr);
/* event handlers */ /* event handlers */
static const struct wl_pointer_listener pointer_listener = { static const struct wl_pointer_listener pointer_listener = {
.enter = wl_pointer_enter, .enter = wl_pointer_enter,
.leave = wl_pointer_leave, .leave = wl_pointer_leave,
.motion = wl_pointer_motion, .motion = wl_pointer_motion,
.button = wl_pointer_button, .button = wl_pointer_button,
}; };
static const struct wl_touch_listener touch_listener = { static const struct wl_touch_listener touch_listener = {
.down = wl_touch_down, .down = wl_touch_down,
.up = wl_touch_up, .up = wl_touch_up,
.motion = wl_touch_motion, .motion = wl_touch_motion,
.frame = wl_touch_frame, .frame = wl_touch_frame,
.cancel = wl_touch_cancel, .cancel = wl_touch_cancel,
.shape = wl_touch_shape, .shape = wl_touch_shape,
.orientation = wl_touch_orientation, .orientation = wl_touch_orientation,
}; };
static const struct wl_seat_listener seat_listener = { static const struct wl_seat_listener seat_listener = {
.capabilities = seat_handle_capabilities, .capabilities = seat_handle_capabilities,
.name = seat_handle_name, .name = seat_handle_name,
}; };
static const struct wl_registry_listener registry_listener = { static const struct wl_registry_listener registry_listener = {
.global = handle_global, .global = handle_global,
.global_remove = handle_global_remove, .global_remove = handle_global_remove,
}; };
static const struct zwlr_layer_surface_v1_listener layer_surface_listener = { static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
.configure = layer_surface_configure, .configure = layer_surface_configure,
.closed = layer_surface_closed, .closed = layer_surface_closed,
}; };
/* configuration, allows nested code to access above variables */ /* configuration, allows nested code to access above variables */
@ -277,8 +278,9 @@ layer_surface_closed(void *data, struct zwlr_layer_surface_v1 *surface) {
} }
void void
create_and_upload_keymap(const char * name, uint32_t comp_unichr, uint32_t comp_shift_unichr) { create_and_upload_keymap(const char *name, uint32_t comp_unichr,
const char * keymap_str = get_keymap(name, comp_unichr, comp_shift_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; size_t keymap_size = strlen(keymap_str) + 1;
int keymap_fd = os_create_anonymous_file(keymap_size); int keymap_fd = os_create_anonymous_file(keymap_size);
if (keymap_fd < 0) { if (keymap_fd < 0) {
@ -292,7 +294,7 @@ create_and_upload_keymap(const char * name, uint32_t comp_unichr, uint32_t comp_
strcpy(ptr, keymap_str); strcpy(ptr, keymap_str);
zwp_virtual_keyboard_v1_keymap( zwp_virtual_keyboard_v1_keymap(
keyboard.vkbd, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, keymap_fd, keymap_size); keyboard.vkbd, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, keymap_fd, keymap_size);
free((void*) keymap_str); free((void *)keymap_str);
} }
int int
@ -326,7 +328,7 @@ main(int argc, char **argv) {
zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkbd_mgr, seat); zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkbd_mgr, seat);
/* upload keymap */ /* upload keymap */
create_and_upload_keymap(layouts[DefaultLayout].keymap_name, 0,0); create_and_upload_keymap(layouts[DefaultLayout].keymap_name, 0, 0);
/* assign kbd state */ /* assign kbd state */
keyboard.surf = &draw_surf; keyboard.surf = &draw_surf;