Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
some other small fixes
[dwm.git]
/
main.c
diff --git
a/main.c
b/main.c
index
d18cd0c
..
6bbb28e
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-4,17
+4,16
@@
*/
#include "dwm.h"
*/
#include "dwm.h"
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.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>
#include <X11/cursorfont.h>
#include <X11/Xatom.h>
#include <X11/Xproto.h>
-
/* static */
static int (*xerrorxlib)(Display *, XErrorEvent *);
/* static */
static int (*xerrorxlib)(Display *, XErrorEvent *);
@@
-84,8
+83,9
@@
xerrorstart(Display *dsply, XErrorEvent *ee)
/* extern */
char stext[1024];
/* extern */
char stext[1024];
-int tsel = Tdev; /* default tag */
+Bool *seltag;
int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
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;
Atom wmatom[WMLast], netatom[NetLast];
Bool running = True;
Bool issel = True;
@@
-102,15
+102,16
@@
getproto(Window w)
int protos = 0;
int i;
long res;
int protos = 0;
int i;
long res;
-
unsigned char
*protocols;
+
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])
if(res <= 0) {
return protos;
}
for(i = 0; i < res; i++) {
if(protocols[i] == wmatom[WMDelete])
- protos |=
WM_PROTOCOL_
DELWIN;
+ protos |=
PROTO
DELWIN;
}
free((char *) protocols);
return protos;
}
free((char *) protocols);
return protos;
@@
-161,37
+162,32
@@
xerror(Display *dpy, XErrorEvent *ee)
int
main(int argc, char *argv[])
{
int
main(int argc, char *argv[])
{
- int i,
n
;
+ int i,
xfd
;
unsigned int mask;
fd_set rd;
unsigned int mask;
fd_set rd;
- Bool read
std
in = True;
+ Bool readin = True;
Window w;
XEvent ev;
XSetWindowAttributes wa;
Window w;
XEvent ev;
XSetWindowAttributes wa;
- 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;
- }
+ 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)
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);
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
- /* check if another WM is already running */
otherwm = False;
XSetErrorHandler(xerrorstart);
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);
XSelectInput(dpy, root, SubstructureRedirectMask);
XSync(dpy, False);
@@
-200,6
+196,7
@@
main(int argc, char *argv[])
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
+ XSync(dpy, False);
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@
-215,6
+212,11
@@
main(int argc, char *argv[])
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
grabkeys();
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
grabkeys();
+ initrregs();
+
+ for(ntags = 0; tags[ntags]; ntags++);
+ seltag = emallocz(sizeof(Bool) * ntags);
+ seltag[DEFTAG] = True;
/* style */
dc.bg = getcolor(BGCOLOR);
/* style */
dc.bg = getcolor(BGCOLOR);
@@
-242,6
+244,8
@@
main(int argc, char *argv[])
dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
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);
drawstatus();
issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
@@
-250,49
+254,39
@@
main(int argc, char *argv[])
wa.cursor = cursor[CurNormal];
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
wa.cursor = cursor[CurNormal];
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
- strcpy(stext, "dwm-"VERSION);
scan();
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);
while(running) {
FD_ZERO(&rd);
- if(read
std
in)
+ if(readin)
FD_SET(STDIN_FILENO, &rd);
FD_SET(STDIN_FILENO, &rd);
- FD_SET(
ConnectionNumber(dpy)
, &rd);
+ FD_SET(
xfd
, &rd);
- i = select(
ConnectionNumber(dpy) + 1, &rd, 0, 0, 0
);
+ 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(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 */
}
}
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);
cleanup();
XCloseDisplay(dpy);