X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/2ffdc1936cf13af5df0cc6d9415961dbe13b9cf8..8b4bc8270a975a14c1fb7db0a94d83f4ba4d2734:/main.c
diff --git a/main.c b/main.c
index 6bbb28e..6da3ccd 100644
--- a/main.c
+++ b/main.c
@@ -11,22 +11,33 @@
#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 int (*xerrorxlib)(Display *, XErrorEvent *);
-static Bool otherwm;
+static Bool otherwm, readin;
static void
cleanup()
{
+ close(STDIN_FILENO);
while(sel) {
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
@@ -36,6 +47,7 @@ scan()
Window *wins, d1, d2;
XWindowAttributes wa;
+ wins = NULL;
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
for(i = 0; i < num; i++) {
if(!XGetWindowAttributes(dpy, wins[i], &wa))
@@ -50,25 +62,6 @@ scan()
XFree(wins);
}
-static int
-win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
-{
- int status, format;
- unsigned long res, extra;
- Atom real;
-
- status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
- &res, &extra, prop);
-
- if(status != Success || *prop == 0) {
- return 0;
- }
- if(res == 0) {
- free((void *) *prop);
- }
- return res;
-}
-
/*
* Startup Error handler to check if another window manager
* is already running.
@@ -85,7 +78,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
char stext[1024];
Bool *seltag;
int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-unsigned int ntags;
+unsigned int ntags, numlockmask;
Atom wmatom[WMLast], netatom[NetLast];
Bool running = True;
Bool issel = True;
@@ -99,21 +92,19 @@ Window root, barwin;
int
getproto(Window w)
{
- int protos = 0;
- int i;
- long res;
- Atom *protocols;
-
- res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
- ((unsigned char **)&protocols));
- if(res <= 0) {
+ 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++) {
+ for(i = 0; i < res; i++)
if(protocols[i] == wmatom[WMDelete])
protos |= PROTODELWIN;
- }
- free((char *) protocols);
+ free(protocols);
return protos;
}
@@ -135,7 +126,7 @@ sendevent(Window w, Atom a, long value)
void
quit(Arg *arg)
{
- running = False;
+ readin = running = False;
}
/*
@@ -162,12 +153,11 @@ xerror(Display *dpy, XErrorEvent *ee)
int
main(int argc, char *argv[])
{
- int i, xfd;
+ int i, j, xfd;
unsigned int mask;
fd_set rd;
- Bool readin = True;
Window w;
- XEvent ev;
+ XModifierKeymap *modmap;
XSetWindowAttributes wa;
if(argc == 2 && !strncmp("-v", argv[1], 3)) {
@@ -194,6 +184,7 @@ main(int argc, char *argv[])
if(otherwm)
eprint("dwm: another window manager is already running\n");
+ XSync(dpy, False);
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
@@ -211,12 +202,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;
+ seltag[0] = True;
/* style */
dc.bg = getcolor(BGCOLOR);
@@ -229,13 +233,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,26 +253,21 @@ main(int argc, char *argv[])
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);
-
scan();
/* main event loop, also reads status text from stdin */
XSync(dpy, False);
+ procevent();
+ readin = True;
while(running) {
FD_ZERO(&rd);
if(readin)
FD_SET(STDIN_FILENO, &rd);
FD_SET(xfd, &rd);
-
i = select(xfd + 1, &rd, NULL, NULL, NULL);
- if(i == -1 && errno == EINTR)
+ if((i == -1) && (errno == EINTR))
continue;
- if(i < 0)
- eprint("select failed\n");
- else if(i > 0) {
+ if(i > 0) {
if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
readin = NULL != fgets(stext, sizeof(stext), stdin);
if(readin)
@@ -278,14 +276,10 @@ main(int argc, char *argv[])
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 */
- }
- }
}
+ else if(i < 0)
+ eprint("select failed\n");
+ procevent();
}
cleanup();
XCloseDisplay(dpy);