Remove modifiers for "visual" and "mouse" modes.

Swap Hyper and Super. Hyper is supported by XMonad, but not by many
other applications, thus, I'd like to leave the more widely supported
Super key available for mapping in individual applications and use Hyper
to control XMonad.

Add indications via Caps and Num Lock LEDs that I'm in "Vi" mode.

2 files changed, 38 insertions, 19 deletions

diff --git a/jr b/jr
index d79338a..919d2cb 100644
--- a/jr
+++ b/jr
@@ -33,7 +33,7 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
     symbols[Group2] = []
   };
   key <LCTL> {
-    symbols[Group1] = [Super_L, Super_L, Super_L, Super_L, Super_L, Super_L, Super_L, Super_L],
+    symbols[Group1] = [Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L],
     symbols[Group2] = []
   };
   key <RTSH> {
@@ -57,13 +57,13 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
     symbols[Group2] = []
   };
   key <RCTL> {
-    symbols[Group1] = [Hyper_L, Hyper_L],
+    symbols[Group1] = [Super_L, Super_L],
     symbols[Group2] = []
   };
 
-  modifier_map Mod3 {<RCTL>};
+  modifier_map Mod4 {<RCTL>};
 
-  modifier_map Mod4 {<LCTL>};
+  modifier_map Mod3 {<LCTL>};
 
   key <RALT> {
     type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level3_Shift]
@@ -74,7 +74,18 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
     symbols[Group1] = type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level5_Shift],
     symbols[Group2] = []
   };
-  modifier_map Lock {<RTSH>, <MENU>};
+  modifier_map Lock {<RTSH> };
+
+  // Set Menu and PrintScreen to Hyper.
+  key <MENU> {
+    symbols = [Hyper_R],
+    actions = [SetMods(modifiers=Mod4)]
+  };
+
+  key <PRSC> {
+    symbols = [Hyper_R],
+    actions = [SetMods(modifiers=Mod4)]
+  };
 
   key <TLDE> {
     symbols[Group1] = [grave, asciitilde, dead_grave, dead_tilde],
@@ -263,16 +274,7 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
   };
   key <AB07> {
     symbols[Group1] = [m, M, mu, mu, Greek_mu, Greek_MU],
-    symbols[Group2] = [NoSymbol],
-    actions[Group2] = [
-      LockMods(modifiers=Mod5),
-      LockMods(modifiers=Mod5),
-      LockMods(modifiers=Mod5),
-      LockMods(modifiers=Mod5),
-      LockMods(modifiers=Mod5),
-      LockMods(modifiers=Mod5),
-      LockMods(modifiers=Mod5),
-      LockMods(modifiers=Mod5)]
+    symbols[Group2] = [NoSymbol]
   };
   key <AB08> {
     symbols[Group1] = [w, W, aring, Aring, Greek_finalsmallsigma],
@@ -280,10 +282,7 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
   };
   key <AB09> {
     symbols[Group1] = [v, V, U1F609, U1F620, Greek_omega, Greek_OMEGA],
-    symbols[Group2] = [NoSymbol],
-    actions[Group2] = [
-      LockMods(modifiers=Shift),
-      LockMods(modifiers=Shift)]
+    symbols[Group2] = [NoSymbol]
   };
   key <AB10> {
     symbols[Group1] = [z, Z, ae, AE, Greek_zeta, Greek_ZETA],
diff --git a/jrcompat b/jrcompat
index a75523d..234ac4e 100644
--- a/jrcompat
+++ b/jrcompat
@@ -8,6 +8,26 @@ default xkb_compatibility "jrcompat" {
   augment "level5"
   augment "caps(caps_lock)"
 
+  indicator "Caps Lock" {
+    modifiers = None;
+    groups = all-group1;
+  };
+
+  indicator "Num Lock" {
+    modifiers = None;
+    groups = all-group1;
+  };
+
+  indicator "Scroll Lock" {
+    modifiers = None;
+    groups = all-group1;
+  };
+
+  indicator "Misc" {
+    modifiers = None;
+    groups = all-group1;
+  };
+
   interpret User {
     action= LockGroup(group=2);
   };