mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-23 09:58:19 -07:00
Code Issues Packages Projects Releases Activity

More progress towards 2nd gameport support

Browse Source
This commit is contained in:
Jasmine Iwanek
2025-08-11 21:59:36 -04:00
parent 6d8274ea13
commit 03006ca078
14 changed files with 155 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/qt/qt_settingsinput.cpp
View File

@@ -8,8 +8,6 @@
*
* Mouse/Joystick configuration UI module.
*
*
*
* Authors: Joakim L. Gilje <jgilje@jgilje.net>
*
* Copyright 2021 Joakim L. Gilje
@@ -95,7 +93,7 @@ SettingsInput::save()
keyboard_type = ui->comboBoxKeyboard->currentData().toInt();
mouse_type = ui->comboBoxMouse->currentData().toInt();
joystick_type = ui->comboBoxJoystick->currentData().toInt();
joystick_type[0] = ui->comboBoxJoystick0->currentData().toInt();
// Copy accelerators from working set to global set
for(int x = 0; x < NUM_ACCELS; x++) {
@@ -179,21 +177,22 @@ SettingsInput::onCurrentMachineChanged(int machineId)
ui->comboBoxMouse->setCurrentIndex(-1);
ui->comboBoxMouse->setCurrentIndex(selectedRow);
// Joysticks
int i = 0;
const char *joyName = joystick_get_name(i);
auto *joystickModel = ui->comboBoxJoystick->model();
auto *joystickModel = ui->comboBoxJoystick0->model();
removeRows = joystickModel->rowCount();
selectedRow = 0;
while (joyName) {
int row = Models::AddEntry(joystickModel, tr(joyName).toUtf8().data(), i);
if (i == joystick_type)
if (i == joystick_type[0])
selectedRow = row - removeRows;
++i;
joyName = joystick_get_name(i);
}
joystickModel->removeRows(0, removeRows);
ui->comboBoxJoystick->setCurrentIndex(selectedRow);
ui->comboBoxJoystick0->setCurrentIndex(selectedRow);
}
void
@@ -309,11 +308,11 @@ SettingsInput::on_comboBoxMouse_currentIndexChanged(int index)
}
void
SettingsInput::on_comboBoxJoystick_currentIndexChanged(int index)
SettingsInput::on_comboBoxJoystick0_currentIndexChanged(int index)
{
int joystickId = ui->comboBoxJoystick->currentData().toInt();
int joystickId = ui->comboBoxJoystick0->currentData().toInt();
for (int i = 0; i < MAX_JOYSTICKS; ++i) {
auto *btn = findChild<QPushButton *>(QString("pushButtonJoystick%1").arg(i + 1));
auto *btn = findChild<QPushButton *>(QString("pushButtonJoystick0%1").arg(i + 1));
if (btn == nullptr)
continue;
@@ -336,10 +335,10 @@ SettingsInput::on_pushButtonConfigureMouse_clicked()
}
static int
get_axis(JoystickConfiguration &jc, int axis, int joystick_nr)
get_axis(JoystickConfiguration &jc, int axis, uint8_t gameport_nr, int joystick_nr)
{
int axis_sel = jc.selectedAxis(axis);
int nr_axes = plat_joystick_state[joystick_state[0][joystick_nr].plat_joystick_nr - 1].nr_axes;
int nr_axes = plat_joystick_state[joystick_state[gameport_nr][joystick_nr].plat_joystick_nr - 1].nr_axes;
if (axis_sel < nr_axes)
return axis_sel;
@@ -352,10 +351,10 @@ get_axis(JoystickConfiguration &jc, int axis, int joystick_nr)
}
static int
get_pov(JoystickConfiguration &jc, int pov, int joystick_nr)
get_pov(JoystickConfiguration &jc, int pov, uint8_t gameport_nr, int joystick_nr)
{
int pov_sel = jc.selectedPov(pov);
int nr_povs = plat_joystick_state[joystick_state[0][joystick_nr].plat_joystick_nr - 1].nr_povs * 2;
int nr_povs = plat_joystick_state[joystick_state[gameport_nr][joystick_nr].plat_joystick_nr - 1].nr_povs * 2;
if (pov_sel < nr_povs) {
if (pov_sel & 1)
@@ -368,9 +367,9 @@ get_pov(JoystickConfiguration &jc, int pov, int joystick_nr)
}
static void
updateJoystickConfig(int type, int joystick_nr, QWidget *parent)
updateJoystickConfig(int type, uint8_t gameport_nr, int joystick_nr, QWidget *parent)
{
JoystickConfiguration jc(type, joystick_nr, parent);
JoystickConfiguration jc(type, gameport_nr, joystick_nr, parent);
switch (jc.exec()) {
case QDialog::Rejected:
return;
@@ -378,43 +377,43 @@ updateJoystickConfig(int type, int joystick_nr, QWidget *parent)
break;
}
joystick_state[0][joystick_nr].plat_joystick_nr = jc.selectedDevice();
if (joystick_state[0][joystick_nr].plat_joystick_nr) {
joystick_state[gameport_nr][joystick_nr].plat_joystick_nr = jc.selectedDevice();
if (joystick_state[gameport_nr][joystick_nr].plat_joystick_nr) {
for (int axis_nr = 0; axis_nr < joystick_get_axis_count(type); axis_nr++) {
joystick_state[0][joystick_nr].axis_mapping[axis_nr] = get_axis(jc, axis_nr, joystick_nr);
joystick_state[gameport_nr][joystick_nr].axis_mapping[axis_nr] = get_axis(jc, axis_nr, gameport_nr, joystick_nr);
}
for (int button_nr = 0; button_nr < joystick_get_button_count(type); button_nr++) {
joystick_state[0][joystick_nr].button_mapping[button_nr] = jc.selectedButton(button_nr);
joystick_state[gameport_nr][joystick_nr].button_mapping[button_nr] = jc.selectedButton(button_nr);
}
for (int pov_nr = 0; pov_nr < joystick_get_pov_count(type) * 2; pov_nr += 2) {
joystick_state[0][joystick_nr].pov_mapping[pov_nr][0] = get_pov(jc, pov_nr, joystick_nr);
joystick_state[0][joystick_nr].pov_mapping[pov_nr][1] = get_pov(jc, pov_nr + 1, joystick_nr);
joystick_state[gameport_nr][joystick_nr].pov_mapping[pov_nr][0] = get_pov(jc, pov_nr, gameport_nr, joystick_nr);
joystick_state[gameport_nr][joystick_nr].pov_mapping[pov_nr][1] = get_pov(jc, pov_nr + 1, gameport_nr, joystick_nr);
}
}
}
void
SettingsInput::on_pushButtonJoystick1_clicked()
SettingsInput::on_pushButtonJoystick01_clicked()
{
updateJoystickConfig(ui->comboBoxJoystick->currentData().toInt(), 0, this);
updateJoystickConfig(ui->comboBoxJoystick0->currentData().toInt(), 0, 0, this);
}
void
SettingsInput::on_pushButtonJoystick2_clicked()
SettingsInput::on_pushButtonJoystick02_clicked()
{
updateJoystickConfig(ui->comboBoxJoystick->currentData().toInt(), 1, this);
updateJoystickConfig(ui->comboBoxJoystick0->currentData().toInt(), 0, 1, this);
}
void
SettingsInput::on_pushButtonJoystick3_clicked()
SettingsInput::on_pushButtonJoystick03_clicked()
{
updateJoystickConfig(ui->comboBoxJoystick->currentData().toInt(), 2, this);
updateJoystickConfig(ui->comboBoxJoystick0->currentData().toInt(), 0, 2, this);
}
void
SettingsInput::on_pushButtonJoystick4_clicked()
SettingsInput::on_pushButtonJoystick04_clicked()
{
updateJoystickConfig(ui->comboBoxJoystick->currentData().toInt(), 3, this);
updateJoystickConfig(ui->comboBoxJoystick0->currentData().toInt(), 0, 3, this);
}