karx/tabbed
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Style cleanup

Browse source 
Signed-off-by: Christoph Lohmann <20h@r-36.net>
This commit is contained in:
Quentin Rameau 2016-01-03 13:00:57 +01:00 committed by Christoph Lohmann
parent 46887ac550
commit 735bed5824
4 changed files with 407 additions and 365 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
config.def.h
View file

@ -23,42 +23,43 @@ static int newposition = 0;
static Bool npisrelative = False; static Bool npisrelative = False;
#define SETPROP(p) { \ #define SETPROP(p) { \
.v = (char *[]){ "/bin/sh", "-c", \ .v = (char *[]){ "/bin/sh", "-c", \
"prop=\"`xwininfo -children -id $1 | grep '^ 0x' | sed -e's@^ *\\(0x[0-9a-f]*\\) \"\\([^\"]*\\)\".*@\\1 \\2@' | xargs -0 printf %b | dmenu -l 10`\" &&" \ "prop=\"`xwininfo -children -id $1 | grep '^ 0x' |" \
"xprop -id $1 -f $0 8s -set $0 \"$prop\"", \ "sed -e's@^ *\\(0x[0-9a-f]*\\) \"\\([^\"]*\\)\".*@\\1 \\2@' |" \
p, winid, NULL \ "xargs -0 printf %b | dmenu -l 10`\" &&" \
} \ "xprop -id $1 -f $0 8s -set $0 \"$prop\"", \
p, winid, NULL \
} \
} }
#define MODKEY ControlMask #define MODKEY ControlMask
static Key keys[] = { \ static Key keys[] = {
/* modifier key function argument */ /* modifier key function argument */
{ MODKEY|ShiftMask, XK_Return, focusonce, { 0 } }, { MODKEY|ShiftMask, XK_Return, focusonce, { 0 } },
{ MODKEY|ShiftMask, XK_Return, spawn, { 0 } }, { MODKEY|ShiftMask, XK_Return, spawn, { 0 } },
{ MODKEY, XK_t, spawn, SETPROP("_TABBED_SELECT_TAB") }, { MODKEY, XK_t, spawn, SETPROP("_TABBED_SELECT_TAB") },
{ MODKEY|ShiftMask, XK_l, rotate, { .i = +1 } }, { MODKEY|ShiftMask, XK_l, rotate, { .i = +1 } },
{ MODKEY|ShiftMask, XK_h, rotate, { .i = -1 } }, { MODKEY|ShiftMask, XK_h, rotate, { .i = -1 } },
{ MODKEY|ShiftMask, XK_j, movetab, { .i = -1 } }, { MODKEY|ShiftMask, XK_j, movetab, { .i = -1 } },
{ MODKEY|ShiftMask, XK_k, movetab, { .i = +1 } }, { MODKEY|ShiftMask, XK_k, movetab, { .i = +1 } },
{ MODKEY, XK_Tab, rotate, { .i = 0 } }, { MODKEY, XK_Tab, rotate, { .i = 0 } },
{ MODKEY, XK_1, move, { .i = 0 } }, { MODKEY, XK_1, move, { .i = 0 } },
{ MODKEY, XK_2, move, { .i = 1 } }, { MODKEY, XK_2, move, { .i = 1 } },
{ MODKEY, XK_3, move, { .i = 2 } }, { MODKEY, XK_3, move, { .i = 2 } },
{ MODKEY, XK_4, move, { .i = 3 } }, { MODKEY, XK_4, move, { .i = 3 } },
{ MODKEY, XK_5, move, { .i = 4 } }, { MODKEY, XK_5, move, { .i = 4 } },
{ MODKEY, XK_6, move, { .i = 5 } }, { MODKEY, XK_6, move, { .i = 5 } },
{ MODKEY, XK_7, move, { .i = 6 } }, { MODKEY, XK_7, move, { .i = 6 } },
{ MODKEY, XK_8, move, { .i = 7 } }, { MODKEY, XK_8, move, { .i = 7 } },
{ MODKEY, XK_9, move, { .i = 8 } }, { MODKEY, XK_9, move, { .i = 8 } },
{ MODKEY, XK_0, move, { .i = 9 } }, { MODKEY, XK_0, move, { .i = 9 } },
{ MODKEY, XK_q, killclient, { 0 } }, { MODKEY, XK_q, killclient, { 0 } },
{ MODKEY, XK_u, focusurgent, { .v = NULL } }, { MODKEY, XK_u, focusurgent, { 0 } },
{ MODKEY|ShiftMask, XK_u, toggle, { .v = (void*) &urgentswitch } }, { MODKEY|ShiftMask, XK_u, toggle, { .v = (void*) &urgentswitch } },
{ 0, XK_F11, fullscreen, { 0 } }, { 0, XK_F11, fullscreen, { 0 } },
}; };

1
config.mk
View file

@ -22,4 +22,3 @@ LDFLAGS = -s ${LIBS}
# compiler and linker # compiler and linker
CC = cc CC = cc

699
tabbed.c
View file

File diff suppressed because it is too large Load diff

11
xembed.c
View file

@ -8,21 +8,21 @@
#include <unistd.h> #include <unistd.h>
int int
main(int argc, char **argv) main(int argc, char *argv[])
{ {
char *xembed; char *xembed;
int tty; int tty;
pid_t pgrp, tcpgrp; pid_t pgrp, tcpgrp;
if(argc < 3) { if (argc < 3) {
fprintf(stderr, "usage: %s flag cmd ...\n", argv[0]); fprintf(stderr, "usage: %s flag cmd ...\n", argv[0]);
return 2; return 2;
} }
if(!(xembed = getenv("XEMBED"))) if (!(xembed = getenv("XEMBED")))
goto noembed; goto noembed;
if((tty = open("/dev/tty", O_RDONLY)) < 0) if ((tty = open("/dev/tty", O_RDONLY)) < 0)
goto noembed; goto noembed;
pgrp = getpgrp(); pgrp = getpgrp();
@ -30,7 +30,7 @@ main(int argc, char **argv)
close(tty); close(tty);
if(pgrp == tcpgrp) { /* in foreground of tty */ if (pgrp == tcpgrp) { /* in foreground of tty */
argv[0] = argv[2]; argv[0] = argv[2];
argv[2] = xembed; argv[2] = xembed;
} else { } else {
@ -43,4 +43,3 @@ noembed:
perror(argv[0]); /* failed to execute */ perror(argv[0]); /* failed to execute */
return 1; return 1;
} }