diff options
| -rw-r--r-- | config.h | 189 | ||||
| -rw-r--r-- | dwm.c | 27 |
2 files changed, 127 insertions, 89 deletions
@@ -6,6 +6,7 @@ #define VOLUP 0x1008FF13 /* Volume control up */ #define BLUP 0x1008FF02 /* Monitor brightness up */ #define BLDOWN 0x1008FF03 /* Monitor brightness down */ +#define SEARCH 0x1008FF1B /* appearance */ static const char font[] = "DVIcons:size=8"; @@ -14,7 +15,7 @@ static const char font[] = "DVIcons:size=8"; static const char colors[NUMCOLORS][ColLast][8] = { // border foreground background { "#3b3b3b", "#404040", "#111111" }, // 0 = normal - { "#000000", "#386dff", "#111111" }, // 1 = selected + { "#689dff", "#386dff", "#111111" }, // 1 = selected { "#ffffff", "#ffca38", "#111111" }, // 2 = urgent/warning { "#ffffff", "#ff3838", "#111111" }, // 3 = error { "#ffffff", "#999999", "#111111" }, // 4 = statusbar @@ -32,6 +33,11 @@ enum showtab_modes { showtab_never, showtab_auto, showtab_nmodes, showtab_always static const int showtab = showtab_auto; /* Default tab bar show mode */ static const Bool toptab = True; /* False means bottom tab bar */ +/* Productivity lock timeout in seconds - when the productivity lock is enabled, it is */ +/* impossible to change view and toggle tags for the duration of the timeout */ +/* Default is 15 minutes (900 s) */ +static const long ptimeout = 900; + /* tags web chat work office media win7 gp gp gp */ static const char *tags[] = { "\uE372", "\uE21B", "\uE3A9", "\uE0F2", "\uE140", "\uE343", "\uE027", "\uE027", "\uE027" }; /* @@ -49,27 +55,28 @@ gp: E027 /* The first element is for all-tag view, following i-th element corresponds to */ /* tags[i]. Layout is referred using the layouts array index.*/ /* tags all web chat work office media win7 gp gp gp */ -static int def_layouts[1 + LENGTH(tags)] = { 0, 2, 0, 2, 2, 0, 0, 0, 0, 0 }; +static int def_layouts[1 + LENGTH(tags)] = { 0, 0, 0, 0, 2, 0, 2, 0, 0, 0 }; /* rules */ static const Rule rules[] = { - /* class instance title tags mask isfloating monitor */ - /* WM_CLASS WM_CLASS WM_NAME */ + /* class instance title tags mask isfloating monitor */ + /* WM_CLASS WM_CLASS WM_NAME */ //{ NULL, NULL, NULL, 0, False, -1 }, - { "Surf", "surf", NULL, 1 << 0, False, -1 }, - { "chromium", "chromium", NULL, 1 << 0, False, -1 }, - - { "XTerm", "weechat", "weechat", 1 << 1, False, -1 }, - { "chromium", "crx_knipolnnllmklapflnccelgolnpehhpl", NULL, 1 << 1, False, -1}, - - { "Eclipse", "Eclipse", NULL, 1 << 2, False, -1 }, - - { "TeXstudio", "texstudio", NULL, 1 << 3, False, -1 }, - { "Abiword", "abiword", NULL, 1 << 3, False, -1 }, - { "Gnumeric", "gnumeric", NULL, 1 << 3, False, -1 }, - - { "Deadbeef", "deadbeef", NULL, 1 << 4, False, -1 }, - { "Vlc", "vlc", NULL, 1 << 4, False, -1 }, + { "Surf", "surf", NULL, 1 << 0, False, -1 }, + { "Chromium", "chromium", NULL, 1 << 0, False, -1 }, + + { "XTerm", "weechat", "weechat", 1 << 1, False, -1 }, + { "Chromium", "crx_knipolnnllmklapflnccelgolnpehhpl", NULL, 1 << 1, False, -1}, + { "Slack", "slack", NULL, 1 << 1, False, -1}, + + { "Eclipse", "Eclipse", NULL, 1 << 2, False, -1 }, + + { "TeXstudio", "texstudio", NULL, 1 << 3, False, -1 }, + { "Abiword", "abiword", NULL, 1 << 3, False, -1 }, + { "Gnumeric", "gnumeric", NULL, 1 << 3, False, -1 }, + + { "Deadbeef", "deadbeef", NULL, 1 << 4, False, -1 }, + { "Vlc", "vlc", NULL, 1 << 4, False, -1 }, }; /* layout(s) */ @@ -78,19 +85,19 @@ 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[] = { - /* symbol arrange function */ - { "[]=", tile }, /* first entry is default */ - { "><>", NULL }, /* no layout function means floating behavior */ - { "[M]", monocle }, + /* symbol arrange function */ + { "[]=", tile }, /* first entry is default */ + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, }; /* key definitions */ #define MODKEY Mod4Mask #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} }, + { 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 } } @@ -103,6 +110,7 @@ static const char *weechatcmd[] = { "xterm", "-name", "weechat", "-e", "weecha static const char *playercmd[] = { "deadbeef", NULL }; static const char *editorcmd[] = { "gedit", NULL }; static const char *scrotcmd[] = { "scrot", "/home/eddy/screenshots/%Y-%m-%d-%H:%M:%S.png", NULL }; +static const char *lockcmd[] = { "i3lock", "-c", "000000", NULL }; static const char *lowervolumecmd[] = { "amixer", "-q", "set", "Master", "2dB-", NULL }; static const char *raisevolumecmd[] = { "amixer", "-q", "set", "Master", "2dB+", NULL }; @@ -112,73 +120,76 @@ static const char *lowerbrightness[] = { "xbacklight", "-dec", "5", NULL }; static Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_d, spawn, {.v = dmenucmd } }, - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_t, spawn, {.v = browsercmd } }, - { MODKEY|ShiftMask, XK_p, spawn, {.v = playercmd } }, - { MODKEY|ShiftMask, XK_o, spawn, {.v = weechatcmd } }, - { MODKEY|ShiftMask, XK_i, spawn, {.v = editorcmd } }, - { 0, XK_Print, spawn, {.v = scrotcmd } }, - - { MODKEY, XK_Left, focusstack, {.i = -1 } }, - { MODKEY, XK_Right, focusstack, {.i = +1 } }, - { MODKEY, XK_Up, incnmaster, {.i = +1 } }, - { MODKEY, XK_Down, incnmaster, {.i = -1 } }, - { MODKEY|ShiftMask, XK_Left, setmfact, {.f = -0.05} }, - { MODKEY|ShiftMask, XK_Right, setmfact, {.f = +0.05} }, - { MODKEY|ShiftMask, XK_Return, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - - { MODKEY, XK_e, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_r, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_w, 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_n, 0) // web - TAGKEYS( XK_b, 1) // chat - TAGKEYS( XK_a, 2) // work - TAGKEYS( XK_s, 3) // office - TAGKEYS( XK_m, 4) // media - TAGKEYS( XK_v, 5) // win7 - TAGKEYS( XK_1, 6) // gp - TAGKEYS( XK_2, 7) // gp - TAGKEYS( XK_3, 8) // gp - - { 0, VOLUP, spawn, {.v = raisevolumecmd } }, - { 0, VOLDOWN, spawn, {.v = lowervolumecmd } }, - { 0, VOLMUTE, spawn, {.v = mutevolumecmd } }, - { 0, BLUP, spawn, {.v = raisebrightness } }, - { 0, BLDOWN, spawn, {.v = lowerbrightness } }, - - { MODKEY|ShiftMask, XK_q, killclient, {0} }, - { MODKEY|ShiftMask, XK_e, quit, {0} }, + /* modifier key function argument */ + { MODKEY, XK_d, spawn, {.v = dmenucmd } }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, XK_t, spawn, {.v = browsercmd } }, + { MODKEY|ShiftMask, XK_p, spawn, {.v = playercmd } }, + { MODKEY|ShiftMask, XK_o, spawn, {.v = weechatcmd } }, + { MODKEY|ShiftMask, XK_i, spawn, {.v = editorcmd } }, + { MODKEY, XK_p, spawn, {.v = lockcmd } }, + { 0, XK_Print, spawn, {.v = scrotcmd } }, + + { 0, SEARCH, prodlock, {0} }, + + { MODKEY, XK_Left, focusstack, {.i = -1 } }, + { MODKEY, XK_Right, focusstack, {.i = +1 } }, + { MODKEY, XK_Up, incnmaster, {.i = +1 } }, + { MODKEY, XK_Down, incnmaster, {.i = -1 } }, + { MODKEY|ShiftMask, XK_Left, setmfact, {.f = -0.05} }, + { MODKEY|ShiftMask, XK_Right, setmfact, {.f = +0.05} }, + { MODKEY|ShiftMask, XK_Return, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + + { MODKEY, XK_e, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_r, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_w, 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_n, 0) // web + TAGKEYS( XK_b, 1) // chat + TAGKEYS( XK_a, 2) // work + TAGKEYS( XK_s, 3) // office + TAGKEYS( XK_m, 4) // media + TAGKEYS( XK_v, 5) // win7 + TAGKEYS( XK_1, 6) // gp + TAGKEYS( XK_2, 7) // gp + TAGKEYS( XK_3, 8) // gp + + { 0, VOLUP, spawn, {.v = raisevolumecmd } }, + { 0, VOLDOWN, spawn, {.v = lowervolumecmd } }, + { 0, VOLMUTE, spawn, {.v = mutevolumecmd } }, + { 0, BLUP, spawn, {.v = raisebrightness } }, + { 0, BLDOWN, spawn, {.v = lowerbrightness } }, + + { MODKEY|ShiftMask, XK_q, killclient, {0} }, + { MODKEY|ShiftMask, XK_e, 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} }, - { ClkTabBar, 0, Button1, focuswin, {0} }, + /* 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} }, + { ClkTabBar, 0, Button1, focuswin, {0} },*/ }; @@ -37,6 +37,7 @@ #include <X11/Xproto.h> #include <X11/Xutil.h> #include <X11/Xft/Xft.h> +#include <sys/time.h> #ifdef XINERAMA #include <X11/extensions/Xinerama.h> #endif /* XINERAMA */ @@ -61,6 +62,10 @@ #define TAGMASK ((1 << LENGTH(tags)) - 1) #define TEXTW(X) (textnw(X, strlen(X)) + dc.font.height) +#define CHECKLOCK struct timeval tv; \ + gettimeofday(&tv, NULL); \ + if (tv.tv_sec - latestlock.tv_sec < ptimeout) return; + /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ @@ -225,6 +230,7 @@ static void motionnotify(XEvent *e); static void movemouse(const Arg *arg); static Client *nexttiled(Client *c); static void pop(Client *); +static void prodlock(const Arg *arg); static void propertynotify(XEvent *e); static void quit(const Arg *arg); static Monitor *recttomon(int x, int y, int w, int h); @@ -306,6 +312,10 @@ static Display *dpy; static DC dc; static Monitor *mons = NULL, *selmon = NULL; static Window root; +static struct timeval latestlock = { + .tv_sec = 0, + .tv_usec = 0 +}; /* configuration, allows nested code to access above variables */ #include "config.h" @@ -1093,6 +1103,8 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */ void focusmon(const Arg *arg) { + CHECKLOCK; + Monitor *m; if(!mons->next) @@ -1496,6 +1508,11 @@ pop(Client *c) { } void +prodlock(const Arg *arg) { + gettimeofday(&latestlock, NULL); +} + +void propertynotify(XEvent *e) { Client *c; Window trans; @@ -1889,6 +1906,8 @@ spawn(const Arg *arg) { void tag(const Arg *arg) { + CHECKLOCK; + if(selmon->sel && arg->ui & TAGMASK) { selmon->sel->tags = arg->ui & TAGMASK; focus(NULL); @@ -1898,6 +1917,8 @@ tag(const Arg *arg) { void tagmon(const Arg *arg) { + CHECKLOCK; + if(!selmon->sel || !mons->next) return; sendmon(selmon->sel, dirtomon(arg->i)); @@ -1970,6 +1991,8 @@ void toggletag(const Arg *arg) { unsigned int newtags; + CHECKLOCK; + if(!selmon->sel) return; newtags = selmon->sel->tags ^ (arg->ui & TAGMASK); @@ -1985,6 +2008,8 @@ toggleview(const Arg *arg) { unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK); int i; + CHECKLOCK; + if(newtagset) { if(newtagset == ~0) { selmon->pertag->prevtag = selmon->pertag->curtag; @@ -2310,6 +2335,8 @@ void view(const Arg *arg) { int i; unsigned int tmptag; + + CHECKLOCK; if((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags]) return; |