about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R Garbe <garbeam@gmail.com>2009-07-01 17:08:10 +0100
committerAnselm R Garbe <garbeam@gmail.com>2009-07-01 17:08:10 +0100
commit25c1eb28f955adf241226596335f5d73b28620a0 (patch)
tree90179ebd4465ca1c789b09254366e6291bebd974
parentd719cc9a0e4bc75b555993f1526b24a5f82222a8 (diff)
downloaddwm-25c1eb28f955adf241226596335f5d73b28620a0.tar.gz
some minor fix if xinerama is disabled, still some odd behavior in there
-rw-r--r--config.mk4
-rw-r--r--dwm.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/config.mk b/config.mk
index f5ec4c1..bd6ff8e 100644
--- a/config.mk
+++ b/config.mk
@@ -11,8 +11,8 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # Xinerama, un-comment if you want it
-XINERAMALIBS = -L${X11LIB} -lXinerama
-XINERAMAFLAGS = -DXINERAMA
+#XINERAMALIBS = -L${X11LIB} -lXinerama
+#XINERAMAFLAGS = -DXINERAMA
 
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC}
diff --git a/dwm.c b/dwm.c
index 5c27113..61ac193 100644
--- a/dwm.c
+++ b/dwm.c
@@ -179,7 +179,6 @@ static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);
-static Monitor *idxtomon(unsigned int n);
 static void initfont(const char *fontstr);
 static Bool isprotodel(Client *c);
 static void keypress(XEvent *e);
@@ -233,6 +232,7 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
 #ifdef XINERAMA
 static void focusmon(const Arg *arg);
+static Monitor *idxtomon(unsigned int n);
 static void tagmon(const Arg *arg);
 #endif /* XINERAMA */
 
@@ -943,6 +943,7 @@ grabkeys(void) {
 	}
 }
 
+#ifdef XINERAMA
 Monitor *
 idxtomon(unsigned int n) {
 	unsigned int i;
@@ -951,6 +952,7 @@ idxtomon(unsigned int n) {
 	for(m = mons, i = 0; m && i != n; m = m->next, i++);
 	return m;
 }
+#endif /* XINERAMA */
 
 void
 initfont(const char *fontstr) {
a id='n208' href='#n208'>208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255