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

qt: Add mouse sensitivity setting

Browse Source
This commit is contained in:
Cacodemon345
2022-06-01 15:31:58 +06:00
parent adb44ca660
commit 3b74aad9d6
8 changed files with 122 additions and 51 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); 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); p = config_get_string(cat, "iconset", NULL);
if (p != NULL) if (p != NULL)
strcpy(icon_set, p); strcpy(icon_set, p);
@@ -2307,6 +2313,11 @@ save_general(void)
else else
config_delete_var(cat, "confirm_save"); 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) if (lang_id == DEFAULT_LANGUAGE)
config_delete_var(cat, "language"); config_delete_var(cat, "language");
else 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, 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. */ how to remove that hack from the ET4000/W32p. */
extern int fixed_size_x, fixed_size_y; 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 */ extern char exe_path[2048]; /* path (dir) of executable */

10
src/qt/qt_progsettings.cpp
View File

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

3
src/qt/qt_progsettings.hpp
View File

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

141
src/qt/qt_progsettings.ui
View File

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

5
src/qt/qt_rendererstack.cpp
View File

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

1
src/unix/unix_sdl.c
View File

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

1
src/win/win_mouse.c
View File

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