Show input modes in the keyboard indicator

shell/plugins/bar/widgets/KeyboardLayout.manifest.json

@@ -4,7 +4,7 @@
   "name": "Keyboard layout",
   "version": "1.0.0",
   "author": "Omarchy",
-  "description": "Current xkb layout, click cycles",
+  "description": "Current keyboard layout and input language, click cycles",
   "kinds": [
     "bar-widget"
   ],
@@ -13,7 +13,7 @@
   },
   "barWidget": {
     "displayName": "Keyboard layout",
-    "description": "Current xkb layout, click cycles",
+    "description": "Current keyboard layout and input language, click cycles",
     "category": "Compositor",
     "allowMultiple": false
   },

shell/plugins/bar/widgets/KeyboardLayout.qml

@@ -36,6 +36,9 @@ BarWidget {
   // xkb's own table rather than maintained by hand.
   property var layoutBriefs: ({})
   readonly property string layoutLabel: KeyboardLayoutModel.shortLabel(layoutFull, layoutBriefs)
+  property var inputState: ({})
+  readonly property bool multipleInputs: (inputState.methods || []).length > 1
+  readonly property string inputLabel: KeyboardLayoutModel.inputLabel(inputState, layoutLabel)
 
   // A query already in flight was started before this event, so it may read the
   // layout the switch replaced. Remember the request and re-run once it lands
@@ -228,7 +231,40 @@ BarWidget {
     onTriggered: root.refresh()
   }
 
-  visible: layoutLabel !== "" && multipleLayouts
+  Process {
+    id: inputWatcher
+    command: ["/usr/bin/python", Quickshell.env("OMARCHY_PATH") + "/default/input-methods/indicator.py"]
+    running: true
+    stdout: SplitParser {
+      onRead: data => {
+        try { root.inputState = JSON.parse(data) } catch (e) {}
+      }
+    }
+    onExited: {
+      root.inputState = ({})
+      inputRestart.restart()
+    }
+  }
+
+  Timer {
+    id: inputRestart
+    interval: 5000
+    onTriggered: inputWatcher.running = true
+  }
+
+  Process {
+    id: inputCycle
+    property int pending: 0
+    command: ["/usr/bin/python", Quickshell.env("OMARCHY_PATH") + "/default/input-methods/indicator.py", "cycle"]
+    onExited: {
+      if (pending > 0) {
+        pending--
+        running = true
+      }
+    }
+  }
+
+  visible: inputLabel !== "" && KeyboardLayoutModel.showIndicator(layoutLabel, multipleLayouts, multipleInputs)
   implicitWidth: button.implicitWidth
   implicitHeight: button.implicitHeight
 
@@ -236,10 +272,19 @@ BarWidget {
     id: button
     anchors.fill: parent
     bar: root.bar
-    text: root.layoutLabel
+    text: root.inputLabel
     fontSize: Style.font.caption
     horizontalMargin: 6
-    tooltipText: root.layoutFull
-    onPressed: function() { root.cycleLayout() }
+    tooltipText: KeyboardLayoutModel.inputTooltip(root.inputState, root.layoutFull, root.multipleLayouts)
+    onPressed: function(button) {
+      if (root.multipleInputs && button === Qt.LeftButton) {
+        if (inputCycle.running) inputCycle.pending++
+        else inputCycle.running = true
+      } else if (root.multipleLayouts) {
+        root.cycleLayout()
+      } else if (!root.multipleInputs && root.bar) {
+        root.bar.run("omarchy-launch-floating-terminal-with-presentation 'omarchy-setup-input'")
+      }
+    }
   }
 }

shell/plugins/bar/widgets/KeyboardLayoutModel.js

@@ -110,6 +110,28 @@ function selectKeyboard(typed, namedByEvent) {
   }, keyboards[0])
 }
 
+function inputLabel(state, fallback) {
+  if (!state || !state.current || state.current.indexOf("keyboard-") === 0) return fallback
+  if (state.label) return String(state.label).substring(0, 3)
+  var labels = { mozc: "あ", hangul: "한", pinyin: "拼", chewing: "注" }
+  return labels[state.current] || shortLabel(state.language || state.name, {})
+}
+
+function inputTooltip(state, layout, multipleLayouts) {
+  if (!state || !state.methods || state.methods.length < 2)
+    return layout + (multipleLayouts ? "" : "\nClick to set up an input language")
+  var text = state.name + "\nClick to switch input language"
+  if (state.methods.indexOf("mozc") !== -1)
+    text += "\nJapanese: type a word, then Space twice for character choices"
+  if (multipleLayouts) text += "\nRight-click to switch keyboard layout"
+  return text
+}
+
+function showIndicator(layoutLabel, multipleLayouts, multipleInputs) {
+  return multipleInputs || (layoutLabel !== "" &&
+    (multipleLayouts || (layoutLabel !== "EN" && layoutLabel !== "ENG")))
+}
+
 function layoutIndex(keyboard) {
   return (keyboard && keyboard.active_layout_index) || 0
 }
@@ -120,6 +142,9 @@ if (typeof module !== "undefined") {
     isTypedKeyboard: isTypedKeyboard,
     layoutBriefs: layoutBriefs,
     selectKeyboard: selectKeyboard,
-    shortLabel: shortLabel
+    shortLabel: shortLabel,
+    inputLabel: inputLabel,
+    inputTooltip: inputTooltip,
+    showIndicator: showIndicator
   }
 }