diff options
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/main.c b/main.c index 6023693..61ee075 100644 --- a/main.c +++ b/main.c @@ -337,14 +337,12 @@ layer_surface_closed(void *data, struct zwlr_layer_surface_v1 *surface) { void usage(char *argv0) { fprintf(stderr, - "usage: %s [-hov] [-H height] [-L landscape height] [-fn font] [-l " - "layers]\n", + "usage: %s [-hov] [-H height] [-L landscape height] [-fn font]\n", argv0); fprintf(stderr, "Options:\n"); fprintf(stderr, " -D - Enable debug\n"); fprintf(stderr, " -o - Print pressed keys to standard output\n"); fprintf(stderr, " -O - Print intersected keys to standard output\n"); - fprintf(stderr, " -l - Comma separated list of layers\n"); fprintf(stderr, " -H [int] - Height in pixels\n"); fprintf(stderr, " -L [int] - Landscape height in pixels\n"); fprintf(stderr, " --fn [font] - Set font (e.g: DejaVu Sans 20)\n"); @@ -396,14 +394,11 @@ show(int sigint) { int main(int argc, char **argv) { /* parse command line arguments */ - char *layer_names_list = NULL; const char *fc_font_pattern = NULL; height = normal_height = KBD_PIXEL_HEIGHT; landscape_height = KBD_PIXEL_LANDSCAPE_HEIGHT; char *tmp; - if ((tmp = getenv("WVKBD_LAYERS"))) - layer_names_list = estrdup(tmp); if ((tmp = getenv("WVKBD_HEIGHT"))) normal_height = atoi(tmp); if ((tmp = getenv("WVKBD_LANDSCAPE_HEIGHT"))) @@ -432,9 +427,6 @@ main(int argc, char **argv) { usage(argv[0]); exit(1); } - if (layer_names_list) - free(layer_names_list); - layer_names_list = estrdup(argv[++i]); } else if (!strcmp(argv[i], "-H")) { if (i >= argc - 1) { usage(argv[0]); @@ -491,7 +483,7 @@ main(int argc, char **argv) { die("layer_shell not available\n"); } - kbd_init(&keyboard, (struct layout *)&layouts, layer_names_list); + kbd_init(&keyboard, (struct layout *)&layouts); draw_ctx.font_description = pango_font_description_from_string(fc_font_pattern); |