Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
dwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added SHCMD support for pipe-based commands due the new spawn() versio
[dwm.git]
/
dwm.c
diff --git
a/dwm.c
b/dwm.c
index
5b8747c
..
7a6c591
100644
(file)
--- a/
dwm.c
+++ b/
dwm.c
@@
-51,6
+51,7
@@
#define LENGTH(x) (sizeof x / sizeof x[0])
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define LENGTH(x) (sizeof x / sizeof x[0])
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+#define SHCMD(cmd) { .v = (char*[]){ "/bin/sh", "-c", cmd, NULL } }
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
@@
-93,11
+94,10
@@
typedef struct {
} DC; /* draw context */
typedef union {
} DC; /* draw context */
typedef union {
- const char *c;
int i;
uint ui;
float f;
int i;
uint ui;
float f;
- void *aux;
+ void *v;
} Arg;
typedef struct {
} Arg;
typedef struct {
@@
-364,8
+364,11
@@
checkotherwm(void) {
void
cleanup(void) {
Arg a = {.i = ~0};
void
cleanup(void) {
Arg a = {.i = ~0};
+ Layout foo = { "", NULL };
+
close(STDIN_FILENO);
view(&a);
close(STDIN_FILENO);
view(&a);
+ lt = &foo;
while(stack)
unmanage(stack);
if(dc.font.set)
while(stack)
unmanage(stack);
if(dc.font.set)
@@
-1388,10
+1391,6
@@
setup(void) {
void
spawn(const Arg *arg) {
void
spawn(const Arg *arg) {
- static char *shell = NULL;
-
- if(!shell && !(shell = getenv("SHELL")))
- shell = "/bin/sh";
/* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers. */
if(fork() == 0) {
/* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers. */
if(fork() == 0) {
@@
-1399,8
+1398,8
@@
spawn(const Arg *arg) {
if(dpy)
close(ConnectionNumber(dpy));
setsid();
if(dpy)
close(ConnectionNumber(dpy));
setsid();
- execl(shell, shell, "-c", arg->c, (char *)NULL);
- fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->c);
+ execvp(((char **)arg->v)[0], (char **)arg->v);
+ fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
perror(" failed");
}
exit(0);
perror(" failed");
}
exit(0);
@@
-1481,20
+1480,10
@@
togglefloating(const Arg *arg) {
void
togglelayout(const Arg *arg) {
void
togglelayout(const Arg *arg) {
- uint i;
-
- if(!arg->c) {
- if(++lt == &layouts[LENGTH(layouts)])
- lt = &layouts[0];
- }
- else {
- for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp(arg->c, layouts[i].symbol))
- break;
- if(i == LENGTH(layouts))
- return;
- lt = &layouts[i];
- }
+ if(arg->v)
+ lt = (Layout *)arg->v;
+ else if(++lt == &layouts[LENGTH(layouts)])
+ lt = &layouts[0];
if(sel)
arrange();
else
if(sel)
arrange();
else