From 18647900aa7d3f554d4c96b51528fa80cd45460d Mon Sep 17 00:00:00 2001 From: Hektor Misplon Date: Thu, 7 May 2020 21:21:44 +0000 Subject: [PATCH] Add border --- .suckless/dmenu/config.h | 2 + .suckless/dmenu/dmenu | Bin 43912 -> 43952 bytes .suckless/dmenu/dmenu.c | 3 +- .suckless/dmenu/dmenu.c.orig | 796 ++++++++++++++++++ .suckless/dmenu/dmenu.c.rej | 14 + .suckless/dmenu/patches/dmenu-border-4.9.diff | 25 + 6 files changed, 839 insertions(+), 1 deletion(-) create mode 100644 .suckless/dmenu/dmenu.c.orig create mode 100644 .suckless/dmenu/dmenu.c.rej create mode 100644 .suckless/dmenu/patches/dmenu-border-4.9.diff diff --git a/.suckless/dmenu/config.h b/.suckless/dmenu/config.h index 21408ef..75ef176 100644 --- a/.suckless/dmenu/config.h +++ b/.suckless/dmenu/config.h @@ -23,3 +23,5 @@ static unsigned int lines = 10; * for example: " /?\"&[]" */ static const char worddelimiters[] = " "; + +static const unsigned int border_width = 1; diff --git a/.suckless/dmenu/dmenu b/.suckless/dmenu/dmenu index 12f21994cd61c567cda04cf50ffc41d7334f3d0c..5acc73c41c69a82a21b9548bcf6e3e9f1f13b1ee 100755 GIT binary patch delta 10178 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 G_x}L>EyFzk delta 10141 zcmaJ{3tUvyy5Eao(}0fw1!q7I&;db07!_f(Q6>l3*r>=OP4kuI3oE;VSw02>)ZIRl z+A_n(MA-NW{F)+c?0&(2mS2jnvLk#lq$#)9SQimh=`Fcz z7d+X7?M>iM6X?OBd_r)e%{EpmtVTa$<4SuQpKZ4BW$kQy9V8Bc+1k#=c9U(^NoZ~n zv27Nzd43x^F4{i|M1ep^qU(T;ydnWZ)J}O>+>5Yx8KJa2Xvfc;%~(C=VxLbtt1$eOj3)9tQ$}4j2RsyDO|cJ zJW5h$(KbofL+zS`8Ih6{CWXreex2W-Z9XUQ&7G_)x^aJ}zKo^w-#c65Cx%QDIr*f~ zpv=qW*|9lnJRcuxWs@3fVy!0Dll!g9S?|UqTUL0ZxALUvt(1G@*e7R7($p1(q9nOT zd;P8=z9elZ>%%`w>(;N!KuOZiUJnLapKm8gia*Z+hN523pZPr)Y-p;n?3EAAGPGN_ z!!ZySd2)Ie-!}sc+{8a|PXR}vwJtGmABGSv1CgL;^0PA}$*a2N1F5L;0+80b0Cop= zdz`cE?Q3K`rL*u+AJS!pZrm_!K@YRu<3=#3%Gso5?ru1l$UjK$>Wd-Pb@)bj1462s z0Y(R6hH0K2W_Vjqn8OApK7{fA1(QUWw+zg0PNRb}{(@<#0_F(=bJW1_JA1}Ny##*X zegyCVf2gOmcr7)(Xg(jZV>0Y?Y>Q_O0kQyiECe|9PYT%5u=|f-unn}DAM9!Ky+)IC z68Z`{6sKr;)zDS^t^#Q4uVC^5k^1`INW1!!BdE_s6&*fEASkp4vKJvoWPzb&ze{}0 zm4Uu0QyNa9C#w8D@phcNMKLw#)HQ8Pw4x?82n#`bO(Yr*p%I949CBRIhr%TsOcY}H zL`3EM@r(pt0df4U53ted2YQj6xNNYrykZi-Cx}O@w|@yA+TZNWAo|=CN!mtvgP|CM zWL4C?uzeUceNif!p&qOuoAZQC`8|SZg#}unS(W?2W>LeHYO5pY(_gtNCcV9`#sdB= z7G@wyKMbPJ0|OEGNYyV-g|%&AhSM!bN=5b96)H;gugIz9x)Z=Q#0vr;XMv@^V~F!_ z5_3ZwJJSdG(}uhda>pTb$pla6k3_mvG;W&9-X^=0FJ#o#M;fw|WJ}B2Y?us#MA3?= zqyEw`O+GdqlNCp!6l}7*`LQY&k*OvH-Os2UBu%RBq3_R-r1!AjNLo@7gl@G-lVed? zbM?2(o$3(}Yf@!1+E|TGkrSu91jN!{!9IrARO0!o?YHW|UulweWBe`kKVzsMoW&RS zN?^nJ+Fo5*Hs9LI-eD7gG><(Oc5d+2UP)cgAVja_HwiH<3)D;YDWS;1lBeJxdgIhV(Qaf*oc*{L{L{;e00f?o$^^9R^U~+ly~Tz=*s~M{ia?7a_U^K-3z~a(R&c7 zrUQ)M4dYp|nQQ_R@}|oFM4X!ZE6VqfC79lO?PFj^i#rCEv)M8dnRpOY{nt1e0l6#c zd+Y6+fQ3P<_zrJ_iV&ZWH+x0aF|~}M3pN+^jca1 zb*_`BOJl}b>Kj0TEHRK}AloD7?4~LFZgz`Z1lY?2 z!7KIl3@o2;OM{hI%VRKJL46b?nD0KM;jFjgYJ;6*4bCt90RZT}AO()qePEA<01_W0 zNQR|=do;Nogysk%acMFI>eaU(+GD6-NOpo0Ire+i7O#3p z|LQDun+~`L=n8hh)~`+I;`>zl3^k=rzelON7G;TC8o*UT@yET->-&|lRs8FI1+1J$ z=fw_qFdR5l&KJh>a)~rtvDDuRJoTp(V(RZjEGoTACm241!Noj8Oym>t(tK}BK$JB| zOZh|8U}!Z+>k9^Eqru`J`m+&2ZMng!CDu}6)w!xrm#RO6iJ2s%y#O}}s^XwO7I+bY z8Psyh13)YdF9ELXl_#Si730^MN8ajO6~w5v1Kye7n5<}}Zk}1Hj;wPv-%YYO^r&?^ zYIUyd#IQ7^i!)X}#Y_4p7VRDnH7)6LBF-_)NqZ_S78I@bkyN3=BDNj5aO z(|Dec-_`d!Vgu|vh^65-@~g_1(9o}8GFo*b5bBZeA1-uru|Bs2lL5MljKBq;Za>cI z3wz{5zF$*-Zq`40tmCkr~L`i81hj;W&r!et@*JxM@Th z4*9Cf>Rde#13JAPtQvHq4{ZMimYxJ#THIW)aYv?$@yE_%a}r@JOW1II36P@YiaU)- z9swrX?F=mJ1VjuP!d)~ffnsp33b5GA&Z64-2og)te5GbYQ9ZBD^*ntq(BvfGtJBHO zf+^5CWN6Xb>0VKln}{G^b_IqQp^gMYpMz_a7Iy&En?ijL2386!S1&;d%@l4iuqJsO zIDx16Ay+C}!7sbg*e^U`P0Jzi@55kZcR-r-RpPD7 zW6!ubwS2tW;N)Q!DrkIN>jcSDL8@cx=G(x_t4E`T4#6r^^lBXVnk>QROi4X2F7d&> z9!(AdXALY&;7bRmn(e}lE01p)Z1rtM!*OUP(>lC{n)^N4a1f;C3MYfXcH~)ZE{ABs zSXzDMwFOf32sr!_JixvM(LV=FlgC11CX@}od4GolzQ=$|zPF%>i*Sbmv>k`s>JB{u zJFO3Uo4T{k^+p-|*2G`~x&a&|dK_>yQK-bC;?DdAF2_OyOI0B553xI9?6V^v)kg~d z$HAW|dDQPK;r0|7>Irgu8^N#sZusOFA@DN5Q}EVRG8rc~EU%%q=ITUHT$0&&Jr@G^ zSob*bR`?kBYhc6epA`}GWbSr5&(1~GxlSQ!Xzv8k4`83t4!cmhU=m{y~Td^jQI1w-?!fw+p8@M?m~ z&-HGw)LLeYkf$9EsJkY3wd@?=*tcGP+P9E0yyH+E1V*dNmW5`;};*cf_M<|EZMn4ZXXV1b*fj zTtFTTG)+TuY-n;-PU37RjOzm-UDx&R2y0!jcDnA zd`oNIHI3>ooDlUXR9|h>CsO@!qdt!6--yee>tWRKap>ZALSqJ6V_P|3l}PC0X!**^ zuo7NHO{(rix6NjHbHdjmehw9=KJYKqrwrA_H>=tV zRq?UPBUHzX8^5!%T=6H3N3+a_tjb2k@=-riVf_`{9sMph-JwoWU*NN|al#KE+o~KU zOu%~*Fi`z@}{bcFXA~xU3}9ZgW2Y;m<1TT^@tMOX-uEGJFr5*d%hVXPsedL^u|eOx;1JA zjwW0fueKiQ{$2qSGRMJ+kiX2yHmG70GMuQ$ySB0v4S5Zc6({S*# zfeOB!;7ZW1IT+V*_>)63!t5h>ub~M8o4xeCqxxtd5wmL|ALOsgQdEXMdHSKG7)E2^0O|(9p8tR4dtubnOJlF|NyEBY-G~l$FrPIU`sFq|^ZAp*wpjL{i9j%y=Mnrt zUU|niEQ|N?_U_UCa4;DBtjIqiSfuLM>eN~GLigBzy*aeDJIw36&Y0O>k#)phw=2bQ zWn60$|IF)wjZVX}@h6hP;YXN<$B#(IH_O5iJ=oF4dq+%X9aG{YX_zzd4_|+5r(f`6 zBWJPIjm4!gj9un;jdJ>~AH*LUPPoXy0d0|WaEj7?(O*O#N4+gRfPH8hl5rarr*u=Hs1e7{~M!0@=^ry zpKu*9oDSH(9lvt?9>#B3sJ#YsV{_0aoL)nN3{U`vL-ij+^k%~yLk`PAlmbY^FB7_L zzjU-m;MWuS#G8ovZ2Y>Qy%qs|jo(~k$OimUzc2@bHdF#Fjbo>5WWL!=!Qdt&SS{#j zd=RLGY&P1Dd>IVx1KkAr4d~~f7ePB?DJ0?+`6ZUlbkJL|xK@B}I}!{Y0G)O;7`zN> z#)3@5N23PNyFq*6P&y6j2fYCrg`)-gf={YL#S6#YQ^DXfphrPh;46n6_x=N*WuQ9f zFQB=&2#mlxz$DNb&;_6eK(~PEpv|C#cm=r#x&<@?-y%N(y$y69XesDJc#GZ#x*7EH zEd$X5ydl%kb?IC%xC*rUc^Cwp40;l@7F5DzX7&a22y_K#0jR`XQ?u}Q^chpTvO?Z4 zwMYEckAguc{Q1zaQ;pxNe8<$zT@GLxa6v=9c8tydp|2%}5AmO-_KLUw(GJE(%(8OF zv>Yt4$VAz?j_?~I$tcstT)-&w%Vcuo>AePE2r!Qp#`M1-pOy$2$?-_RD z81FVCo#pVN8F#S%;VWm{A+LHLVe{{2+!-;dV{Js(NbZ_>2Xk|E=D?&<%t3F8WN63e zC1LmM>4=~`Xs*KW-^0J3SMqXHM|3RS6N703R*!C#EIvRaG_?&0nwTigJHd zGE;bKRX(fdsk1uAJ&K8>RZ9=``UWO#HZPg=Ft&*uv$ELR{M@V@Ch?^EA7qu>e}6KY z%3r@fi#@`RqCSuRc7N9-FD5CT3}B2#Q&@N?veTHbQto)5Se^%j+_?CGWD7413y++H zg-%a2e|2H9qc;+d9^|QbD*n<=N8-`bCU4=tEldu(R>2b%O<+t3a6jzV?ywoh)FU_ z_~TE#75z-Dk26I{WB920VrXnet0Tr~bG;RTG=5S)g0UGqeo0SuJ9jThX6yLmCD!!Hk0-O3bp;`5i2OHC)vS^4 zgrL#OZTwFclqE+)I)g$wJwrODLi{&yZ=$CyuP=iC zpZ+t4iTc3Wi84WyX;eD;U?YkNvtjNHJ8k74@Tm`pxERv28+Pd_7P{kv?gJs+eNP&) zwsL+*_a7w&XIx0IMCh)eGXC`trZzO9_k}PY3hBX+bZe-0uZE;YgoPhP`I{&^@=M&x zx{LBwQ97xNSFj`~{!w@jrw4B^;;9tU8IaO{i1}-;YlH>N2WLhbUX9ETKOi zk>w9UGlG{G@mvYb_q!S2=Uj4vSEG*Z{h2ovhrn5*;qfSvD-vhD#~f1d{~qk zcdX7~&x!g*QEnCGXQDhV%JWn@OxW`&vKRl76P-f*BcX`##Zf$|JoRZS%j2U^Dx$0q z<#bUl6y+)^<6nV=XzBlE$(sW6A(b5eLn?k>$P;~Vp=Yo`q^||;2Vv`C2s1l`xfsG+ z7E(%N>ci}`5WBNMW#00Pm33)sd8UxH>nBw|ST(n|vwwcy#>8iPg*T3VEPZiF&6o2d=Y?AHxcYMbpZjauKD&>% zyzIkSI%-2sXnEvwu#4V3}RP}c`ZM(`5D7k RFFxwE{IKgU@W)?E|6fD#$<6=( diff --git a/.suckless/dmenu/dmenu.c b/.suckless/dmenu/dmenu.c index 041c7f8..db08c8e 100644 --- a/.suckless/dmenu/dmenu.c +++ b/.suckless/dmenu/dmenu.c @@ -682,9 +682,10 @@ setup(void) swa.override_redirect = True; swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; - win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0, + win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width, CopyFromParent, CopyFromParent, CopyFromParent, CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); + XSetWindowBorder(dpy, win, scheme[SchemeSel] [ColBg].pixel); XSetClassHint(dpy, win, &ch); diff --git a/.suckless/dmenu/dmenu.c.orig b/.suckless/dmenu/dmenu.c.orig new file mode 100644 index 0000000..5bb8ce6 --- /dev/null +++ b/.suckless/dmenu/dmenu.c.orig @@ -0,0 +1,796 @@ +/* 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 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) +{ + 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: + movewordedge(-1); + goto draw; + case XK_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: + 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: + 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: + if (sel == matches) { + cursor = 0; + break; + } + sel = curr = matches; + calcoffsets(); + break; + case XK_Left: + if (cursor > 0 && (!sel || !sel->left || lines > 0)) { + cursor = nextrune(-1); + break; + } + if (lines > 0) + return; + /* fallthrough */ + case XK_Up: + if (sel && sel->left && (sel = sel->left)->right == curr) { + curr = prev; + calcoffsets(); + } + break; + case XK_Next: + if (!next) + return; + sel = curr = next; + calcoffsets(); + break; + case XK_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: + if (text[cursor] != '\0') { + cursor = nextrune(+1); + break; + } + if (lines > 0) + return; + /* fallthrough */ + case XK_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; + promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; +#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; + + 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 + { + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + + 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; + } + } + 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, mw, mh, border_width, + CopyFromParent, CopyFromParent, CopyFromParent, + CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); + 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], "-c")) /* centers dmenu on screen */ + centered = 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 + 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/dmenu.c.rej b/.suckless/dmenu/dmenu.c.rej new file mode 100644 index 0000000..dd978c8 --- /dev/null +++ b/.suckless/dmenu/dmenu.c.rej @@ -0,0 +1,14 @@ +--- dmenu.c 2019-02-02 13:55:02.000000000 +0100 ++++ dmenu.c 2019-05-19 02:11:20.966710117 +0200 +@@ -654,9 +654,10 @@ setup(void) + swa.override_redirect = True; + swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; + swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; +- win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0, ++ win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width, + CopyFromParent, CopyFromParent, CopyFromParent, + CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); ++ XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel); + XSetClassHint(dpy, win, &ch); + + /* open input methods */ diff --git a/.suckless/dmenu/patches/dmenu-border-4.9.diff b/.suckless/dmenu/patches/dmenu-border-4.9.diff new file mode 100644 index 0000000..2009adc --- /dev/null +++ b/.suckless/dmenu/patches/dmenu-border-4.9.diff @@ -0,0 +1,25 @@ +diff -up dmenu-4.9-b/config.h dmenu-4.9-a/config.h +--- dmenu-4.9-b/config.h 2019-02-02 13:55:02.000000000 +0100 ++++ dmenu-4.9-a/config.h 2019-05-19 02:10:12.740040403 +0200 +@@ -21,3 +21,6 @@ static unsigned int lines = 0; + * for example: " /?\"&[]" + */ + static const char worddelimiters[] = " "; ++ ++/* Size of the window border */ ++static const unsigned int border_width = 5; +diff -up dmenu-4.9-b/dmenu.c dmenu-4.9-a/dmenu.c +--- dmenu-4.9-b/dmenu.c 2019-02-02 13:55:02.000000000 +0100 ++++ dmenu-4.9-a/dmenu.c 2019-05-19 02:11:20.966710117 +0200 +@@ -654,9 +654,10 @@ setup(void) + swa.override_redirect = True; + swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; + swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; +- win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0, ++ win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width, + CopyFromParent, CopyFromParent, CopyFromParent, + CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); ++ XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel); + XSetClassHint(dpy, win, &ch); + + /* open input methods */