em/dwm
1
0
Fork 0
Code Releases Activity

urgency hook handling needs also to invert the square if present

Browse Source
This commit is contained in:
Anselm R Garbe 2008-02-13 20:34:17 +00:00
parent 954db46bac
commit e8244395e4
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dwm.c
View File

@ -145,7 +145,7 @@ 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(void);
void drawsquare(Monitor *, Bool filled, Bool empty, unsigned long col[ColLast]); void drawsquare(Monitor *, 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 *, 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);
@ -570,11 +570,13 @@ drawbar(void) {
m->dc.w = textw(m, tags[j]); m->dc.w = textw(m, tags[j]);
if(m->seltags[j]) { if(m->seltags[j]) {
drawtext(m, tags[j], m->dc.sel, isurgent(i, j)); drawtext(m, tags[j], m->dc.sel, isurgent(i, j));
drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.sel); drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor,
isoccupied(m, j), isurgent(i, j), m->dc.sel);
} }
else { else {
drawtext(m, tags[j], m->dc.norm, isurgent(i, j)); drawtext(m, tags[j], m->dc.norm, isurgent(i, j));
drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.norm); drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor,
isoccupied(m, j), isurgent(i, j), m->dc.norm);
} }
m->dc.x += m->dc.w; m->dc.x += m->dc.w;
} }
@ -592,7 +594,7 @@ drawbar(void) {
m->dc.x = x; m->dc.x = x;
if(sel && sel->monitor == selmonitor) { if(sel && sel->monitor == selmonitor) {
drawtext(m, sel->name, m->dc.sel, False); drawtext(m, sel->name, m->dc.sel, False);
drawsquare(m, False, sel->isfloating, m->dc.sel); drawsquare(m, False, sel->isfloating, False, m->dc.sel);
} }
else else
drawtext(m, NULL, m->dc.norm, False); drawtext(m, NULL, m->dc.norm, False);
@ -603,12 +605,12 @@ drawbar(void) {
} }
void void
drawsquare(Monitor *m, Bool filled, Bool empty, unsigned long col[ColLast]) { drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
int x; int x;
XGCValues gcv; XGCValues gcv;
XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h }; XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
gcv.foreground = col[ColFG]; gcv.foreground = col[invert ? ColBG : ColFG];
XChangeGC(dpy, m->dc.gc, GCForeground, &gcv); XChangeGC(dpy, m->dc.gc, GCForeground, &gcv);
x = (m->dc.font.ascent + m->dc.font.descent + 2) / 4; x = (m->dc.font.ascent + m->dc.font.descent + 2) / 4;
r.x = m->dc.x + 1; r.x = m->dc.x + 1;
@ -1141,14 +1143,11 @@ monitorat() {
XQueryPointer(dpy, monitors[selmonitor].root, &win, &win, &x, &y, &i, &i, &mask); XQueryPointer(dpy, monitors[selmonitor].root, &win, &win, &x, &y, &i, &i, &mask);
for(i = 0; i < mcount; i++) { for(i = 0; i < mcount; i++) {
fprintf(stderr, "checking monitor[%d]: %d %d %d %d\n", i, monitors[i].sx, monitors[i].sy, monitors[i].sw, monitors[i].sh);
if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw) if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
&& (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) { && (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
fprintf(stderr, "%d,%d -> %d\n", x, y, i);
return i; return i;
} }
} }
fprintf(stderr, "?,? -> 0\n");
return 0; return 0;
} }