MCorange/dwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made restack, drawbar also Monitor-related only

Browse Source
This commit is contained in:
Anselm R Garbe 2008-02-21 10:31:06 +00:00
parent 2e8e5509d9
commit 55edd2d6ec
1 changed files with 92 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
dwm.c
View File

@ -144,9 +144,9 @@ void configurerequest(XEvent *e);
void destroynotify(XEvent *e); void destroynotify(XEvent *e);
void detach(Client *c); void detach(Client *c);
void detachstack(Client *c); void detachstack(Client *c);
void drawbar(void); void drawbar(Monitor *m);
void drawsquare(Monitor *, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]); void drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
void drawtext(Monitor *, const char *text, unsigned long col[ColLast], Bool invert); void drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert);
void *emallocz(unsigned int size); void *emallocz(unsigned int size);
void enternotify(XEvent *e); void enternotify(XEvent *e);
void eprint(const char *errstr, ...); void eprint(const char *errstr, ...);
@ -158,6 +158,7 @@ void focusnext(const char *arg);
void focusprev(const char *arg); void focusprev(const char *arg);
Client *getclient(Window w); Client *getclient(Window w);
unsigned long getcolor(const char *colstr); unsigned long getcolor(const char *colstr);
Monitor *getmonitor(Window barwin);
long getstate(Window w); long getstate(Window w);
Bool gettextprop(Window w, Atom atom, char *text, unsigned int size); Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
void grabbuttons(Client *c, Bool focused); void grabbuttons(Client *c, Bool focused);
@ -180,7 +181,7 @@ void quit(const char *arg);
void reapply(const char *arg); void reapply(const char *arg);
void resize(Client *c, int x, int y, int w, int h, Bool sizehints); void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
void resizemouse(Client *c); void resizemouse(Client *c);
void restack(void); void restack(Monitor *m);
void run(void); void run(void);
void scan(void); void scan(void);
void setclientstate(Client *c, long state); void setclientstate(Client *c, long state);
@ -309,7 +310,7 @@ arrange(void) {
monitors[selmonitor].layout->arrange(&monitors[selmonitor]); monitors[selmonitor].layout->arrange(&monitors[selmonitor]);
focus(NULL); focus(NULL);
restack(); restack(&monitors[selmonitor]);
} }
void void
@ -370,7 +371,7 @@ buttonpress(XEvent *e) {
if(CLEANMASK(ev->state) != MODKEY) if(CLEANMASK(ev->state) != MODKEY)
return; return;
if(ev->button == Button1) { if(ev->button == Button1) {
restack(); restack(&monitors[c->monitor]);
movemouse(c); movemouse(c);
} }
else if(ev->button == Button2) { else if(ev->button == Button2) {
@ -380,7 +381,7 @@ buttonpress(XEvent *e) {
zoom(NULL); zoom(NULL);
} }
else if(ev->button == Button3 && !c->isfixed) { else if(ev->button == Button3 && !c->isfixed) {
restack(); restack(&monitors[c->monitor]);
resizemouse(c); resizemouse(c);
} }
} }
@ -562,33 +563,30 @@ detachstack(Client *c) {
} }
void void
drawbar(void) { drawbar(Monitor *m) {
int i, j, x; int j, x;
Client *c; Client *c;
for(i = 0; i < mcount; i++) {
Monitor *m = &monitors[i];
dc.x = 0; dc.x = 0;
for(c = stack; c && !isvisible(c, i); c = c->snext); for(c = stack; c && !isvisible(c, m->id); c = c->snext);
fprintf(stderr, "m%d %s\n", i, c ? c->name : "NIL");
for(j = 0; j < LENGTH(tags); j++) { for(j = 0; j < LENGTH(tags); j++) {
dc.w = textw(tags[j]); dc.w = textw(tags[j]);
if(m->seltags[j]) { if(m->seltags[j]) {
drawtext(m, tags[j], dc.sel, isurgent(i, j)); drawtext(m, tags[j], dc.sel, isurgent(m->id, j));
drawsquare(m, c && c->tags[j] && c->monitor == i, drawsquare(m, c && c->tags[j] && c->monitor == m->id,
isoccupied(i, j), isurgent(i, j), dc.sel); isoccupied(m->id, j), isurgent(m->id, j), dc.sel);
} }
else { else {
drawtext(m, tags[j], dc.norm, isurgent(i, j)); drawtext(m, tags[j], dc.norm, isurgent(m->id, j));
drawsquare(m, c && c->tags[j] && c->monitor == i, drawsquare(m, c && c->tags[j] && c->monitor == m->id,
isoccupied(i, j), isurgent(i, j), dc.norm); isoccupied(m->id, j), isurgent(m->id, j), dc.norm);
} }
dc.x += dc.w; dc.x += dc.w;
} }
dc.w = blw; dc.w = blw;
drawtext(m, m->layout->symbol, dc.norm, False); drawtext(m, m->layout->symbol, dc.norm, False);
x = dc.x + dc.w; x = dc.x + dc.w;
if(i == selmonitor) { if(m->id == selmonitor) {
dc.w = textw(stext); dc.w = textw(stext);
dc.x = m->sw - dc.w; dc.x = m->sw - dc.w;
if(dc.x < x) { if(dc.x < x) {
@ -611,7 +609,6 @@ drawbar(void) {
XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->sw, bh, 0, 0); XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->sw, bh, 0, 0);
XSync(dpy, False); XSync(dpy, False);
} }
}
void void
drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) { drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
@ -713,12 +710,11 @@ eprint(const char *errstr, ...) {
void void
expose(XEvent *e) { expose(XEvent *e) {
Monitor *m;
XExposeEvent *ev = &e->xexpose; XExposeEvent *ev = &e->xexpose;
if(ev->count == 0) { if(ev->count == 0 && (m = getmonitor(ev->window)))
if(ev->window == monitors[selmonitor].barwin) drawbar(m);
drawbar();
}
} }
void void
@ -750,16 +746,14 @@ focus(Client *c) {
grabbuttons(c, True); grabbuttons(c, True);
} }
sel = c; sel = c;
drawbar();
if(c) { if(c) {
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
selmonitor = c->monitor; selmonitor = c->monitor;
} }
else { else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
drawbar(); drawbar(&monitors[selmonitor]);
}
} }
void void
@ -781,7 +775,7 @@ focusnext(const char *arg) {
for(c = clients; c && !isvisible(c, selmonitor); c = c->next); for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
if(c) { if(c) {
focus(c); focus(c);
restack(); restack(&monitors[c->monitor]);
} }
} }
@ -798,7 +792,7 @@ focusprev(const char *arg) {
} }
if(c) { if(c) {
focus(c); focus(c);
restack(); restack(&monitors[c->monitor]);
} }
} }
@ -820,6 +814,16 @@ getcolor(const char *colstr) {
return color.pixel; return color.pixel;
} }
Monitor *
getmonitor(Window barwin) {
unsigned int i;
for(i = 0; i < mcount; i++)
if(monitors[i].barwin == barwin)
return &monitors[i];
return NULL;
}
long long
getstate(Window w) { getstate(Window w) {
int format, status; int format, status;
@ -1236,13 +1240,13 @@ propertynotify(XEvent *e) {
break; break;
case XA_WM_HINTS: case XA_WM_HINTS:
updatewmhints(c); updatewmhints(c);
drawbar(); drawbar(&monitors[c->monitor]);
break; break;
} }
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c); updatetitle(c);
if(c == sel) if(c == sel)
drawbar(); drawbar(&monitors[c->monitor]);
} }
} }
} }
@ -1375,33 +1379,30 @@ resizemouse(Client *c) {
} }
void void
restack(void) { restack(Monitor *m) {
unsigned int i;
Client *c; Client *c;
XEvent ev; XEvent ev;
XWindowChanges wc; XWindowChanges wc;
drawbar(); drawbar(m);
if(!sel) if(!sel)
return; return;
if(sel->isfloating || (monitors[selmonitor].layout->arrange == floating)) if(sel->isfloating || (m->layout->arrange == floating))
XRaiseWindow(dpy, sel->win); XRaiseWindow(dpy, sel->win);
if(monitors[selmonitor].layout->arrange != floating) { if(m->layout->arrange != floating) {
wc.stack_mode = Below; wc.stack_mode = Below;
wc.sibling = monitors[selmonitor].barwin; wc.sibling = m->barwin;
if(!sel->isfloating) { if(!sel->isfloating) {
XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc); XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
wc.sibling = sel->win; wc.sibling = sel->win;
} }
for(i = 0; i < mcount; i++) { for(c = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) {
for(c = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
if(c == sel) if(c == sel)
continue; continue;
XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc); XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
wc.sibling = c->win; wc.sibling = c->win;
} }
} }
}
XSync(dpy, False); XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
} }
@ -1456,7 +1457,7 @@ run(void) {
} }
break; break;
} }
drawbar(); drawbar(&monitors[selmonitor]);
} }
while(XPending(dpy)) { while(XPending(dpy)) {
XNextEvent(dpy, &ev); XNextEvent(dpy, &ev);
@ -1522,7 +1523,7 @@ setlayout(const char *arg) {
if(sel) if(sel)
arrange(); arrange();
else else
drawbar(); drawbar(m);
} }
void void
@ -1651,6 +1652,8 @@ setup(void) {
| EnterWindowMask | LeaveWindowMask | StructureNotifyMask; | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
XSelectInput(dpy, root, wa.event_mask); XSelectInput(dpy, root, wa.event_mask);
drawbar(m);
} }
if(info) if(info)
XFree(info); XFree(info);
@ -2054,7 +2057,6 @@ main(int argc, char *argv[]) {
checkotherwm(); checkotherwm();
setup(); setup();
drawbar();
scan(); scan();
run(); run();
cleanup(); cleanup();