# HG changeset patch # User Zetoke # Date 1296674673 -10800 # Node ID 4a1df4ff7ca36fefd61a0cd72f97093e966c5186 # Parent 606ac98e35df7a7acd8ec95d43b0f7f979f36c6a pushup and pushdown provide a way to move clients inside the clients list --- config.h | 5 +++++ dwm | Bin 89791 -> 94665 bytes dwm.c | 3 +++ dwm.o | Bin 99364 -> 100940 bytes push.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ push.h | 3 +++ 6 files changed, 69 insertions(+), 0 deletions(-) create mode 100644 push.c create mode 100644 push.h diff -r 606ac98e35df -r 4a1df4ff7ca3 config.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config.h Wed Feb 02 22:24:33 2011 +0300 @@ -0,0 +1,116 @@ +/* See LICENSE file for copyright and license details. */ + +//Move clients +//#include "push.c" + +/* appearance */ +//static const char font[] = "-*-unifont-medium-r-*-*-16-*-*-*-*-*-*-*"; +static const char font[] = "Unifont 13"; +static const char normbordercolor[] = "#cccccc"; +static const char normbgcolor[] = "#cccccc"; +static const char normfgcolor[] = "#000000"; +static const char selbordercolor[] = "#0066ff"; +static const char selbgcolor[] = "#0066ff"; +static const char selfgcolor[] = "#ffffff"; +static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int snap = 32; /* snap pixel */ +static const Bool showbar = True; /* False means no bar */ +static const Bool topbar = True; /* False means bottom bar */ + +/* tagging */ +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; + +static const Rule rules[] = { + /* class instance title tags mask isfloating monitor */ + { "Gimp", NULL, NULL, 0, True, -1 }, + { "Firefox", NULL, NULL, 1 << 8, False, -1 }, + { "Chrome", NULL, NULL, 1 << 2, False, -1 }, + { "URxvt", NULL, NULL, 1 << 0, False, -1 }, +}; + +/* layout(s) */ +static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ +static const Bool resizehints = True; /* True means respect size hints in tiled resizals */ + +static const Layout layouts[] = { + /* symbol arrange function */ + { "[]=", tile }, /* first entry is default */ + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, +}; +static const int deflayouts[] = { 2, 0, 2, 0, 0, 0, 0, 0, 0 }; + +/* key definitions */ +#define MODKEY Mod1Mask +#define TAGKEYS(KEY,TAG) \ + { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, + +/* helper for spawning shell commands in the pre dwm-5.0 fashion */ +#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } + +/* commands */ +static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; +static const char *termcmd[] = { "urxvtc", NULL }; +static const char *scrotcmd[] = { "scrot", "/home/stil/scrot-%Y-%m-%d-%H-%M-%S_$wx$h_full.png", NULL }; + +static Key keys[] = { + /* modifier key function argument */ + { MODKEY|ShiftMask, XK_Left, focusstack, {.i = +1 } }, + { MODKEY|ShiftMask, XK_Right, focusstack, {.i = -1 } }, + { MODKEY, XK_r, spawn, {.v = dmenucmd } }, + { MODKEY|ShiftMask, XK_Down, spawn, {.v = termcmd } }, + { 0, XK_Print, spawn, {.v = scrotcmd } }, + + { MODKEY, XK_b, togglebar, {0} }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY|ShiftMask, XK_j, pushdown, {0} }, + { MODKEY|ShiftMask, XK_k, pushup, {0} }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, + { MODKEY|ShiftMask, XK_Return, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY|ShiftMask, XK_c, killclient, {0} }, + { MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[0]} }, + { MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[1]} }, + { MODKEY|ShiftMask, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_space, setlayout, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY, XK_0, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + { MODKEY, XK_comma, focusmon, {.i = -1 } }, + { MODKEY, XK_period, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) + TAGKEYS( XK_4, 3) + TAGKEYS( XK_5, 4) + TAGKEYS( XK_6, 5) + TAGKEYS( XK_7, 6) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) + { MODKEY|ShiftMask, XK_q, quit, {0} }, +}; + +/* button definitions */ +/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ +static Button buttons[] = { + /* click event mask button function argument */ + { ClkLtSymbol, 0, Button1, setlayout, {0} }, + { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, + { ClkWinTitle, 0, Button2, zoom, {0} }, + { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, + { ClkClientWin, MODKEY, Button1, movemouse, {0} }, + { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, + { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, + { ClkTagBar, 0, Button1, view, {0} }, + { ClkTagBar, 0, Button3, toggleview, {0} }, + { ClkTagBar, MODKEY, Button1, tag, {0} }, + { ClkTagBar, MODKEY, Button3, toggletag, {0} }, +}; + diff -r 606ac98e35df -r 4a1df4ff7ca3 dwm Binary file dwm has changed diff -r 606ac98e35df -r 4a1df4ff7ca3 dwm.c --- a/dwm.c Wed Feb 02 21:20:03 2011 +0300 +++ b/dwm.c Wed Feb 02 22:24:33 2011 +0300 @@ -269,6 +269,7 @@ static Window root; /* configuration, allows nested code to access above variables */ +#include "push.h" #include "config.h" struct Monitor { @@ -296,6 +297,8 @@ Bool showbars[LENGTH(tags) + 1]; }; +#include "push.c" + /* compile-time check if all tags fit into an unsigned int bit array. */ struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; }; diff -r 606ac98e35df -r 4a1df4ff7ca3 dwm.o Binary file dwm.o has changed diff -r 606ac98e35df -r 4a1df4ff7ca3 push.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/push.c Wed Feb 02 22:24:33 2011 +0300 @@ -0,0 +1,58 @@ +static Client * +prevtiled(Client *c) { + Client *p, *r; + + for(p = selmon->clients, r = NULL; p && p != c; p = p->next) + if(!p->isfloating && ISVISIBLE(p)) + r = p; + return r; +} + +static void +pushup(const Arg *arg) { + Client *sel = selmon->sel; + Client *c; + + if(!sel || sel->isfloating) + return; + if((c = prevtiled(sel))) { + /* attach before c */ + detach(sel); + sel->next = c; + if(selmon->clients == c) + selmon->clients = sel; + else { + for(c = selmon->clients; c->next != sel->next; c = c->next); + c->next = sel; + } + } else { + /* move to the end */ + for(c = sel; c->next; c = c->next); + detach(sel); + sel->next = NULL; + c->next = sel; + } + focus(sel); + arrange(selmon); +} + +static void +pushdown(const Arg *arg) { + Client *sel = selmon->sel; + Client *c; + + if(!sel || sel->isfloating) + return; + if((c = nexttiled(sel->next))) { + /* attach after c */ + detach(sel); + sel->next = c->next; + c->next = sel; + } else { + /* move to the front */ + detach(sel); + attach(sel); + } + focus(sel); + arrange(selmon); +} diff -r 606ac98e35df -r 4a1df4ff7ca3 push.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/push.h Wed Feb 02 22:24:33 2011 +0300 @@ -0,0 +1,3 @@ +static Client* prevtiled(Client* c); +static void pushup(const Arg* arg); +static void pushdown(const Arg* arg);