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

cleanup indentation (tab)

Browse Source
This commit is contained in:
Maarten van Gompel 2021-08-24 09:48:37 +02:00 committed by John Sullivan
parent 58e52575b6
commit 878b16b997
3 changed files with 1107 additions and 1104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
keyboard.h
View File

@ -104,7 +104,7 @@ uint8_t kbd_get_rows(struct layout *l) {
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\n");
uint8_t rows = kbd_get_rows(l); uint8_t rows = kbd_get_rows(l);
l->keyheight = height / rows; l->keyheight = height / rows;
@ -174,12 +174,12 @@ kbd_unpress_key(struct kbd *kb, uint32_t time) {
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);
} else if ((kb->mods & Shift) == Shift) {
kb->mods ^= Shift;
kbd_draw_layout(kb); kbd_draw_layout(kb);
} } else if ((kb->mods & Shift) == Shift) {
kb->mods ^= Shift;
kbd_draw_layout(kb);
}
} }
} }
@ -262,12 +262,12 @@ 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, k->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);
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->y + (k->h / 2), label, -1, NULL); k->x + xoffset, k->y + (k->h / 2), label, -1, NULL);
} }
@ -277,7 +277,7 @@ kbd_draw_layout(struct kbd *kb) {
struct drwsurf *d = kb->surf; struct drwsurf *d = kb->surf;
struct key *next_key = kb->layout->keys; struct key *next_key = kb->layout->keys;
bool pressed = false; bool pressed = false;
fprintf(stderr, "Draw layout"); fprintf(stderr, "Draw layout");
wld_fill_rectangle(d->render, kb->scheme.bg.color, 0, 0, kb->w, kb->h); wld_fill_rectangle(d->render, kb->scheme.bg.color, 0, 0, kb->w, kb->h);
@ -294,7 +294,7 @@ 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, uint8_t layoutcount) {
struct drwsurf *d = kb->surf; struct drwsurf *d = kb->surf;
kb->w = w; kb->w = w;
kb->h = h; kb->h = h;

2151
layout.mobile.h
View File

File diff suppressed because it is too large Load Diff

40
main.c
View File

@ -98,35 +98,35 @@ static void create_and_upload_keymap(const char * name, uint32_t comp_unichr, ui
/* 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 */
@ -278,8 +278,8 @@ 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, uint32_t comp_shift_unichr) {
const char * keymap_str = get_keymap(name, comp_unichr, 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) {
die("could not create keymap fd\n"); die("could not create keymap fd\n");
@ -292,7 +292,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