Move keyboard layout control to saturnin-kb

An improved version of previous code

mkit/config.ini

@@ -48,6 +48,7 @@
     src/libexec/saturnin-iam                = saturnin-iam
     src/libexec/saturnin-conf               = saturnin-conf
     src/libexec/saturnin-ip                 = saturnin-ip
+    src/libexec/saturnin-kb                 = saturnin-kb
     src/libexec/saturnin-ln                 = saturnin-ln
     src/libexec/saturnin-push               = saturnin-push
     src/libexec/saturnin-revert             = saturnin-revert

src/libexec/saturnin-iam

@@ -16,12 +16,9 @@ available_commands() {
     echo afk
     echo at
     echo back
-    echo bbl
-    echo bbldone
     echo gone
     echo ooo
     echo wfh
-    echo writing
     echo undocking
     echo zleeping
 }
@@ -103,31 +100,6 @@ i_am_back() {
     klist -s || urxvt -e kinit
 }
 
-i_am_bbl() {
-    #
-    # changing language
-    #
-    local cur=$(setxkbmap -v | grep '^symbols: ' | cut -d+ -f2)
-    local all="$(saturnin conf    -p iam.typing.lang)"
-    local def="$(saturnin conf -1 -p iam.typing.lang)"
-    local nxt=$(
-        echo -e "$all\n$all" \
-          | grep -m 1 -A 1 $cur \
-          | tail -1
-    )
-    test -z "$nxt" && nxt=$def
-    test -z "$nxt" && nxt=us
-    debug -v all def cur nxt
-    setxkbmap "$nxt"
-}
-
-i_am_bbldone() {
-    #
-    # changing language back to normal
-    #
-    setxkbmap "$(saturnin conf -1 -p iam.typing.lang)"
-}
-
 i_am_gone() {
     #
     # gone fishin'
@@ -153,14 +125,6 @@ i_am_wfh() {
     die "not implemented"
 }
 
-i_am_writing() {
-    #
-    # writing in that language
-    #
-    set -x
-    DISPLAY=:0 setxkbmap $1
-}
-
 i_am_undocking() {
     #
     # i.e. hibernated

src/libexec/saturnin-kb

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+. $(ffoom path)
+
+ffoo import pretty
+
+
+usage() {
+    usage_is "[show]" \
+             "next" \
+             "home" \
+             "layout LAYOUT"
+}
+
+next_layout() {
+    #
+    # change layout to the next one in row
+    #
+    local cur="$current_layout"
+    local all="$(saturnin conf -p kb.layout)"
+    local def="$default_layout"
+    local nxt=$(
+        echo -e "$all\n$all" \
+          | grep -m 1 -A 1 $cur \
+          | tail -1
+    )
+    test -z "$nxt" && nxt=$def
+    test -z "$nxt" && nxt=us
+    debug -v all def cur nxt
+    echo "$nxt"
+}
+
+default_layout="$(saturnin conf -1 -p kb.layout)"
+current_layout="$(setxkbmap -v | grep '^symbols: ' | cut -d+ -f2)"
+
+layout=""
+action=show
+case "$1" in
+    home)     action=set; layout="$default_layout" ;;
+    next)     action=set; layout="$(next_layout)"  ;;
+    layout)   action=set; layout="$2"              ;;
+    ""|show)  true                                 ;;
+    *)        usage                                ;;
+esac
+
+
+debug -v layout current_layout default_layout
+
+case "$action" in
+    show)
+        echo "$current_layout"
+        exit
+        ;;
+    set)
+        test -n "$layout" || usage
+        setxkbmap "$layout"
+        ;;
+esac