Talon/chat_grid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Route main-mode key commands through main command router

Browse Source
This commit is contained in:
Jage9
2026-02-22 16:49:15 -05:00
parent e198ef5f80
commit ab26ceaafc
2 changed files with 336 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
client/src/input/mainCommandRouter.ts Normal file
View File

@@ -0,0 +1,55 @@
export type MainModeCommand =
| 'editNickname'
| 'toggleMute'
| 'toggleOutputMode'
| 'toggleLoopback'
| 'toggleVoiceLayer'
| 'toggleItemLayer'
| 'toggleMediaLayer'
| 'toggleWorldLayer'
| 'openEffectSelect'
| 'effectValueUp'
| 'effectValueDown'
| 'speakCoordinates'
| 'openMicGainEdit'
| 'calibrateMicrophone'
| 'useItemOrUsersSummary'
| 'addItem'
| 'locateOrListItems'
| 'pickupDropOrDelete'
| 'editOrInspectItem'
| 'pingServer'
| 'locateOrListUsers'
| 'openHelp'
| 'openChat'
| 'chatPrev'
| 'chatNext'
| 'chatFirst'
| 'chatLast'
| 'escape';
export function resolveMainModeCommand(code: string, shiftKey: boolean): MainModeCommand | null {
if (code === 'KeyN') return 'editNickname';
if (code === 'KeyM') return shiftKey ? 'toggleOutputMode' : 'toggleMute';
if (code === 'Digit1') return shiftKey ? 'toggleLoopback' : 'toggleVoiceLayer';
if (code === 'Digit2') return 'toggleItemLayer';
if (code === 'Digit3') return 'toggleMediaLayer';
if (code === 'Digit4') return 'toggleWorldLayer';
if (code === 'KeyE') return 'openEffectSelect';
if (code === 'Equal' || code === 'NumpadAdd') return 'effectValueUp';
if (code === 'Minus' || code === 'NumpadSubtract') return 'effectValueDown';
if (code === 'KeyC') return 'speakCoordinates';
if (code === 'KeyV') return shiftKey ? 'calibrateMicrophone' : 'openMicGainEdit';
if (code === 'KeyU') return 'useItemOrUsersSummary';
if (code === 'KeyA') return 'addItem';
if (code === 'KeyI') return 'locateOrListItems';
if (code === 'KeyD') return 'pickupDropOrDelete';
if (code === 'KeyO') return 'editOrInspectItem';
if (code === 'KeyP') return 'pingServer';
if (code === 'KeyL') return 'locateOrListUsers';
if (code === 'Slash') return shiftKey ? 'openHelp' : 'openChat';
if (code === 'Comma') return shiftKey ? 'chatFirst' : 'chatPrev';
if (code === 'Period') return shiftKey ? 'chatLast' : 'chatNext';
if (code === 'Escape') return 'escape';
return null;
}

126
client/src/main.ts
View File

@@ -28,6 +28,7 @@ import {
moveCursorWordRight,
shouldReplaceCurrentText,
} from './input/textInput';
import { resolveMainModeCommand } from './input/mainCommandRouter';
import { cycleIndex, findNextIndexByInitial } from './input/listNavigation';
import { formatSteppedNumber, snapNumberToStep } from './input/numeric';
import { type IncomingMessage, type OutgoingMessage } from './network/protocol';
@@ -1437,8 +1438,11 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
if (code !== 'Escape' && pendingEscapeDisconnect) {
pendingEscapeDisconnect = false;
}
const command = resolveMainModeCommand(code, shiftKey);
if (!command) return;
if (code === 'KeyN') {
switch (command) {
case 'editNickname':
state.mode = 'nickname';
state.nicknameInput = state.player.nickname;
state.cursorPos = state.player.nickname.length;
@@ -1446,48 +1450,34 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
updateStatus(`Nickname edit: ${state.nicknameInput}`);
audio.sfxUiBlip();
return;
}
if (code === 'KeyM') {
if (shiftKey) {
case 'toggleMute':
toggleMute();
return;
case 'toggleOutputMode':
outputMode = audio.toggleOutputMode();
localStorage.setItem(AUDIO_OUTPUT_MODE_STORAGE_KEY, outputMode);
updateStatus(outputMode === 'mono' ? 'Mono output.' : 'Stereo output.');
audio.sfxUiBlip();
return;
}
toggleMute();
return;
}
if (code === 'Digit1' && shiftKey) {
case 'toggleLoopback': {
const enabled = audio.toggleLoopback();
updateStatus(enabled ? 'Loopback on.' : 'Loopback off.');
audio.sfxUiBlip();
return;
}
if (code === 'Digit1') {
case 'toggleVoiceLayer':
toggleAudioLayer('voice');
return;
}
if (code === 'Digit2') {
case 'toggleItemLayer':
toggleAudioLayer('item');
return;
}
if (code === 'Digit3') {
case 'toggleMediaLayer':
toggleAudioLayer('media');
return;
}
if (code === 'Digit4') {
case 'toggleWorldLayer':
toggleAudioLayer('world');
return;
}
if (code === 'KeyE') {
case 'openEffectSelect': {
const currentEffect = audio.getCurrentEffect();
const currentIndex = EFFECT_SEQUENCE.findIndex((effect) => effect.id === currentEffect.id);
state.effectSelectIndex = currentIndex >= 0 ? currentIndex : 0;
@@ -1496,30 +1486,21 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
audio.sfxUiBlip();
return;
}
if (code === 'Equal' || code === 'NumpadAdd' || code === 'Minus' || code === 'NumpadSubtract') {
const step = code === 'Equal' || code === 'NumpadAdd' ? 5 : -5;
case 'effectValueUp':
case 'effectValueDown': {
const step = command === 'effectValueUp' ? 5 : -5;
const adjusted = audio.adjustCurrentEffectLevel(step);
if (!adjusted) {
return;
}
if (!adjusted) return;
persistEffectLevels();
audio.sfxEffectLevel(adjusted.value === adjusted.defaultValue);
updateStatus(`${adjusted.label} ${adjusted.value}`);
return;
}
if (code === 'KeyC') {
case 'speakCoordinates':
updateStatus(`${state.player.x}, ${state.player.y}`);
audio.sfxUiBlip();
return;
}
if (code === 'KeyV') {
if (shiftKey) {
void calibrateMicInputGain();
return;
}
case 'openMicGainEdit':
state.mode = 'micGainEdit';
state.nicknameInput = formatSteppedNumber(audio.getOutboundInputGain(), MIC_INPUT_GAIN_STEP);
state.cursorPos = state.nicknameInput.length;
@@ -1527,9 +1508,10 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
updateStatus(`Set microphone gain: ${state.nicknameInput}`);
audio.sfxUiBlip();
return;
}
if (code === 'KeyU') {
case 'calibrateMicrophone':
void calibrateMicInputGain();
return;
case 'useItemOrUsersSummary':
if (shiftKey) {
const allUsers = [state.player.nickname, ...Array.from(state.peers.values()).map((p) => p.nickname)];
const label = allUsers.length === 1 ? 'user' : 'users';
@@ -1537,6 +1519,7 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
audio.sfxUiBlip();
return;
}
{
const carried = getCarriedItem();
if (carried) {
useItem(carried);
@@ -1556,8 +1539,7 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
beginItemSelection('use', usable);
return;
}
if (code === 'KeyA') {
case 'addItem': {
const itemTypeSequence = getItemTypeSequence();
if (itemTypeSequence.length === 0) {
updateStatus('No item types available.');
@@ -1570,8 +1552,7 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
audio.sfxUiBlip();
return;
}
if (code === 'KeyI') {
case 'locateOrListItems':
if (shiftKey) {
if (state.items.size === 0) {
updateStatus('No items to list.');
@@ -1602,6 +1583,7 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
audio.sfxUiBlip();
return;
}
{
const nearest = getNearestItem(state);
if (!nearest.itemId) {
updateStatus('No items to locate.');
@@ -1616,8 +1598,7 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
);
return;
}
if (code === 'KeyD') {
case 'pickupDropOrDelete': {
const carried = getCarriedItem();
if (shiftKey) {
const squareItems = getItemsAtPosition(state.player.x, state.player.y);
@@ -1633,7 +1614,6 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
beginItemSelection('delete', squareItems);
return;
}
if (carried) {
signaling.send({ type: 'item_drop', itemId: carried.id, x: state.player.x, y: state.player.y });
return;
@@ -1651,8 +1631,7 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
beginItemSelection('pickup', squareItems);
return;
}
if (code === 'KeyO') {
case 'editOrInspectItem': {
const squareItems = getItemsAtPosition(state.player.x, state.player.y);
const carried = getCarriedItem();
if (shiftKey) {
@@ -1672,7 +1651,6 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
beginItemSelection('inspect', squareItems);
return;
}
if (squareItems.length === 0) {
if (!carried) {
updateStatus('No editable item here.');
@@ -1689,13 +1667,10 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
beginItemSelection('edit', squareItems);
return;
}
if (code === 'KeyP') {
case 'pingServer':
signaling.send({ type: 'ping', clientSentAt: Date.now() });
return;
}
if (code === 'KeyL') {
case 'locateOrListUsers':
if (shiftKey) {
if (state.peers.size === 0) {
updateStatus('No users to list.');
@@ -1720,7 +1695,7 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
audio.sfxUiBlip();
return;
}
{
const nearest = getNearestPeer(state);
if (!nearest.peerId) {
updateStatus('No users to locate.');
@@ -1735,13 +1710,10 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
);
return;
}
if (code === 'Slash' && shiftKey) {
case 'openHelp':
openHelpViewer();
return;
}
if (code === 'Slash' && !shiftKey) {
case 'openChat':
state.mode = 'chat';
state.nicknameInput = '';
state.cursorPos = 0;
@@ -1749,27 +1721,19 @@ function handleNormalModeInput(code: string, shiftKey: boolean): void {
updateStatus('Chat.');
audio.sfxUiBlip();
return;
}
if (code === 'Comma') {
if (shiftKey) {
navigateChatBuffer('first');
} else {
case 'chatPrev':
navigateChatBuffer('prev');
}
return;
}
if (code === 'Period') {
if (shiftKey) {
navigateChatBuffer('last');
} else {
case 'chatNext':
navigateChatBuffer('next');
}
return;
}
if (code === 'Escape') {
case 'chatFirst':
navigateChatBuffer('first');
return;
case 'chatLast':
navigateChatBuffer('last');
return;
case 'escape':
if (pendingEscapeDisconnect) {
pendingEscapeDisconnect = false;
disconnect();