debug: include trailing \0 byte in call to zwp_virtual_keyboard_v1.keymap()

Ref: https://github.com/jjsullivan5196/wvkbd/issues/70

config.def.h

@@ -2,7 +2,6 @@
 #define config_def_h_INCLUDED
 
 #define DEFAULT_FONT "Sans 14"
-#define DEFAULT_ROUNDING 5
 static const int transparency = 255;
 
 struct clr_scheme schemes[] = {
@@ -14,7 +13,6 @@ struct clr_scheme schemes[] = {
   .swipe = {.bgra = {100, 255, 100, 64}},
   .text = {.color = UINT32_MAX},
   .font = DEFAULT_FONT,
-  .rounding = DEFAULT_ROUNDING,
 },
 {
   /* colors */
@@ -24,7 +22,6 @@ struct clr_scheme schemes[] = {
   .swipe = {.bgra = {100, 255, 100, 64}},
   .text = {.color = UINT32_MAX},
   .font = DEFAULT_FONT,
-  .rounding = DEFAULT_ROUNDING,
 }
 };
 

config.mk

@@ -1,4 +1,4 @@
-VERSION = 0.15
+VERSION = 0.14.3
 CFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=700
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man

drw.c

@@ -71,7 +71,7 @@ drw_do_clear(struct drwsurf *d, uint32_t x, uint32_t y, uint32_t w, uint32_t h)
 
 void
 drw_do_rectangle(struct drwsurf *d, Color color, uint32_t x, uint32_t y,
-                 uint32_t w, uint32_t h, bool over, int rounding)
+                 uint32_t w, uint32_t h, bool over)
 {
     cairo_save(d->cairo);
 
@@ -81,48 +81,27 @@ drw_do_rectangle(struct drwsurf *d, Color color, uint32_t x, uint32_t y,
         cairo_set_operator(d->cairo, CAIRO_OPERATOR_SOURCE);
     }
 
-    if (rounding > 0) {
-        double radius = rounding / 1.0;
-        double degrees = M_PI / 180.0;
+    cairo_rectangle(d->cairo, x, y, w, h);
+    cairo_set_source_rgba(
+        d->cairo, color.bgra[2] / (double)255, color.bgra[1] / (double)255,
+        color.bgra[0] / (double)255, color.bgra[3] / (double)255);
+    cairo_fill(d->cairo);
 
-        cairo_new_sub_path (d->cairo);
-        cairo_arc (d->cairo, x + w - radius, y + radius, radius, -90 * degrees, 0 * degrees);
-        cairo_arc (d->cairo, x + w - radius, y + h - radius, radius, 0 * degrees, 90 * degrees);
-        cairo_arc (d->cairo, x + radius, y + h - radius, radius, 90 * degrees, 180 * degrees);
-        cairo_arc (d->cairo, x + radius, y + radius, radius, 180 * degrees, 270 * degrees);
-        cairo_close_path (d->cairo);
-
-        cairo_set_source_rgba(
-          d->cairo, color.bgra[2] / (double)255, color.bgra[1] / (double)255, 
-          color.bgra[0] / (double)255, color.bgra[3] / (double)255);
-        cairo_fill (d->cairo);
-        cairo_set_source_rgba(d->cairo, 0, 0, 0, 0.9);
-        cairo_set_line_width(d->cairo, 1.0);
-        cairo_stroke(d->cairo);
-    }
-    else {
-        cairo_rectangle(d->cairo, x, y, w, h);
-        cairo_set_source_rgba(
-            d->cairo, color.bgra[2] / (double)255, color.bgra[1] / (double)255,
-            color.bgra[0] / (double)255, color.bgra[3] / (double)255);
-        cairo_fill(d->cairo);
-
-        cairo_restore(d->cairo);
-    }
+    cairo_restore(d->cairo);
 }
 
 void
 drw_fill_rectangle(struct drwsurf *d, Color color, uint32_t x, uint32_t y,
-                   uint32_t w, uint32_t h, int rounding)
+                   uint32_t w, uint32_t h)
 {
-    drw_do_rectangle(d, color, x, y, w, h, false, rounding);
+    drw_do_rectangle(d, color, x, y, w, h, false);
 }
 
 void
 drw_over_rectangle(struct drwsurf *d, Color color, uint32_t x, uint32_t y,
-                   uint32_t w, uint32_t h, int rounding)
+                   uint32_t w, uint32_t h)
 {
-    drw_do_rectangle(d, color, x, y, w, h, true, rounding);
+    drw_do_rectangle(d, color, x, y, w, h, true);
 }
 
 uint32_t

drw.h

@@ -33,11 +33,11 @@ typedef union {
 void drw_do_clear(struct drwsurf *d, uint32_t x, uint32_t y,
                       uint32_t w, uint32_t h);
 void drw_do_rectangle(struct drwsurf *d, Color color, uint32_t x, uint32_t y,
-                      uint32_t w, uint32_t h, bool fill, int rounding);
+                      uint32_t w, uint32_t h, bool fill);
 void drw_fill_rectangle(struct drwsurf *d, Color color, uint32_t x, uint32_t y,
-                        uint32_t w, uint32_t h, int rounding);
+                        uint32_t w, uint32_t h);
 void drw_over_rectangle(struct drwsurf *d, Color color, uint32_t x, uint32_t y,
-                        uint32_t w, uint32_t h, int rounding);
+                        uint32_t w, uint32_t h);
 
 void drw_draw_text(struct drwsurf *d, Color color, uint32_t x, uint32_t y,
                    uint32_t w, uint32_t h, uint32_t b, const char *label,

keyboard.c

@@ -561,15 +561,15 @@ kbd_draw_key(struct kbd *kb, struct key *k, enum key_draw_type type)
     case None:
     case Unpress:
         draw_inset(kb->surf, k->x, k->y, k->w, k->h, KBD_KEY_BORDER,
-                   scheme->fg, scheme->rounding);
+                   scheme->fg);
         break;
     case Press:
         draw_inset(kb->surf, k->x, k->y, k->w, k->h, KBD_KEY_BORDER,
-                   scheme->high, scheme->rounding);
+                   scheme->high);
         break;
     case Swipe:
         draw_over_inset(kb->surf, k->x, k->y, k->w, k->h, KBD_KEY_BORDER,
-                        scheme->swipe, scheme->rounding);
+                        scheme->swipe);
         break;
     }
 
@@ -586,9 +586,9 @@ kbd_draw_key(struct kbd *kb, struct key *k, enum key_draw_type type)
         kb->last_popup_h = k->h;
 
         drw_fill_rectangle(kb->popup_surf, scheme->bg, k->x,
-                           kb->last_popup_y, k->w, k->h, scheme->rounding);
+                           kb->last_popup_y, k->w, k->h);
         draw_inset(kb->popup_surf, k->x, kb->last_popup_y, k->w, k->h,
-                   KBD_KEY_BORDER, scheme->high, scheme->rounding);
+                   KBD_KEY_BORDER, scheme->high);
         drw_draw_text(kb->popup_surf, scheme->text, k->x, kb->last_popup_y,
                       k->w, k->h, KBD_KEY_BORDER, label,
                       scheme->font_description);
@@ -605,7 +605,7 @@ kbd_draw_layout(struct kbd *kb)
     if (kb->debug)
         fprintf(stderr, "Draw layout\n");
 
-    drw_fill_rectangle(d, kb->schemes[0].bg, 0, 0, kb->w, kb->h, 0);
+    drw_fill_rectangle(d, kb->schemes[0].bg, 0, 0, kb->w, kb->h);
 
     while (next_key->type != Last) {
         if ((next_key->type == Pad) || (next_key->type == EndRow)) {
@@ -647,17 +647,17 @@ kbd_resize(struct kbd *kb, struct layout *layouts, uint8_t layoutcount)
 
 void
 draw_inset(struct drwsurf *ds, uint32_t x, uint32_t y, uint32_t width,
-           uint32_t height, uint32_t border, Color color, int rounding)
+           uint32_t height, uint32_t border, Color color)
 {
     drw_fill_rectangle(ds, color, x + border, y + border, width - (border * 2),
-                       height - (border * 2), rounding);
+                       height - (border * 2));
 }
 void
 draw_over_inset(struct drwsurf *ds, uint32_t x, uint32_t y, uint32_t width,
-                uint32_t height, uint32_t border, Color color, int rounding)
+                uint32_t height, uint32_t border, Color color)
 {
     drw_over_rectangle(ds, color, x + border, y + border, width - (border * 2),
-                       height - (border * 2), rounding);
+                       height - (border * 2));
 }
 
 void
@@ -678,7 +678,7 @@ create_and_upload_keymap(struct kbd *kb, const char *name, uint32_t comp_unichr,
     size_t keymap_size = strlen(keymap_template) + 64;
     char *keymap_str = malloc(keymap_size);
     sprintf(keymap_str, keymap_template, comp_unichr, comp_shift_unichr);
-    keymap_size = strlen(keymap_str);
+    keymap_size = strlen(keymap_str) + 1;
     int keymap_fd = os_create_anonymous_file(keymap_size);
     if (keymap_fd < 0) {
         die("could not create keymap fd\n");

keyboard.h

@@ -55,7 +55,6 @@ struct clr_scheme {
 	Color swipe;
 	Color text;
 	char *font;
-	int rounding;
 	PangoFontDescription *font_description;
 };
 
@@ -122,9 +121,9 @@ struct kbd {
 };
 
 void draw_inset(struct drwsurf *ds, uint32_t x, uint32_t y, uint32_t width,
-                uint32_t height, uint32_t border, Color color, int rounding);
+                uint32_t height, uint32_t border, Color color);
 void draw_over_inset(struct drwsurf *ds, uint32_t x, uint32_t y, uint32_t width,
-                     uint32_t height, uint32_t border, Color color, int rounding);
+                     uint32_t height, uint32_t border, Color color);
 
 void kbd_init(struct kbd *kb, struct layout *layouts,
               char *layer_names_list, char *landscape_layer_names_list);

main.c

@@ -76,7 +76,6 @@ static int cur_x = -1, cur_y = -1;
 static bool cur_press = false;
 static struct kbd keyboard;
 static uint32_t height, normal_height, landscape_height;
-static int rounding = DEFAULT_ROUNDING;
 static bool hidden = false;
 
 /* event handler prototypes */
@@ -681,7 +680,6 @@ usage(char *argv0)
             "  -O          - Print intersected keys to standard output\n");
     fprintf(stderr, "  -H [int]    - Height in pixels\n");
     fprintf(stderr, "  -L [int]    - Landscape height in pixels\n");
-    fprintf(stderr, "  -R [int]    - Rounding radius in pixels\n");
     fprintf(stderr, "  --fn [font] - Set font (e.g: DejaVu Sans 20)\n");
     fprintf(stderr, "  --hidden    - Start hidden (send SIGUSR2 to show)\n");
     fprintf(
@@ -799,7 +797,7 @@ set_kbd_colors(uint8_t *bgra, char *hex)
     // bg, fg, text, high, swipe
     int length = strlen(hex);
     if (length == 6 || length == 8) {
-        char subhex[3] = { 0 };
+        char subhex[2];
         memcpy(subhex, hex, 2);
         bgra[2] = (int)strtol(subhex, NULL, 16);
         memcpy(subhex, hex + 2, 2);
@@ -950,12 +948,6 @@ main(int argc, char **argv)
                 exit(1);
             }
             height = landscape_height = atoi(argv[++i]);
-        } else if (!strcmp(argv[i], "-R")) {
-            if (i >= argc - 1) {
-                usage(argv[0]);
-                exit(1);
-            }
-            rounding = atoi(argv[++i]);
         } else if (!strcmp(argv[i], "-D")) {
             keyboard.debug = true;
         } else if ((!strcmp(argv[i], "-fn")) || (!strcmp(argv[i], "--fn"))) {
@@ -996,11 +988,6 @@ main(int argc, char **argv)
             schemes[i].font = fc_font_pattern;
     }
 
-    if (rounding != DEFAULT_ROUNDING) {
-        for (i = 0; i < countof(schemes); i++)
-            schemes[i].rounding = rounding;
-    }
-
     display = wl_display_connect(NULL);
     if (display == NULL) {
         die("Failed to create display\n");