X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/a24a6701c8bb32c1bfa0120a692445ec85c9b5b9..a58731e8355a1dd85df1275fe851c7a48648a162:/main.c
diff --git a/main.c b/main.c
index 067f383..e6ba20c 100644
--- a/main.c
+++ b/main.c
@@ -17,13 +17,12 @@
/* extern */
-char stext[1024], mtext[32];
-Bool *seltag;
-int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
-unsigned int master, nmaster, ntags, numlockmask;
+char stext[256];
+int screen, sx, sy, sw, sh, wax, way, waw, wah;
+unsigned int bh, ntags, numlockmask;
Atom wmatom[WMLast], netatom[NetLast];
-Bool running = True;
-Bool issel = True;
+Bool *seltag;
+Bool selscreen = True;
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
@@ -36,12 +35,14 @@ Window root, barwin;
static int (*xerrorxlib)(Display *, XErrorEvent *);
static Bool otherwm, readin;
+static Bool running = True;
static void
cleanup(void) {
close(STDIN_FILENO);
while(stack) {
- resize(stack, True, TopLeft);
+ if(stack->isbanned)
+ XMoveWindow(dpy, stack->win, stack->x, stack->y);
unmanage(stack);
}
if(dc.font.set)
@@ -60,6 +61,57 @@ cleanup(void) {
free(seltag);
}
+static unsigned long
+initcolor(const char *colstr) {
+ Colormap cmap = DefaultColormap(dpy, screen);
+ XColor color;
+
+ if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+ eprint("error, cannot allocate color '%s'\n", colstr);
+ return color.pixel;
+}
+
+static void
+initfont(const char *fontstr) {
+ char *def, **missing;
+ int i, n;
+
+ missing = NULL;
+ if(dc.font.set)
+ XFreeFontSet(dpy, dc.font.set);
+ dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+ if(missing) {
+ while(n--)
+ fprintf(stderr, "missing fontset: %s\n", missing[n]);
+ XFreeStringList(missing);
+ }
+ if(dc.font.set) {
+ XFontSetExtents *font_extents;
+ XFontStruct **xfonts;
+ char **font_names;
+ dc.font.ascent = dc.font.descent = 0;
+ font_extents = XExtentsOfFontSet(dc.font.set);
+ n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+ for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+ if(dc.font.ascent < (*xfonts)->ascent)
+ dc.font.ascent = (*xfonts)->ascent;
+ if(dc.font.descent < (*xfonts)->descent)
+ dc.font.descent = (*xfonts)->descent;
+ xfonts++;
+ }
+ }
+ else {
+ if(dc.font.xfont)
+ XFreeFont(dpy, dc.font.xfont);
+ dc.font.xfont = NULL;
+ if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+ eprint("error, cannot load font: '%s'\n", fontstr);
+ dc.font.ascent = dc.font.xfont->ascent;
+ dc.font.descent = dc.font.xfont->descent;
+ }
+ dc.font.height = dc.font.ascent + dc.font.descent;
+}
+
static void
scan(void) {
unsigned int i, num;
@@ -69,9 +121,8 @@ scan(void) {
wins = NULL;
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
for(i = 0; i < num; i++) {
- if(!XGetWindowAttributes(dpy, wins[i], &wa))
- continue;
- if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+ if(!XGetWindowAttributes(dpy, wins[i], &wa)
+ || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
continue;
if(wa.map_state == IsViewable)
manage(wins[i], &wa);
@@ -92,6 +143,7 @@ setup(void) {
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
+ wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
@@ -103,12 +155,12 @@ setup(void) {
/* init modifier map */
numlockmask = 0;
modmap = XGetModifierMapping(dpy);
- for (i = 0; i < 8; i++) {
+ for (i = 0; i < 8; i++)
for (j = 0; j < modmap->max_keypermod; j++) {
- if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+ if(modmap->modifiermap[i * modmap->max_keypermod + j]
+ == XKeysymToKeycode(dpy, XK_Num_Lock))
numlockmask = (1 << i);
}
- }
XFreeModifiermap(modmap);
/* select for events */
wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
@@ -116,42 +168,37 @@ setup(void) {
wa.cursor = cursor[CurNormal];
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
grabkeys();
- initrregs();
+ compileregs();
for(ntags = 0; tags[ntags]; ntags++);
seltag = emallocz(sizeof(Bool) * ntags);
seltag[0] = True;
/* style */
- dc.norm[ColBG] = getcolor(NORMBGCOLOR);
- dc.norm[ColFG] = getcolor(NORMFGCOLOR);
- dc.sel[ColBG] = getcolor(SELBGCOLOR);
- dc.sel[ColFG] = getcolor(SELFGCOLOR);
- dc.status[ColBG] = getcolor(STATUSBGCOLOR);
- dc.status[ColFG] = getcolor(STATUSFGCOLOR);
- setfont(FONT);
+ dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
+ dc.norm[ColBG] = initcolor(NORMBGCOLOR);
+ dc.norm[ColFG] = initcolor(NORMFGCOLOR);
+ dc.sel[ColBorder] = initcolor(SELBORDERCOLOR);
+ dc.sel[ColBG] = initcolor(SELBGCOLOR);
+ dc.sel[ColFG] = initcolor(SELFGCOLOR);
+ initfont(FONT);
/* geometry */
sx = sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
- master = MASTER;
- nmaster = NMASTER;
- updatemodetext();
+ initlayouts();
/* bar */
- bx = sx;
- by = sy;
- bw = sw;
dc.h = bh = dc.font.height + 2;
wa.override_redirect = 1;
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask | ExposureMask;
- barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
- CopyFromParent, DefaultVisual(dpy, screen),
+ barwin = XCreateWindow(dpy, root, sx, sy + (TOPBAR ? 0 : sh - bh), sw, bh, 0,
+ DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
XDefineCursor(dpy, barwin, cursor[CurNormal]);
XMapRaised(dpy, barwin);
strcpy(stext, "dwm-"VERSION);
/* windowarea */
wax = sx;
- way = sy + bh;
+ way = sy + (TOPBAR ? bh : 0);
wah = sh - bh;
waw = sw;
/* pixmap for everything */
@@ -159,7 +206,7 @@ setup(void) {
dc.gc = XCreateGC(dpy, root, 0, 0);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
/* multihead support */
- issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+ selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
}
/*
@@ -174,24 +221,6 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
/* extern */
-int
-getproto(Window w) {
- int i, format, protos, status;
- unsigned long extra, res;
- Atom *protocols, real;
-
- protos = 0;
- status = XGetWindowProperty(dpy, w, wmatom[WMProtocols], 0L, 20L, False,
- XA_ATOM, &real, &format, &res, &extra, (unsigned char **)&protocols);
- if(status != Success || protocols == 0)
- return protos;
- for(i = 0; i < res; i++)
- if(protocols[i] == wmatom[WMDelete])
- protos |= PROTODELWIN;
- free(protocols);
- return protos;
-}
-
void
sendevent(Window w, Atom a, long value) {
XEvent e;
@@ -207,7 +236,7 @@ sendevent(Window w, Atom a, long value) {
}
void
-quit(Arg *arg) {
+quit(const char *arg) {
readin = running = False;
}
@@ -236,16 +265,14 @@ main(int argc, char *argv[]) {
char *p;
int r, xfd;
fd_set rd;
+ XEvent ev;
- if(argc == 2 && !strncmp("-v", argv[1], 3)) {
- fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
- exit(EXIT_SUCCESS);
- }
+ if(argc == 2 && !strncmp("-v", argv[1], 3))
+ eprint("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
else if(argc != 1)
eprint("usage: dwm [-v]\n");
setlocale(LC_CTYPE, "");
- dpy = XOpenDisplay(0);
- if(!dpy)
+ if(!(dpy = XOpenDisplay(0)))
eprint("dwm: cannot open display\n");
xfd = ConnectionNumber(dpy);
screen = DefaultScreen(dpy);
@@ -268,7 +295,6 @@ main(int argc, char *argv[]) {
/* main event loop, also reads status text from stdin */
XSync(dpy, False);
- procevent();
readin = True;
while(running) {
FD_ZERO(&rd);
@@ -293,14 +319,17 @@ main(int argc, char *argv[]) {
break;
default:
for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
- for(p = stext + strlen(stext) - 1; p >= stext && *p != '\n'; --p);
+ for(; p >= stext && *p != '\n'; --p);
if(p > stext)
strncpy(stext, p + 1, sizeof stext);
}
drawstatus();
}
- if(FD_ISSET(xfd, &rd))
- procevent();
+ while(XPending(dpy)) {
+ XNextEvent(dpy, &ev);
+ if(handler[ev.type])
+ (handler[ev.type])(&ev); /* call handler */
+ }
}
cleanup();
XCloseDisplay(dpy);