for-script

diff --git a/Makefile b/Makefile
index 4bacdd1378f6a1e1b5f9907f7f5269762685c94a..9af98e31abd2d4361082277733880ff4b64c04bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,10 +46,17 @@ install: all
        mkdir -p ${DESTDIR}${MANPREFIX}/man7
        cp -f extras/TuCLS.7 ${DESTDIR}${MANPREFIX}/man7
        chmod 644 ${DESTDIR}${MANPREFIX}/man7/TuCLS.7
+       mkdir -p ${DESTDIR}${PREFIX}/share/kbd/keymaps
+       cp -f extras/ttymaps.kmap ${DESTDIR}${PREFIX}/share/kbd/keymaps/ttymaps.kmap
+       chmod 644 ${DESTDIR}${PREFIX}/share/kbd/keymaps/ttymaps.kmap
 
 uninstall:
        rm -f ${DESTDIR}${PREFIX}/bin/dwm\
+               ${DESTDIR}${PREFIX}/bin/remapd\
+               ${DESTDIR}${PREFIX}/bin/remaps\
+               ${DESTDIR}${PREFIX}/bin/setbg\
                ${DESTDIR}${MANPREFIX}/man7/TuCLS.7\
-               ${DESTDIR}${MANPREFIX}/man1/dwm.1
+               ${DESTDIR}${MANPREFIX}/man1/dwm.1\
+               ${DESTDIR}${PREFIX}/share/kbd/keymaps/ttymaps.kmap
 
 .PHONY: all options clean dist install uninstall

diff --git a/config.h b/config.h
index e28e0a9f28f4fa74417232e94aadad3298b16534..3856b8ddb4105043daa5ca006e5ccb1223ccbf2e 100644 (file)
--- a/config.h
+++ b/config.h
@@ -245,8 +245,8 @@ static const Key keys[] = {
        { MODKEY,                       XK_F4,          spawn,          {.v = (const char*[]){ TERMINAL, "-e", "htop", NULL } } },
        { MODKEY,                       XK_F5,          spawn,          {.v = (const char*[]){ "dm-mounter", NULL } } },
        { MODKEY,                       XK_F6,          spawn,          {.v = (const char*[]){ "dm-mountcifs", NULL } } },
-       { MODKEY,                       XK_F7,          spawn,          {.v = (const char*[]){ "dm-unmounter", NULL } } },
-       /* { MODKEY,                    XK_F8,          spawn,          {.v = (const char*[]){ "dm-unmounter", NULL } } }, */
+       { MODKEY,                       XK_F7,          spawn,          {.v = (const char*[]){ "dm-umounter", NULL } } },
+       /* { MODKEY,                    XK_F8,          spawn,          {.v = (const char*[]){ "dm-umounter", NULL } } }, */
        { MODKEY,                       XK_F9,          spawn,          {.v = (const char*[]){ "dm-maimpick", NULL } } },
        { MODKEY,                       XK_F10,         spawn,          {.v = (const char*[]){ "dm-record", NULL } } },
        { MODKEY,                       XK_F11,         spawn,          SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls /dev/video[0,2,4,6,8] | tail -n 1)") },

diff --git a/extras/TuCLS.7 b/extras/TuCLS.7
index 1560a00d499f52c50695d264dd37ba0f3bf10ff2..8f12aeef20f8c81d469408030ec1d176e60e9110 100644 (file)
--- a/extras/TuCLS.7
+++ b/extras/TuCLS.7
@@ -40,7 +40,7 @@ and more, in addition to compositionally related computation using any number of
 Any connected keyboard is remapped using the script
 .I remaps
 in
-.BR "~/.local/bin/".
+.BR "/usr/local/bin/".
 Two keys are remapped in the process:
 the key between Alt and Ctrl (either windows or command) becomes a Mod key
 and the Capslock key becomes escape when tapped and another Mod key when held.
@@ -53,21 +53,30 @@ They are also placed in different tags which can be navigated like alternate des
 .MR dwm 1
 man page)
 .TP
-.B Nav
+.B Navigation
 NB move/resize windows with 'Mod + left/right click'
 .TS
 tab(|) nospaces;
 l l.
-Mod + j/k|move down/up through windows in the stack
-Mod + Space|move selected window to top (or switch second window to top)
-Mod + h/l|diminish/augment width of main window
-Mod + z/x|diminish/augment gaps between windows
-Mod + a|toggle gaps on/off
-Mod + A|reset gaps to default scale
-Mod + Shift + Space|make a window float
-Mod + s|toggle a 'sticky' window that follows you through tags
+Mod + j / k|focus down/up in stack
+Mod + Shift + j / k|push window down/up in stack
+Mod + v|focus top of stack
+Mod + Space|zoom window to master
+Mod + Shift + Space|toggle floating
+Mod + h / l|shrink/grow master area
+Mod + s|toggle sticky
 Mod + b|toggle status bar
-Mod + v|jump to top window
+.TE
+.
+.TP
+.B Gaps
+.TS
+tab(|) nospaces;
+l l.
+Mod + z / x|increase/decrease gaps
+Mod + a|toggle gaps
+Mod + Shift + a|reset gaps to default
+Mod + Shift + '|toggle smart gaps
 .TE
 .
 .TP
@@ -75,18 +84,17 @@ Mod + v|jump to top window
 .TS
 tab(|) nospaces;
 l l.
-Mod + t|tiling \(en default|[tlng]
-Mod + T|horizontal tiling|[htlng]
-Mod + f|fullscreen selected window|
-Mod + F|floating|[fltg]
-Mod + y|spiral|[sprl]
-Mod + Y|dwindle|[dwdl]
-Mod + u|main on left, others in deck|[ldck]
-Mod + U|deck|[sdck]
-Mod + i|center main|[cntr]
-Mod + I|center, floating main|[fcntr]
-Mod + o/O|decrease/increase main window count|
-Mod + b|show/hide status bar
+Mod + t|tile (default) [tlng]
+Mod + Shift + t|horizontal tile (bstack) [htlng]
+Mod + y|spiral [sprl]
+Mod + Shift + y|dwindle [dwdl]
+Mod + u|deck \(en master left, stack in monocle [ldck]
+Mod + Shift + u|monocle [mncl]
+Mod + i|centered master [cntr]
+Mod + Shift + i|centered floating master [fcntr]
+Mod + Shift + f|floating [fltg]
+Mod + f|toggle fullscreen
+Mod + o / Shift + o|increase/decrease master count
 .TE
 .
 .TP
@@ -95,11 +103,16 @@ Tags function like workspaces or alternate desktops.
 .TS
 tab(|) nospaces;
 l l.
-Mod + 1-9|switch tags
-Mod + Shift + 1-9|send current window to a tag
+Mod + 1\(en9|switch to tag
+Mod + Shift + 1\(en9|send window to tag
+Mod + Ctrl + 1\(en9|toggle tag view
+Mod + Ctrl + Shift + 1\(en9|toggle window on tag
+Mod + 0|view all tags
+Mod + Shift + 0|send window to all tags
 Mod + Tab|switch to previous tag
-Mod + Left/Right|switch displays
-Mod + Shift + Left/Right|send current window to another display
+Mod + g|shift view left
+Mod + Page Up / Page Down|shift view left/right
+Mod + Shift + Page Up / Page Down|shift tag left/right
 .TE
 .
 .TP
@@ -107,33 +120,48 @@ Mod + Shift + Left/Right|send current window to another display
 .TS
 tab(|) nospaces;
 l l.
-Mod + left/right|navigate to another display
-Mod + Shift + left/right|send current window to another display
+Mod + Left / Right|focus previous/next monitor
+Mod + Shift + Left / Right|send window to previous/next monitor
+.TE
+.
+.TP
+.B Scratchpads
+.TS
+tab(|) nospaces;
+l l.
+Mod + Shift + Return|drop-down terminal (spterm)
+Mod + '|calculator scratchpad (bc)
 .TE
 .
 .SS System and Program Bindings
 .TP
 .B System
-NB media keys are not mapped, but could be adjusted in source.
 .TS
 tab(|) nospaces;
 l l.
-Mod + backspace|dmenu system functions
-Mod + Q|dmenu system functions
-Mod + -/+|default audio volume
-Mod + M|mute audio
-Mod + F1|dmenu display selection
+Mod + Backspace|dm-sysact
+Mod + Shift + Backspace|dm-sysact
+Mod + q|kill client
+Mod + Shift + q|dm-sysact
+Mod + -|volume \(mi5%
+Mod + Shift + -|volume \(mi15%
+Mod + =|volume +5%
+Mod + Shift + =|volume +15%
+Mod + Shift + m|mute toggle
+Mod + Shift + w|nmtui (Network Manager)
+Mod + F1|dm-displayselect
 Mod + F2|pulsemixer
 Mod + F3|qpwgraph
 Mod + F4|htop
-Mod + F5|dmenu drive mounter
-Mod + F6|dmenu cifs mounter
-Mod + F7|dmenu unmounter
-Mod + F9|dmenu screen select (maim)
-Mod + F10|dmenu screen recording (ffmpeg)
-Mod + F11|open webcam
-Mod + F12|remap keyboard
-Mod + W|Network Manager
+Mod + F5|dm-mounter
+Mod + F6|dm-mountcifs
+Mod + F7|dm-umounter
+Mod + F9|dm-maimpick
+Mod + F10|dm-record
+Mod + F11|mpv webcam
+Mod + F12|remaps
+Mod + Scroll_Lock|toggle screenkey
+Mod + Delete|stop recording
 .TE
 .
 .TP
@@ -141,17 +169,17 @@ Mod + W|Network Manager
 .TS
 tab(|) nospaces;
 l l.
-Mod + enter|terminal window
-Mod + shift + enter|drop-down terminal
-Mod + d|dmenu program launcher
-Mod + D|dmenu pass (password manager)
-Mod + S|dmenu stream select (see dmenu scripts)
+Mod + Return|terminal (st)
+Mod + d|dmenu_run
+Mod + Shift + d|passmenu
+Mod + w|librewolf
 Mod + e|neomutt
-Mod + E|abook
-Mod + w|web browser
-Mod + n|notes (see notes)
-Mod + N|newsboat
-Mod + M|ncmpcpp (see music and media)
+Mod + Shift + e|abook
+Mod + m|ncmpcpp
+Mod + n|dm-notepick
+Mod + Shift + n|newsboat
+Mod + Shift + s|dm-streamselect
+Mod + `|dmenuunicode
 .TE
 .
 .TP
@@ -160,11 +188,35 @@ using the programs mpd and mpv
 .TS
 tab(|) nospaces;
 l l.
-Mod + P|pause mpd and end any mpv instance
-Mod + ,|mpd previous track
-Mod + .|mpd next track
-Mod + <|mpd restart track
-Mod + >|mpd repeat
+Mod + p|mpc toggle
+Mod + Shift + p|mpc pause + kill all mpv
+Mod + ,|mpc prev
+Mod + Shift + ,|mpc seek 0% (restart track)
+Mod + .|mpc next
+Mod + Shift + .|mpc repeat
+Mod + [|mpc seek \(mi10s
+Mod + Shift + [|mpc seek \(mi60s
+Mod + ]|mpc seek +10s
+Mod + Shift + ]|mpc seek +60s
+.TE
+.
+.TP
+.B Screenshots and Recording
+.TS
+tab(|) nospaces;
+l l.
+Print|full screenshot (maim)
+Shift + Print|maimpick (interactive)
+Mod + Print|dmenurecord
+Mod + Shift + Print|dmenurecord kill
+.TE
+.
+.TP
+.B Help
+.TS
+tab(|) nospaces;
+l l.
+Mod + Shift + /|man TuCLS
 .TE
 .
 .SH Author