some minor fix if xinerama is disabled, still some odd behavior in there

diff --git a/config.mk b/config.mk
index f5ec4c1..bd6ff8e 100644 (file)
--- 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
 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}
 
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC}

diff --git a/dwm.c b/dwm.c
index 5c27113..61ac193 100644 (file)
--- 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 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);
 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 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 */
 
 static void tagmon(const Arg *arg);
 #endif /* XINERAMA */
 


@@ -943,6 +943,7 @@ grabkeys(void) {
        }
 }
 
        }
 }
 

+#ifdef XINERAMA

 Monitor *
 idxtomon(unsigned int n) {
        unsigned int i;
 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;
 }
        for(m = mons, i = 0; m && i != n; m = m->next, i++);
        return m;
 }

+#endif /* XINERAMA */

 
 void
 initfont(const char *fontstr) {
 
 void
 initfont(const char *fontstr) {