X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/b739721d9ec56379a55228e8e01b618d5932f6ca..8a5f002c4182abf6dcaac354a3da04cc18830ad9:/main.c?ds=inline
diff --git a/main.c b/main.c
index 561aa37..94041c0 100644
--- a/main.c
+++ b/main.c
@@ -1,10 +1,10 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dwm.h"
#include <errno.h>
+#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -17,15 +17,16 @@
/* extern */
-char stext[1024];
-Bool *seltag;
-int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-unsigned int ntags, numlockmask;
+char stext[256];
+int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;
+unsigned int master, nmaster, 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;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
@@ -37,12 +38,11 @@ static int (*xerrorxlib)(Display *, XErrorEvent *);
static Bool otherwm, readin;
static void
-cleanup()
-{
+cleanup(void) {
close(STDIN_FILENO);
- while(sel) {
- resize(sel, True, TopLeft);
- unmanage(sel);
+ while(stack) {
+ resize(stack, True);
+ unmanage(stack);
}
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
@@ -52,13 +52,16 @@ cleanup()
XFreePixmap(dpy, dc.drawable);
XFreeGC(dpy, dc.gc);
XDestroyWindow(dpy, barwin);
+ XFreeCursor(dpy, cursor[CurNormal]);
+ XFreeCursor(dpy, cursor[CurResize]);
+ XFreeCursor(dpy, cursor[CurMove]);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
XSync(dpy, False);
+ free(seltag);
}
static void
-scan()
-{
+scan(void) {
unsigned int i, num;
Window *wins, d1, d2;
XWindowAttributes wa;
@@ -66,9 +69,8 @@ scan()
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);
@@ -79,8 +81,7 @@ scan()
}
static void
-setup()
-{
+setup(void) {
int i, j;
unsigned int mask;
Window w;
@@ -90,64 +91,72 @@ setup()
/* 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,
PropModeReplace, (unsigned char *) netatom, NetLast);
-
/* init cursors */
cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
-
+ /* 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);
}
- }
- XFree(modmap);
-
- wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask;
+ XFreeModifiermap(modmap);
+ /* select for events */
+ wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
+ | EnterWindowMask | LeaveWindowMask;
wa.cursor = cursor[CurNormal];
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-
grabkeys();
initrregs();
-
for(ntags = 0; tags[ntags]; ntags++);
seltag = emallocz(sizeof(Bool) * ntags);
seltag[0] = True;
-
/* style */
- dc.bg = getcolor(BGCOLOR);
- dc.fg = getcolor(FGCOLOR);
- dc.border = getcolor(BORDERCOLOR);
+ dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
+ dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+ dc.norm[ColFG] = getcolor(NORMFGCOLOR);
+ dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
+ dc.sel[ColBG] = getcolor(SELBGCOLOR);
+ dc.sel[ColFG] = getcolor(SELFGCOLOR);
setfont(FONT);
-
+ /* geometry */
sx = sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
- mw = (sw * MASTERW) / 100;
-
- bx = by = 0;
- bw = sw;
- dc.h = bh = dc.font.height + 4;
+ master = MASTER;
+ nmaster = NMASTER;
+ bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
+ /* bar */
+ 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 + (TOPBAR ? bh : 0);
+ wah = sh - bh;
+ waw = sw;
+ /* pixmap for everything */
dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
-
- issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
- strcpy(stext, "dwm-"VERSION);
+ XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+ /* multihead support */
+ selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
}
/*
@@ -155,36 +164,15 @@ setup()
* is already running.
*/
static int
-xerrorstart(Display *dsply, XErrorEvent *ee)
-{
+xerrorstart(Display *dsply, XErrorEvent *ee) {
otherwm = True;
return -1;
}
/* 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)
-{
+sendevent(Window w, Atom a, long value) {
XEvent e;
e.type = ClientMessage;
@@ -198,59 +186,54 @@ sendevent(Window w, Atom a, long value)
}
void
-quit(Arg *arg)
-{
+quit(Arg *arg) {
readin = running = False;
}
-/*
- * There's no way to check accesses to destroyed windows, thus those cases are
+/* There's no way to check accesses to destroyed windows, thus those cases are
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs
- * default error handler, which calls exit().
+ * default error handler, which may call exit.
*/
int
-xerror(Display *dpy, XErrorEvent *ee)
-{
+xerror(Display *dpy, XErrorEvent *ee) {
if(ee->error_code == BadWindow
|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
|| (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
- || (ee->request_code == X_GrabKey && ee->error_code == BadAccess))
+ || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
+ || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
return 0;
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
ee->request_code, ee->error_code);
- return xerrorxlib(dpy, ee); /* may call exit() */
+ return xerrorxlib(dpy, ee); /* may call exit */
}
int
-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {
+ char *p;
int r, xfd;
fd_set rd;
if(argc == 2 && !strncmp("-v", argv[1], 3)) {
- fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+ fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
exit(EXIT_SUCCESS);
}
else if(argc != 1)
eprint("usage: dwm [-v]\n");
-
+ setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
eprint("dwm: cannot open display\n");
-
xfd = ConnectionNumber(dpy);
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
-
otherwm = False;
XSetErrorHandler(xerrorstart);
/* this causes an error if some other window manager is running */
XSelectInput(dpy, root, SubstructureRedirectMask);
XSync(dpy, False);
-
if(otherwm)
eprint("dwm: another window manager is already running\n");
@@ -258,7 +241,6 @@ main(int argc, char *argv[])
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
-
setup();
drawstatus();
scan();
@@ -272,25 +254,34 @@ main(int argc, char *argv[])
if(readin)
FD_SET(STDIN_FILENO, &rd);
FD_SET(xfd, &rd);
- r = select(xfd + 1, &rd, NULL, NULL, NULL);
- if((r == -1) && (errno == EINTR))
- continue;
- if(r > 0) {
- if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
- readin = NULL != fgets(stext, sizeof(stext), stdin);
- if(readin)
- stext[strlen(stext) - 1] = 0;
- else
- strcpy(stext, "broken pipe");
- drawstatus();
+ if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
+ if(errno == EINTR)
+ continue;
+ eprint("select failed\n");
+ }
+ if(FD_ISSET(STDIN_FILENO, &rd)) {
+ switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
+ case -1:
+ strncpy(stext, strerror(errno), sizeof stext - 1);
+ stext[sizeof stext - 1] = '\0';
+ readin = False;
+ break;
+ case 0:
+ strncpy(stext, "EOF", 4);
+ readin = False;
+ break;
+ default:
+ for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
+ for(; p >= stext && *p != '\n'; --p);
+ if(p > stext)
+ strncpy(stext, p + 1, sizeof stext);
}
+ drawstatus();
}
- else if(r < 0)
- eprint("select failed\n");
- procevent();
+ if(FD_ISSET(xfd, &rd))
+ procevent();
}
cleanup();
XCloseDisplay(dpy);
-
return 0;
}