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

This commit is contained in:
Anselm R Garbe 2009-07-01 17:08:10 +01:00
parent d719cc9a0e
commit 25c1eb28f9
2 changed files with 5 additions and 3 deletions

View File

@ -11,8 +11,8 @@ X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib X11LIB = /usr/X11R6/lib
# Xinerama, un-comment if you want it # Xinerama, un-comment if you want it
XINERAMALIBS = -L${X11LIB} -lXinerama #XINERAMALIBS = -L${X11LIB} -lXinerama
XINERAMAFLAGS = -DXINERAMA #XINERAMAFLAGS = -DXINERAMA
# includes and libs # includes and libs
INCS = -I. -I/usr/include -I${X11INC} INCS = -I. -I/usr/include -I${X11INC}

4
dwm.c
View File

@ -179,7 +179,6 @@ static long getstate(Window w);
static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size); static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
static void grabbuttons(Client *c, Bool focused); static void grabbuttons(Client *c, Bool focused);
static void grabkeys(void); static void grabkeys(void);
static Monitor *idxtomon(unsigned int n);
static void initfont(const char *fontstr); static void initfont(const char *fontstr);
static Bool isprotodel(Client *c); static Bool isprotodel(Client *c);
static void keypress(XEvent *e); static void keypress(XEvent *e);
@ -233,6 +232,7 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee);
static void zoom(const Arg *arg); static void zoom(const Arg *arg);
#ifdef XINERAMA #ifdef XINERAMA
static void focusmon(const Arg *arg); static void focusmon(const Arg *arg);
static Monitor *idxtomon(unsigned int n);
static void tagmon(const Arg *arg); static void tagmon(const Arg *arg);
#endif /* XINERAMA */ #endif /* XINERAMA */
@ -943,6 +943,7 @@ grabkeys(void) {
} }
} }
#ifdef XINERAMA
Monitor * Monitor *
idxtomon(unsigned int n) { idxtomon(unsigned int n) {
unsigned int i; unsigned int i;
@ -951,6 +952,7 @@ idxtomon(unsigned int n) {
for(m = mons, i = 0; m && i != n; m = m->next, i++); for(m = mons, i = 0; m && i != n; m = m->next, i++);
return m; return m;
} }
#endif /* XINERAMA */
void void
initfont(const char *fontstr) { initfont(const char *fontstr) {