diff options
| -rw-r--r-- | dmenu/config.h | 40 | ||||
| -rwxr-xr-x | dmenu/dmenu | bin | 47872 -> 47896 bytes | |||
| -rw-r--r-- | dmenu/dmenu.c | 4 | ||||
| -rwxr-xr-x | dmenu/stest | bin | 16408 -> 16432 bytes | |||
| -rw-r--r-- | dwm/config.h | 25 | ||||
| -rwxr-xr-x | dwm/dwm | bin | 133704 -> 133728 bytes | |||
| -rw-r--r-- | dwm/thesiah.mom | 2 |
7 files changed, 36 insertions, 35 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 Binary files differindex 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 Binary files differindex 02ccef7..b2b76c4 100755 --- a/dmenu/stest +++ b/dmenu/stest diff --git a/dwm/config.h b/dwm/config.h index 3004d3c..dae1d5a 100644 --- a/dwm/config.h +++ b/dwm/config.h @@ -6,20 +6,21 @@ #define BROWSER "firefox" #define BROWSERCLASS "Firefox" #define GAP 8 +#define PADDING 0 /* appearance */ -static unsigned int borderpx = 3; /* border pixel of windows */ -static unsigned int snap = 32; /* snap pixel */ -static unsigned int gappih = GAP; /* horiz inner gap between windows */ -static unsigned int gappiv = GAP; /* vert inner gap between windows */ -static unsigned int gappoh = GAP; /* horiz outer gap between windows and screen edge */ -static unsigned int gappov = GAP; /* vert outer gap between windows and screen edge */ -static int swallowfloating = 0; /* 1 means swallow floating windows by default */ -static int smartgaps = 0; /* 1 means no outer gap when there is only one window */ -static int showbar = 1; /* 0 means no bar */ -static int topbar = 1; /* 0 means bottom bar */ -static const int vertpad = GAP; /* vertical padding of bar */ -static const int sidepad = GAP; /* horizontal padding of bar */ +static unsigned int borderpx = 3; /* border pixel of windows */ +static unsigned int snap = 32; /* snap pixel */ +static unsigned int gappih = GAP; /* horiz inner gap between windows */ +static unsigned int gappiv = GAP; /* vert inner gap between windows */ +static unsigned int gappoh = GAP; /* horiz outer gap between windows and screen edge */ +static unsigned int gappov = GAP; /* vert outer gap between windows and screen edge */ +static int swallowfloating = 0; /* 1 means swallow floating windows by default */ +static int smartgaps = 0; /* 1 means no outer gap when there is only one window */ +static int showbar = 1; /* 0 means no bar */ +static int topbar = 1; /* 0 means bottom bar */ +static const int vertpad = PADDING; /* vertical padding of bar */ +static const int sidepad = PADDING; /* horizontal padding of bar */ static char *fonts[] = { "monospace:size=10", "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" }; Binary files differdiff --git a/dwm/thesiah.mom b/dwm/thesiah.mom index 6452983..2c970e2 100644 --- a/dwm/thesiah.mom +++ b/dwm/thesiah.mom @@ -434,8 +434,6 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik \f(CWMOD+Shift+Right\fP \(en tagmon {.i=+1} .ITEM \f(CWMOD+Shift+Tab\fP \(en view {0} -.ITEM -\f(CWstaticKeycmdkeys[]={+\fP \(en staticKeycmdkeys[]={ .LIST OFF .HEADING 9 "Commands" .LI |