From c7d049b0738ea3a6e9458d83eeaa622f559763c9 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Mon, 7 Aug 2017 10:55:54 -0400 Subject: [PATCH] update config --- config.def.h | 146 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 85 insertions(+), 61 deletions(-) diff --git a/config.def.h b/config.def.h index 9d9a0e7..c37cb21 100644 --- a/config.def.h +++ b/config.def.h @@ -8,14 +8,13 @@ static const char normfgcolor[] = "#bbbbbb"; static const char selbordercolor[] = "#005577"; static const char selbgcolor[] = "#005577"; static const char selfgcolor[] = "#eeeeee"; -static const unsigned int borderpx = 0; /* border pixel of windows. leave at 0, use xcompmgr to show focus instead. */ +static const unsigned int borderpx = 0; /* 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", "0", "[", "]" }; -// the ENV var WORKSPACE_NUMBER (passed to terminal) will use these names instead: static const char *workspace_numbers_str[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12" }; #define TBC(tag, wclass) { wclass, NULL, NULL, 1 << tag, False, False, -1 }, @@ -28,18 +27,16 @@ static const Rule rules[] = { */ // Tag By Class TBC( 1, "Chromium") - TBC( 1, "Firefox") - TBC( 1, "Iceweasel") + //TBC( 7, "Firefox") + TBC( 7, "Iceweasel") + TBC( 9, "Transmission-gtk") TBC(10, "Pidgin") // Screen Hog (By class) + tag SHBC( 2, "Inkscape") SHBC( 2, "org-openstreetmap-josm-Main") // Josm (both splash and main window) + SHBC( 3, "VirtualBox") SHBC( 5, "Gimp") // Tag By Title (matches prefix) - // These rules are used to keep terminals in the right workspace (tag) accross dwm restarts - // Put something like this in your .zshrc: - // function preexec { echo -ne "\033]0;w$WORKSPACE_NUMBER: $1\a"; } - // function precmd { echo -ne "\033]0;w$WORKSPACE_NUMBER: $PWD\a"; } TBT( 1, "w1: ") TBT( 2, "w2: ") TBT( 3, "w3: ") @@ -52,11 +49,13 @@ static const Rule rules[] = { TBT(10, "w10: ") TBT(11, "w11: ") TBT(12, "w12: ") + // make run dialog floating + { NULL, "zsh_run", NULL, 0, True, False, -1 }, }; /* layout(s) */ static const float mfact = 0.595; /* factor of master area size [0.05..0.95] */ -static const int nmaster = 1; /* number of clients in master area. This setting probably does nothing */ +static const int nmaster = 1; /* number of clients in master area */ static const Bool resizehints = False; /* True means respect size hints in tiled resizals */ static const Layout layouts[] = { @@ -72,7 +71,7 @@ static const Layout layouts[] = { { 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} }, + { 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 } } @@ -81,64 +80,89 @@ static const Layout layouts[] = { static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ //static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; -char WORKSPACE_NUMBER[] = "WORKSPACE_NUMBER=00"; // if you change the _length_ of this string, update spawn() in dwm.c. This is the ENV var passed to your terminal. The value is pulled from workspace_numbers_str based on the active tag. +char WORKSPACE_NUMBER[] = "WORKSPACE_NUMBER=00"; static const char *termcmd[] = { "env", (const char *)(&(WORKSPACE_NUMBER[0])), "st", NULL }; +#define ARGS(...) {.v = (const char *[]) {__VA_ARGS__, NULL}} + static Key keys[] = { - /* modifier key function argument */ - { 0, XK_F1, spawn, {.v = dmenucmd } }, - { 0, XK_F2, kbspawn, {.v = termcmd } }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_n, focusstack, {.i = +1 } }, - { MODKEY, XK_h, focusstack, {.i = 0 } }, -// { MODKEY, XK_i, incnmaster, {.i = +1 } }, -// { MODKEY, XK_d, incnmaster, {.i = -1 } }, - { MODKEY|ControlMask, XK_h, setmfact, {.f = -0.05} }, - { MODKEY|ControlMask, XK_n, setmfact, {.f = +0.05} }, - { MODKEY|ShiftMask, XK_h, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY, XK_w, killclient, {0} }, - { MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[0]} }, - { MODKEY|ShiftMask|ControlMask, XK_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_f, 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_grave, 0) - TAGKEYS( XK_1, 1) - TAGKEYS( XK_2, 2) - TAGKEYS( XK_3, 3) - TAGKEYS( XK_4, 4) - TAGKEYS( XK_5, 5) - TAGKEYS( XK_6, 6) - TAGKEYS( XK_7, 7) - TAGKEYS( XK_8, 8) - TAGKEYS( XK_9, 9) - TAGKEYS( XK_0, 10) - TAGKEYS( XK_bracketleft, 11) - TAGKEYS( XK_bracketright, 12) - { MODKEY|ShiftMask, XK_q, quit, {0} }, + /* modifier key function argument */ + {0, XK_Scroll_Lock, spawn, ARGS("pulseaudio-set-sink", "toggle")}, + {ControlMask, XK_Scroll_Lock, spawn, ARGS("pulseaudio-set-sink", "headphones")}, + {ShiftMask, XK_Scroll_Lock, spawn, ARGS("pulseaudio-set-sink", "speakers")}, + {0, XK_Pause, spawn, ARGS("black", "0.2")}, + {0, XK_F3, spawn, ARGS("vol", "down")}, + {0, XF86XK_AudioLowerVolume, spawn, ARGS("vol", "down")}, + {0, XK_F4, spawn, ARGS("vol", "up")}, + {0, XF86XK_AudioRaiseVolume, spawn, ARGS("vol", "up")}, + {0, XF86XK_AudioPrev, spawn, ARGS("sayremote", "back")}, + {0, XK_F5, spawn, ARGS("sayremote", "back")}, + {MODKEY, XK_F5, spawn, ARGS("sayremote", "slower")}, + {0, XF86XK_AudioNext, spawn, ARGS("sayremote", "forward")}, + {0, XK_F6, spawn, ARGS("sayremote", "forward")}, + {MODKEY, XK_F6, spawn, ARGS("sayremote", "faster")}, + {0, XK_F7, spawn, ARGS("sayremote", "pause")}, + {0, XF86XK_AudioPause, spawn, ARGS("sayremote", "pause")}, + {0, XF86XK_AudioStop, spawn, ARGS("sayremote", "stop")}, + {0, XK_F8, spawn, ARGS("sayremote", "stop")}, + {MODKEY, XK_F8, spawn, ARGS("sayremote", "reset")}, + {0, XK_F10, spawn, ARGS("sayclip")}, + {ControlMask, XK_Return, spawn, ARGS("default-browser-clipboard")}, + {MODKEY, XK_Return, spawn, ARGS("default-browser-debian-bug")}, + {0, XK_F1, kbspawn, ARGS("run-dialog")}, + {MODKEY, XK_l, view, {.ui = 1 << 1}}, + {MODKEY, XK_l, focusstack, {.i = 0}}, + {MODKEY, XK_l, kbspawn, ARGS("url-dialog")}, + {0, XK_F2, kbspawn, {.v = termcmd}}, + {MODKEY, XK_b, togglebar, {0}}, + {MODKEY, XK_n, focusstack, {.i = +1}}, + {MODKEY, XK_h, focusstack, {.i = 0}}, + {MODKEY, XK_c, focusstack, {.i = -1}}, +// {MODKEY, XK_i, incnmaster, {.i = +1}}, +// {MODKEY, XK_d, incnmaster, {.i = -1}}, + {MODKEY|ControlMask, XK_h, setmfact, {.f = -0.05}}, + {MODKEY|ControlMask, XK_n, setmfact, {.f = +0.05}}, + {MODKEY|ShiftMask, XK_h, zoom, {0}}, + {MODKEY, XK_Tab, view, {0}}, + {MODKEY, XK_w, killclient, {0}}, + {MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[0]}}, + {MODKEY, XK_f, 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}}, + {MODKEY|ShiftMask, XK_q, quit, {0}}, + TAGKEYS( XK_grave, 0), + TAGKEYS( XK_1, 1), + TAGKEYS( XK_2, 2), + TAGKEYS( XK_3, 3), + TAGKEYS( XK_4, 4), + TAGKEYS( XK_5, 5), + TAGKEYS( XK_6, 6), + TAGKEYS( XK_7, 7), + TAGKEYS( XK_8, 8), + TAGKEYS( XK_9, 9), + TAGKEYS( XK_0, 10), + TAGKEYS( XK_bracketleft, 11), + TAGKEYS( XK_bracketright, 12), }; +// X.h defines Button1 through Button5 +#ifndef Button8 + #define Button8 (Button1 + 7) +#endif + /* 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} }, + /* click event mask button function argument */ + {ClkAnywhere, 0, Button8, spawn, ARGS("sayclip", "--no-terminal")}, + {ClkClientWin, MODKEY, Button1, movemouse, {0}}, + {ClkClientWin, MODKEY, Button2, togglefloating, {0}}, + {ClkClientWin, MODKEY, Button3, resizemouse, {0}}, }; -- 1.7.10.4