Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
33da96a7a7 | |||
3397e3c4a9 | |||
db976e0936 | |||
1e8272016b | |||
da2689feea |
@ -2,6 +2,9 @@
|
|||||||
/* Default settings; can be overriden by command line. */
|
/* Default settings; can be overriden by command line. */
|
||||||
|
|
||||||
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
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 */
|
||||||
|
static const float menu_height_ratio = 4.0f; /* This is the ratio used in the original calculation */
|
||||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
/* -fn option overrides fonts[0]; default X11 font or font set */
|
||||||
static const char *fonts[] = {
|
static const char *fonts[] = {
|
||||||
"monospace:size=10"
|
"monospace:size=10"
|
||||||
@ -14,7 +17,7 @@ static const char *colors[SchemeLast][2] = {
|
|||||||
[SchemeOut] = { "#000000", "#00ffff" },
|
[SchemeOut] = { "#000000", "#00ffff" },
|
||||||
};
|
};
|
||||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
||||||
static unsigned int lines = 0;
|
static unsigned int lines = 6;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Characters not considered part of a word while deleting words
|
* Characters not considered part of a word while deleting words
|
||||||
|
3
dmenu.1
3
dmenu.1
@ -40,6 +40,9 @@ which lists programs in the user's $PATH and runs the result in their $SHELL.
|
|||||||
.B \-b
|
.B \-b
|
||||||
dmenu appears at the bottom of the screen.
|
dmenu appears at the bottom of the screen.
|
||||||
.TP
|
.TP
|
||||||
|
.B \-c
|
||||||
|
dmenu appears centered on the screen.
|
||||||
|
.TP
|
||||||
.B \-f
|
.B \-f
|
||||||
dmenu grabs the keyboard before reading stdin if not reading from a tty. This
|
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.
|
is faster, but will lock up X until stdin reaches end\-of\-file.
|
||||||
|
28
dmenu.c
28
dmenu.c
@ -95,6 +95,15 @@ calcoffsets(void)
|
|||||||
break;
|
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
|
static void
|
||||||
cleanup(void)
|
cleanup(void)
|
||||||
{
|
{
|
||||||
@ -170,7 +179,7 @@ drawmenu(void)
|
|||||||
if (lines > 0) {
|
if (lines > 0) {
|
||||||
/* draw vertical list */
|
/* draw vertical list */
|
||||||
for (item = curr; item != next; item = item->right)
|
for (item = curr; item != next; item = item->right)
|
||||||
drawitem(item, x, y += bh, mw - x);
|
drawitem(item, x - promptw, y += bh, mw - x);
|
||||||
} else if (matches) {
|
} else if (matches) {
|
||||||
/* draw horizontal list */
|
/* draw horizontal list */
|
||||||
x += inputw;
|
x += inputw;
|
||||||
@ -636,6 +645,7 @@ setup(void)
|
|||||||
bh = drw->fonts->h + 2;
|
bh = drw->fonts->h + 2;
|
||||||
lines = MAX(lines, 0);
|
lines = MAX(lines, 0);
|
||||||
mh = (lines + 1) * bh;
|
mh = (lines + 1) * bh;
|
||||||
|
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
||||||
#ifdef XINERAMA
|
#ifdef XINERAMA
|
||||||
i = 0;
|
i = 0;
|
||||||
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
|
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
|
||||||
@ -662,9 +672,16 @@ setup(void)
|
|||||||
if (INTERSECT(x, y, 1, 1, info[i]) != 0)
|
if (INTERSECT(x, y, 1, 1, info[i]) != 0)
|
||||||
break;
|
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) / menu_height_ratio);
|
||||||
|
} else {
|
||||||
x = info[i].x_org;
|
x = info[i].x_org;
|
||||||
y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
||||||
mw = info[i].width;
|
mw = info[i].width;
|
||||||
|
}
|
||||||
|
|
||||||
XFree(info);
|
XFree(info);
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
@ -672,10 +689,17 @@ setup(void)
|
|||||||
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
||||||
die("could not get embedding window attributes: 0x%lx",
|
die("could not get embedding window attributes: 0x%lx",
|
||||||
parentwin);
|
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;
|
x = 0;
|
||||||
y = topbar ? 0 : wa.height - mh;
|
y = topbar ? 0 : wa.height - mh;
|
||||||
mw = wa.width;
|
mw = wa.width;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
||||||
inputw = mw / 3; /* input width: ~33% of monitor width */
|
inputw = mw / 3; /* input width: ~33% of monitor width */
|
||||||
match();
|
match();
|
||||||
@ -733,6 +757,8 @@ main(int argc, char *argv[])
|
|||||||
topbar = 0;
|
topbar = 0;
|
||||||
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
||||||
fast = 1;
|
fast = 1;
|
||||||
|
else if (!strcmp(argv[i], "-c")) /* centers dmenu on screen */
|
||||||
|
centered = 1;
|
||||||
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
||||||
fstrncmp = strncasecmp;
|
fstrncmp = strncasecmp;
|
||||||
fstrstr = cistrstr;
|
fstrstr = cistrstr;
|
||||||
|
119
patches/dmenu-center-20240616-36c3d68.diff
Normal file
119
patches/dmenu-center-20240616-36c3d68.diff
Normal file
@ -0,0 +1,119 @@
|
|||||||
|
From 36c3d68f185f47cbb754569775b7888728be4711 Mon Sep 17 00:00:00 2001
|
||||||
|
From: elbachir-one <bachiralfa@gmail.com>
|
||||||
|
Date: Sun, 16 Jun 2024 21:28:41 +0100
|
||||||
|
Subject: [PATCH] Adding an option to change the height as well
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 3 +++
|
||||||
|
dmenu.1 | 3 +++
|
||||||
|
dmenu.c | 38 ++++++++++++++++++++++++++++++++------
|
||||||
|
3 files changed, 38 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 1edb647..832896f 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -2,6 +2,9 @@
|
||||||
|
/* 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 */
|
||||||
|
+static const float menu_height_ratio = 4.0f; /* This is the ratio used in the original calculation */
|
||||||
|
/* -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 40f93e0..32d6a9d 100644
|
||||||
|
--- a/dmenu.c
|
||||||
|
+++ b/dmenu.c
|
||||||
|
@@ -95,6 +95,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)
|
||||||
|
{
|
||||||
|
@@ -636,6 +645,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))) {
|
||||||
|
@@ -662,9 +672,16 @@ setup(void)
|
||||||
|
if (INTERSECT(x, y, 1, 1, info[i]) != 0)
|
||||||
|
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) / menu_height_ratio);
|
||||||
|
+ } 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
|
||||||
|
@@ -672,9 +689,16 @@ 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 = mw / 3; /* input width: ~33% of monitor width */
|
||||||
|
@@ -734,6 +758,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.45.2
|
||||||
|
|
25
patches/dmenu-linesbelowprompt-and-fullwidth-20211014.diff
Normal file
25
patches/dmenu-linesbelowprompt-and-fullwidth-20211014.diff
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 98e63311c4816fb3c7f5c5d00232fec3232465f3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sebastian LaVine <mail@smlavine.com>
|
||||||
|
Date: Sat, 3 Jul 2021 17:35:50 -0400
|
||||||
|
Subject: [PATCH] Draw lines immediately below prompt
|
||||||
|
|
||||||
|
---
|
||||||
|
dmenu.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/dmenu.c b/dmenu.c
|
||||||
|
index 65f25ce..5a041a6 100644
|
||||||
|
--- a/dmenu.c
|
||||||
|
+++ b/dmenu.c
|
||||||
|
@@ -154,7 +154,7 @@ drawmenu(void)
|
||||||
|
if (lines > 0) {
|
||||||
|
/* draw vertical list */
|
||||||
|
for (item = curr; item != next; item = item->right)
|
||||||
|
- drawitem(item, x, y += bh, mw - x);
|
||||||
|
+ drawitem(item, x - promptw, y += bh, mw);
|
||||||
|
} else if (matches) {
|
||||||
|
/* draw horizontal list */
|
||||||
|
x += inputw;
|
||||||
|
--
|
||||||
|
2.32.0
|
||||||
|
|
Reference in New Issue
Block a user