From 32c401e9ae1509004b78a4d1a5f5fc405a17828e Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Wed, 20 Oct 2021 10:20:38 +0200 Subject: [PATCH] Center patch for dmenu. --- _suckless/_scripts/dmenu-audio | 8 +- _suckless/_scripts/dmenu-bluetooth | 2 +- _suckless/_scripts/dmenu-display | 12 +- _suckless/_scripts/dmenu-emoji | 2 +- _suckless/dmenu/config.def.h | 2 + _suckless/dmenu/config.h | 2 + _suckless/dmenu/dmenu.1 | 3 + _suckless/dmenu/dmenu.c | 39 +- _suckless/dmenu/dmenu.c.orig | 786 ++++++++++++++++++ .../01-dmenu-center-20200111-8cd37e1.diff | 120 +++ _suckless/dwm/config.h | 2 +- _suckless/dwm/drw.o | Bin 0 -> 10424 bytes 12 files changed, 958 insertions(+), 20 deletions(-) create mode 100644 _suckless/dmenu/dmenu.c.orig create mode 100644 _suckless/dmenu/patches/01-dmenu-center-20200111-8cd37e1.diff create mode 100644 _suckless/dwm/drw.o diff --git a/_suckless/_scripts/dmenu-audio b/_suckless/_scripts/dmenu-audio index ba1a863..1370111 100755 --- a/_suckless/_scripts/dmenu-audio +++ b/_suckless/_scripts/dmenu-audio @@ -3,7 +3,7 @@ div="----------" set_output() { - sel_sink=$(printf "$sinks\\n$div\\nback\\nexit" | dmenu -l 10 -i -p "sink") + sel_sink=$(printf "$sinks\\n$div\\nback\\nexit" | dmenu -c -l 10 -i) case "$sel_sink" in back) show_current ;; exit) exit ;; @@ -14,7 +14,7 @@ set_output() { } set_input() { - sel_source=$(printf "$sources\\n$div\\nBluetooth profile\\n$div\\nback\\nexit" | dmenu -l 10 -i -p "source") + sel_source=$(printf "$sources\\n$div\\nBluetooth profile\\n$div\\nback\\nexit" | dmenu -c -l 10 -i) case "$sel_source" in back) show_current ;; exit) exit ;; @@ -29,7 +29,7 @@ set_bt_profile() { bt_sink=$(pactl list cards | awk -F'"' '/device.name.*bluez/ {print $2}') [ -z "${bt_sink}" ] && { dunstify -u critical "🎧 no headphones connected"; exit; } - profile_chosen=$(printf "profile mSBC\\nprofile LDAC\\n$div\\nback\\nexit" | dmenu -l 5 -i -p "profile") + profile_chosen=$(printf "profile mSBC\\nprofile LDAC\\n$div\\nback\\nexit" | dmenu -c -l 5 -i) case "$profile_chosen" in back) show_current ;; exit) exit ;; @@ -44,7 +44,7 @@ set_bt_profile() { show_current() { def_snk=$(pactl list | grep -A 1 "Name: $(pactl get-default-sink)\$" | awk -F': ' '/Description: / {print $2}') def_src=$(pactl list | grep -A 1 "Name: $(pactl get-default-source)\$" | awk -F': ' '/Description: / {print $2}') - chosen=$(printf "Output: $def_snk\\nInput: $def_src" | dmenu -l 2 -p "current settings") + chosen=$(printf "Output: $def_snk\\nInput: $def_src" | dmenu -c -l 2) if [ "$1" = "no_switch" ]; then case "$chosen" in *) dunstify -u critical "🔊 no device to switch" ;; diff --git a/_suckless/_scripts/dmenu-bluetooth b/_suckless/_scripts/dmenu-bluetooth index b85d6f7..a67c5ff 100755 --- a/_suckless/_scripts/dmenu-bluetooth +++ b/_suckless/_scripts/dmenu-bluetooth @@ -287,7 +287,7 @@ show_menu() { } # command to pipe into, can add any options here -rofi_command="dmenu -l 20 -i -p" +rofi_command="dmenu -c -l 20 -i -p" case "$1" in --status) diff --git a/_suckless/_scripts/dmenu-display b/_suckless/_scripts/dmenu-display index 0977fc4..16e884b 100755 --- a/_suckless/_scripts/dmenu-display +++ b/_suckless/_scripts/dmenu-display @@ -1,9 +1,9 @@ #!/bin/sh twoscreen() { - mirror=$(printf "no\\nyes" | dmenu -l 2 -i -p "mirror") + mirror=$(printf "no\\nyes" | dmenu -c -l 2 -i) if [ "$mirror" = "yes" ]; then - external=$(echo "$screens" | dmenu -l 2 -i -p "optimize resolution for") + external=$(echo "$screens" | dmenu -c -l 2 -i) internal=$(echo "$screens" | grep -v "$external") res_external=$(xrandr --query | sed -n "/^$external/,/\+/p" | \ tail -n 1 | awk '{print $1}') @@ -19,9 +19,9 @@ twoscreen() { --output "$internal" --auto --same-as "$external" \ --scale "$scale_x"x"$scale_y" else - primary=$(echo "$screens" | dmenu -l 50 -i -p "primary") + primary=$(echo "$screens" | dmenu -c -l 50 -i) secondary=$(echo "$screens" | grep -v "$primary") - direction=$(printf "left\\nright" | dmenu -l 2 -i -p "side of $primary should $secondary be on") + direction=$(printf "left\\nright" | dmenu -c -l 2 -i) xrandr --output "$primary" --auto --scale 1.0x1.0 --output "$secondary" --"$direction"-of "$primary" --auto --scale 1.0x1.0 fi } @@ -30,7 +30,7 @@ onescreen() { if [ "$2" = "native" ]; then xrandr --output "$1" --auto --scale 1.0x1.0 $(echo "$allposs" | grep -v "\b$1" | awk '{print "--output", $1, "--off"}' | paste -sd ' ' -) else - scale=$(printf "native\\n0.75\\n0.5" | dmenu -l 3 -i -p "scale") && + scale=$(printf "native\\n0.75\\n0.5" | dmenu -c -l 3 -i) && case "$scale" in "native") xrandr --output "$1" --auto --scale 1.0x1.0 $(echo "$allposs" | grep -v "\b$1" | awk '{print "--output", $1, "--off"}' | paste -sd ' ' -);; *) xrandr --output "$1" --auto --scale ${scale}x${scale} $(echo "$allposs" | grep -v "\b$1" | awk '{print "--output", $1, "--off"}' | paste -sd ' ' -);; @@ -55,7 +55,7 @@ screens=$(echo "$allposs" | awk '/ connected/ {print $1}') { onescreen "$screens" "native"; postrun; dunstify -u critical "💻 no device to switch"; exit ;} # Get user choice including both and manual selection: -chosen=$(printf -- "%s\\nmulti" "$screens" | dmenu -l 5 -i -p "display") && +chosen=$(printf -- "%s\\nmulti" "$screens" | dmenu -c -l 5 -i) && case "$chosen" in "multi") twoscreen ;; *) onescreen "$chosen" ;; diff --git a/_suckless/_scripts/dmenu-emoji b/_suckless/_scripts/dmenu-emoji index 6bbbcf0..6b04289 100755 --- a/_suckless/_scripts/dmenu-emoji +++ b/_suckless/_scripts/dmenu-emoji @@ -1,6 +1,6 @@ #!/bin/sh -chosen=$(cut -d ';' -f1 ~/.local/share/emoji | dmenu -l 30 -i -p emoji | sed "s/ .*//") +chosen=$(cut -d ';' -f1 ~/.local/share/emoji | dmenu -c -l 30 -i | sed "s/ .*//") [ -z "$chosen" ] && exit if [ -n "$1" ]; then diff --git a/_suckless/dmenu/config.def.h b/_suckless/dmenu/config.def.h index dd3eb31..cfff3e4 100644 --- a/_suckless/dmenu/config.def.h +++ b/_suckless/dmenu/config.def.h @@ -2,6 +2,8 @@ /* Default settings; can be overriden by command line. */ static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ +static int centered = 0; /* -c option; centers dmenu on screen */ +static int min_width = 500; /* minimum width when centered */ /* -fn option overrides fonts[0]; default X11 font or font set */ static const char *fonts[] = { "monospace:size=10" diff --git a/_suckless/dmenu/config.h b/_suckless/dmenu/config.h index bd10095..d2c31ef 100644 --- a/_suckless/dmenu/config.h +++ b/_suckless/dmenu/config.h @@ -2,6 +2,8 @@ /* Default settings; can be overriden by command line. */ static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ +static int centered = 0; /* -c option; centers dmenu on screen */ +static int min_width = 500; /* minimum width when centered */ /* -fn option overrides fonts[0]; default X11 font or font set */ static const char *fonts[] = { "JetBrainsMono Nerd Font Mono:style=Medium:size=12", diff --git a/_suckless/dmenu/dmenu.1 b/_suckless/dmenu/dmenu.1 index 323f93c..c036baa 100644 --- a/_suckless/dmenu/dmenu.1 +++ b/_suckless/dmenu/dmenu.1 @@ -40,6 +40,9 @@ which lists programs in the user's $PATH and runs the result in their $SHELL. .B \-b dmenu appears at the bottom of the screen. .TP +.B \-c +dmenu appears centered on the screen. +.TP .B \-f dmenu grabs the keyboard before reading stdin if not reading from a tty. This is faster, but will lock up X until stdin reaches end\-of\-file. diff --git a/_suckless/dmenu/dmenu.c b/_suckless/dmenu/dmenu.c index 3d88c18..f26af0e 100644 --- a/_suckless/dmenu/dmenu.c +++ b/_suckless/dmenu/dmenu.c @@ -89,6 +89,15 @@ calcoffsets(void) break; } +static int +max_textw(void) +{ + int len = 0; + for (struct item *item = items; item && item->text; item++) + len = MAX(TEXTW(item->text), len); + return len; +} + static void cleanup(void) { @@ -622,6 +631,7 @@ setup(void) bh = drw->fonts->h + 2; lines = MAX(lines, 0); mh = (lines + 1) * bh; + promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; #ifdef XINERAMA i = 0; if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { @@ -648,9 +658,16 @@ setup(void) if (INTERSECT(x, y, 1, 1, info[i])) break; - x = info[i].x_org; - y = info[i].y_org + (topbar ? 0 : info[i].height - mh); - mw = info[i].width; + if (centered) { + mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width); + x = info[i].x_org + ((info[i].width - mw) / 2); + y = info[i].y_org + ((info[i].height - mh) / 2); + } else { + x = info[i].x_org; + y = info[i].y_org + (topbar ? 0 : info[i].height - mh); + mw = info[i].width; + } + XFree(info); } else #endif @@ -658,11 +675,17 @@ setup(void) if (!XGetWindowAttributes(dpy, parentwin, &wa)) die("could not get embedding window attributes: 0x%lx", parentwin); - x = 0; - y = topbar ? 0 : wa.height - mh; - mw = wa.width; + + if (centered) { + mw = MIN(MAX(max_textw() + promptw, min_width), wa.width); + x = (wa.width - mw) / 2; + y = (wa.height - mh) / 2; + } else { + x = 0; + y = topbar ? 0 : wa.height - mh; + mw = wa.width; + } } - promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; inputw = MIN(inputw, mw/3); match(); @@ -722,6 +745,8 @@ main(int argc, char *argv[]) topbar = 0; else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */ fast = 1; + else if (!strcmp(argv[i], "-c")) /* centers dmenu on screen */ + centered = 1; else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ fstrncmp = strncasecmp; fstrstr = cistrstr; diff --git a/_suckless/dmenu/dmenu.c.orig b/_suckless/dmenu/dmenu.c.orig new file mode 100644 index 0000000..3d88c18 --- /dev/null +++ b/_suckless/dmenu/dmenu.c.orig @@ -0,0 +1,786 @@ +/* See LICENSE file for copyright and license details. */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#ifdef XINERAMA +#include +#endif +#include + +#include "drw.h" +#include "util.h" + +/* macros */ +#define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \ + * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) +#define LENGTH(X) (sizeof X / sizeof X[0]) +#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) + +/* enums */ +enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */ + +struct item { + char *text; + struct item *left, *right; + int out; +}; + +static char text[BUFSIZ] = ""; +static char *embed; +static int bh, mw, mh; +static int inputw = 0, promptw; +static int lrpad; /* sum of left and right padding */ +static size_t cursor; +static struct item *items = NULL; +static struct item *matches, *matchend; +static struct item *prev, *curr, *next, *sel; +static int mon = -1, screen; + +static Atom clip, utf8; +static Display *dpy; +static Window root, parentwin, win; +static XIC xic; + +static Drw *drw; +static Clr *scheme[SchemeLast]; + +#include "config.h" + +static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; +static char *(*fstrstr)(const char *, const char *) = strstr; + +static void +appenditem(struct item *item, struct item **list, struct item **last) +{ + if (*last) + (*last)->right = item; + else + *list = item; + + item->left = *last; + item->right = NULL; + *last = item; +} + +static void +calcoffsets(void) +{ + int i, n; + + if (lines > 0) + n = lines * bh; + else + n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">")); + /* calculate which items will begin the next page and previous page */ + for (i = 0, next = curr; next; next = next->right) + if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n) + break; + for (i = 0, prev = curr; prev && prev->left; prev = prev->left) + if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n) + break; +} + +static void +cleanup(void) +{ + size_t i; + + XUngrabKey(dpy, AnyKey, AnyModifier, root); + for (i = 0; i < SchemeLast; i++) + free(scheme[i]); + drw_free(drw); + XSync(dpy, False); + XCloseDisplay(dpy); +} + +static char * +cistrstr(const char *s, const char *sub) +{ + size_t len; + + for (len = strlen(sub); *s; s++) + if (!strncasecmp(s, sub, len)) + return (char *)s; + return NULL; +} + +static int +drawitem(struct item *item, int x, int y, int w) +{ + if (item == sel) + drw_setscheme(drw, scheme[SchemeSel]); + else if (item->out) + drw_setscheme(drw, scheme[SchemeOut]); + else + drw_setscheme(drw, scheme[SchemeNorm]); + + return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0); +} + +static void +drawmenu(void) +{ + unsigned int curpos; + struct item *item; + int x = 0, y = 0, w; + + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, 0, 0, mw, mh, 1, 1); + + if (prompt && *prompt) { + drw_setscheme(drw, scheme[SchemeSel]); + x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0); + } + /* draw input field */ + w = (lines > 0 || !matches) ? mw - x : inputw; + drw_setscheme(drw, scheme[SchemeNorm]); + drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + + curpos = TEXTW(text) - TEXTW(&text[cursor]); + if ((curpos += lrpad / 2 - 1) < w) { + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0); + } + + if (lines > 0) { + /* draw vertical list */ + for (item = curr; item != next; item = item->right) + drawitem(item, x, y += bh, mw - x); + } else if (matches) { + /* draw horizontal list */ + x += inputw; + w = TEXTW("<"); + if (curr->left) { + drw_setscheme(drw, scheme[SchemeNorm]); + drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0); + } + x += w; + for (item = curr; item != next; item = item->right) + x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">"))); + if (next) { + w = TEXTW(">"); + drw_setscheme(drw, scheme[SchemeNorm]); + drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0); + } + } + drw_map(drw, win, 0, 0, mw, mh); +} + +static void +grabfocus(void) +{ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 }; + Window focuswin; + int i, revertwin; + + for (i = 0; i < 100; ++i) { + XGetInputFocus(dpy, &focuswin, &revertwin); + if (focuswin == win) + return; + XSetInputFocus(dpy, win, RevertToParent, CurrentTime); + nanosleep(&ts, NULL); + } + die("cannot grab focus"); +} + +static void +grabkeyboard(void) +{ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 }; + int i; + + if (embed) + return; + /* try to grab keyboard, we may have to wait for another process to ungrab */ + for (i = 0; i < 1000; i++) { + if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync, + GrabModeAsync, CurrentTime) == GrabSuccess) + return; + nanosleep(&ts, NULL); + } + die("cannot grab keyboard"); +} + +static void +match(void) +{ + static char **tokv = NULL; + static int tokn = 0; + + char buf[sizeof text], *s; + int i, tokc = 0; + size_t len, textsize; + struct item *item, *lprefix, *lsubstr, *prefixend, *substrend; + + strcpy(buf, text); + /* separate input text into tokens to be matched individually */ + for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " ")) + if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv))) + die("cannot realloc %u bytes:", tokn * sizeof *tokv); + len = tokc ? strlen(tokv[0]) : 0; + + matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; + textsize = strlen(text) + 1; + for (item = items; item && item->text; item++) { + for (i = 0; i < tokc; i++) + if (!fstrstr(item->text, tokv[i])) + break; + if (i != tokc) /* not all tokens match */ + continue; + /* exact matches go first, then prefixes, then substrings */ + if (!tokc || !fstrncmp(text, item->text, textsize)) + appenditem(item, &matches, &matchend); + else if (!fstrncmp(tokv[0], item->text, len)) + appenditem(item, &lprefix, &prefixend); + else + appenditem(item, &lsubstr, &substrend); + } + if (lprefix) { + if (matches) { + matchend->right = lprefix; + lprefix->left = matchend; + } else + matches = lprefix; + matchend = prefixend; + } + if (lsubstr) { + if (matches) { + matchend->right = lsubstr; + lsubstr->left = matchend; + } else + matches = lsubstr; + matchend = substrend; + } + curr = sel = matches; + calcoffsets(); +} + +static void +insert(const char *str, ssize_t n) +{ + if (strlen(text) + n > sizeof text - 1) + return; + /* move existing text out of the way, insert new text, and update cursor */ + memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0)); + if (n > 0) + memcpy(&text[cursor], str, n); + cursor += n; + match(); +} + +static size_t +nextrune(int inc) +{ + ssize_t n; + + /* return location of next utf8 rune in the given direction (+1 or -1) */ + for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc) + ; + return n; +} + +static void +movewordedge(int dir) +{ + if (dir < 0) { /* move cursor to the start of the word*/ + while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) + cursor = nextrune(-1); + while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) + cursor = nextrune(-1); + } else { /* move cursor to the end of the word */ + while (text[cursor] && strchr(worddelimiters, text[cursor])) + cursor = nextrune(+1); + while (text[cursor] && !strchr(worddelimiters, text[cursor])) + cursor = nextrune(+1); + } +} + +static void +keypress(XKeyEvent *ev) +{ + char buf[32]; + int len; + KeySym ksym; + Status status; + + len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); + switch (status) { + default: /* XLookupNone, XBufferOverflow */ + return; + case XLookupChars: + goto insert; + case XLookupKeySym: + case XLookupBoth: + break; + } + + if (ev->state & ControlMask) { + switch(ksym) { + case XK_a: ksym = XK_Home; break; + case XK_b: ksym = XK_Left; break; + case XK_c: ksym = XK_Escape; break; + case XK_d: ksym = XK_Delete; break; + case XK_e: ksym = XK_End; break; + case XK_f: ksym = XK_Right; break; + case XK_g: ksym = XK_Escape; break; + case XK_h: ksym = XK_BackSpace; break; + case XK_i: ksym = XK_Tab; break; + case XK_j: /* fallthrough */ + case XK_J: /* fallthrough */ + case XK_m: /* fallthrough */ + case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break; + case XK_n: ksym = XK_Down; break; + case XK_p: ksym = XK_Up; break; + + case XK_k: /* delete right */ + text[cursor] = '\0'; + match(); + break; + case XK_u: /* delete left */ + insert(NULL, 0 - cursor); + break; + case XK_w: /* delete word */ + while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) + insert(NULL, nextrune(-1) - cursor); + while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) + insert(NULL, nextrune(-1) - cursor); + break; + case XK_y: /* paste selection */ + case XK_Y: + XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, + utf8, utf8, win, CurrentTime); + return; + case XK_Left: + case XK_KP_Left: + movewordedge(-1); + goto draw; + case XK_Right: + case XK_KP_Right: + movewordedge(+1); + goto draw; + case XK_Return: + case XK_KP_Enter: + break; + case XK_bracketleft: + cleanup(); + exit(1); + default: + return; + } + } else if (ev->state & Mod1Mask) { + switch(ksym) { + case XK_b: + movewordedge(-1); + goto draw; + case XK_f: + movewordedge(+1); + goto draw; + case XK_g: ksym = XK_Home; break; + case XK_G: ksym = XK_End; break; + case XK_h: ksym = XK_Up; break; + case XK_j: ksym = XK_Next; break; + case XK_k: ksym = XK_Prior; break; + case XK_l: ksym = XK_Down; break; + default: + return; + } + } + + switch(ksym) { + default: +insert: + if (!iscntrl(*buf)) + insert(buf, len); + break; + case XK_Delete: + case XK_KP_Delete: + if (text[cursor] == '\0') + return; + cursor = nextrune(+1); + /* fallthrough */ + case XK_BackSpace: + if (cursor == 0) + return; + insert(NULL, nextrune(-1) - cursor); + break; + case XK_End: + case XK_KP_End: + if (text[cursor] != '\0') { + cursor = strlen(text); + break; + } + if (next) { + /* jump to end of list and position items in reverse */ + curr = matchend; + calcoffsets(); + curr = prev; + calcoffsets(); + while (next && (curr = curr->right)) + calcoffsets(); + } + sel = matchend; + break; + case XK_Escape: + cleanup(); + exit(1); + case XK_Home: + case XK_KP_Home: + if (sel == matches) { + cursor = 0; + break; + } + sel = curr = matches; + calcoffsets(); + break; + case XK_Left: + case XK_KP_Left: + if (cursor > 0 && (!sel || !sel->left || lines > 0)) { + cursor = nextrune(-1); + break; + } + if (lines > 0) + return; + /* fallthrough */ + case XK_Up: + case XK_KP_Up: + if (sel && sel->left && (sel = sel->left)->right == curr) { + curr = prev; + calcoffsets(); + } + break; + case XK_Next: + case XK_KP_Next: + if (!next) + return; + sel = curr = next; + calcoffsets(); + break; + case XK_Prior: + case XK_KP_Prior: + if (!prev) + return; + sel = curr = prev; + calcoffsets(); + break; + case XK_Return: + case XK_KP_Enter: + puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); + if (!(ev->state & ControlMask)) { + cleanup(); + exit(0); + } + if (sel) + sel->out = 1; + break; + case XK_Right: + case XK_KP_Right: + if (text[cursor] != '\0') { + cursor = nextrune(+1); + break; + } + if (lines > 0) + return; + /* fallthrough */ + case XK_Down: + case XK_KP_Down: + if (sel && sel->right && (sel = sel->right) == next) { + curr = next; + calcoffsets(); + } + break; + case XK_Tab: + if (!sel) + return; + strncpy(text, sel->text, sizeof text - 1); + text[sizeof text - 1] = '\0'; + cursor = strlen(text); + match(); + break; + } + +draw: + drawmenu(); +} + +static void +paste(void) +{ + char *p, *q; + int di; + unsigned long dl; + Atom da; + + /* we have been given the current selection, now insert it into input */ + if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, + utf8, &da, &di, &dl, &dl, (unsigned char **)&p) + == Success && p) { + insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p)); + XFree(p); + } + drawmenu(); +} + +static void +readstdin(void) +{ + char buf[sizeof text], *p; + size_t i, imax = 0, size = 0; + unsigned int tmpmax = 0; + + /* read each line from stdin and add it to the item list */ + for (i = 0; fgets(buf, sizeof buf, stdin); i++) { + if (i + 1 >= size / sizeof *items) + if (!(items = realloc(items, (size += BUFSIZ)))) + die("cannot realloc %u bytes:", size); + if ((p = strchr(buf, '\n'))) + *p = '\0'; + if (!(items[i].text = strdup(buf))) + die("cannot strdup %u bytes:", strlen(buf) + 1); + items[i].out = 0; + drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL); + if (tmpmax > inputw) { + inputw = tmpmax; + imax = i; + } + } + if (items) + items[i].text = NULL; + inputw = items ? TEXTW(items[imax].text) : 0; + lines = MIN(lines, i); +} + +static void +run(void) +{ + XEvent ev; + + while (!XNextEvent(dpy, &ev)) { + if (XFilterEvent(&ev, win)) + continue; + switch(ev.type) { + case DestroyNotify: + if (ev.xdestroywindow.window != win) + break; + cleanup(); + exit(1); + case Expose: + if (ev.xexpose.count == 0) + drw_map(drw, win, 0, 0, mw, mh); + break; + case FocusIn: + /* regrab focus from parent window */ + if (ev.xfocus.window != win) + grabfocus(); + break; + case KeyPress: + keypress(&ev.xkey); + break; + case SelectionNotify: + if (ev.xselection.property == utf8) + paste(); + break; + case VisibilityNotify: + if (ev.xvisibility.state != VisibilityUnobscured) + XRaiseWindow(dpy, win); + break; + } + } +} + +static void +setup(void) +{ + int x, y, i, j; + unsigned int du; + XSetWindowAttributes swa; + XIM xim; + Window w, dw, *dws; + XWindowAttributes wa; + XClassHint ch = {"dmenu", "dmenu"}; +#ifdef XINERAMA + XineramaScreenInfo *info; + Window pw; + int a, di, n, area = 0; +#endif + /* init appearance */ + for (j = 0; j < SchemeLast; j++) + scheme[j] = drw_scm_create(drw, colors[j], 2); + + clip = XInternAtom(dpy, "CLIPBOARD", False); + utf8 = XInternAtom(dpy, "UTF8_STRING", False); + + /* calculate menu geometry */ + bh = drw->fonts->h + 2; + lines = MAX(lines, 0); + mh = (lines + 1) * bh; +#ifdef XINERAMA + i = 0; + if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { + XGetInputFocus(dpy, &w, &di); + if (mon >= 0 && mon < n) + i = mon; + else if (w != root && w != PointerRoot && w != None) { + /* find top-level window containing current input focus */ + do { + if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws) + XFree(dws); + } while (w != root && w != pw); + /* find xinerama screen with which the window intersects most */ + if (XGetWindowAttributes(dpy, pw, &wa)) + for (j = 0; j < n; j++) + if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) { + area = a; + i = j; + } + } + /* no focused window is on screen, so use pointer location instead */ + if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du)) + for (i = 0; i < n; i++) + if (INTERSECT(x, y, 1, 1, info[i])) + break; + + x = info[i].x_org; + y = info[i].y_org + (topbar ? 0 : info[i].height - mh); + mw = info[i].width; + XFree(info); + } else +#endif + { + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + x = 0; + y = topbar ? 0 : wa.height - mh; + mw = wa.width; + } + promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; + inputw = MIN(inputw, mw/3); + match(); + + /* create menu window */ + swa.override_redirect = True; + swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; + swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; + win = XCreateWindow(dpy, parentwin, x, y - (topbar ? 0 : border_width * 2), mw - border_width * 2, mh, border_width, + CopyFromParent, CopyFromParent, CopyFromParent, + CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); + if (border_width) + XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel); + XSetClassHint(dpy, win, &ch); + + + /* input methods */ + if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) + die("XOpenIM failed: could not open input device"); + + xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, + XNClientWindow, win, XNFocusWindow, win, NULL); + + XMapRaised(dpy, win); + if (embed) { + XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask); + if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { + for (i = 0; i < du && dws[i] != win; ++i) + XSelectInput(dpy, dws[i], FocusChangeMask); + XFree(dws); + } + grabfocus(); + } + drw_resize(drw, mw, mh); + drawmenu(); +} + +static void +usage(void) +{ + fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); + exit(1); +} + +int +main(int argc, char *argv[]) +{ + XWindowAttributes wa; + int i, fast = 0; + + for (i = 1; i < argc; i++) + /* these options take no arguments */ + if (!strcmp(argv[i], "-v")) { /* prints version information */ + puts("dmenu-"VERSION); + exit(0); + } else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */ + topbar = 0; + else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */ + fast = 1; + else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ + fstrncmp = strncasecmp; + fstrstr = cistrstr; + } else if (i + 1 == argc) + usage(); + /* these options take one argument */ + else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ + lines = atoi(argv[++i]); + else if (!strcmp(argv[i], "-m")) + mon = atoi(argv[++i]); + else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ + prompt = argv[++i]; + else if (!strcmp(argv[i], "-fn")) /* font or font set */ + fonts[0] = argv[++i]; + else if (!strcmp(argv[i], "-nb")) /* normal background color */ + colors[SchemeNorm][ColBg] = argv[++i]; + else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ + colors[SchemeNorm][ColFg] = argv[++i]; + else if (!strcmp(argv[i], "-sb")) /* selected background color */ + colors[SchemeSel][ColBg] = argv[++i]; + else if (!strcmp(argv[i], "-sf")) /* selected foreground color */ + colors[SchemeSel][ColFg] = argv[++i]; + else if (!strcmp(argv[i], "-w")) /* embedding window id */ + embed = argv[++i]; + else if (!strcmp(argv[i], "-bw")) + border_width = atoi(argv[++i]); /* border width */ + else + usage(); + + if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fputs("warning: no locale support\n", stderr); + if (!(dpy = XOpenDisplay(NULL))) + die("cannot open display"); + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + if (!embed || !(parentwin = strtol(embed, NULL, 0))) + parentwin = root; + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + drw = drw_create(dpy, screen, root, wa.width, wa.height); + if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) + die("no fonts could be loaded."); + lrpad = drw->fonts->h; + +#ifdef __OpenBSD__ + if (pledge("stdio rpath", NULL) == -1) + die("pledge"); +#endif + + if (fast && !isatty(0)) { + grabkeyboard(); + readstdin(); + } else { + readstdin(); + grabkeyboard(); + } + setup(); + run(); + + return 1; /* unreachable */ +} diff --git a/_suckless/dmenu/patches/01-dmenu-center-20200111-8cd37e1.diff b/_suckless/dmenu/patches/01-dmenu-center-20200111-8cd37e1.diff new file mode 100644 index 0000000..af249a6 --- /dev/null +++ b/_suckless/dmenu/patches/01-dmenu-center-20200111-8cd37e1.diff @@ -0,0 +1,120 @@ +From 8cd37e1ab9e7cb025224aeb3543f1a5be8bceb93 Mon Sep 17 00:00:00 2001 +From: Nihal Jere +Date: Sat, 11 Jan 2020 21:16:08 -0600 +Subject: [PATCH] center patch now has adjustable minimum width + +--- + config.def.h | 2 ++ + dmenu.1 | 3 +++ + dmenu.c | 39 ++++++++++++++++++++++++++++++++------- + 3 files changed, 37 insertions(+), 7 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 1edb647..88ef264 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -2,6 +2,8 @@ + /* Default settings; can be overriden by command line. */ + + static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ ++static int centered = 0; /* -c option; centers dmenu on screen */ ++static int min_width = 500; /* minimum width when centered */ + /* -fn option overrides fonts[0]; default X11 font or font set */ + static const char *fonts[] = { + "monospace:size=10" +diff --git a/dmenu.1 b/dmenu.1 +index 323f93c..c036baa 100644 +--- a/dmenu.1 ++++ b/dmenu.1 +@@ -40,6 +40,9 @@ which lists programs in the user's $PATH and runs the result in their $SHELL. + .B \-b + dmenu appears at the bottom of the screen. + .TP ++.B \-c ++dmenu appears centered on the screen. ++.TP + .B \-f + dmenu grabs the keyboard before reading stdin if not reading from a tty. This + is faster, but will lock up X until stdin reaches end\-of\-file. +diff --git a/dmenu.c b/dmenu.c +index 65f25ce..041c7f8 100644 +--- a/dmenu.c ++++ b/dmenu.c +@@ -89,6 +89,15 @@ calcoffsets(void) + break; + } + ++static int ++max_textw(void) ++{ ++ int len = 0; ++ for (struct item *item = items; item && item->text; item++) ++ len = MAX(TEXTW(item->text), len); ++ return len; ++} ++ + static void + cleanup(void) + { +@@ -611,6 +620,7 @@ setup(void) + bh = drw->fonts->h + 2; + lines = MAX(lines, 0); + mh = (lines + 1) * bh; ++ promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; + #ifdef XINERAMA + i = 0; + if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { +@@ -637,9 +647,16 @@ setup(void) + if (INTERSECT(x, y, 1, 1, info[i])) + break; + +- x = info[i].x_org; +- y = info[i].y_org + (topbar ? 0 : info[i].height - mh); +- mw = info[i].width; ++ if (centered) { ++ mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width); ++ x = info[i].x_org + ((info[i].width - mw) / 2); ++ y = info[i].y_org + ((info[i].height - mh) / 2); ++ } else { ++ x = info[i].x_org; ++ y = info[i].y_org + (topbar ? 0 : info[i].height - mh); ++ mw = info[i].width; ++ } ++ + XFree(info); + } else + #endif +@@ -647,11 +664,17 @@ setup(void) + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); +- x = 0; +- y = topbar ? 0 : wa.height - mh; +- mw = wa.width; ++ ++ if (centered) { ++ mw = MIN(MAX(max_textw() + promptw, min_width), wa.width); ++ x = (wa.width - mw) / 2; ++ y = (wa.height - mh) / 2; ++ } else { ++ x = 0; ++ y = topbar ? 0 : wa.height - mh; ++ mw = wa.width; ++ } + } +- promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; + inputw = MIN(inputw, mw/3); + match(); + +@@ -709,6 +732,8 @@ main(int argc, char *argv[]) + topbar = 0; + else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */ + fast = 1; ++ else if (!strcmp(argv[i], "-c")) /* centers dmenu on screen */ ++ centered = 1; + else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ + fstrncmp = strncasecmp; + fstrstr = cistrstr; +-- +2.24.1 + diff --git a/_suckless/dwm/config.h b/_suckless/dwm/config.h index 07f1817..3f9486d 100644 --- a/_suckless/dwm/config.h +++ b/_suckless/dwm/config.h @@ -104,7 +104,7 @@ static Key keys[] = { TAGKEYS( XK_0, 9) /* apps n'shit */ { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_space, spawn, SHCMD("dmenu_run -i") }, + { MODKEY, XK_space, spawn, SHCMD("dmenu_run -c -i" -l 20) }, { MODKEY, XK_f, spawn, SHCMD("st -n nnn -e nnn -de") }, { MODKEY, XK_i, spawn, SHCMD("scrot -f -s 'scrot_%Y-%m-%d_%H-%M-%S_%s.png'") }, { SHTKEY, XK_i, spawn, SHCMD("scrot 'scrot_%Y-%m-%d_%H-%M-%S_%s.png'") }, diff --git a/_suckless/dwm/drw.o b/_suckless/dwm/drw.o new file mode 100644 index 0000000000000000000000000000000000000000..7cfdabe7b3ebcc028bfee5041933a9c642b9147f GIT binary patch literal 10424 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 literal 0 HcmV?d00001