80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Implement rest of Action checkable options

Browse Source
This commit is contained in:
Cacodemon345
2021-12-24 16:31:36 +06:00
parent 9671469778
commit 2c4fe15539
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/qt/qt_mainwindow.cpp
View File

@@ -138,6 +138,17 @@ MainWindow::MainWindow(QWidget *parent) :
ui->actionHiDPI_scaling->setChecked(dpi_scale); ui->actionHiDPI_scaling->setChecked(dpi_scale);
ui->actionHide_status_bar->setChecked(hide_status_bar); ui->actionHide_status_bar->setChecked(hide_status_bar);
ui->actionUpdate_status_bar_icons->setChecked(update_icons); ui->actionUpdate_status_bar_icons->setChecked(update_icons);
#if defined Q_OS_WINDOWS || defined Q_OS_MACOS
/* Make the option visible only if ANGLE is loaded. */
ui->actionHardware_Renderer_OpenGL_ES->setVisible(QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES);
if (QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGLES && vid_api == 2) vid_api = 1;
#endif
if (QApplication::platformName().contains("eglfs") && vid_api >= 1) {
fprintf(stderr, "OpenGL renderers are unsupported on EGLFS.\n");
vid_api = 0;
}
QActionGroup* actGroup = nullptr; QActionGroup* actGroup = nullptr;
switch (vid_api) { switch (vid_api) {
case 0: case 0:
@@ -254,11 +265,6 @@ MainWindow::MainWindow(QWidget *parent) :
ui->actionChange_contrast_for_monochrome_display->setChecked(true); ui->actionChange_contrast_for_monochrome_display->setChecked(true);
} }
#if defined Q_OS_WINDOWS || defined Q_OS_MACOS
/* Make the option visible only if ANGLE is loaded. */
ui->actionHardware_Renderer_OpenGL_ES->setVisible(QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES);
#endif
setFocusPolicy(Qt::StrongFocus); setFocusPolicy(Qt::StrongFocus);
ui->stackedWidget->setFocusPolicy(Qt::NoFocus); ui->stackedWidget->setFocusPolicy(Qt::NoFocus);
ui->centralwidget->setFocusPolicy(Qt::NoFocus); ui->centralwidget->setFocusPolicy(Qt::NoFocus);
@@ -865,10 +871,11 @@ static std::array<uint32_t, 256>& selected_keycode = x11_to_xt_base;
uint16_t x11_keycode_to_keysym(uint32_t keycode) uint16_t x11_keycode_to_keysym(uint32_t keycode)
{ {
uint16_t finalkeycode = 0;
#if defined(Q_OS_WINDOWS) #if defined(Q_OS_WINDOWS)
return keycode & 0xFFFF; finalkeycode = (keycode & 0xFFFF);
#elif defined(__APPLE__) #elif defined(__APPLE__)
return darwin_to_xt[keycode]; finalkeycode = darwin_to_xt[keycode];
#else #else
static Display* x11display = nullptr; static Display* x11display = nullptr;
if (QApplication::platformName().contains("wayland")) if (QApplication::platformName().contains("wayland"))
@@ -878,8 +885,8 @@ uint16_t x11_keycode_to_keysym(uint32_t keycode)
else if (QApplication::platformName().contains("eglfs")) else if (QApplication::platformName().contains("eglfs"))
{ {
keycode -= 8; keycode -= 8;
if (keycode <= 88) return keycode; if (keycode <= 88) finalkeycode = keycode;
else return evdev_to_xt[keycode]; else finalkeycode = evdev_to_xt[keycode];
} }
else if (!x11display) else if (!x11display)
{ {
@@ -893,8 +900,13 @@ uint16_t x11_keycode_to_keysym(uint32_t keycode)
selected_keycode = x11_to_xt_vnc; selected_keycode = x11_to_xt_vnc;
} }
} }
return selected_keycode[keycode]; if (!QApplication::platformName().contains("eglfs")) finalkeycode = selected_keycode[keycode];
#endif #endif
if (rctrl_is_lalt && finalkeycode == 0x11D)
{
finalkeycode = 0x38;
}
return finalkeycode;
} }
void MainWindow::on_actionFullscreen_triggered() { void MainWindow::on_actionFullscreen_triggered() {
@@ -967,7 +979,7 @@ void MainWindow::showMessage_(const QString &header, const QString &message) {
void MainWindow::keyPressEvent(QKeyEvent* event) void MainWindow::keyPressEvent(QKeyEvent* event)
{ {
if (send_keyboard_input) if (send_keyboard_input && !(kbd_req_capture && !mouse_capture && !video_fullscreen))
{ {
#ifdef __APPLE__ #ifdef __APPLE__
keyboard_input(1, x11_keycode_to_keysym(event->nativeVirtualKey())); keyboard_input(1, x11_keycode_to_keysym(event->nativeVirtualKey()));