X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/f60c597d653bd7eab6c620fc53d732ca75f6a880..57e6e3bb80b5fc4709de3f8b716a8b8065897c7a:/main.c
diff --git a/main.c b/main.c
index 5cf2738..2df9683 100644
--- a/main.c
+++ b/main.c
@@ -4,41 +4,26 @@
*/
#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/Xatom.h>
#include <X11/Xproto.h>
-Display *dpy;
-Window root, barwin;
-Atom wmatom[WMLast], netatom[NetLast];
-Cursor cursor[CurLast];
-Bool running = True;
-Bool issel = True;
+/* static */
-int tsel = Tdev; /* default tag */
-int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-char stext[1024];
-
-DC dc = {0};
-Client *clients = NULL;
-Client *sel = NULL;
-
-static Bool otherwm;
static int (*xerrorxlib)(Display *, XErrorEvent *);
-
-/* static functions */
+static Bool otherwm;
static void
cleanup()
{
while(sel) {
- resize(sel, True);
+ resize(sel, True, TopLeft);
unmanage(sel);
}
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
@@ -48,9 +33,8 @@ static void
scan()
{
unsigned int i, num;
- Window *wins;
+ Window *wins, d1, d2;
XWindowAttributes wa;
- Window d1, d2;
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
for(i = 0; i < num; i++) {
@@ -69,10 +53,9 @@ scan()
static int
win_property(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);
@@ -97,23 +80,38 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
return -1;
}
-/* extern functions */
+/* extern */
+
+char stext[1024];
+Bool *seltag;
+int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+unsigned int ntags;
+Atom wmatom[WMLast], netatom[NetLast];
+Bool running = True;
+Bool issel = True;
+Client *clients = NULL;
+Client *sel = NULL;
+Cursor cursor[CurLast];
+Display *dpy;
+DC dc = {0};
+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 = win_property(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;
@@ -131,7 +129,7 @@ sendevent(Window w, Atom a, long value)
e.xclient.data.l[0] = value;
e.xclient.data.l[1] = CurrentTime;
XSendEvent(dpy, w, False, NoEventMask, &e);
- XFlush(dpy);
+ XSync(dpy, False);
}
void
@@ -141,68 +139,55 @@ quit(Arg *arg)
}
/*
- * There's no way to check accesses to destroyed windows, thus
- * those cases are ignored (especially on UnmapNotify's).
- * Other types of errors call Xlib's default error handler, which
- * calls exit().
+ * 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().
*/
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, xfd;
unsigned int mask;
- Bool readstdin = True;
+ fd_set rd;
+ Bool readin = True;
Window w;
XEvent ev;
+ XSetWindowAttributes wa;
- for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
- switch (argv[i][1]) {
- case 'v':
- fprintf(stdout, "%s",
- "dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n");
- exit(0);
- break;
- default:
- eprint("usage: dwm [-v]\n");
- break;
- }
+ 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);
@@ -211,6 +196,7 @@ main(int argc, char *argv[])
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
+ XSync(dpy, False);
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -225,7 +211,16 @@ main(int argc, char *argv[])
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
+ wa.event_mask = SubstructureRedirectMask | 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);
@@ -253,59 +248,44 @@ 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);
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);
+ 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)) {
+ 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(FD_ISSET(xfd, &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;
- drawstatus();
- }
}
}
-
cleanup();
XCloseDisplay(dpy);