# HG changeset patch # User Anselm R. Garbe # Date 1187514047 -7200 # Node ID ce9a5452ac8c72f93a365f9b8ba38c01ec94eee8 # Parent 66f17bf2c27857b96ef11142612172a872e12c42 moved updatebarpos to screen diff -r 66f17bf2c278 -r ce9a5452ac8c dwm.h --- a/dwm.h Sun Aug 19 10:57:02 2007 +0200 +++ b/dwm.h Sun Aug 19 11:00:47 2007 +0200 @@ -117,8 +117,7 @@ /* main.c */ Bool gettextprop(Window w, Atom atom, char *text, unsigned int size); /* return text property, UTF-8 compliant */ -void updatebarpos(void); /* updates the bar position */ -void quit(const char *arg); /* quit dwm nicely */ +void quit(const char *arg); /* quit dwm nicely */ int xerror(Display *dsply, XErrorEvent *ee); /* dwm's X error handler */ /* screen.c */ @@ -142,6 +141,7 @@ void togglemax(const char *arg); /* toggles maximization of floating client */ void toggletag(const char *arg); /* toggles sel tags with arg's index */ void toggleview(const char *arg); /* toggles the tag with arg's index (in)visible */ +void updatebarpos(void); /* updates the bar position */ void view(const char *arg); /* views the tag with arg's index */ /* util.c */ diff -r 66f17bf2c278 -r ce9a5452ac8c main.c --- a/main.c Sun Aug 19 10:57:02 2007 +0200 +++ b/main.c Sun Aug 19 11:00:47 2007 +0200 @@ -253,32 +253,6 @@ readin = running = False; } -void -updatebarpos(void) { - XEvent ev; - - wax = sx; - way = sy; - wah = sh; - waw = sw; - switch(bpos) { - default: - wah -= bh; - way += bh; - XMoveWindow(dpy, barwin, sx, sy); - break; - case BarBot: - wah -= bh; - XMoveWindow(dpy, barwin, sx, sy + wah); - break; - case BarOff: - XMoveWindow(dpy, barwin, sx, sy - bh); - break; - } - XSync(dpy, False); - while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); -} - /* There's no way to check accesses to destroyed windows, thus those cases are * ignored (especially on UnmapNotify's). Other types of errors call Xlibs * default error handler, which may call exit. diff -r 66f17bf2c278 -r ce9a5452ac8c screen.c --- a/screen.c Sun Aug 19 10:57:02 2007 +0200 +++ b/screen.c Sun Aug 19 11:00:47 2007 +0200 @@ -370,6 +370,32 @@ } void +updatebarpos(void) { + XEvent ev; + + wax = sx; + way = sy; + wah = sh; + waw = sw; + switch(bpos) { + default: + wah -= bh; + way += bh; + XMoveWindow(dpy, barwin, sx, sy); + break; + case BarBot: + wah -= bh; + XMoveWindow(dpy, barwin, sx, sy + wah); + break; + case BarOff: + XMoveWindow(dpy, barwin, sx, sy - bh); + break; + } + XSync(dpy, False); + while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); +} + +void view(const char *arg) { unsigned int i;