commit 653315a673ac65c9ecb8748956b77c4e9db931fb
parent 578d043481f5b3eea73a602a82a88f1594098395
Author: Miles Alan <m@milesalan.com>
Date: Wed, 25 Mar 2020 19:10:25 -0500
Some keyboard fixes; screenlock update; shift tag by clicking window title
Diffstat:
| M | config.def.h | | | 51 | +++++---------------------------------------------- |
| M | dwm.c | | | 41 | ++++++++++++++++++++++------------------- |
2 files changed, 27 insertions(+), 65 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -63,70 +63,29 @@ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont,
#include <X11/XF86keysym.h>
static Key keys[] = {
-
// TODO: hold functionality doesnt work if keybinding starts at 0 index
{0, MODKEY, XK_0, view, {.ui = ~0 } },
{1, 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("sxmo_appmenu.sh") },
{2, 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("sxmo_appmenu.sh sys") },
- {3, 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("sxmo_lowpowermode.sh") },
+ {3, 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("sxmo_screenlock") },
{1, 0, XF86XK_AudioLowerVolume, cyclelayout , {.i = +1 } },
{2, 0, XF86XK_AudioLowerVolume, rotatestack, {.i = +1} },
{3, 0, XF86XK_AudioLowerVolume, killclient, {0} },
- {1, 0, XF86XK_PowerOff, spawn, SHCMD("sxmo_keyboard.sh") },
+ {1, 0, XF86XK_PowerOff, spawn, SHCMD("pkill -9 svkbd-sxmo || svkbd-sxmo") },
{2, 0, XF86XK_PowerOff, spawn, SHCMD("sxmo_blinkled.sh green & $TERM") },
{3, 0, XF86XK_PowerOff, spawn, SHCMD("sxmo_blinkled.sh green & $BROWSER") }
-
- /*
- {0, MODKEY, XK_p, spawn, {.v = dmenucmd } },
- {0, MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
- {0, MODKEY, XK_b, togglebar, {0} },
- {0, MODKEY, XK_j, focusstack, {.i = +1 } },
- {0, MODKEY, XK_k, focusstack, {.i = -1 } },
- {0, MODKEY, XK_i, incnmaster, {.i = +1 } },
- {0, MODKEY, XK_d, incnmaster, {.i = -1 } },
- {0, MODKEY, XK_h, setmfact, {.f = -0.05} },
- {0, MODKEY, XK_l, setmfact, {.f = +0.05} },
- {0, MODKEY, XK_Return, zoom, {0} },
- {0, MODKEY, XK_Tab, view, {0} },
- {0, MODKEY|ShiftMask, XK_c, killclient, {0} },
- {0, MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
- {0, MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
- {0, MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
- {0, MODKEY|ControlMask, XK_comma, cyclelayout, {.i = -1 } },
- {0, MODKEY|ControlMask, XK_period, cyclelayout, {.i = +1 } },
- {0, MODKEY, XK_space, setlayout, {0} },
- {0, MODKEY|ShiftMask, XK_space, togglefloating, {0} },
- {0, MODKEY, XK_0, view, {.ui = ~0 } },
- {0, MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
- {0, MODKEY, XK_comma, focusmon, {.i = -1 } },
- {0, MODKEY, XK_period, focusmon, {.i = +1 } },
- {0, MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
- {0, MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
- TAGKEYS( XK_1, 0)
- TAGKEYS( XK_2, 1)
- TAGKEYS( XK_3, 2)
- TAGKEYS( XK_4, 3)
- {0, MODKEY|ShiftMask, XK_q, quit, {0} },
- */
};
/* button definitions */
/* click can be ClkTagBar, 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} },
+ { ClkLtSymbol, 0, Button1, cyclelayout, {.i = +1} },
+ { ClkWinTitle, 0, Button1, tagtoright, {0} },
+ { ClkStatusText, 0, Button1, spawn, SHCMD("sxmo_appmenu.sh control") },
};
diff --git a/dwm.c b/dwm.c
@@ -906,12 +906,10 @@ void
focus(Client *c)
{
if (!c || !ISVISIBLE(c))
- for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+ for (c = selmon->stack; c && (!ISVISIBLE(c) || c->iskbd) ; c = c->snext);
if (selmon->sel && selmon->sel != c)
unfocus(selmon->sel, 0);
if (c) {
- if (c->iskbd)
- return;
if (c->mon != selmon)
selmon = c->mon;
if (c->isurgent)
@@ -1244,7 +1242,6 @@ manage(Window w, XWindowAttributes *wa)
c->h = c->oldh = wa->height;
c->oldbw = wa->border_width;
- updatetitle(c);
if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
c->mon = t->mon;
c->tags = t->tags;
@@ -1255,12 +1252,13 @@ manage(Window w, XWindowAttributes *wa)
}
if (c->iskbd) {
- //c->y = c->mon->my + c->mon->mh - c->h;
- //c->mon->mh = HEIGHT(c);
- //updatebarpos(selmon);
- //XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
- //arrange(selmon);
+ c->y = c->mon->my + c->mon->mh - c->h;
+ c->mon->mh = c->mon->mh - HEIGHT(c);
+ updatebarpos(selmon);
+ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
+ arrange(selmon);
} else {
+ updatetitle(c);
if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
c->x = c->mon->mx + c->mon->mw - WIDTH(c);
if (c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
@@ -1268,7 +1266,7 @@ manage(Window w, XWindowAttributes *wa)
c->x = MAX(c->x, c->mon->mx);
/* only fix client y-offset, if the client center might cover the bar */
c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >= c->mon->wx)
- && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
+ && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
}
c->bw = borderpx;
@@ -1291,9 +1289,11 @@ manage(Window w, XWindowAttributes *wa)
(unsigned char *) &(c->win), 1);
XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
setclientstate(c, NormalState);
- if (c->mon == selmon)
- unfocus(selmon->sel, 0);
- c->mon->sel = c;
+ if (!c->iskbd) {
+ if (c->mon == selmon)
+ unfocus(selmon->sel, 0);
+ c->mon->sel = c;
+ }
arrange(c->mon);
XMapWindow(dpy, c->win);
if (term)
@@ -1461,7 +1461,7 @@ propertynotify(XEvent *e)
break;
}
if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
- updatetitle(c);
+ //updatetitle(c);
if (c == c->mon->sel)
drawbar(c->mon);
}
@@ -2606,13 +2606,16 @@ bstackhoriz(Monitor *m) {
void
tagtoright(const Arg *arg) {
- if(
- selmon->sel != NULL
- && (selmon->tagset[selmon->seltags] & TAGMASK)
+ if (selmon->sel == NULL) return;
+
+ if (
+ (selmon->tagset[selmon->seltags] & TAGMASK)
&& (selmon->tagset[selmon->seltags] & (TAGMASK >> 1))
) {
selmon->sel->tags <<= 1;
- focus(NULL);
- arrange(selmon);
+ } else {
+ selmon->sel->tags = 1 << 0;
}
+ focus(NULL);
+ arrange(selmon);
}