[CONTACT]

[ABOUT]

[POLICY]

git clone dmenu dmenu Log gph

Found at: gopher.r-36.net:70/scm/dmenu/commit/1f6af5e78f74c80fcb9853dcc2fc7940538808b0.gph

tadded Xinerama support to dmenu, reverted -b behavior, removed -x, -y, -w - dmenu - Dmenu fork with xft fonts.

git clone git://r-36.net/dmenu

Log

Files

Refs

README

LICENSE

---

commit 1f6af5e78f74c80fcb9853dcc2fc7940538808b0

parent f3617bd7caf83a6e184cbdfeeebed0be88f158fa

Author: anselm@anselm1

Date:   Mon, 19 May 2008 20:29:32 +0100
added Xinerama support to dmenu, reverted -b behavior, removed -x, -y, -w
Diffstat:
  config.mk                           |       9 +++++++--
  dmenu.1                             |      18 ++++--------------
  dmenu.c                             |      60 +++++++++++++++++---------------
3 files changed, 43 insertions(+), 44 deletions(-)
---

diff --git a/config.mk b/config.mk

t@@ -10,12 +10,17 @@ MANPREFIX = ${PREFIX}/share/man
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
+# Xinerama, comment if you don't want it
+XINERAMALIBS = -L${X11LIB} -lXinerama
+XINERAMAFLAGS = -DXINERAMA
+
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
 # flags
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CFLAGS = -Os ${INCS} ${CPPFLAGS}
 LDFLAGS = -s ${LIBS}
 #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = -g ${LIBS}

diff --git a/dmenu.1 b/dmenu.1

t@@ -4,9 +4,7 @@ dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
 .RB [ \-i ]
-.RB [ \-x " "]
-.RB [ \-y " "]
-.RB [ \-w " "]
+.RB [ \-b ]
 .RB [ \-fn " "]
 .RB [ \-nb " "]
 .RB [ \-nf " "]
t@@ -22,20 +20,12 @@ It manages huge amounts (up to 10.000 and more) of user defined menu items
 efficiently.
 .SS Options
 .TP
-.B \-x
-defines the x coordinate dmenu appears at (0 by default).
-.TP
-.B \-y
-defines the y coordinate dmenu appears at (0 by default). If it is negative,
-dmenu will appear with the bottom at the given positive coordinate. If it is
--0, dmenu appears at the screen bottom.
-.TP
-.B \-w
-defines the width of the dmenu window (screen width by default).
-.TP
 .B \-i
 makes dmenu match menu entries case insensitively.
 .TP
+.B \-b
+defines that dmenu appears at the bottom.
+.TP
 .B \-fn 
 defines the font.
 .TP

diff --git a/dmenu.c b/dmenu.c

t@@ -1,6 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include 
-#include 
 #include 
 #include 
 #include 
t@@ -10,6 +9,9 @@
 #include 
 #include 
 #include 
+#ifdef XINERAMA
+#include 
+#endif
 /* macros */
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
t@@ -57,7 +59,7 @@ void kpress(XKeyEvent * e);
 void match(char *pattern);
 void readstdin(void);
 void run(void);
-void setup(int x, int y, int w);
+void setup(Bool topbar);
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
t@@ -601,10 +603,13 @@ run(void) {
 }
 void
-setup(int x, int y, int w) {
-        unsigned int i, j;
+setup(Bool topbar) {
+        int i, j, x, y;
         XModifierKeymap *modmap;
         XSetWindowAttributes wa;
+#if XINERAMA
+        XineramaScreenInfo *info = NULL;
+#endif
         /* init modifier map */
         modmap = XGetModifierMapping(dpy);
t@@ -627,14 +632,25 @@ setup(int x, int y, int w) {
         wa.override_redirect = 1;
         wa.background_pixmap = ParentRelative;
         wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-        mw = w ? w : DisplayWidth(dpy, screen);
+
+        /* menu window geometry */
         mh = dc.font.height + 2;
-        if(y < 0) {
-                if(y == INT_MIN)
-                        y = DisplayHeight(dpy, screen) - mh;
-                else
-                        y = (-1 * y) - mh;
+#if XINERAMA
+        if(XineramaIsActive(dpy)) {
+                info = XineramaQueryScreens(dpy, &i);
+                x = info[0].x_org;
+                y = topbar ? info[0].y_org : info[0].y_org + info[0].height - mh;
+                mw = info[0].width;
+                XFree(info);
+        }
+        else
+#endif
+        {
+                x = 0;
+                y = topbar ? 0 : DisplayHeight(dpy, screen) - mh;
+                mw = DisplayWidth(dpy, screen);
         }
+
         win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
                         DefaultDepth(dpy, screen), CopyFromParent,
                         DefaultVisual(dpy, screen),
t@@ -677,8 +693,8 @@ textw(const char *text) {
 int
 main(int argc, char *argv[]) {
-        int x = 0, y = 0, w = 0;
         unsigned int i;
+        Bool topbar = True;
         /* command line args */
         for(i = 1; i < argc; i++)
t@@ -686,6 +702,8 @@ main(int argc, char *argv[]) {
                         fstrncmp = strncasecmp;
                         fstrstr = cistrstr;
                 }
+                else if(!strcmp(argv[i], "-b"))
+                        topbar = False;
                 else if(!strcmp(argv[i], "-fn")) {
                         if(++i < argc) font = argv[i];
                 }
t@@ -704,25 +722,11 @@ main(int argc, char *argv[]) {
                 else if(!strcmp(argv[i], "-sf")) {
                         if(++i < argc) selfg = argv[i];
                 }
-                else if(!strcmp(argv[i], "-x")) {
-                        if(++i < argc) x = atoi(argv[i]);
-                }
-                else if(!strcmp(argv[i], "-y")) {
-                        if(++i < argc)
-                                if(!strcmp(argv[i], "-0"))
-                                        y = INT_MIN;
-                                else
-                                        y = atoi(argv[i]);
-                }
-                else if(!strcmp(argv[i], "-w")) {
-                        if(++i < argc) w = atoi(argv[i]);
-                }
                 else if(!strcmp(argv[i], "-v"))
                         eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
                 else
-                        eprint("usage: dmenu [-i] [-fn ] [-nb ] [-nf ]\n"
-                               "             [-p ] [-sb ] [-sf ]\n"
-                               "             [-x ] [-y ] [-w ] [-v]\n");
+                        eprint("usage: dmenu [-i] [-b] [-fn ] [-nb ] [-nf ]\n"
+                               "             [-p ] [-sb ] [-sf ] [-v]\n");
         setlocale(LC_CTYPE, "");
         dpy = XOpenDisplay(0);
         if(!dpy)
t@@ -739,7 +743,7 @@ main(int argc, char *argv[]) {
                 readstdin();
         }
-        setup(x, y, w);
+        setup(topbar);
         drawmenu();
         XSync(dpy, False);
         run();
.


AD: