Skip to content

Commit

Permalink
fix: windows: AltGr maps to LEFT_CTRL+RIGHT_ALT (#1162)
Browse files Browse the repository at this point in the history 
On Windows, some keyboard layouts have an AltGr button that's similar to
the Mac options button and can be used to send characters.
This PR respects the AltGr button and treat its characters as bubbletea
key runes.

Fixes: #1126
  • Loading branch information
@aymanbagabas
aymanbagabas authored Feb 6, 2025
1 parent 696e4ab commit c66daf9
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions key_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,11 @@ func keyType(e coninput.KeyEventRecord) KeyType {
case coninput.VK_DELETE:
return KeyDelete
default:
if e.ControlKeyState&(coninput.LEFT_CTRL_PRESSED|coninput.RIGHT_CTRL_PRESSED) == 0 {
switch {
case e.ControlKeyState.Contains(coninput.LEFT_CTRL_PRESSED) && e.ControlKeyState.Contains(coninput.RIGHT_ALT_PRESSED):
// AltGr is pressed, then it's a rune.
fallthrough
case !e.ControlKeyState.Contains(coninput.LEFT_CTRL_PRESSED) && !e.ControlKeyState.Contains(coninput.RIGHT_CTRL_PRESSED):
return KeyRunes
}

Expand Down Expand Up @@ -334,7 +338,7 @@ func keyType(e coninput.KeyEventRecord) KeyType {
case '\x1a':
return KeyCtrlZ
case '\x1b':
return KeyCtrlCloseBracket
return KeyCtrlOpenBracket // KeyEscape
case '\x1c':
return KeyCtrlBackslash
case '\x1f':
Expand All @@ -344,6 +348,8 @@ func keyType(e coninput.KeyEventRecord) KeyType {
switch code {

Check failure on line 348 in key_windows.go

View workflow job for this annotation

GitHub Actions / lint / lint-soft (windows-latest) 

missing cases in switch of type coninput.VirtualKeyCode: coninput.VK_LBUTTON, coninput.VK_RBUTTON, coninput.VK_CANCEL, coninput.VK_MBUTTON, coninput.VK_XBUTTON1, coninput.VK_XBUTTON2, coninput.VK_BACK, coninput.VK_TAB, coninput.VK_CLEAR, coninput.VK_RETURN, coninput.VK_SHIFT, coninput.VK_CONTROL, coninput.VK_MENU, coninput.VK_PAUSE, coninput.VK_CAPITAL, coninput.VK_KANA|coninput.VK_HANGEUL|coninput.VK_HANGUL, coninput.VK_IME_ON, coninput.VK_JUNJA, coninput.VK_FINAL, coninput.VK_HANJA|coninput.VK_KANJI, coninput.VK_IME_OFF, coninput.VK_ESCAPE, coninput.VK_CONVERT, coninput.VK_NONCONVERT, coninput.VK_ACCEPT, coninput.VK_MODECHANGE, coninput.VK_SPACE, coninput.VK_PRIOR, coninput.VK_NEXT, coninput.VK_END, coninput.VK_HOME, coninput.VK_LEFT, coninput.VK_UP, coninput.VK_RIGHT, coninput.VK_DOWN, coninput.VK_SELECT, coninput.VK_PRINT, coninput.VK_EXECUTE, coninput.VK_SNAPSHOT, coninput.VK_INSERT, coninput.VK_DELETE, coninput.VK_HELP, coninput.VK_0, coninput.VK_1, coninput.VK_2, coninput.VK_3, coninput.VK_4, coninput.VK_5, coninput.VK_6, coninput.VK_7, coninput.VK_8, coninput.VK_9, coninput.VK_A, coninput.VK_B, coninput.VK_C, coninput.VK_D, coninput.VK_E, coninput.VK_F, coninput.VK_G, coninput.VK_H, coninput.VK_I, coninput.VK_J, coninput.VK_K, coninput.VK_L, coninput.VK_M, coninput.VK_N, coninput.VK_O, coninput.VK_P, coninput.VK_Q, coninput.VK_R, coninput.VK_S, coninput.VK_T, coninput.VK_U, coninput.VK_V, coninput.VK_W, coninput.VK_X, coninput.VK_Y, coninput.VK_Z, coninput.VK_LWIN, coninput.VK_RWIN, coninput.VK_APPS, coninput.VK_SLEEP, coninput.VK_NUMPAD0, coninput.VK_NUMPAD1, coninput.VK_NUMPAD2, coninput.VK_NUMPAD3, coninput.VK_NUMPAD4, coninput.VK_NUMPAD5, coninput.VK_NUMPAD6, coninput.VK_NUMPAD7, coninput.VK_NUMPAD8, coninput.VK_NUMPAD9, coninput.VK_MULTIPLY, coninput.VK_ADD, coninput.VK_SEPARATOR, coninput.VK_SUBTRACT, coninput.VK_DECIMAL, coninput.VK_DIVIDE, coninput.VK_F1, coninput.VK_F2, coninput.VK_F3, coninput.VK_F4, coninput.VK_F5, coninput.VK_F6, coninput.VK_F7, coninput.VK_F8, coninput.VK_F9, coninput.VK_F10, coninput.VK_F11, coninput.VK_F12, coninput.VK_F13, coninput.VK_F14, coninput.VK_F15, coninput.VK_F16, coninput.VK_F17, coninput.VK_F18, coninput.VK_F19, coninput.VK_F20, coninput.VK_F21, coninput.VK_F22, coninput.VK_F23, coninput.VK_F24, coninput.VK_NUMLOCK, coninput.VK_SCROLL, coninput.VK_OEM_NEC_EQUAL|coninput.VK_OEM_FJ_JISHO, coninput.VK_OEM_FJ_MASSHOU, coninput.VK_OEM_FJ_TOUROKU, coninput.VK_OEM_FJ_LOYA, coninput.VK_OEM_FJ_ROYA, coninput.VK_LSHIFT, coninput.VK_RSHIFT, coninput.VK_LCONTROL, coninput.VK_RCONTROL, coninput.VK_LMENU, coninput.VK_RMENU, coninput.VK_BROWSER_BACK, coninput.VK_BROWSER_FORWARD, coninput.VK_BROWSER_REFRESH, coninput.VK_BROWSER_STOP, coninput.VK_BROWSER_SEARCH, coninput.VK_BROWSER_FAVORITES, coninput.VK_BROWSER_HOME, coninput.VK_VOLUME_MUTE, coninput.VK_VOLUME_DOWN, coninput.VK_VOLUME_UP, coninput.VK_MEDIA_NEXT_TRACK, coninput.VK_MEDIA_PREV_TRACK, coninput.VK_MEDIA_STOP, coninput.VK_MEDIA_PLAY_PAUSE, coninput.VK_LAUNCH_MAIL, coninput.VK_LAUNCH_MEDIA_SELECT, coninput.VK_LAUNCH_APP1, coninput.VK_LAUNCH_APP2, coninput.VK_OEM_1, coninput.VK_OEM_PLUS, coninput.VK_OEM_COMMA, coninput.VK_OEM_MINUS, coninput.VK_OEM_PERIOD, coninput.VK_OEM_2, coninput.VK_OEM_3, coninput.VK_OEM_5, coninput.VK_OEM_7, coninput.VK_OEM_8, coninput.VK_OEM_AX, coninput.VK_OEM_102, coninput.VK_ICO_HELP, coninput.VK_ICO_00, coninput.VK_PROCESSKEY, coninput.VK_ICO_CLEAR, coninput.VK_OEM_RESET, coninput.VK_OEM_JUMP, coninput.VK_OEM_PA1, coninput.VK_OEM_PA2, coninput.VK_OEM_PA3, coninput.VK_OEM_WSCTRL, coninput.VK_OEM_CUSEL, coninput.VK_OEM_ATTN, coninput.VK_OEM_FINISH, coninput.VK_OEM_COPY, coninput.VK_OEM_AUTO, coninput.VK_OEM_ENLW, coninput.VK_OEM_BACKTAB, coninput.VK_ATTN, coninput.VK_CRSEL, coninput.VK_EXSEL, coninput.VK_EREOF, coninput.VK_PLAY, coninput.VK_ZOOM, coninput.VK_NONAME, coninput.VK_PA1, coninput.VK_OEM_CLEAR (exhaustive)
case coninput.VK_OEM_4:
return KeyCtrlOpenBracket
case coninput.VK_OEM_6:
return KeyCtrlCloseBracket
}

return KeyRunes
Expand Down

0 comments on commit c66daf9

Please sign in to comment.