em/dwm
1
0
Fork 0
Code Releases Activity

simplified main.c, switching back to single urxvt usage

Browse Source
This commit is contained in:
arg@10ksloc.org 2006-07-21 14:11:38 +02:00
parent f85b163899
commit 4970ef938e
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
event.c
View File

@ -23,7 +23,7 @@ typedef struct {
const char *browse[] = { "firefox", NULL };
const char *gimp[] = { "gimp", NULL };
const char *term[] = {
"urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
"urxvt", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
"-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
};
const char *xlock[] = { "xlock", NULL };

34
main.c
View File

@ -166,22 +166,17 @@ main(int argc, char *argv[])
int i, n;
unsigned int mask;
fd_set rd;
Bool readstdin = True;
Bool readin = True;
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':
if(argc == 2 && !strncmp("-v", argv[1], 3)) {
fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
exit(EXIT_SUCCESS);
break;
}
}
else if(argc != 1)
eprint("usage: dwm [-v]\n");
dpy = XOpenDisplay(0);
if(!dpy)
@ -256,10 +251,9 @@ main(int argc, char *argv[])
scan();
/* main event loop, reads status text from stdin as well */
Mainloop:
while(running) {
FD_ZERO(&rd);
if(readstdin)
if(readin)
FD_SET(STDIN_FILENO, &rd);
FD_SET(ConnectionNumber(dpy), &rd);
@ -276,20 +270,12 @@ Mainloop:
(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;
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");
goto Mainloop;
}
if(i == '\n' || n >= sizeof(stext) - 1)
break;
stext[n++] = i;
}
stext[n] = 0;
drawstatus();
}
}