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

removed Monitor->root, since we do not support classical multihead

This commit is contained in:
Anselm R Garbe 2008-02-18 16:47:16 +00:00
parent 6ab163c695
commit 191cb9ce28
1 changed files with 49 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
dwm.c
View File

@ -118,7 +118,6 @@ typedef struct {
typedef struct { typedef struct {
int screen; int screen;
Window root;
Window barwin; Window barwin;
int sx, sy, sw, sh, wax, way, wah, waw; int sx, sy, sw, sh, wax, way, wah, waw;
DC dc; DC dc;
@ -216,6 +215,7 @@ void selectmonitor(const char *arg);
/* variables */ /* variables */
char stext[256]; char stext[256];
int mcount = 1; int mcount = 1;
int selmonitor = 0;
int (*xerrorxlib)(Display *, XErrorEvent *); int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int bh, bpos; unsigned int bh, bpos;
unsigned int blw = 0; unsigned int blw = 0;
@ -248,7 +248,7 @@ Display *dpy;
DC dc = {0}; DC dc = {0};
Regs *regs = NULL; Regs *regs = NULL;
Monitor *monitors; Monitor *monitors;
int selmonitor = 0; Window root;
/* configuration, allows nested code to access above variables */ /* configuration, allows nested code to access above variables */
#include "config.h" #include "config.h"
@ -414,7 +414,7 @@ cleanup(void) {
XFreeFontSet(dpy, m->dc.font.set); XFreeFontSet(dpy, m->dc.font.set);
else else
XFreeFont(dpy, m->dc.font.xfont); XFreeFont(dpy, m->dc.font.xfont);
XUngrabKey(dpy, AnyKey, AnyModifier, m->root); XUngrabKey(dpy, AnyKey, AnyModifier, root);
XFreePixmap(dpy, m->dc.drawable); XFreePixmap(dpy, m->dc.drawable);
XFreeGC(dpy, m->dc.gc); XFreeGC(dpy, m->dc.gc);
XDestroyWindow(dpy, m->barwin); XDestroyWindow(dpy, m->barwin);
@ -475,11 +475,11 @@ configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure; XConfigureEvent *ev = &e->xconfigure;
Monitor *m = &monitors[selmonitor]; Monitor *m = &monitors[selmonitor];
if(ev->window == m->root && (ev->width != m->sw || ev->height != m->sh)) { if(ev->window == root && (ev->width != m->sw || ev->height != m->sh)) {
m->sw = ev->width; m->sw = ev->width;
m->sh = ev->height; m->sh = ev->height;
XFreePixmap(dpy, dc.drawable); XFreePixmap(dpy, dc.drawable);
dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen)); dc.drawable = XCreatePixmap(dpy, root, m->sw, bh, DefaultDepth(dpy, m->screen));
XResizeWindow(dpy, m->barwin, m->sw, bh); XResizeWindow(dpy, m->barwin, m->sw, bh);
updatebarpos(m); updatebarpos(m);
arrange(); arrange();
@ -687,7 +687,7 @@ enternotify(XEvent *e) {
XCrossingEvent *ev = &e->xcrossing; XCrossingEvent *ev = &e->xcrossing;
if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) { if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) {
if(!isxinerama || ev->window != monitors[selmonitor].root) if(!isxinerama || ev->window != root)
return; return;
} }
if((c = getclient(ev->window))) if((c = getclient(ev->window)))
@ -755,7 +755,7 @@ focus(Client *c) {
selmonitor = c->monitor; selmonitor = c->monitor;
} }
else { else {
XSetInputFocus(dpy, m->root, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
drawbar(); drawbar();
} }
} }
@ -914,20 +914,17 @@ grabkeys(void) {
} }
XFreeModifiermap(modmap); XFreeModifiermap(modmap);
for(i = 0; i < mcount; i++) { XUngrabKey(dpy, AnyKey, AnyModifier, root);
Monitor *m = &monitors[i]; for(i = 0; i < LENGTH(keys); i++) {
XUngrabKey(dpy, AnyKey, AnyModifier, m->root); code = XKeysymToKeycode(dpy, keys[i].keysym);
for(j = 0; j < LENGTH(keys); j++) { XGrabKey(dpy, code, keys[i].mod, root, True,
code = XKeysymToKeycode(dpy, keys[j].keysym); GrabModeAsync, GrabModeAsync);
XGrabKey(dpy, code, keys[j].mod, m->root, True, XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
XGrabKey(dpy, code, keys[j].mod | LockMask, m->root, True, XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
XGrabKey(dpy, code, keys[j].mod | numlockmask, m->root, True, XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
XGrabKey(dpy, code, keys[j].mod | numlockmask | LockMask, m->root, True,
GrabModeAsync, GrabModeAsync);
}
} }
} }
@ -1153,7 +1150,7 @@ monitorat() {
Window win; Window win;
unsigned int mask; unsigned int mask;
XQueryPointer(dpy, monitors[selmonitor].root, &win, &win, &x, &y, &i, &i, &mask); XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
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)) {
@ -1172,10 +1169,10 @@ movemouse(Client *c) {
ocx = nx = c->x; ocx = nx = c->x;
ocy = ny = c->y; ocy = ny = c->y;
if(XGrabPointer(dpy, monitors[selmonitor].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;
XQueryPointer(dpy, monitors[selmonitor].root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
for(;;) { for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev); XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
switch (ev.type) { switch (ev.type) {
@ -1342,7 +1339,7 @@ resizemouse(Client *c) {
ocx = c->x; ocx = c->x;
ocy = c->y; ocy = c->y;
if(XGrabPointer(dpy, monitors[selmonitor].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;
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1); XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
@ -1469,32 +1466,29 @@ run(void) {
void void
scan(void) { scan(void) {
unsigned int i, j, num; unsigned int i, num;
Window *wins, d1, d2; Window *wins, d1, d2;
XWindowAttributes wa; XWindowAttributes wa;
for(i = 0; i < mcount; i++) { wins = NULL;
Monitor *m = &monitors[i]; if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
wins = NULL; for(i = 0; i < num; i++) {
if(XQueryTree(dpy, m->root, &d1, &d2, &wins, &num)) { if(!XGetWindowAttributes(dpy, wins[i], &wa)
for(j = 0; j < num; j++) { || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
if(!XGetWindowAttributes(dpy, wins[j], &wa) continue;
|| wa.override_redirect || XGetTransientForHint(dpy, wins[j], &d1)) if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
continue; manage(wins[i], &wa);
if(wa.map_state == IsViewable || getstate(wins[j]) == IconicState) }
manage(wins[j], &wa); for(i = 0; i < num; i++) { /* now the transients */
} if(!XGetWindowAttributes(dpy, wins[i], &wa))
for(j = 0; j < num; j++) { /* now the transients */ continue;
if(!XGetWindowAttributes(dpy, wins[j], &wa)) if(XGetTransientForHint(dpy, wins[i], &d1)
continue; && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
if(XGetTransientForHint(dpy, wins[j], &d1) manage(wins[i], &wa);
&& (wa.map_state == IsViewable || getstate(wins[j]) == IconicState))
manage(wins[j], &wa);
}
} }
if(wins)
XFree(wins);
} }
if(wins)
XFree(wins);
} }
void void
@ -1579,12 +1573,13 @@ setup(void) {
info = XineramaQueryScreens(dpy, &mcount); info = XineramaQueryScreens(dpy, &mcount);
monitors = emallocz(mcount * sizeof(Monitor)); monitors = emallocz(mcount * sizeof(Monitor));
root = DefaultRootWindow(dpy);
for(i = 0; i < mcount; i++) { for(i = 0; i < mcount; i++) {
/* init geometry */ /* init geometry */
m = &monitors[i]; m = &monitors[i];
m->screen = isxinerama ? 0 : i; m->screen = isxinerama ? 0 : i;
m->root = RootWindow(dpy, m->screen);
if (mcount != 1 && isxinerama) { if (mcount != 1 && isxinerama) {
m->sx = info[i].x_org; m->sx = info[i].x_org;
@ -1632,28 +1627,28 @@ setup(void) {
wa.event_mask = ButtonPressMask | ExposureMask; wa.event_mask = ButtonPressMask | ExposureMask;
/* init bars */ /* init bars */
m->barwin = XCreateWindow(dpy, m->root, m->sx, m->sy, m->sw, bh, 0, m->barwin = XCreateWindow(dpy, root, m->sx, m->sy, m->sw, bh, 0,
DefaultDepth(dpy, m->screen), CopyFromParent, DefaultVisual(dpy, m->screen), DefaultDepth(dpy, m->screen), CopyFromParent, DefaultVisual(dpy, m->screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
XDefineCursor(dpy, m->barwin, cursor[CurNormal]); XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
updatebarpos(m); updatebarpos(m);
XMapRaised(dpy, m->barwin); XMapRaised(dpy, m->barwin);
strcpy(stext, "dwm-"VERSION); strcpy(stext, "dwm-"VERSION);
m->dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen)); m->dc.drawable = XCreatePixmap(dpy, root, m->sw, bh, DefaultDepth(dpy, m->screen));
m->dc.gc = XCreateGC(dpy, m->root, 0, 0); m->dc.gc = XCreateGC(dpy, root, 0, 0);
XSetLineAttributes(dpy, m->dc.gc, 1, LineSolid, CapButt, JoinMiter); XSetLineAttributes(dpy, m->dc.gc, 1, LineSolid, CapButt, JoinMiter);
if(!m->dc.font.set) if(!m->dc.font.set)
XSetFont(dpy, m->dc.gc, m->dc.font.xfont->fid); XSetFont(dpy, m->dc.gc, m->dc.font.xfont->fid);
/* EWMH support per monitor */ /* EWMH support per monitor */
XChangeProperty(dpy, m->root, netatom[NetSupported], XA_ATOM, 32, XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
PropModeReplace, (unsigned char *) netatom, NetLast); PropModeReplace, (unsigned char *) netatom, NetLast);
/* select for events */ /* select for events */
wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
| EnterWindowMask | LeaveWindowMask | StructureNotifyMask; | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
XChangeWindowAttributes(dpy, m->root, CWEventMask | CWCursor, &wa); XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
XSelectInput(dpy, m->root, wa.event_mask); XSelectInput(dpy, root, wa.event_mask);
} }
if(info) if(info)
XFree(info); XFree(info);
@ -2044,7 +2039,7 @@ void
selectmonitor(const char *arg) { selectmonitor(const char *arg) {
Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount]; Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount];
XWarpPointer(dpy, None, m->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);
} }