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

Cleanup some code

Browse Source
This commit is contained in:
Stacy Harper 2021-08-25 22:32:04 +02:00 committed by John Sullivan
parent c8a02479a9
commit 915d01c562
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main.c
View File

@ -351,18 +351,17 @@ usage(char *argv0)
int int
main(int argc, char **argv) { main(int argc, char **argv) {
/* parse command line arguments */ /* parse command line arguments */
int i;
char *layer_names_list = NULL; char *layer_names_list = NULL;
const char *fc_font_pattern = NULL; const char *fc_font_pattern = NULL;
char *tmp;
uint32_t height = KBD_PIXEL_HEIGHT; uint32_t height = KBD_PIXEL_HEIGHT;
char *tmp;
if ((tmp = getenv("WVKBD_LAYERS"))) if ((tmp = getenv("WVKBD_LAYERS")))
layer_names_list = estrdup(tmp); layer_names_list = estrdup(tmp);
if ((tmp = getenv("WVKBD_HEIGHT"))) if ((tmp = getenv("WVKBD_HEIGHT")))
height = atoi(tmp); height = atoi(tmp);
int i;
for (i = 1; argv[i]; i++) { for (i = 1; argv[i]; i++) {
if ((!strcmp(argv[i], "-v")) || (!strcmp(argv[i], "--version"))) { if ((!strcmp(argv[i], "-v")) || (!strcmp(argv[i], "--version"))) {
printf("wvkbd-%s", VERSION); printf("wvkbd-%s", VERSION);
@ -401,13 +400,14 @@ main(int argc, char **argv) {
fc_font_pattern = default_font; fc_font_pattern = default_font;
} }
/* connect to compositor */
display = wl_display_connect(NULL); display = wl_display_connect(NULL);
if (display == NULL) { if (display == NULL) {
die("Failed to create display\n"); die("Failed to create display\n");
} }
/* acquire state */ draw_surf.ctx = &draw_ctx;
keyboard.surf = &draw_surf;
struct wl_registry *registry = wl_display_get_registry(display); struct wl_registry *registry = wl_display_get_registry(display);
wl_registry_add_listener(registry, &registry_listener, NULL); wl_registry_add_listener(registry, &registry_listener, NULL);
wl_display_roundtrip(display); wl_display_roundtrip(display);
@ -425,20 +425,14 @@ main(int argc, char **argv) {
die("virtual_keyboard_manager not available\n"); die("virtual_keyboard_manager not available\n");
} }
/* create vkbd */
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, (struct layout *) &layouts, layer_names_list); kbd_init(&keyboard, (struct layout *) &layouts, layer_names_list);
/* assign kbd state */
keyboard.surf = &draw_surf;
/* create surface */
draw_surf.surf = wl_compositor_create_surface(compositor);; draw_surf.surf = wl_compositor_create_surface(compositor);;
draw_ctx.font_description = pango_font_description_from_string(fc_font_pattern); draw_ctx.font_description = pango_font_description_from_string(fc_font_pattern);
draw_surf.ctx = &draw_ctx;
layer_surface = zwlr_layer_shell_v1_get_layer_surface( layer_surface = zwlr_layer_shell_v1_get_layer_surface(
layer_shell, draw_surf.surf, wl_output, layer, namespace); layer_shell, draw_surf.surf, wl_output, layer, namespace);
@ -447,11 +441,9 @@ main(int argc, char **argv) {
zwlr_layer_surface_v1_set_anchor(layer_surface, anchor); zwlr_layer_surface_v1_set_anchor(layer_surface, anchor);
zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, height); zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, height);
zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface, false); zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface, false);
zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener, zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener, NULL);
NULL);
wl_surface_commit(draw_surf.surf); wl_surface_commit(draw_surf.surf);
/* flush requests and start drawing */
wl_display_roundtrip(display); wl_display_roundtrip(display);
drwsurf_flip(&draw_surf); drwsurf_flip(&draw_surf);