Add support for readonly hotkeys and expose chat input hotkeys

OpenRA.Game/HotkeyDefinition.cs

@@ -21,6 +21,7 @@ namespace OpenRA
 		public readonly string Description = "";
 		public readonly HashSet<string> Types = new HashSet<string>();
 		public readonly HashSet<string> Contexts = new HashSet<string>();
+		public readonly bool Readonly = false;
 		public bool HasDuplicates { get; internal set; }
 
 		public HotkeyDefinition(string name, MiniYaml node)
@@ -49,6 +50,10 @@ namespace OpenRA
 				if (platformOverride != null)
 					Default = FieldLoader.GetValue<Hotkey>("value", platformOverride.Value.Value);
 			}
+
+			var readonlyNode = node.Nodes.FirstOrDefault(n => n.Key == "Readonly");
+			if (readonlyNode != null)
+				Readonly = FieldLoader.GetValue<bool>("Readonly", readonlyNode.Value.Value);
 		}
 	}
 }

OpenRA.Game/HotkeyManager.cs

@@ -35,7 +35,7 @@ namespace OpenRA
 
 			foreach (var kv in settings)
 			{
-				if (definitions.ContainsKey(kv.Key))
+				if (definitions.ContainsKey(kv.Key) && !definitions[kv.Key].Readonly)
 					keys[kv.Key] = kv.Value;
 			}
 
@@ -61,6 +61,9 @@ namespace OpenRA
 			if (!definitions.TryGetValue(name, out var definition))
 				return;
 
+			if (definition.Readonly)
+				return;
+
 			keys[name] = value;
 			if (value != definition.Default)
 				settings[name] = value;

OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs

@@ -86,6 +86,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				selectedHotkeyButton = remapButton;
 				hotkeyEntryWidget.Key = modData.Hotkeys[hd.Name].GetValue();
 				ValidateHotkey();
+
+				if (hd.Readonly)
+					hotkeyEntryWidget.YieldKeyboardFocus();
+				else
 					hotkeyEntryWidget.TakeKeyboardFocus();
 			};
 
@@ -228,17 +232,21 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var originalNoticeText = new CachedTransform<HotkeyDefinition, string>(hd => originalNotice.Text.F(hd?.Default.DisplayString()));
 			originalNotice.GetText = () => originalNoticeText.Update(selectedHotkeyDefinition);
 
+			var readonlyNotice = panel.Get<LabelWidget>("READONLY_NOTICE");
+			readonlyNotice.TextColor = ChromeMetrics.Get<Color>("NoticeInfoColor");
+			readonlyNotice.IsVisible = () => selectedHotkeyDefinition.Readonly;
+
 			var resetButton = panel.Get<ButtonWidget>("RESET_HOTKEY_BUTTON");
-			resetButton.IsDisabled = () => isHotkeyDefault;
+			resetButton.IsDisabled = () => isHotkeyDefault || selectedHotkeyDefinition.Readonly;
 			resetButton.OnClick = ResetHotkey;
 
 			var clearButton = panel.Get<ButtonWidget>("CLEAR_HOTKEY_BUTTON");
-			clearButton.IsDisabled = () => !hotkeyEntryWidget.Key.IsValid();
+			clearButton.IsDisabled = () => selectedHotkeyDefinition.Readonly || !hotkeyEntryWidget.Key.IsValid();
 			clearButton.OnClick = ClearHotkey;
 
 			var overrideButton = panel.Get<ButtonWidget>("OVERRIDE_HOTKEY_BUTTON");
 			overrideButton.IsDisabled = () => isHotkeyValid;
-			overrideButton.IsVisible = () => !isHotkeyValid;
+			overrideButton.IsVisible = () => !isHotkeyValid && !duplicateHotkeyDefinition.Readonly;
 			overrideButton.OnClick = OverrideHotkey;
 
 			hotkeyEntryWidget = panel.Get<HotkeyEntryWidget>("HOTKEY_ENTRY");
@@ -248,6 +256,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			{
 				hotkeyEntryWidget.Key = modData.Hotkeys[selectedHotkeyDefinition.Name].GetValue();
 			};
+			hotkeyEntryWidget.IsDisabled = () => selectedHotkeyDefinition.Readonly;
 
 			validHotkeyEntryWidth = hotkeyEntryWidget.Bounds.Width;
 			invalidHotkeyEntryWidth = validHotkeyEntryWidth - (clearButton.Bounds.X - overrideButton.Bounds.X);
@@ -259,7 +268,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				return;
 
 			duplicateHotkeyDefinition = modData.Hotkeys.GetFirstDuplicate(selectedHotkeyDefinition, hotkeyEntryWidget.Key);
-			isHotkeyValid = duplicateHotkeyDefinition == null;
+			isHotkeyValid = duplicateHotkeyDefinition == null || selectedHotkeyDefinition.Readonly;
 			isHotkeyDefault = hotkeyEntryWidget.Key == selectedHotkeyDefinition.Default || (!hotkeyEntryWidget.Key.IsValid() && !selectedHotkeyDefinition.Default.IsValid());
 
 			if (isHotkeyValid)
@@ -269,13 +278,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			}
 			else
 			{
-				hotkeyEntryWidget.Bounds.Width = invalidHotkeyEntryWidth;
+				hotkeyEntryWidget.Bounds.Width = duplicateHotkeyDefinition.Readonly ? validHotkeyEntryWidth : invalidHotkeyEntryWidth;
 				hotkeyEntryWidget.TakeKeyboardFocus();
 			}
 		}
 
 		void SaveHotkey()
 		{
+			if (selectedHotkeyDefinition.Readonly)
+				return;
+
 			WidgetUtils.TruncateButtonToTooltip(selectedHotkeyButton, hotkeyEntryWidget.Key.DisplayString());
 			modData.Hotkeys.Set(selectedHotkeyDefinition.Name, hotkeyEntryWidget.Key);
 			Game.Settings.Save();

mods/cnc/chrome/ingame-chat.yaml

@@ -32,7 +32,7 @@ Container@CHAT_PANEL:
 					Height: 25
 					Text: Team
 					Font: Bold
-					Key: Tab SHIFT
+					Key: ToggleChatMode
 					TooltipText: Toggle chat mode
 					TooltipTemplate: BUTTON_TOOLTIP_FACTIONSUFFIX
 					TooltipContainer: TOOLTIP_CONTAINER

mods/cnc/chrome/ingame-infochat.yaml

@@ -19,7 +19,7 @@ Container@CHAT_CONTAINER:
 					Height: 25
 					Text: Team
 					Font: Bold
-					Key: Tab SHIFT
+					Key: ToggleChatMode
 					TooltipText: Toggle chat mode
 					TooltipContainer: TOOLTIP_CONTAINER
 				TextField@CHAT_TEXTFIELD:

mods/cnc/chrome/lobby.yaml

@@ -110,7 +110,7 @@ Container@SERVER_LOBBY:
 							Height: 25
 							Text: Team
 							Font: Bold
-							Key: Tab SHIFT
+							Key: ToggleChatMode
 							TooltipText: Toggle chat mode
 							TooltipContainer: TOOLTIP_CONTAINER
 						TextField@CHAT_TEXTFIELD:

mods/cnc/chrome/settings-hotkeys.yaml

@@ -131,6 +131,11 @@ Container@HOTKEYS_PANEL:
 									Height: PARENT_BOTTOM
 									Font: Tiny
 									Text: This is already used for "{0}" in the {1} context
+								Label@READONLY_NOTICE:
+									Width: PARENT_RIGHT
+									Height: PARENT_BOTTOM
+									Font: Tiny
+									Text: This hotkey cannot be modified
 						Button@OVERRIDE_HOTKEY_BUTTON:
 							X: PARENT_RIGHT - 3 * WIDTH - 30
 							Y: 20

mods/common/chrome/ingame-chat.yaml

@@ -31,7 +31,7 @@ Container@CHAT_PANEL:
 					Height: 25
 					Text: Team
 					Font: Bold
-					Key: Tab SHIFT
+					Key: ToggleChatMode
 					TooltipText: Toggle chat mode
 					TooltipContainer: TOOLTIP_CONTAINER
 				TextField@CHAT_TEXTFIELD:

mods/common/chrome/ingame-infochat.yaml

@@ -19,7 +19,7 @@ Container@CHAT_CONTAINER:
 					Height: 25
 					Text: Team
 					Font: Bold
-					Key: Tab SHIFT
+					Key: ToggleChatMode
 					TooltipText: Toggle chat mode
 					TooltipContainer: TOOLTIP_CONTAINER
 				TextField@CHAT_TEXTFIELD:

mods/common/chrome/lobby.yaml

@@ -114,7 +114,7 @@ Background@SERVER_LOBBY:
 					Height: 25
 					Text: Team
 					Font: Bold
-					Key: Tab SHIFT
+					Key: ToggleChatMode
 					TooltipText: Toggle chat mode
 					TooltipContainer: TOOLTIP_CONTAINER
 				TextField@CHAT_TEXTFIELD:

mods/common/chrome/settings-hotkeys.yaml

@@ -131,6 +131,11 @@ Container@HOTKEYS_PANEL:
 									Height: PARENT_BOTTOM
 									Font: Tiny
 									Text: This is already used for "{0}" in the {1} context
+								Label@READONLY_NOTICE:
+									Width: PARENT_RIGHT
+									Height: PARENT_BOTTOM
+									Font: Tiny
+									Text: This hotkey cannot be modified
 						Button@OVERRIDE_HOTKEY_BUTTON:
 							X: PARENT_RIGHT - 3 * WIDTH - 30
 							Y: 20

mods/common/hotkeys/chat.yaml

@@ -7,3 +7,15 @@ OpenGeneralChat: Return Shift
 	Description: Open General Chat
 	Types: Chat
 	Contexts: Player, Spectator
+
+ToggleChatMode: Tab Shift
+	Description: Toggle Chat Mode
+	Types: Chat
+	Contexts: Chat Input, Menu
+	Readonly: True
+
+Autocomplete: Tab
+	Description: Autocomplete
+	Types: Chat
+	Contexts: Chat Input
+	Readonly: True

mods/ts/chrome/settings-hotkeys.yaml

@@ -133,6 +133,11 @@ Container@HOTKEYS_PANEL:
 									Height: PARENT_BOTTOM
 									Font: Tiny
 									Text: This is already used for "{0}" in the {1} context
+								Label@READONLY_NOTICE:
+									Width: PARENT_RIGHT
+									Height: PARENT_BOTTOM
+									Font: Tiny
+									Text: This hotkey cannot be modified
 						Button@OVERRIDE_HOTKEY_BUTTON:
 							X: PARENT_RIGHT - 3 * WIDTH - 30
 							Y: 20