6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-17 13:29:02 +00:00
Code Issues Projects Releases Wiki Activity

Undoes extra dependency, checks for X11 at runtime.

Browse Source
This commit is contained in:
Thomas Harte 2020-07-08 00:15:44 -04:00
parent 0763ae38dd
commit fa26c82273
3 changed files with 57 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OSBindings/Qt/ClockSignal.pro
View File

@ -1,11 +1,5 @@
QT += core gui multimedia widgets QT += core gui multimedia widgets
unix:!mac {
# For non-Mac UNIX targets, include X11 extras to check for X11.
# x11extras isn't supported on the Mac.
QT += x11extras
}
CONFIG += c++17 CONFIG += c++17
# Permit multiple source files in different directories to have the same file name. # Permit multiple source files in different directories to have the same file name.

52
OSBindings/Qt/mainwindow.cpp
View File

@ -765,18 +765,6 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event) {
processEvent(event); processEvent(event);
} }
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
#include <QX11Info>
#endif
bool MainWindow::processEvent(QKeyEvent *event) {
if(!machine) return true;
const auto keyboardMachine = machine->keyboard_machine();
if(!keyboardMachine) return true;
// Qt is the worst. // Qt is the worst.
// //
// Assume your keyboard has a key labelled both . and >, as they do on US and UK keyboards. Call it the dot key. // Assume your keyboard has a key labelled both . and >, as they do on US and UK keyboards. Call it the dot key.
@ -801,18 +789,28 @@ bool MainWindow::processEvent(QKeyEvent *event) {
// //
// So how can you track the physical keys on a keyboard via Qt? // So how can you track the physical keys on a keyboard via Qt?
// //
// You can't. Qt is the worst. SDL doesn't have this problem, including in X11, so this seems to be a problem // You can't. Qt is the worst. SDL doesn't have this problem, including in X11, but I'm not sure I want the extra
// Qt has invented for itself. // dependency. I may need to reassess.
// Workaround for X11: assume std::optional<Inputs::Keyboard::Key> MainWindow::keyForEvent(QKeyEvent *event) {
// QX11Info::isPlatformX11(); // Workaround for X11: assume PC-esque mapping from ::nativeScanCode to symbols.
#define BIND2(qtKey, clkKey) case Qt::qtKey: key = Inputs::Keyboard::Key::clkKey; break; if(QGuiApplication::platformName() == QLatin1String("xcb")) {
#define BIND(code, key) case code: return Inputs::Keyboard::Key::key;
switch(event->nativeVirtualKey()) {
default: qDebug() << "Unmapped" << event->nativeScanCode(); return {};
}
#undef BIND
}
// Fall back on a limited, faulty adaptation.
#define BIND2(qtKey, clkKey) case Qt::qtKey: return Inputs::Keyboard::Key::clkKey;
#define BIND(key) BIND2(Key_##key, key) #define BIND(key) BIND2(Key_##key, key)
Inputs::Keyboard::Key key;
switch(event->key()) { switch(event->key()) {
default: return true; default: return {};
BIND(Escape); BIND(Escape);
BIND(F1); BIND(F2); BIND(F3); BIND(F4); BIND(F5); BIND(F6); BIND(F1); BIND(F2); BIND(F3); BIND(F4); BIND(F5); BIND(F6);
@ -862,8 +860,22 @@ bool MainWindow::processEvent(QKeyEvent *event) {
BIND(NumLock); BIND(NumLock);
} }
#undef BIND
#undef BIND2
}
bool MainWindow::processEvent(QKeyEvent *event) {
if(!machine) return true;
const auto keyboardMachine = machine->keyboard_machine();
if(!keyboardMachine) return true;
const auto key = keyForEvent(event);
if(!key) return true;
std::unique_lock lock(machineMutex); std::unique_lock lock(machineMutex);
keyboardMachine->get_keyboard().set_key_pressed(key, event->text().size() ? event->text()[0].toLatin1() : '\0', event->type() == QEvent::KeyPress); keyboardMachine->get_keyboard().set_key_pressed(*key, event->text().size() ? event->text()[0].toLatin1() : '\0', event->type() == QEvent::KeyPress);
return false; return false;
} }

4
OSBindings/Qt/mainwindow.h
View File

@ -5,6 +5,8 @@
#include <QMainWindow> #include <QMainWindow>
#include <memory> #include <memory>
#include <optional>
#include "audiobuffer.h" #include "audiobuffer.h"
#include "timer.h" #include "timer.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
@ -127,6 +129,8 @@ class MainWindow : public QMainWindow, public Outputs::Speaker::Speaker::Delegat
QMenu *helpMenu = nullptr; QMenu *helpMenu = nullptr;
void addHelpMenu(); void addHelpMenu();
std::optional<Inputs::Keyboard::Key> keyForEvent(QKeyEvent *);
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H