diff options
| -rw-r--r-- | dmenu-center-4.8.diff | 19 | ||||
| -rw-r--r-- | dmenu.1 | 2 | ||||
| -rw-r--r-- | dmenu.c | 26 |
3 files changed, 7 insertions, 40 deletions
diff --git a/dmenu-center-4.8.diff b/dmenu-center-4.8.diff deleted file mode 100644 index 5878a33..0000000 --- a/dmenu-center-4.8.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/dmenu.c b/dmenu.c -index 5e9c367..2268ea9 100644 ---- a/dmenu.c -+++ b/dmenu.c -@@ -634,11 +644,10 @@ 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; -+ mw = MIN(MAX(max_textw() + promptw, 100), wa.width); -+ x = (wa.width - mw) / 2; -+ y = (wa.height - mh) / 2; - } -- promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; - inputw = MIN(inputw, mw/3); - match(); - @@ -106,7 +106,7 @@ defines the selected highlight background color. .BI \-shf " color" defines the selected highlight foreground color. .TP -.B \-v +.BI \-v prints version information to stdout, then exits. .TP .BI \-w " windowid" @@ -121,13 +121,6 @@ static void 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) { size_t i; @@ -971,7 +964,6 @@ static void 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))) { @@ -1000,24 +992,18 @@ static void 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; */ - mw = MIN(MAX(max_textw() + promptw, 100), info[i].width); - x = info[i].x_org + ((info[i].width - mw) / 2); - y = info[i].y_org + ((info[i].height - mh) / 2); + 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; */ - mw = MIN(MAX(max_textw() + promptw, 100), wa.width); - x = (wa.width - mw) / 2; - y = (wa.height - mh) / 2; + x = 0; + y = topbar ? 0 : wa.height - mh; + mw = wa.width; } promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; inputw = MIN(inputw, mw / 3); |