update gaps for dmenu and dwm

4 files changed, 23 insertions, 21 deletions

diff --git a/dmenu/config.h b/dmenu/config.h
index 1ac8c72..5f8c2aa 100644
--- a/dmenu/config.h
+++ b/dmenu/config.h
@@ -1,28 +1,32 @@
 /* See LICENSE file for copyright and license details. */
 /* Default settings; can be overriden by command line. */
 
-static int topbar = 1; /* -b  option; if 0, dmenu appears at bottom     */
-static int fuzzy = 1;  /* -F  option; if 0, dmenu doesn't use fuzzy matching  */
+#define PADDING 0
+
+static int topbar = 1;              /* -b  option; if 0, dmenu appears at bottom     */
+static int fuzzy = 1;               /* -F  option; if 0, dmenu doesn't use fuzzy matching  */
+static int dmx = PADDING;           /* put dmenu at this x offset */
+static int dmy = PADDING;           /* put dmenu at this y offset (measured from the bottom if topbar is 0) */
+static unsigned int dmw = 0;        /* make dmenu this wide */
 /* -fn option overrides fonts[0]; default X11 font or font set */
 static const char *fonts[] = {
     "monospace:size=10",
     "NotoColorEmoji:pixelsize=8:antialias=true:autohint=true"};
 static const unsigned int bgalpha = 0xe0;
 static const unsigned int fgalpha = OPAQUE;
-static const char *prompt =
-    NULL; /* -p  option; prompt to the left of input field */
+static const char *prompt = NULL;   /* -p  option; prompt to the left of input field */
 static const char *colors[SchemeLast][2] = {
-    /*     fg         bg       */
-    [SchemeNorm] = {"#bbbbbb", "#222222"},
-    [SchemeSel] = {"#eeeeee", "#005577"},
-    [SchemeOut] = {"#000000", "#00ffff"},
-    [SchemeCursor] = {"#222222", "#bbbbbb"},
+    /*     fg                   bg       */
+    [SchemeNorm]    = {"#bbbbbb", "#222222"},
+    [SchemeSel]     = {"#eeeeee", "#005577"},
+    [SchemeOut]     = {"#000000", "#00ffff"},
+    [SchemeCursor]  = {"#222222", "#bbbbbb"},
 };
 static const unsigned int alphas[SchemeLast][2] = {
-    /*		fgalpha		bgalphga	*/
-    [SchemeNorm] = {fgalpha, bgalpha},
-    [SchemeSel] = {fgalpha, bgalpha},
-    [SchemeOut] = {fgalpha, bgalpha},
+    /*  fgalpha             bgalphga    */
+    [SchemeNorm]    = {fgalpha, bgalpha},
+    [SchemeSel]     = {fgalpha, bgalpha},
+    [SchemeOut]     = {fgalpha, bgalpha},
 };
 
 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
@@ -39,8 +43,10 @@ static const char worddelimiters[] = " ";
  * accessed with the global_esc keysym + mod mask
  */
 static unsigned int vi_mode = 1;
-static unsigned int start_mode = 0; /* mode to use when -vi is passed. 0 = insert mode, 1 = normal mode */
-static Key global_esc = {XK_c, ControlMask}; /* escape key when vi mode is not enabled explicitly */
+static unsigned int start_mode = 0;             /* mode to use when -vi is passed. 0 = insert mode, 1 = normal mode */
+static Key global_esc = { XK_c, ControlMask};   /* escape key when vi mode is not enabled explicitly */
 static Key quit_keys[] = {
-    /* keysym	modifier */
-    {XK_q, 0}};
+    /* keysym   modifier */
+    { XK_q,         0 },
+    { XK_Escape,    0 }
+};
diff --git a/dmenu/dmenu b/dmenu/dmenu
index 3b7809a..03520bc 100755
--- a/dmenu/dmenu
+++ b/dmenu/dmenu
diff --git a/dmenu/dmenu.c b/dmenu/dmenu.c
index 9c67296..1fd4f34 100644
--- a/dmenu/dmenu.c
+++ b/dmenu/dmenu.c
@@ -55,10 +55,6 @@ typedef struct {
 static char text[BUFSIZ] = "";
 static char *embed;
 static int bh, mw, mh;
-static int dmx = 6; /* put dmenu at this x offset */
-static int dmy = 6; /* put dmenu at this y offset (measured from the bottom if
-                       topbar is 0) */
-static unsigned int dmw = 0; /* make dmenu this wide */
 static int inputw = 0, promptw, passwd = 0;
 static int lrpad; /* sum of left and right padding */
 static int reject_no_match = 0;
diff --git a/dmenu/stest b/dmenu/stest
index 02ccef7..b2b76c4 100755
--- a/dmenu/stest
+++ b/dmenu/stest