empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework a bit the way keys are processed.

Browse source 
Add Ctrl-'-' = 0x1f.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2020-06-19 18:23:29 +01:00
parent 8502d4b0d9
commit b01bfe8b49
1 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
source/frontends/qapple/video.cpp
View file

@ -106,35 +106,33 @@ void Video::keyReleaseEvent(QKeyEvent *event)
{
case Qt::Key_AltGr:
Paddle::setButtonReleased(Paddle::ourOpenApple);
break;
return;
case Qt::Key_Menu:
Paddle::setButtonReleased(Paddle::ourClosedApple);
break;
return;
}
}
// should we always call?
VIDEO_BASECLASS::keyReleaseEvent(event);
}
void Video::keyPressEvent(QKeyEvent *event)
{
const int key = event->key();
if (!event->isAutoRepeat())
{
const int key = event->key();
switch (key)
{
case Qt::Key_AltGr:
Paddle::setButtonPressed(Paddle::ourOpenApple);
break;
return;
case Qt::Key_Menu:
Paddle::setButtonPressed(Paddle::ourClosedApple);
break;
return;
}
}
const int key = event->key();
BYTE ch = 0;
switch (key)
@ -165,30 +163,50 @@ void Video::keyPressEvent(QKeyEvent *event)
case Qt::Key_Tab:
ch = 0x09;
break;
default:
if (key < 0x80)
case 'A' ... 'Z':
case ']':
case '[':
case '\\':
{
ch = key;
const Qt::KeyboardModifiers modifiers = event->modifiers();
if (modifiers & Qt::ControlModifier)
{
ch = key;
if (ch >= 'A' && ch <= 'Z')
{
const Qt::KeyboardModifiers modifiers = event->modifiers();
if (modifiers & Qt::ControlModifier)
{
ch = (ch - 'A') + 1;
}
else if (modifiers & Qt::ShiftModifier)
{
ch += 'a' - 'A';
}
}
ch = (ch - 'A') + 1;
}
else if (modifiers & Qt::ShiftModifier)
{
ch += 'a' - 'A';
}
break;
}
case '-':
{
ch = key;
const Qt::KeyboardModifiers modifiers = event->modifiers();
if (modifiers & Qt::ControlModifier)
{
ch = 0x1f;
}
break;
}
default:
{
if (key < 0x80)
{
ch = key;
}
}
}
if (ch)
{
addKeyToBuffer(ch);
event->accept();
}
else
{
VIDEO_BASECLASS::keyPressEvent(event);
}
}