elal
/
ewm
mirror of https://github.com/E-Almqvist/ewm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

applied Gottox' monitor.diff patch (thanks btw)

Browse Source
pull/1/head
Anselm R Garbe 17 years ago
parent 55edd2d6ec
commit 4076e2ff60
1 changed files with 80 additions and 67 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 147
      dwm.c

147
dwm.c
Unescape View File

@ -60,6 +60,7 @@ enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */ enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */ /* typedefs */
typedef struct Monitor Monitor;
typedef struct Client Client; typedef struct Client Client;
struct Client { struct Client {
char name[256]; char name[256];
@ -74,7 +75,7 @@ struct Client {
Client *prev; Client *prev;
Client *snext; Client *snext;
Window win; Window win;
int monitor; Monitor *monitor;
}; };
typedef struct { typedef struct {
@ -99,7 +100,6 @@ typedef struct {
const char *arg; const char *arg;
} Key; } Key;
typedef struct Monitor Monitor;
typedef struct { typedef struct {
const char *symbol; const char *symbol;
void (*arrange)(Monitor *); void (*arrange)(Monitor *);
@ -165,17 +165,18 @@ void grabbuttons(Client *c, Bool focused);
void grabkeys(void); void grabkeys(void);
unsigned int idxoftag(const char *tag); unsigned int idxoftag(const char *tag);
void initfont(const char *fontstr); void initfont(const char *fontstr);
Bool isoccupied(unsigned int monitor, unsigned int t); Bool isoccupied(Monitor *monitor, unsigned int t);
Bool isprotodel(Client *c); Bool isprotodel(Client *c);
Bool isurgent(unsigned int monitor, unsigned int t); Bool isurgent(Monitor *monitor, unsigned int t);
Bool isvisible(Client *c, int monitor); Bool isvisible(Client *c, Monitor *m);
void keypress(XEvent *e); void keypress(XEvent *e);
void killclient(const char *arg); void killclient(const char *arg);
void manage(Window w, XWindowAttributes *wa); void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e); void mappingnotify(XEvent *e);
void maprequest(XEvent *e); void maprequest(XEvent *e);
Monitor *monitorat(void);
void movemouse(Client *c); void movemouse(Client *c);
Client *nexttiled(Client *c, int monitor); Client *nexttiled(Client *c, Monitor *monitor);
void propertynotify(XEvent *e); void propertynotify(XEvent *e);
void quit(const char *arg); void quit(const char *arg);
void reapply(const char *arg); void reapply(const char *arg);
@ -210,14 +211,13 @@ int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dsply, XErrorEvent *ee); int xerrordummy(Display *dsply, XErrorEvent *ee);
int xerrorstart(Display *dsply, XErrorEvent *ee); int xerrorstart(Display *dsply, XErrorEvent *ee);
void zoom(const char *arg); void zoom(const char *arg);
int monitorat(void);
void movetomonitor(const char *arg); void movetomonitor(const char *arg);
void selectmonitor(const char *arg); void selectmonitor(const char *arg);
/* variables */ /* variables */
char stext[256]; char stext[256];
int mcount = 1; int mcount = 1;
int selmonitor = 0; Monitor *selmonitor;
int screen; int screen;
int (*xerrorxlib)(Display *, XErrorEvent *); int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int bh, bpos; unsigned int bh, bpos;
@ -277,7 +277,7 @@ applyrules(Client *c) {
if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) { if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
if (rules[i].monitor >= 0 && rules[i].monitor < mcount) { if (rules[i].monitor >= 0 && rules[i].monitor < mcount) {
matched_monitor = True; matched_monitor = True;
c->monitor = rules[i].monitor; c->monitor = &monitors[rules[i].monitor];
} }
c->isfloating = rules[i].isfloating; c->isfloating = rules[i].isfloating;
@ -293,7 +293,7 @@ applyrules(Client *c) {
if(ch.res_name) if(ch.res_name)
XFree(ch.res_name); XFree(ch.res_name);
if(!matched_tag) if(!matched_tag)
memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags); memcpy(c->tags, monitorat()->seltags, sizeof initags);
if (!matched_monitor) if (!matched_monitor)
c->monitor = monitorat(); c->monitor = monitorat();
} }
@ -308,9 +308,9 @@ arrange(void) {
else else
ban(c); ban(c);
monitors[selmonitor].layout->arrange(&monitors[selmonitor]); selmonitor->layout->arrange(selmonitor);
focus(NULL); focus(NULL);
restack(&monitors[selmonitor]); restack(selmonitor);
} }
void void
@ -331,7 +331,7 @@ void
ban(Client *c) { ban(Client *c) {
if(c->isbanned) if(c->isbanned)
return; return;
XMoveWindow(dpy, c->win, c->x + 3 * monitors[c->monitor].sw, c->y); XMoveWindow(dpy, c->win, c->x + 3 * c->monitor->sw, c->y);
c->isbanned = True; c->isbanned = True;
} }
@ -341,7 +341,7 @@ buttonpress(XEvent *e) {
Client *c; Client *c;
XButtonPressedEvent *ev = &e->xbutton; XButtonPressedEvent *ev = &e->xbutton;
Monitor *m = &monitors[monitorat()]; Monitor *m = monitorat();
if(ev->window == m->barwin) { if(ev->window == m->barwin) {
x = 0; x = 0;
@ -371,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(&monitors[c->monitor]); restack(c->monitor);
movemouse(c); movemouse(c);
} }
else if(ev->button == Button2) { else if(ev->button == Button2) {
@ -381,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(&monitors[c->monitor]); restack(c->monitor);
resizemouse(c); resizemouse(c);
} }
} }
@ -475,7 +475,7 @@ configure(Client *c) {
void void
configurenotify(XEvent *e) { configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure; XConfigureEvent *ev = &e->xconfigure;
Monitor *m = &monitors[selmonitor]; Monitor *m = selmonitor;
if(ev->window == root && (ev->width != m->sw || ev->height != m->sh)) { if(ev->window == root && (ev->width != m->sw || ev->height != m->sh)) {
/* TODO -- update Xinerama dimensions here */ /* TODO -- update Xinerama dimensions here */
@ -496,7 +496,7 @@ configurerequest(XEvent *e) {
XWindowChanges wc; XWindowChanges wc;
if((c = getclient(ev->window))) { if((c = getclient(ev->window))) {
Monitor *m = &monitors[c->monitor]; Monitor *m = c->monitor;
if(ev->value_mask & CWBorderWidth) if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width; c->border = ev->border_width;
if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) { if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
@ -568,25 +568,25 @@ drawbar(Monitor *m) {
Client *c; Client *c;
dc.x = 0; dc.x = 0;
for(c = stack; c && !isvisible(c, m->id); c = c->snext); for(c = stack; c && !isvisible(c, m); c = c->snext);
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(m->id, j)); drawtext(m, tags[j], dc.sel, isurgent(m, j));
drawsquare(m, c && c->tags[j] && c->monitor == m->id, drawsquare(m, c && c->tags[j] && c->monitor == m,
isoccupied(m->id, j), isurgent(m->id, j), dc.sel); isoccupied(m, j), isurgent(m, j), dc.sel);
} }
else { else {
drawtext(m, tags[j], dc.norm, isurgent(m->id, j)); drawtext(m, tags[j], dc.norm, isurgent(m, j));
drawsquare(m, c && c->tags[j] && c->monitor == m->id, drawsquare(m, c && c->tags[j] && c->monitor == m,
isoccupied(m->id, j), isurgent(m->id, j), dc.norm); isoccupied(m, j), isurgent(m, 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(m->id == selmonitor) { if(m == 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) {
@ -693,7 +693,7 @@ enternotify(XEvent *e) {
focus(c); focus(c);
else { else {
selmonitor = monitorat(); selmonitor = monitorat();
fprintf(stderr, "updating selmonitor %d\n", selmonitor); fprintf(stderr, "updating selmonitor %d\n", selmonitor - monitors);
focus(NULL); focus(NULL);
} }
} }
@ -723,17 +723,14 @@ floating(Monitor *m) { /* default floating layout */
domwfact = dozoom = False; domwfact = dozoom = False;
for(c = clients; c; c = c->next) for(c = clients; c; c = c->next)
if(isvisible(c, m->id)) if(isvisible(c, m))
resize(c, c->x, c->y, c->w, c->h, True); resize(c, c->x, c->y, c->w, c->h, True);
} }
void void
focus(Client *c) { focus(Client *c) {
Monitor *m;
if(c) if(c)
selmonitor = c->monitor; selmonitor = c->monitor;
m = &monitors[selmonitor];
if(!c || (c && !isvisible(c, selmonitor))) if(!c || (c && !isvisible(c, selmonitor)))
for(c = stack; c && !isvisible(c, c->monitor); c = c->snext); for(c = stack; c && !isvisible(c, c->monitor); c = c->snext);
if(sel && sel != c) { if(sel && sel != c) {
@ -753,7 +750,7 @@ focus(Client *c) {
} }
else else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
drawbar(&monitors[selmonitor]); drawbar(selmonitor);
} }
void void
@ -775,7 +772,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(&monitors[c->monitor]); restack(c->monitor);
} }
} }
@ -792,7 +789,7 @@ focusprev(const char *arg) {
} }
if(c) { if(c) {
focus(c); focus(c);
restack(&monitors[c->monitor]); restack(c->monitor);
} }
} }
@ -985,7 +982,7 @@ initfont(const char *fontstr) {
} }
Bool Bool
isoccupied(unsigned int monitor, unsigned int t) { isoccupied(Monitor *monitor, unsigned int t) {
Client *c; Client *c;
for(c = clients; c; c = c->next) for(c = clients; c; c = c->next)
@ -1010,7 +1007,7 @@ isprotodel(Client *c) {
} }
Bool Bool
isurgent(unsigned int monitor, unsigned int t) { isurgent(Monitor *monitor, unsigned int t) {
Client *c; Client *c;
for(c = clients; c; c = c->next) for(c = clients; c; c = c->next)
@ -1020,13 +1017,13 @@ isurgent(unsigned int monitor, unsigned int t) {
} }
Bool Bool
isvisible(Client *c, int monitor) { isvisible(Client *c, Monitor *m) {
unsigned int i; unsigned int i;
if(c->monitor != monitor) if(c->monitor != m)
return False; return False;
for(i = 0; i < LENGTH(tags); i++) for(i = 0; i < LENGTH(tags); i++)
if(c->tags[i] && monitors[c->monitor].seltags[i]) if(c->tags[i] && c->monitor->seltags[i])
return True; return True;
return False; return False;
} }
@ -1081,7 +1078,7 @@ manage(Window w, XWindowAttributes *wa) {
applyrules(c); applyrules(c);
m = &monitors[c->monitor]; m = selmonitor;
c->x = wa->x + m->sx; c->x = wa->x + m->sx;
c->y = wa->y + m->sy; c->y = wa->y + m->sy;
@ -1150,7 +1147,7 @@ maprequest(XEvent *e) {
manage(ev->window, &wa); manage(ev->window, &wa);
} }
int Monitor *
monitorat() { monitorat() {
int i, x, y; int i, x, y;
Window win; Window win;
@ -1160,10 +1157,10 @@ monitorat() {
for(i = 0; i < mcount; i++) { for(i = 0; i < mcount; i++) {
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)) {
return i; return &monitors[i];
} }
} }
return 0; return NULL;
} }
void void
@ -1176,7 +1173,7 @@ movemouse(Client *c) {
ocx = nx = c->x; ocx = nx = c->x;
ocy = ny = c->y; ocy = ny = c->y;
m = &monitors[c->monitor]; m = c->monitor;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess) None, cursor[CurMove], CurrentTime) != GrabSuccess)
return; return;
@ -1214,7 +1211,7 @@ movemouse(Client *c) {
} }
Client * Client *
nexttiled(Client *c, int monitor) { nexttiled(Client *c, Monitor *monitor) {
for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next); for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
return c; return c;
} }
@ -1240,13 +1237,13 @@ propertynotify(XEvent *e) {
break; break;
case XA_WM_HINTS: case XA_WM_HINTS:
updatewmhints(c); updatewmhints(c);
drawbar(&monitors[c->monitor]); drawbar(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(&monitors[c->monitor]); drawbar(c->monitor);
} }
} }
} }
@ -1273,7 +1270,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
Monitor *m; Monitor *m;
XWindowChanges wc; XWindowChanges wc;
m = &monitors[c->monitor]; m = c->monitor;
if(sizehints) { if(sizehints) {
/* set minimum possible */ /* set minimum possible */
@ -1344,7 +1341,7 @@ resizemouse(Client *c) {
ocx = c->x; ocx = c->x;
ocy = c->y; ocy = c->y;
m = &monitors[c->monitor]; m = c->monitor;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurResize], CurrentTime) != GrabSuccess) None, cursor[CurResize], CurrentTime) != GrabSuccess)
return; return;
@ -1396,7 +1393,7 @@ restack(Monitor *m) {
XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc); XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
wc.sibling = sel->win; wc.sibling = sel->win;
} }
for(c = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) { for(c = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
if(c == sel) if(c == sel)
continue; continue;
XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc); XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
@ -1457,7 +1454,7 @@ run(void) {
} }
break; break;
} }
drawbar(&monitors[selmonitor]); drawbar(selmonitor);
} }
while(XPending(dpy)) { while(XPending(dpy)) {
XNextEvent(dpy, &ev); XNextEvent(dpy, &ev);
@ -1505,7 +1502,7 @@ setclientstate(Client *c, long state) {
void void
setlayout(const char *arg) { setlayout(const char *arg) {
unsigned int i; unsigned int i;
Monitor *m = &monitors[monitorat()]; Monitor *m = monitorat();
if(!arg) { if(!arg) {
m->layout++; m->layout++;
@ -1530,7 +1527,7 @@ void
setmwfact(const char *arg) { setmwfact(const char *arg) {
double delta; double delta;
Monitor *m = &monitors[monitorat()]; Monitor *m = monitorat();
if(!domwfact) if(!domwfact)
return; return;
@ -1574,7 +1571,7 @@ setup(void) {
mcount = 1; mcount = 1;
if((isxinerama = XineramaIsActive(dpy))) if((isxinerama = XineramaIsActive(dpy)))
info = XineramaQueryScreens(dpy, &mcount); info = XineramaQueryScreens(dpy, &mcount);
monitors = emallocz(mcount * sizeof(Monitor)); selmonitor = monitors = emallocz(mcount * sizeof(Monitor));
screen = DefaultScreen(dpy); screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen); root = RootWindow(dpy, screen);
@ -1665,7 +1662,7 @@ setup(void) {
compileregs(); compileregs();
selmonitor = monitorat(); selmonitor = monitorat();
fprintf(stderr, "selmonitor == %d\n", selmonitor); fprintf(stderr, "selmonitor == %d\n", selmonitor - monitors);
} }
void void
@ -1729,7 +1726,7 @@ tile(Monitor *m) {
nx = ny = nw = 0; /* gcc stupidity requires this */ nx = ny = nw = 0; /* gcc stupidity requires this */
for(n = 0, c = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next, m))
n++; n++;
/* window geoms */ /* window geoms */
@ -1738,7 +1735,7 @@ tile(Monitor *m) {
if(n > 1 && th < bh) if(n > 1 && th < bh)
th = m->wah; th = m->wah;
for(i = 0, c = mc = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) { for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
if(i == 0) { /* master */ if(i == 0) { /* master */
nx = m->wax; nx = m->wax;
ny = m->way; ny = m->way;
@ -1772,7 +1769,7 @@ togglebar(const char *arg) {
bpos = (BARPOS == BarOff) ? BarTop : BARPOS; bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
else else
bpos = BarOff; bpos = BarOff;
updatebarpos(&monitors[monitorat()]); updatebarpos(monitorat());
arrange(); arrange();
} }
@ -1804,7 +1801,7 @@ void
toggleview(const char *arg) { toggleview(const char *arg) {
unsigned int i, j; unsigned int i, j;
Monitor *m = &monitors[monitorat()]; Monitor *m = monitorat();
i = idxoftag(arg); i = idxoftag(arg);
m->seltags[i] = !m->seltags[i]; m->seltags[i] = !m->seltags[i];
@ -1984,7 +1981,7 @@ void
view(const char *arg) { view(const char *arg) {
unsigned int i; unsigned int i;
Bool tmp[LENGTH(tags)]; Bool tmp[LENGTH(tags)];
Monitor *m = &monitors[monitorat()]; Monitor *m = monitorat();
for(i = 0; i < LENGTH(tags); i++) for(i = 0; i < LENGTH(tags); i++)
tmp[i] = (NULL == arg); tmp[i] = (NULL == arg);
@ -2000,7 +1997,7 @@ void
viewprevtag(const char *arg) { viewprevtag(const char *arg) {
static Bool tmp[LENGTH(tags)]; static Bool tmp[LENGTH(tags)];
Monitor *m = &monitors[monitorat()]; Monitor *m = monitorat();
memcpy(tmp, m->seltags, sizeof initags); memcpy(tmp, m->seltags, sizeof initags);
memcpy(m->seltags, m->prevtags, sizeof initags); memcpy(m->seltags, m->prevtags, sizeof initags);
@ -2025,19 +2022,35 @@ zoom(const char *arg) {
void void
movetomonitor(const char *arg) { movetomonitor(const char *arg) {
if (sel) { int i;
sel->monitor = arg ? atoi(arg) : (sel->monitor+1) % mcount;
memcpy(sel->tags, monitors[sel->monitor].seltags, sizeof initags); if (sel)
resize(sel, monitors[sel->monitor].wax, monitors[sel->monitor].way, sel->w, sel->h, True); return;
arrange(); if(arg)
i = atoi(arg);
else {
for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
i++;
} }
sel->monitor = &monitors[i % mcount];
memcpy(sel->tags, sel->monitor->seltags, sizeof initags);
resize(sel, sel->monitor->wax, sel->monitor->way, sel->w, sel->h, True);
arrange();
} }
void void
selectmonitor(const char *arg) { selectmonitor(const char *arg) {
Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount]; int i;
Monitor *m;
if(arg)
i = atoi(arg);
else {
for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
i++;
}
m = &monitors[i % mcount];
XWarpPointer(dpy, None, root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2); XWarpPointer(dpy, None, root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
focus(NULL); focus(NULL);
} }

Write Preview
Loading…
Cancel
Save