make it easier for the user, if Xinerama support is given, always use the screen...

diff --git a/config.mk b/config.mk
index b18ad3308073ab8a823834392a8033fbe7cfc91b..e9c956e76e7a3e424ff1d812aabeaf0a7000278c 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -10,14 +10,19 @@ MANPREFIX = ${PREFIX}/share/man
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
+# Xinerama, uncomment 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}\"
+#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} ${CPPFLAGS}
 #LDFLAGS = -g ${LIBS}
 
 # Solaris

diff --git a/dwm.1 b/dwm.1
index 3b8bf1d0040feee0a8bce32c382388a4a4d6b39f..66e89ee0c3931f33b915dcf111d10520c6950f27 100644 (file)
--- a/dwm.1
+++ b/dwm.1
@@ -57,6 +57,9 @@ click on a tag label adds/removes that tag to/from the focused window.
 Start
 .BR xterm.
 .TP
+.B Mod1\-b
+Toggles bar on and off.
+.TP
 .B Mod1\-space
 Toggles between layouts.
 .TP

diff --git a/dwm.c b/dwm.c
index 504b78b0dcaa7ed40c19e2714b0bbe1e71532e78..4a8c2a9ed53968f72647e34ec29224c1f8bab442 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -39,6 +39,9 @@
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
 
 /* macros */
 #define MAX(a, b)       ((a) > (b) ? (a) : (b))
@@ -1579,22 +1582,32 @@ updatebar(void) {
 
 void
 updategeom(void) {
-       unsigned int i;
-
-#ifdef CUSTOMGEOM /* define your own if you are Xinerama user */
-       CUSTOMGEOM
-#else
-       /* bar geometry*/
-       bx = 0;
-       by = showbar ? (topbar ? 0 : sh - bh) : -bh;
-       bw = sw;
+       int i;
+#ifdef XINERAMA
+       XineramaScreenInfo *info = NULL;
 
        /* window area geometry */
-       wx = sx;
-       wy = showbar && topbar ? sy + bh : sy;
-       ww = sw;
-       wh = showbar ? sh - bh : sh;
+       if(XineramaIsActive(dpy)) {
+               info = XineramaQueryScreens(dpy, &i);
+               wx = info[0].x_org;
+               wy = showbar && topbar ? info[0].y_org + info[0].height + bh : info[0].y_org;
+               ww = info[0].width;
+               wh = showbar ? info[0].height - bh : info[0].height;
+               XFree(info);
+       }
+       else
 #endif
+       {
+               wx = sx;
+               wy = showbar && topbar ? sy + bh : sy;
+               ww = sw;
+               wh = showbar ? sh - bh : sh;
+       }
+
+       /* bar geometry*/
+       bx = wx;
+       by = showbar ? (topbar ? 0 : wy + wh) : -bh;
+       bw = ww;
 
        /* update layout geometries */
        for(i = 0; i < LENGTH(layouts); i++)