339 lines
9.3 KiB
Diff
Executable File
339 lines
9.3 KiB
Diff
Executable File
diff --color -u a/config.def.h b/config.def.h
|
|
--- a/config.def.h 2020-09-02 22:07:07.000000000 +0530
|
|
+++ b/config.def.h 2021-05-21 00:20:28.562140000 +0530
|
|
@@ -2,16 +2,21 @@
|
|
/* Default settings; can be overriden by command line. */
|
|
|
|
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
|
+static int centered = 1; /* -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"
|
|
+ "Consolas:pixelsize=15"
|
|
};
|
|
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" },
|
|
+ [SchemeNorm] = { "#bbbbbb", "#1d2021" },
|
|
+ [SchemeSel] = { "#1d2021", "#ebdbb2" },
|
|
+ [SchemeSelHighlight] = { "#000080", "#ebdbb2" },
|
|
+ [SchemeNormHighlight] = { "#ffc978", "#1d2021" },
|
|
[SchemeOut] = { "#000000", "#00ffff" },
|
|
+ [SchemeOutHighlight] = { "#ffc978", "#00ffff" },
|
|
};
|
|
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
|
static unsigned int lines = 0;
|
|
@@ -21,3 +26,5 @@
|
|
* for example: " /?\"&[]"
|
|
*/
|
|
static const char worddelimiters[] = " ";
|
|
+/* Size of the window border */
|
|
+static const unsigned int border_width = 4;
|
|
Only in b: config.def.h.orig
|
|
diff --color -u a/dmenu.1 b/dmenu.1
|
|
--- a/dmenu.1 2020-09-02 22:07:07.000000000 +0530
|
|
+++ b/dmenu.1 2020-12-29 02:11:41.804718200 +0530
|
|
@@ -40,6 +40,9 @@
|
|
.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 --color -u a/dmenu.c b/dmenu.c
|
|
--- a/dmenu.c 2020-09-02 22:07:07.000000000 +0530
|
|
+++ b/dmenu.c 2020-12-29 02:24:03.168766600 +0530
|
|
@@ -26,8 +26,7 @@
|
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
|
|
/* enums */
|
|
-enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
|
|
-
|
|
+enum { SchemeNorm, SchemeSel, SchemeOut, SchemeNormHighlight, SchemeSelHighlight, SchemeOutHighlight, SchemeLast }; /* color schemes */
|
|
struct item {
|
|
char *text;
|
|
struct item *left, *right;
|
|
@@ -89,6 +88,15 @@
|
|
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)
|
|
{
|
|
@@ -113,6 +121,43 @@
|
|
return NULL;
|
|
}
|
|
|
|
+static void
|
|
+drawhighlights(struct item *item, int x, int y, int maxw)
|
|
+{
|
|
+ char restorechar, tokens[sizeof text], *highlight, *token;
|
|
+ int indentx, highlightlen;
|
|
+
|
|
+ drw_setscheme(drw, scheme[item == sel ? SchemeSelHighlight : item->out ? SchemeOutHighlight : SchemeNormHighlight]);
|
|
+ strcpy(tokens, text);
|
|
+ for (token = strtok(tokens, " "); token; token = strtok(NULL, " ")) {
|
|
+ highlight = fstrstr(item->text, token);
|
|
+ while (highlight) {
|
|
+ // Move item str end, calc width for highlight indent, & restore
|
|
+ highlightlen = highlight - item->text;
|
|
+ restorechar = *highlight;
|
|
+ item->text[highlightlen] = '\0';
|
|
+ indentx = TEXTW(item->text);
|
|
+ item->text[highlightlen] = restorechar;
|
|
+
|
|
+ // Move highlight str end, draw highlight, & restore
|
|
+ restorechar = highlight[strlen(token)];
|
|
+ highlight[strlen(token)] = '\0';
|
|
+ if (indentx - (lrpad / 2) - 1 < maxw)
|
|
+ drw_text(
|
|
+ drw,
|
|
+ x + indentx - (lrpad / 2) - 1,
|
|
+ y,
|
|
+ MIN(maxw - indentx, TEXTW(highlight) - lrpad),
|
|
+ bh, 0, highlight, 0
|
|
+ );
|
|
+ highlight[strlen(token)] = restorechar;
|
|
+
|
|
+ if (strlen(highlight) - strlen(token) < strlen(token)) break;
|
|
+ highlight = fstrstr(highlight + strlen(token), token);
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
static int
|
|
drawitem(struct item *item, int x, int y, int w)
|
|
{
|
|
@@ -123,7 +168,9 @@
|
|
else
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
- return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
|
|
+ int r = drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
|
|
+ drawhighlights(item, x, y, w);
|
|
+ return r;
|
|
}
|
|
|
|
static void
|
|
@@ -501,6 +548,119 @@
|
|
}
|
|
|
|
static void
|
|
+buttonpress(XEvent *e)
|
|
+{
|
|
+ struct item *item;
|
|
+ XButtonPressedEvent *ev = &e->xbutton;
|
|
+ int x = 0, y = 0, h = bh, w;
|
|
+
|
|
+ if (ev->window != win)
|
|
+ return;
|
|
+
|
|
+ /* right-click: exit */
|
|
+ if (ev->button == Button3)
|
|
+ exit(1);
|
|
+
|
|
+ if (prompt && *prompt)
|
|
+ x += promptw;
|
|
+
|
|
+ /* input field */
|
|
+ w = (lines > 0 || !matches) ? mw - x : inputw;
|
|
+
|
|
+ /* left-click on input: clear input,
|
|
+ * NOTE: if there is no left-arrow the space for < is reserved so
|
|
+ * add that to the input width */
|
|
+ if (ev->button == Button1 &&
|
|
+ ((lines <= 0 && ev->x >= 0 && ev->x <= x + w +
|
|
+ ((!prev || !curr->left) ? TEXTW("<") : 0)) ||
|
|
+ (lines > 0 && ev->y >= y && ev->y <= y + h))) {
|
|
+ insert(NULL, -cursor);
|
|
+ drawmenu();
|
|
+ return;
|
|
+ }
|
|
+ /* middle-mouse click: paste selection */
|
|
+ if (ev->button == Button2) {
|
|
+ XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
|
|
+ utf8, utf8, win, CurrentTime);
|
|
+ drawmenu();
|
|
+ return;
|
|
+ }
|
|
+ /* scroll up */
|
|
+ if (ev->button == Button4 && prev) {
|
|
+ sel = curr = prev;
|
|
+ calcoffsets();
|
|
+ drawmenu();
|
|
+ return;
|
|
+ }
|
|
+ /* scroll down */
|
|
+ if (ev->button == Button5 && next) {
|
|
+ sel = curr = next;
|
|
+ calcoffsets();
|
|
+ drawmenu();
|
|
+ return;
|
|
+ }
|
|
+ if (ev->button != Button1)
|
|
+ return;
|
|
+ if (ev->state & ~ControlMask)
|
|
+ return;
|
|
+ if (lines > 0) {
|
|
+ /* vertical list: (ctrl)left-click on item */
|
|
+ w = mw - x;
|
|
+ for (item = curr; item != next; item = item->right) {
|
|
+ y += h;
|
|
+ if (ev->y >= y && ev->y <= (y + h)) {
|
|
+ puts(item->text);
|
|
+ if (!(ev->state & ControlMask))
|
|
+ exit(0);
|
|
+ sel = item;
|
|
+ if (sel) {
|
|
+ sel->out = 1;
|
|
+ drawmenu();
|
|
+ }
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ } else if (matches) {
|
|
+ /* left-click on left arrow */
|
|
+ x += inputw;
|
|
+ w = TEXTW("<");
|
|
+ if (prev && curr->left) {
|
|
+ if (ev->x >= x && ev->x <= x + w) {
|
|
+ sel = curr = prev;
|
|
+ calcoffsets();
|
|
+ drawmenu();
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ /* horizontal list: (ctrl)left-click on item */
|
|
+ for (item = curr; item != next; item = item->right) {
|
|
+ x += w;
|
|
+ w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
|
|
+ if (ev->x >= x && ev->x <= x + w) {
|
|
+ puts(item->text);
|
|
+ if (!(ev->state & ControlMask))
|
|
+ exit(0);
|
|
+ sel = item;
|
|
+ if (sel) {
|
|
+ sel->out = 1;
|
|
+ drawmenu();
|
|
+ }
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ /* left-click on right arrow */
|
|
+ w = TEXTW(">");
|
|
+ x = mw - w;
|
|
+ if (next && ev->x >= x && ev->x <= x + w) {
|
|
+ sel = curr = next;
|
|
+ calcoffsets();
|
|
+ drawmenu();
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+static void
|
|
paste(void)
|
|
{
|
|
char *p, *q;
|
|
@@ -561,6 +721,9 @@
|
|
break;
|
|
cleanup();
|
|
exit(1);
|
|
+ case ButtonPress:
|
|
+ buttonpress(&ev);
|
|
+ break;
|
|
case Expose:
|
|
if (ev.xexpose.count == 0)
|
|
drw_map(drw, win, 0, 0, mw, mh);
|
|
@@ -611,6 +774,7 @@
|
|
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 +801,16 @@
|
|
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,21 +818,30 @@
|
|
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();
|
|
|
|
/* create menu window */
|
|
swa.override_redirect = True;
|
|
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
+ swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask |
|
|
+ ButtonPressMask;
|
|
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);
|
|
|
|
|
|
@@ -709,6 +889,8 @@
|
|
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;
|
|
Only in b: dmenu.c.orig
|
|
Only in a: dmenu_path
|
|
Only in a: dmenu_run
|