~mil/sxmo-dwm

1c0c526af7d78482a212d78e0204c64a2374fa7b — Miles Alan 6 months ago 664d6c3 6.2.16
Revert "dwm: various updates due to renames"

This reverts commit b5438d12c80d4cf76639e3a3053c8e37cd430765.

Reverting so that we can tag new sxmo-dwm version; this relies on changes
in sxmo-utils, but we are unable to tag sxmo-utils currently.

Signed-off-by: Miles Alan <m@milesalan.com>
2 files changed, 12 insertions(+), 11 deletions(-)

M config.def.h
M dwm.c
M config.def.h => config.def.h +11 -11
@@ 83,17 83,17 @@ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont,
#include <X11/XF86keysym.h>
static Key keys[] = {
  /* PP */
	{1,  0,  XF86XK_AudioRaiseVolume, spawn, SHCMD("sxmo_hook_inputhandler.sh volup_one") },
	{2,  0,  XF86XK_AudioRaiseVolume, spawn, SHCMD("sxmo_hook_inputhandler.sh volup_two") },
	{3,  0,  XF86XK_AudioRaiseVolume, spawn, SHCMD("sxmo_hook_inputhandler.sh volup_three") },
	{1,  0,  XF86XK_AudioLowerVolume, spawn, SHCMD("sxmo_hook_inputhandler.sh voldown_one") },
	{2,  0,  XF86XK_AudioLowerVolume, spawn, SHCMD("sxmo_hook_inputhandler.sh voldown_two") },
	{3,  0,  XF86XK_AudioLowerVolume, spawn, SHCMD("sxmo_hook_nputhandler.sh voldown_three") },
	{1,  0,  XF86XK_AudioRaiseVolume, spawn, SHCMD("sxmo_inputhandler.sh volup_one") },
	{2,  0,  XF86XK_AudioRaiseVolume, spawn, SHCMD("sxmo_inputhandler.sh volup_two") },
	{3,  0,  XF86XK_AudioRaiseVolume, spawn, SHCMD("sxmo_inputhandler.sh volup_three") },
	{1,  0,  XF86XK_AudioLowerVolume, spawn, SHCMD("sxmo_inputhandler.sh voldown_one") },
	{2,  0,  XF86XK_AudioLowerVolume, spawn, SHCMD("sxmo_inputhandler.sh voldown_two") },
	{3,  0,  XF86XK_AudioLowerVolume, spawn, SHCMD("sxmo_inputhandler.sh voldown_three") },
	//{3,  0,  XF86XK_AudioLowerVolume, killclient, {0} },

	{1,  0,  XF86XK_PowerOff, spawn, SHCMD("sxmo_hook_inputhandler.sh powerbutton_one") },
	{2,  0,  XF86XK_PowerOff, spawn, SHCMD("sxmo_hook_inputhandler.sh powerbutton_two") },
	{3,  0,  XF86XK_PowerOff, spawn, SHCMD("sxmo_hook_inputhandler.sh powerbutton_three") },
	{1,  0,  XF86XK_PowerOff, spawn, SHCMD("sxmo_inputhandler.sh powerbutton_one") },
	{2,  0,  XF86XK_PowerOff, spawn, SHCMD("sxmo_inputhandler.sh powerbutton_two") },
	{3,  0,  XF86XK_PowerOff, spawn, SHCMD("sxmo_inputhandler.sh powerbutton_three") },

	/* Used by scripts via xdotool */
	{0,  MODKEY|ShiftMask,  XK_e, shiftview, {.i = -1} },


@@ 117,8 117,8 @@ static Key keys[] = {

	{ 0, 0,                         XF86XK_MonBrightnessUp,  spawn, SHCMD("sxmo_brightness.sh up") },
	{ 0, 0,                         XF86XK_MonBrightnessDown,  spawn, SHCMD("sxmo_brightness.sh down") },
	{ 0, MODKEY|ShiftMask,          XK_Down,      spawn,    SHCMD("sxmo_audio.sh vol down") },
	{ 0, MODKEY|ShiftMask,          XK_Up,      spawn,    SHCMD("sxmo_audio.sh vol up") },
	{ 0, MODKEY|ShiftMask,          XK_Down,      spawn,    SHCMD("sxmo_vol.sh down") },
	{ 0, MODKEY|ShiftMask,          XK_Up,      spawn,    SHCMD("sxmo_vol.sh up") },

	{ 0, MODKEY,                    XK_i,      incnmaster,     {.i = +1 } },
	{ 0, MODKEY,                    XK_o,      incnmaster,     {.i = -1 } },

M dwm.c => dwm.c +1 -0
@@ 1365,6 1365,7 @@ keyrelease(XEvent *e)
void
killclient(const Arg *arg)
{
	system("sh -c 'sxmo_blinkled.sh red'");
	if (!selmon->sel)
		return;
	if (!sendevent(selmon->sel, wmatom[WMDelete])) {