Skip to content

Improve AltGr modifier triggering detection #965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnd0e wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve AltGr modifier triggering detection #965

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f75034c
Simplify modifiers-only triggering detection
johnd0e Jun 2, 2025
53d519b
Improve AltGr modifier triggering detection
johnd0e Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 8 additions & 32 deletions far/keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ enum MODIF_PRESSED_LAST
MODIF_CTRL = 3_bit,
MODIF_RCTRL = 4_bit,
};
static TBitFlags<size_t> PressedLast;
static bool LastWasDown, LastWasAltGr;

static std::chrono::steady_clock::time_point KeyPressedLastTime;

Expand Down Expand Up @@ -742,7 +742,7 @@ static DWORD ProcessFocusEvent(bool Got)

/* $ 28.04.2001 VVM
+ Не только обработаем сами смену фокуса, но и передадим дальше */
PressedLast.ClearAll();
LastWasDown = false;

UpdateIntKeyState(0);

Expand Down Expand Up @@ -1116,6 +1116,7 @@ static DWORD GetInputRecordImpl(INPUT_RECORD *rec,bool ExcludeMacro,bool Process
{
const auto CtrlState = rec->Event.KeyEvent.dwControlKeyState;
const auto KeyCode = rec->Event.KeyEvent.wVirtualKeyCode;
const auto KeyDown = rec->Event.KeyEvent.bKeyDown;

UpdateIntKeyState(CtrlState);

Expand All @@ -1127,37 +1128,12 @@ static DWORD GetInputRecordImpl(INPUT_RECORD *rec,bool ExcludeMacro,bool Process
true :
(CtrlState & SHIFT_PRESSED) != 0;

struct KeysData
{
size_t FarKey;
size_t VkKey;
size_t Modif;
bool Enhanced;
}
const Keys[]
{
{ KEY_SHIFT, VK_SHIFT, MODIF_SHIFT, false, },
{ KEY_ALT, VK_MENU, MODIF_ALT, false, },
{ KEY_RALT, VK_MENU, MODIF_RALT, true, },
{ KEY_CTRL, VK_CONTROL, MODIF_CTRL, false, },
{ KEY_RCTRL, VK_CONTROL, MODIF_RCTRL, true, },
};

if (std::ranges::any_of(Keys, [&CalcKey](const KeysData& A){ return CalcKey == A.FarKey && !PressedLast.Check(A.Modif); }))
if (!KeyDown && CalcKey != KEY_NONE
&& (!LastWasDown || LastWasAltGr && KeyCode == VK_CONTROL && !(CtrlState & ENHANCED_KEY)))
CalcKey = KEY_NONE;

const size_t AllModif = KEY_CTRL | KEY_ALT | KEY_SHIFT | KEY_RCTRL | KEY_RALT;
if ((CalcKey&AllModif) && !(CalcKey&~AllModif) && !PressedLast.Check(MODIF_SHIFT | MODIF_ALT | MODIF_RALT | MODIF_CTRL | MODIF_RCTRL)) CalcKey=KEY_NONE;
PressedLast.ClearAll();

if (rec->Event.KeyEvent.bKeyDown)
{
for (const auto& A: Keys)
{
if (KeyCode == A.VkKey && (!A.Enhanced || CtrlState & ENHANCED_KEY))
PressedLast.Set(A.Modif);
}
}
else
LastWasDown = CalcKey == KEY_NONE && KeyDown;
LastWasAltGr = KeyDown && KeyCode == VK_MENU && ENHANCED_KEY == (CtrlState & (ENHANCED_KEY | LEFT_CTRL_PRESSED));

Panel::EndDrag();
}
Expand Down