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

Merge pull request #2376 from Cacodemon345/qtdev-new

Browse Source 
qt: Add mouse sensitivity setting
This commit is contained in:
Miran Grča
2022-06-04 13:48:42 +02:00
committed by GitHub
parent 1955def798 c61c9f5e0a
commit 3ea52cb714
10 changed files with 154 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/config.c
View File

@@ -599,6 +599,12 @@ load_general(void)
lang_id = plat_language_code(p);
}
mouse_sensitivity = config_get_double(cat, "mouse_sensitivity", 1.0);
if (mouse_sensitivity < 0.5)
mouse_sensitivity = 0.5;
else if (mouse_sensitivity > 2.0)
mouse_sensitivity = 2.0;
p = config_get_string(cat, "iconset", NULL);
if (p != NULL)
strcpy(icon_set, p);
@@ -2307,6 +2313,11 @@ save_general(void)
else
config_delete_var(cat, "confirm_save");
if (mouse_sensitivity != 1.0)
config_set_double(cat, "mouse_sensitivity", mouse_sensitivity);
else
config_delete_var(cat, "mouse_sensitivity");
if (lang_id == DEFAULT_LANGUAGE)
config_delete_var(cat, "language");
else

1
src/include/86box/86box.h
View File

@@ -131,6 +131,7 @@ extern int enable_discord; /* (C) enable Discord integration */
extern int is_pentium; /* TODO: Move back to cpu/cpu.h when it's figured out,
how to remove that hack from the ET4000/W32p. */
extern int fixed_size_x, fixed_size_y;
extern double mouse_sensitivity; /* (C) Mouse sensitivity scale */
extern char exe_path[2048]; /* path (dir) of executable */

2
src/qt/qt_mainwindow.cpp
View File

@@ -38,6 +38,7 @@ extern "C" {
#include <86box/plat.h>
#include <86box/discord.h>
#include <86box/video.h>
#include <86box/machine.h>
#include <86box/vid_ega.h>
#include <86box/version.h>
@@ -1435,6 +1436,7 @@ bool MainWindow::eventFilter(QObject* receiver, QEvent* event)
void MainWindow::refreshMediaMenu() {
mm->refresh(ui->menuMedia);
status->refresh(ui->statusbar);
ui->actionMCA_devices->setVisible(machine_has_bus(machine, MACHINE_BUS_MCA));
}
void MainWindow::showMessage(const QString& header, const QString& message) {

17
src/qt/qt_progsettings.cpp
View File

@@ -110,6 +110,9 @@ ProgSettings::ProgSettings(QWidget *parent) :
ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i.key()));
}
}
mouseSensitivity = mouse_sensitivity;
ui->horizontalSlider->setValue(mouseSensitivity * 100.);
}
void ProgSettings::accept()
@@ -132,6 +135,7 @@ void ProgSettings::accept()
connect(main_window, &MainWindow::updateStatusBarActivity, main_window->status.get(), &MachineStatus::setActivity);
connect(main_window, &MainWindow::updateStatusBarEmpty, main_window->status.get(), &MachineStatus::setEmpty);
connect(main_window, &MainWindow::statusBarMessage, main_window->status.get(), &MachineStatus::message, Qt::QueuedConnection);
mouse_sensitivity = mouseSensitivity;
QDialog::accept();
}
@@ -193,3 +197,16 @@ void ProgSettings::on_pushButtonLanguage_released()
{
ui->comboBoxLanguage->setCurrentIndex(0);
}
void ProgSettings::on_horizontalSlider_valueChanged(int value)
{
mouseSensitivity = (double)value / 100.;
}
void ProgSettings::on_pushButton_2_clicked()
{
mouseSensitivity = 1.0;
ui->horizontalSlider->setValue(100);
}

5
src/qt/qt_progsettings.hpp
View File

@@ -57,10 +57,15 @@ private slots:
void on_pushButton_released();
void on_pushButtonLanguage_released();
void on_horizontalSlider_valueChanged(int value);
void on_pushButton_2_clicked();
private:
Ui::ProgSettings *ui;
friend class MainWindow;
double mouseSensitivity;
};
#endif // QT_PROGSETTINGS_HPP

141
src/qt/qt_progsettings.ui
View File

@@ -6,35 +6,38 @@
<rect>
<x>0</x>
<y>0</y>
<width>370</width>
<height>228</height>
<width>458</width>
<height>303</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>370</width>
<height>228</height>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>370</width>
<height>228</height>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle">
<string>Preferences</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="6" column="1">
<spacer name="verticalSpacer">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item row="2" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
@@ -48,6 +51,13 @@
</item>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Mouse sensitivity:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton">
<property name="text">
@@ -55,26 +65,7 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Language:</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QComboBox" name="comboBox">
<property name="editable">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>(Default)</string>
</property>
</item>
</widget>
</item>
<item row="7" column="0" colspan="2">
<item row="11" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -84,6 +75,47 @@
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="pushButtonLanguage">
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Icon set:</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
<item row="8" column="0">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Language:</string>
</property>
</widget>
</item>
<item row="5" column="0">
<spacer name="horizontalSpacer_2">
<property name="orientation">
@@ -97,32 +129,39 @@
</property>
</spacer>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Icon set:</string>
<item row="7" column="0" colspan="2">
<widget class="QSlider" name="horizontalSlider">
<property name="minimum">
<number>50</number>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="pushButtonLanguage">
<property name="text">
<string>Default</string>
<property name="maximum">
<number>200</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
<property name="pageStep">
<number>20</number>
</property>
<property name="value">
<number>100</number>
</property>
</widget>
</item>
<item row="2" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QComboBox" name="comboBox">
<property name="editable">
<bool>false</bool>
</property>
</spacer>
<item>
<property name="text">
<string>(Default)</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>

5
src/qt/qt_rendererstack.cpp
View File

@@ -44,6 +44,8 @@ extern "C" {
#include <86box/mouse.h>
#include <86box/plat.h>
#include <86box/video.h>
double mouse_sensitivity = 1.0;
}
extern "C" void macos_poll_mouse();
@@ -123,6 +125,9 @@ RendererStack::mousePoll()
if (this->mouse_poll_func)
#endif
this->mouse_poll_func();
mouse_x *= mouse_sensitivity;
mouse_y *= mouse_sensitivity;
}
int ignoreNextMouseEvent = 1;

25
src/qt/wl_mouse.cpp
View File

@@ -25,6 +25,11 @@
#include <QWindow>
#include <QGuiApplication>
extern "C"
{
#include <86box/plat.h>
}
static zwp_relative_pointer_manager_v1* rel_manager = nullptr;
static zwp_relative_pointer_v1* rel_pointer = nullptr;
static zwp_pointer_constraints_v1* conf_pointer_interface = nullptr;
@@ -70,9 +75,19 @@ display_handle_global(void *data, struct wl_registry *registry, uint32_t id,
}
}
static void
display_global_remove(void *data, struct wl_registry *wl_registry, uint32_t name)
{
plat_mouse_capture(0);
zwp_relative_pointer_manager_v1_destroy(rel_manager);
zwp_pointer_constraints_v1_destroy(conf_pointer_interface);
rel_manager = nullptr;
conf_pointer_interface = nullptr;
}
static const struct wl_registry_listener registry_listener = {
display_handle_global,
nullptr
display_global_remove
};
void wl_init()
@@ -91,9 +106,11 @@ void wl_init()
void wl_mouse_capture(QWindow *window)
{
rel_pointer = zwp_relative_pointer_manager_v1_get_relative_pointer(rel_manager, (wl_pointer*)QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_pointer"));
zwp_relative_pointer_v1_add_listener(rel_pointer, &rel_listener, nullptr);
conf_pointer = zwp_pointer_constraints_v1_lock_pointer(conf_pointer_interface, (wl_surface*)QGuiApplication::platformNativeInterface()->nativeResourceForWindow("surface", window), (wl_pointer*)QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_pointer"), nullptr, ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
if (rel_manager) {
rel_pointer = zwp_relative_pointer_manager_v1_get_relative_pointer(rel_manager, (wl_pointer*)QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_pointer"));
zwp_relative_pointer_v1_add_listener(rel_pointer, &rel_listener, nullptr);
}
if (conf_pointer_interface) conf_pointer = zwp_pointer_constraints_v1_lock_pointer(conf_pointer_interface, (wl_surface*)QGuiApplication::platformNativeInterface()->nativeResourceForWindow("surface", window), (wl_pointer*)QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_pointer"), nullptr, ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
}
void wl_mouse_uncapture()

1
src/unix/unix_sdl.c
View File

@@ -43,6 +43,7 @@ int title_set = 0;
int resize_pending = 0;
int resize_w = 0;
int resize_h = 0;
double mouse_sensitivity = 1.0; /* Unused. */
static uint8_t interpixels[17842176];
extern void RenderImGui();

1
src/win/win_mouse.c
View File

@@ -28,6 +28,7 @@
#include <86box/win.h>
int mouse_capture;
double mouse_sensitivity = 1.0; /* Unused. */
typedef struct {
int buttons;