changeset: 365:3d8970486eb3
tag: tip
user: Anselm R Garbe <garbeam_AT_gmail.com>
date: Tue Nov 03 19:53:47 2009 +0000
files: tools.suckless.org/dmenu/patches/dmenu-4.0-vertical_meillo.diff tools.suckless.org/dmenu/patches/vertical.md
description:
added vertical dmenu patch
diff -r c054dd495621 -r 3d8970486eb3 tools.suckless.org/dmenu/patches/dmenu-4.0-vertical_meillo.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools.suckless.org/dmenu/patches/dmenu-4.0-vertical_meillo.diff Tue Nov 03 19:53:47 2009 +0000
_AT_@ -0,0 +1,221 @@
+# dmenu-4.0 vertical patch
+#
+# assembled by meillo_AT_marmaro.de
+#
+# this is a minimal version of fresch's patch
+#
http://schiewek.net/fresch/dmenu-3.9-fresch-3.diff
+#
http://bbs.archlinux.org/viewtopic.php?id=54086
+
+
+diff -up dmenu-4.0/config.mk dmenu-v/config.mk
+--- dmenu-4.0/config.mk 2009-04-18 13:50:04.000000000 +0200
++++ dmenu-v/config.mk 2009-06-03 10:48:35.000000000 +0200
+_AT_@ -1,5 +1,5 @@
+ # dmenu version
+-VERSION = 4.0
++VERSION = 4.0-vertical
+
+ # Customize below to fit your system
+
+diff -up dmenu-4.0/dmenu.1 dmenu-v/dmenu.1
+--- dmenu-4.0/dmenu.1 2009-04-18 13:50:04.000000000 +0200
++++ dmenu-v/dmenu.1 2009-06-03 12:54:25.000000000 +0200
+_AT_@ -5,6 +5,7 @@ dmenu \- dynamic menu
+ .B dmenu
+ .RB [ \-i ]
+ .RB [ \-b ]
++.RB [ \-l " <lines>"]
+ .RB [ \-fn " <font>"]
+ .RB [ \-nb " <color>"]
+ .RB [ \-nf " <color>"]
+_AT_@ -26,6 +27,10 @@ makes dmenu match menu entries case inse
+ .B \-b
+ defines that dmenu appears at the bottom.
+ .TP
++.B \-l <lines>
++activates vertical list mode.
++The given number of lines will be displayed. Window height will get adjusted.
++.TP
+ .B \-fn <font>
+ defines the font.
+ .TP
+_AT_@ -57,7 +62,7 @@ dmenu is completely controlled by the ke
+ Appends the character to the text in the input field. This works as a filter:
+ only items containing this text will be displayed.
+ .TP
+-.B Left/Right (Mod1\-h/Mod1\-l)
++.B Left/Right (Up/Down) (Mod1\-h/Mod1\-l)
+ Select the previous/next item.
+ .TP
+ .B PageUp/PageDown (Mod1\-k/Mod1\-j)
+diff -up dmenu-4.0/dmenu.c dmenu-v/dmenu.c
+--- dmenu-4.0/dmenu.c 2009-04-18 13:50:04.000000000 +0200
++++ dmenu-v/dmenu.c 2009-06-03 12:31:00.000000000 +0200
+_AT_@ -47,10 +47,12 @@ struct Item {
+
+ /* forward declarations */
+ static void appenditem(Item *i, Item **list, Item **last);
+-static void calcoffsets(void);
++static void calcoffsetsh(void);
++static void calcoffsetsv(void);
+ static char *cistrstr(const char *s, const char *sub);
+ static void cleanup(void);
+-static void drawmenu(void);
++static void drawmenuh(void);
++static void drawmenuv(void);
+ static void drawtext(const char *text, unsigned long col[ColLast]);
+ static void eprint(const char *errstr, ...);
+ static unsigned long getcolor(const char *colstr);
+_AT_@ -88,6 +90,10 @@ static Item *curr = NULL;
+ static Window root, win;
+ static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
+ static char *(*fstrstr)(const char *, const char *) = strstr;
++static Bool vlist = False;
++static unsigned int lines = 0;
++static void (*calcoffsets)(void) = calcoffsetsh;
++static void (*drawmenu)(void) = drawmenuh;
+
+ void
+ appenditem(Item *i, Item **list, Item **last) {
+_AT_@ -101,7 +107,7 @@ appenditem(Item *i, Item **list, Item **
+ }
+
+ void
+-calcoffsets(void) {
++calcoffsetsh(void) {
+ int tw;
+ unsigned int w;
+
+_AT_@ -127,6 +133,26 @@ calcoffsets(void) {
+ }
+ }
+
++void
++calcoffsetsv(void) {
++ static unsigned int w;
++
++ if(!curr)
++ return;
++ w = (dc.font.height + 2) * (lines + 1);
++ for(next = curr; next; next=next->right) {
++ w -= dc.font.height + 2;
++ if(w <= 0)
++ break;
++ }
++ w = (dc.font.height + 2) * (lines + 1);
++ for(prev = curr; prev && prev->left; prev=prev->left) {
++ w -= dc.font.height + 2;
++ if(w <= 0)
++ break;
++ }
++}
++
+ char *
+ cistrstr(const char *s, const char *sub) {
+ int c, csub;
+_AT_@ -171,7 +197,7 @@ cleanup(void) {
+ }
+
+ void
+-drawmenu(void) {
++drawmenuh(void) {
+ Item *i;
+
+ dc.x = 0;
+_AT_@ -212,6 +238,39 @@ drawmenu(void) {
+ }
+
+ void
++drawmenuv(void) {
++ Item *i;
++
++ dc.x = 0;
++ dc.y = 0;
++ dc.w = mw;
++ dc.h = mh;
++ drawtext(NULL, dc.norm);
++ /* print prompt? */
++ if(promptw) {
++ dc.w = promptw;
++ drawtext(prompt, dc.sel);
++ }
++ dc.x += promptw;
++ dc.w = mw - promptw;
++ /* print command */
++ drawtext(text[0] ? text : NULL, dc.norm);
++ if(curr) {
++ dc.x = 0;
++ dc.w = mw;
++ dc.y += dc.font.height + 2;
++ /* determine maximum items */
++ for(i = curr; i != next; i=i->right) {
++ drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
++ dc.y += dc.font.height + 2;
++ }
++ drawtext(NULL, dc.norm);
++ }
++ XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
++ XFlush(dpy);
++}
++
++void
+ drawtext(const char *text, unsigned long col[ColLast]) {
+ char buf[256];
+ int i, x, y, h, len, olen;
+_AT_@ -222,8 +281,8 @@ drawtext(const char *text, unsigned long
+ if(!text)
+ return;
+ olen = strlen(text);
+- h = dc.font.ascent + dc.font.descent;
+- y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
++ h = dc.font.height;
++ y = dc.y + ((h+2) / 2) - (h / 2) + dc.font.ascent;
+ x = dc.x + (h / 2);
+ /* shorten text if necessary */
+ for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
+_AT_@ -426,6 +485,7 @@ kpress(XKeyEvent * e) {
+ calcoffsets();
+ break;
+ case XK_Left:
++ case XK_Up:
+ if(!(sel && sel->left))
+ return;
+ sel=sel->left;
+_AT_@ -457,6 +517,7 @@ kpress(XKeyEvent * e) {
+ running = False;
+ break;
+ case XK_Right:
++ case XK_Down:
+ if(!(sel && sel->right))
+ return;
+ sel=sel->right;
+_AT_@ -598,6 +659,7 @@ setup(Bool topbar) {
+
+ /* menu window geometry */
+ mh = dc.font.height + 2;
++ mh = vlist ? mh * (lines+1) : mh;
+ #if XINERAMA
+ if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+ i = 0;
+_AT_@ -676,6 +738,12 @@ main(int argc, char *argv[]) {
+ }
+ else if(!strcmp(argv[i], "-b"))
+ topbar = False;
++ else if(!strcmp(argv[i], "-l")) {
++ vlist = True;
++ calcoffsets = calcoffsetsv;
++ drawmenu = drawmenuv;
++ if(++i < argc) lines += atoi(argv[i]);
++ }
+ else if(!strcmp(argv[i], "-fn")) {
+ if(++i < argc) font = argv[i];
+ }
+_AT_@ -697,7 +765,7 @@ main(int argc, char *argv[]) {
+ else if(!strcmp(argv[i], "-v"))
+ eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
+ else
+- eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
++ eprint("usage: dmenu [-i] [-b] [-l <lines>] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+ " [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+ if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+ fprintf(stderr, "warning: no locale support\n");
diff -r c054dd495621 -r 3d8970486eb3 tools.suckless.org/dmenu/patches/vertical.md
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools.suckless.org/dmenu/patches/vertical.md Tue Nov 03 19:53:47 2009 +0000
_AT_@ -0,0 +1,11 @@
+VERTICAL MENU
+=============
+
+This patch allows you to present a vertical menu instead of a horizontal (this is especially useful for long menu entries such as URLs in conjunction with surf).
+
+It is expected this patch will go into mainstream dmenu in a slightly modified form in the next version (due to the recent decision of surf to use dmenu for interactive input).
+
+Download
+--------
+
+* [dmenu-4.0-vertical_meillo.diff](dmenu-4.0-vertical_meillo.diff)
Received on Tue Nov 03 2009 - 20:53:49 CET