added heretag command which allows to tag a client of a foreign tag with current tag
This commit is contained in:
parent
849e631510
commit
4f8b08d330
6 changed files with 42 additions and 10 deletions
8
client.c
8
client.c
|
@ -66,8 +66,8 @@ focusnext(Arg *arg)
|
||||||
if(!sel)
|
if(!sel)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(!(c = getnext(sel->next)))
|
if(!(c = getnext(sel->next, tsel)))
|
||||||
c = getnext(clients);
|
c = getnext(clients, tsel);
|
||||||
if(c) {
|
if(c) {
|
||||||
higher(c);
|
higher(c);
|
||||||
c->revert = sel;
|
c->revert = sel;
|
||||||
|
@ -410,8 +410,8 @@ zoom(Arg *arg)
|
||||||
if(!sel)
|
if(!sel)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(sel == getnext(clients) && sel->next) {
|
if(sel == getnext(clients, tsel) && sel->next) {
|
||||||
if((c = getnext(sel->next)))
|
if((c = getnext(sel->next, tsel)))
|
||||||
sel = c;
|
sel = c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
draw.c
2
draw.c
|
@ -97,7 +97,7 @@ drawall()
|
||||||
{
|
{
|
||||||
Client *c;
|
Client *c;
|
||||||
|
|
||||||
for(c = clients; c; c = getnext(c->next))
|
for(c = clients; c; c = getnext(c->next, tsel))
|
||||||
drawtitle(c);
|
drawtitle(c);
|
||||||
drawstatus();
|
drawstatus();
|
||||||
}
|
}
|
||||||
|
|
8
dwm.1
8
dwm.1
|
@ -93,6 +93,14 @@ Append
|
||||||
tag to current
|
tag to current
|
||||||
.B window
|
.B window
|
||||||
.TP
|
.TP
|
||||||
|
.B Control-Shift-[0..n]
|
||||||
|
Replace current
|
||||||
|
.B window
|
||||||
|
of
|
||||||
|
.B nth
|
||||||
|
tag with current tag.
|
||||||
|
.B window
|
||||||
|
.TP
|
||||||
.B Control-Button1
|
.B Control-Button1
|
||||||
Zooms the clicked
|
Zooms the clicked
|
||||||
.B window
|
.B window
|
||||||
|
|
3
dwm.h
3
dwm.h
|
@ -145,7 +145,8 @@ extern int xerror(Display *dsply, XErrorEvent *ee);
|
||||||
extern void appendtag(Arg *arg);
|
extern void appendtag(Arg *arg);
|
||||||
extern void dofloat(Arg *arg);
|
extern void dofloat(Arg *arg);
|
||||||
extern void dotile(Arg *arg);
|
extern void dotile(Arg *arg);
|
||||||
extern Client *getnext(Client *c);
|
extern Client *getnext(Client *c, unsigned int t);
|
||||||
|
extern void heretag(Arg *arg);
|
||||||
extern void replacetag(Arg *arg);
|
extern void replacetag(Arg *arg);
|
||||||
extern void settags(Client *c);
|
extern void settags(Client *c);
|
||||||
extern void view(Arg *arg);
|
extern void view(Arg *arg);
|
||||||
|
|
4
event.c
4
event.c
|
@ -35,6 +35,10 @@ Key key[] = {
|
||||||
{ Mod1Mask, XK_m, maximize, { 0 } },
|
{ Mod1Mask, XK_m, maximize, { 0 } },
|
||||||
{ Mod1Mask, XK_space, dotile, { 0 } },
|
{ Mod1Mask, XK_space, dotile, { 0 } },
|
||||||
{ Mod1Mask, XK_Return, zoom, { 0 } },
|
{ Mod1Mask, XK_Return, zoom, { 0 } },
|
||||||
|
{ ControlMask|ShiftMask,XK_0, heretag, { .i = Tscratch } },
|
||||||
|
{ ControlMask|ShiftMask,XK_1, heretag, { .i = Tdev } },
|
||||||
|
{ ControlMask|ShiftMask,XK_2, heretag, { .i = Twww } },
|
||||||
|
{ ControlMask|ShiftMask,XK_3, heretag, { .i = Twork } },
|
||||||
{ Mod1Mask|ShiftMask, XK_0, replacetag, { .i = Tscratch } },
|
{ Mod1Mask|ShiftMask, XK_0, replacetag, { .i = Tscratch } },
|
||||||
{ Mod1Mask|ShiftMask, XK_1, replacetag, { .i = Tdev } },
|
{ Mod1Mask|ShiftMask, XK_1, replacetag, { .i = Tdev } },
|
||||||
{ Mod1Mask|ShiftMask, XK_2, replacetag, { .i = Twww } },
|
{ Mod1Mask|ShiftMask, XK_2, replacetag, { .i = Twww } },
|
||||||
|
|
27
tag.c
27
tag.c
|
@ -49,7 +49,7 @@ dofloat(Arg *arg)
|
||||||
ban(c);
|
ban(c);
|
||||||
}
|
}
|
||||||
if(sel && !sel->tags[tsel]) {
|
if(sel && !sel->tags[tsel]) {
|
||||||
if((sel = getnext(clients))) {
|
if((sel = getnext(clients, tsel))) {
|
||||||
higher(sel);
|
higher(sel);
|
||||||
focus(sel);
|
focus(sel);
|
||||||
}
|
}
|
||||||
|
@ -106,7 +106,7 @@ dotile(Arg *arg)
|
||||||
ban(c);
|
ban(c);
|
||||||
}
|
}
|
||||||
if(!sel || (sel && !sel->tags[tsel])) {
|
if(!sel || (sel && !sel->tags[tsel])) {
|
||||||
if((sel = getnext(clients))) {
|
if((sel = getnext(clients, tsel))) {
|
||||||
higher(sel);
|
higher(sel);
|
||||||
focus(sel);
|
focus(sel);
|
||||||
}
|
}
|
||||||
|
@ -115,12 +115,31 @@ dotile(Arg *arg)
|
||||||
}
|
}
|
||||||
|
|
||||||
Client *
|
Client *
|
||||||
getnext(Client *c)
|
getnext(Client *c, unsigned int t)
|
||||||
{
|
{
|
||||||
for(; c && !c->tags[tsel]; c = c->next);
|
for(; c && !c->tags[t]; c = c->next);
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
heretag(Arg *arg)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
Client *c;
|
||||||
|
|
||||||
|
if(arg->i == tsel)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if(!(c = getnext(clients, arg->i)))
|
||||||
|
return;
|
||||||
|
|
||||||
|
for(i = 0; i < TLast; i++)
|
||||||
|
c->tags[i] = NULL;
|
||||||
|
c->tags[tsel] = tags[tsel];
|
||||||
|
arrange(NULL);
|
||||||
|
focus(c);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
replacetag(Arg *arg)
|
replacetag(Arg *arg)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue