X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/849e631510ed6533ac930449804e477fe67a43c2..08d85d6d66bc4493414d76e470e473fa689c5990:/main.c
diff --git a/main.c b/main.c
index 6035fb6..4aad990 100644
--- a/main.c
+++ b/main.c
@@ -4,40 +4,50 @@
*/
#include "dwm.h"
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/select.h>
#include <X11/cursorfont.h>
+#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/Xproto.h>
-
/* static */
-static Bool otherwm;
static int (*xerrorxlib)(Display *, XErrorEvent *);
+static Bool otherwm, readin;
static void
cleanup()
{
+ close(STDIN_FILENO);
while(sel) {
- resize(sel, True);
+ resize(sel, True, TopLeft);
unmanage(sel);
}
+ if(dc.font.set)
+ XFreeFontSet(dpy, dc.font.set);
+ else
+ XFreeFont(dpy, dc.font.xfont);
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
+ XFreePixmap(dpy, dc.drawable);
+ XFreeGC(dpy, dc.gc);
+ XDestroyWindow(dpy, barwin);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+ XSync(dpy, False);
}
static void
scan()
{
unsigned int i, num;
- Window *wins;
+ Window *wins, d1, d2;
XWindowAttributes wa;
- Window d1, d2;
+ wins = NULL;
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
for(i = 0; i < num; i++) {
if(!XGetWindowAttributes(dpy, wins[i], &wa))
@@ -53,12 +63,11 @@ scan()
}
static int
-win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
+winprop(Window w, Atom a, Atom t, long l, unsigned char **prop)
{
- Atom real;
- int format;
+ int status, format;
unsigned long res, extra;
- int status;
+ Atom real;
status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
&res, &extra, prop);
@@ -86,8 +95,9 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
/* extern */
char stext[1024];
-int tsel = Tdev; /* default tag */
+Bool *seltag;
int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+unsigned int ntags, numlockmask;
Atom wmatom[WMLast], netatom[NetLast];
Bool running = True;
Bool issel = True;
@@ -101,18 +111,19 @@ Window root, barwin;
int
getproto(Window w)
{
- unsigned char *protocols;
- long res;
int protos = 0;
int i;
+ long res;
+ Atom *protocols;
- res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
+ res = winprop(w, wmatom[WMProtocols], XA_ATOM, 20L,
+ ((unsigned char **)&protocols));
if(res <= 0) {
return protos;
}
for(i = 0; i < res; i++) {
if(protocols[i] == wmatom[WMDelete])
- protos |= WM_PROTOCOL_DELWIN;
+ protos |= PROTODELWIN;
}
free((char *) protocols);
return protos;
@@ -136,7 +147,7 @@ sendevent(Window w, Atom a, long value)
void
quit(Arg *arg)
{
- running = False;
+ readin = running = False;
}
/*
@@ -148,66 +159,56 @@ int
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_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))
return 0;
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
- ee->request_code, ee->error_code);
+ ee->request_code, ee->error_code);
return xerrorxlib(dpy, ee); /* may call exit() */
}
int
main(int argc, char *argv[])
{
- int i, n;
- fd_set rd;
- XSetWindowAttributes wa;
+ int i, j, xfd;
unsigned int mask;
- Bool readstdin = True;
+ fd_set rd;
Window w;
- XEvent ev;
-
- for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
- switch (argv[i][1]) {
- default:
- eprint("usage: dwm [-v]\n");
- break;
- case 'v':
- fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
- exit(EXIT_SUCCESS);
- break;
- }
+ XModifierKeymap *modmap;
+ XSetWindowAttributes wa;
+
+ if(argc == 2 && !strncmp("-v", argv[1], 3)) {
+ fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+ exit(EXIT_SUCCESS);
}
+ else if(argc != 1)
+ eprint("usage: dwm [-v]\n");
dpy = XOpenDisplay(0);
if(!dpy)
- eprint("dwm: cannot connect X server\n");
+ eprint("dwm: cannot open display\n");
+ xfd = ConnectionNumber(dpy);
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
- /* check if another WM is already running */
otherwm = False;
XSetErrorHandler(xerrorstart);
- /* this causes an error if some other WM is running */
+ /* 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");
+ XSync(dpy, False);
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
+ XSync(dpy, False);
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -222,7 +223,25 @@ main(int argc, char *argv[])
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
+ modmap = XGetModifierMapping(dpy);
+ 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))
+ numlockmask = (1 << i);
+ }
+ }
+ XFree(modmap);
+
+ 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[DEFTAG] = True;
/* style */
dc.bg = getcolor(BGCOLOR);
@@ -235,13 +254,12 @@ main(int argc, char *argv[])
sh = DisplayHeight(dpy, screen);
mw = (sw * MASTERW) / 100;
- wa.override_redirect = 1;
- wa.background_pixmap = ParentRelative;
- wa.event_mask = ButtonPressMask | ExposureMask;
-
bx = by = 0;
bw = sw;
dc.h = bh = dc.font.height + 4;
+ 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),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
@@ -250,59 +268,40 @@ main(int argc, char *argv[])
dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
+
+ strcpy(stext, "dwm-"VERSION);
drawstatus();
issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
- wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
- | LeaveWindowMask;
- wa.cursor = cursor[CurNormal];
-
- XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-
- strcpy(stext, "dwm-"VERSION);
scan();
- /* main event loop, reads status text from stdin as well */
-Mainloop:
+ /* main event loop, also reads status text from stdin */
+ XSync(dpy, False);
+ procevent();
+ readin = True;
while(running) {
FD_ZERO(&rd);
- if(readstdin)
+ if(readin)
FD_SET(STDIN_FILENO, &rd);
- FD_SET(ConnectionNumber(dpy), &rd);
-
- i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
- if(i == -1 && errno == EINTR)
+ FD_SET(xfd, &rd);
+ i = select(xfd + 1, &rd, NULL, NULL, NULL);
+ if((i == -1) && (errno == EINTR))
continue;
- if(i < 0)
- eprint("select failed\n");
- else if(i > 0) {
- if(FD_ISSET(ConnectionNumber(dpy), &rd)) {
- while(XPending(dpy)) {
- XNextEvent(dpy, &ev);
- if(handler[ev.type])
- (handler[ev.type])(&ev); /* call handler */
- }
- }
- if(readstdin && FD_ISSET(STDIN_FILENO, &rd)) {
- i = n = 0;
- for(;;) {
- if((i = getchar()) == EOF) {
- /* broken pipe/end of producer */
- readstdin = False;
- strcpy(stext, "broken pipe");
- goto Mainloop;
- }
- if(i == '\n' || n >= sizeof(stext) - 1)
- break;
- stext[n++] = i;
- }
- stext[n] = 0;
+ if(i > 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();
}
}
+ else if(i < 0)
+ eprint("select failed\n");
+ procevent();
}
-
cleanup();
XCloseDisplay(dpy);