diff options
| -rwxr-xr-x[-rw-r--r--] | .gitignore | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | LICENSE | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | Makefile | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | README | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | config.def.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | config.h | 26 | ||||
| -rwxr-xr-x[-rw-r--r--] | config.mk | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | drw.c | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | drw.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | dwm.1 | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | dwm.c | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | quicksearch.c | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | transient.c | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | util.c | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | util.h | 0 |
15 files changed, 17 insertions, 27 deletions
diff --git a/.gitignore b/.gitignore index 16de471..16de471 100644..100755 --- a/.gitignore +++ b/.gitignore diff --git a/config.def.h b/config.def.h index f93406a..f93406a 100644..100755 --- a/config.def.h +++ b/config.def.h @@ -2,7 +2,7 @@ /* Constants */ #define TERMINAL "st" -#define BROWSER "chromium" +#define BROWSER "firefox" /* appearance */ static const unsigned int borderpx = 3; /* border pixel of windows */ @@ -76,7 +76,7 @@ static const char *termcmd[] = { TERMINAL, NULL }; #include <X11/XF86keysym.h> static const Key keys[] = { /* modifier key function argument */ - { MODKEY, XK_space, spawn, {.v = termcmd } }, + { MODKEY, XK_space, spawn, {.v = termcmd } }, { MODKEY, XK_d, spawn, SHCMD("dmenu_run") }, { Mod1Mask, XK_space, spawn, SHCMD(TERMINAL" -c stfloat") }, { MODKEY, XK_j, focusstack, {.i = +1 } }, @@ -90,8 +90,8 @@ static const Key keys[] = { { MODKEY, XK_q, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[1]} }, - { Mod1Mask, XK_f, togglefloating, {0} }, - { MODKEY, XK_f, togglefullscr, {0} }, + { MODKEY|ShiftMask, XK_f, togglefullscr, {0} }, + { MODKEY, XK_f, togglefloating, {0} }, { MODKEY, XK_grave, view, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_grave, tag, {.ui = ~0 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } }, @@ -113,21 +113,23 @@ static const Key keys[] = { { Mod1Mask|ShiftMask, XK_p, spawn, SHCMD(TERMINAL" -c stfloat -e pulsemixer") }, { MODKEY, XK_Escape, spawn, SHCMD(TERMINAL" -e htop") }, { Mod1Mask, XK_Escape, spawn, SHCMD(TERMINAL" -c stfloat -e htop") }, - { Mod1Mask, XK_t, spawn, SHCMD(TERMINAL" -c stfloat -e watch -n 1 transmission-remote -l") }, - { MODKEY, XK_x, spawn, SHCMD("xkill") }, - { MODKEY, XK_s, spawn, SHCMD("steam") }, - { MODKEY|ShiftMask, XK_s, spawn, SHCMD("pkill -9 steam") }, - { MODKEY, XK_w, spawn, SHCMD(BROWSER) }, + { Mod1Mask, XK_t, spawn, SHCMD(TERMINAL" -c stfloat -e gnuwatch -n 1 transmission-remote -l") }, + { MODKEY, XK_x, spawn, SHCMD("xkill") }, + { MODKEY, XK_s, spawn, SHCMD("steam") }, + { MODKEY|ShiftMask, XK_s, spawn, SHCMD("pkill -9 steam") }, + { MODKEY, XK_w, spawn, SHCMD(BROWSER) }, { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("amixer sset Master 5%+") }, { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("amixer sset Master 5%-") }, { 0, XF86XK_AudioMute, spawn, SHCMD("amixer sset Master toggle") }, { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("xbacklight -inc 10") }, { 0, XF86XK_MonBrightnessDown, spawn, SHCMD("xbacklight -dec 10") }, - { MODKEY, XK_Print, spawn, SHCMD("maimpick") }, + { MODKEY, XK_Print, spawn, SHCMD("maimpick") }, - { ControlMask, XK_F1, spawn, SHCMD("amixer sset Master toggle") }, + { MODKEY, XK_c, spawn, SHCMD("pgrep xcompmgr && pkill -9 xcompmgr || xcompmgr &") }, + + { ControlMask, XK_F1, spawn, SHCMD("amixer sset Master toggle") }, { ControlMask, XK_F2, spawn, SHCMD("amixer sset Master 5%-") }, - { ControlMask, XK_F3, spawn, SHCMD("amixer sset Master 5%+") }, + { ControlMask, XK_F3, spawn, SHCMD("amixer sset Master 5%+") }, { MODKEY, XK_p, quicksearch, {0} }, }; diff --git a/config.mk b/config.mk index 0e41d35..2cdd7e7 100644..100755 --- a/config.mk +++ b/config.mk @@ -18,9 +18,9 @@ XINERAMAFLAGS = -DXINERAMA FREETYPELIBS = -lfontconfig -lXft FREETYPEINC = /usr/include/freetype2 # OpenBSD (uncomment) -#FREETYPEINC = ${X11INC}/freetype2 -#MANPREFIX = ${PREFIX}/man -#KVMLIB = -lkvm +FREETYPEINC = ${X11INC}/freetype2 +MANPREFIX = ${PREFIX}/man +KVMLIB = -lkvm # includes and libs INCS = -I${X11INC} -I${FREETYPEINC} @@ -1100,12 +1100,8 @@ maprequest(XEvent *e) void monocle(Monitor *m) { - unsigned int n = 0; Client *c; - for (c = m->clients; c; c = c->next) - if (ISVISIBLE(c)) - n++; for (c = nexttiled(m->clients); c; c = nexttiled(c->next)) resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0); } @@ -1268,14 +1264,6 @@ resizeclient(Client *c, int x, int y, int w, int h) c->oldw = c->w; c->w = wc.width = w; c->oldh = c->h; c->h = wc.height = h; wc.border_width = c->bw; - if (((nexttiled(c->mon->clients) == c && !nexttiled(c->next)) - || &monocle == c->mon->lt[c->mon->sellt]->arrange) - && !c->isfullscreen && !c->isfloating - && NULL != c->mon->lt[c->mon->sellt]->arrange) { - c->w = wc.width += c->bw * 2; - c->h = wc.height += c->bw * 2; - wc.border_width = 0; - } XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); configure(c); diff --git a/quicksearch.c b/quicksearch.c index 9cc517c..9cc517c 100644..100755 --- a/quicksearch.c +++ b/quicksearch.c diff --git a/transient.c b/transient.c index 040adb5..040adb5 100644..100755 --- a/transient.c +++ b/transient.c |
