ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Add open/join session UI

This commit is contained in:
Stenzek 2023-05-11 02:13:45 +10:00
parent d85bb065a7
commit 352d1eaede
13 changed files with 663 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/core/netplay.cpp
View File

@ -97,8 +97,7 @@ static void HandleChatMessage(s32 player_id, const ENetPacket* pkt);
// l = local, r = remote // l = local, r = remote
static void CreateGGPOSession(); static void CreateGGPOSession();
static void DestroyGGPOSession(); static void DestroyGGPOSession();
static bool Start(s32 lhandle, u16 lport, const std::string& raddr, u16 rport, s32 ldelay, u32 pred, static bool Start(bool is_hosting, std::string nickname, const std::string& remote_addr, s32 port, s32 ldelay);
std::string game_path);
static void CloseSession(); static void CloseSession();
// Host functions. // Host functions.
@ -275,20 +274,40 @@ static const T* CheckReceivedPacket(s32 player_id, const ENetPacket* pkt)
// Netplay Impl // Netplay Impl
bool Netplay::Start(s32 lhandle, u16 lport, const std::string& raddr, u16 rport, s32 ldelay, u32 pred, bool Netplay::Start(bool is_hosting, std::string nickname, const std::string& remote_addr, s32 port, s32 ldelay)
std::string game_path)
{ {
const bool is_hosting = (lhandle == 1); if (IsActive())
{
Log_ErrorPrintf("Netplay session already active");
return false;
}
// Port should be valid regardless of hosting/joining.
if (port < 0 || port >= 65535)
{
Log_ErrorPrintf("Invalid port %d", port);
return false;
}
// Need a system if we're hosting.
if (!System::IsValid())
{
if (is_hosting)
{
Log_ErrorPrintf("Can't host a netplay session without a valid VM");
return false;
}
else if (!is_hosting && !CreateSystem(std::string(), false))
{
Log_ErrorPrintf("Failed to create VM for joining session");
return false;
}
}
s_state = SessionState::Initializing; s_state = SessionState::Initializing;
SetSettings(); SetSettings();
if (!CreateSystem(std::move(game_path), is_hosting))
{
Log_ErrorPrintf("Failed to create system.");
return false;
}
if (!InitializeEnet()) if (!InitializeEnet())
{ {
Log_ErrorPrintf("Failed to initialize Enet."); Log_ErrorPrintf("Failed to initialize Enet.");
@ -298,7 +317,7 @@ bool Netplay::Start(s32 lhandle, u16 lport, const std::string& raddr, u16 rport,
// Create our "host" (which is basically just our port). // Create our "host" (which is basically just our port).
ENetAddress server_address; ENetAddress server_address;
server_address.host = ENET_HOST_ANY; server_address.host = ENET_HOST_ANY;
server_address.port = lport; server_address.port = is_hosting ? static_cast<u16>(port) : ENET_PORT_ANY;
s_enet_host = enet_host_create(&server_address, MAX_PLAYERS - 1, NUM_ENET_CHANNELS, 0, 0); s_enet_host = enet_host_create(&server_address, MAX_PLAYERS - 1, NUM_ENET_CHANNELS, 0, 0);
if (!s_enet_host) if (!s_enet_host)
{ {
@ -307,7 +326,7 @@ bool Netplay::Start(s32 lhandle, u16 lport, const std::string& raddr, u16 rport,
} }
s_host_player_id = 0; s_host_player_id = 0;
s_local_nickname = fmt::format("NICKNAME{}", lhandle); s_local_nickname = std::move(nickname);
s_local_delay = ldelay; s_local_delay = ldelay;
s_reset_cookie = 0; s_reset_cookie = 0;
s_reset_players.reset(); s_reset_players.reset();
@ -321,7 +340,8 @@ bool Netplay::Start(s32 lhandle, u16 lport, const std::string& raddr, u16 rport,
s_reset_players = 1; s_reset_players = 1;
CreateGGPOSession(); CreateGGPOSession();
s_state = SessionState::Running; s_state = SessionState::Running;
Log_InfoPrintf("Netplay session started as host."); Log_InfoPrintf("Netplay session started as host on port %d.", port);
System::SetState(System::State::Paused);
return true; return true;
} }
@ -330,10 +350,10 @@ bool Netplay::Start(s32 lhandle, u16 lport, const std::string& raddr, u16 rport,
// Connect to host. // Connect to host.
ENetAddress host_address; ENetAddress host_address;
host_address.port = rport; host_address.port = static_cast<u16>(port);
if (enet_address_set_host_ip(&host_address, raddr.c_str()) != 0) if (enet_address_set_host(&host_address, remote_addr.c_str()) != 0)
{ {
Log_ErrorPrintf("Failed to parse host: '%s'", raddr.c_str()); Log_ErrorPrintf("Failed to parse host: '%s'", remote_addr.c_str());
return false; return false;
} }
@ -348,6 +368,7 @@ bool Netplay::Start(s32 lhandle, u16 lport, const std::string& raddr, u16 rport,
// Wait until we're connected to the main host. They'll send us back state to load and a full player list. // Wait until we're connected to the main host. They'll send us back state to load and a full player list.
s_state = SessionState::Connecting; s_state = SessionState::Connecting;
s_reset_start_time.Reset(); s_reset_start_time.Reset();
System::SetState(System::State::Paused);
return true; return true;
} }
@ -1409,6 +1430,8 @@ void Netplay::SetSettings()
Settings::GetControllerTypeName(ControllerType::DigitalController)); Settings::GetControllerTypeName(ControllerType::DigitalController));
} }
//si.SetStringValue("CPU", "ExecutionMode", "Interpreter");
// No runahead or rewind, that'd be a disaster. // No runahead or rewind, that'd be a disaster.
si.SetIntValue("Main", "RunaheadFrameCount", 0); si.SetIntValue("Main", "RunaheadFrameCount", 0);
si.SetBoolValue("Main", "RewindEnable", false); si.SetBoolValue("Main", "RewindEnable", false);
@ -1619,16 +1642,23 @@ void Netplay::SetInputs(Netplay::Input inputs[2])
} }
} }
void Netplay::StartNetplaySession(s32 local_handle, u16 local_port, std::string& remote_addr, u16 remote_port, void Netplay::StartNetplaySession(s32 local_handle, u16 local_port, const std::string& remote_addr, u16 remote_port,
s32 input_delay, std::string game_path) s32 input_delay, std::string game_path)
{ {
// dont want to start a session when theres already one going on. // dont want to start a session when theres already one going on.
if (IsActive()) if (IsActive())
return; return;
const bool is_hosting = (local_handle == 1);
if (!CreateSystem(std::move(game_path), is_hosting))
{
Log_ErrorPrintf("Failed to create system.");
return;
}
// create session // create session
if (!Netplay::Start(local_handle, local_port, remote_addr, remote_port, input_delay, MAX_ROLLBACK_FRAMES, std::string nickname = fmt::format("NICKNAME{}", local_handle);
std::move(game_path))) if (!Netplay::Start(is_hosting, std::move(nickname), remote_addr, is_hosting ? local_port : remote_port, input_delay))
{ {
// this'll call back to us to shut everything netplay-related down // this'll call back to us to shut everything netplay-related down
Log_ErrorPrint("Failed to Create Netplay Session!"); Log_ErrorPrint("Failed to Create Netplay Session!");
@ -1652,6 +1682,36 @@ void Netplay::StopNetplaySession()
System::ShutdownSystem(false); System::ShutdownSystem(false);
} }
bool Netplay::CreateSession(std::string nickname, s32 port, s32 max_players, std::string password)
{
// TODO: Password
const s32 input_delay = 1;
if (!Netplay::Start(true, std::move(nickname), std::string(), port, input_delay))
{
CloseSession();
return false;
}
return true;
}
bool Netplay::JoinSession(std::string nickname, const std::string& hostname, s32 port, std::string password)
{
// TODO: Password
const s32 input_delay = 1;
if (!Netplay::Start(false, std::move(nickname), hostname, port, input_delay))
{
CloseSession();
return false;
}
return true;
}
void Netplay::NetplayAdvanceFrame(Netplay::Input inputs[], int disconnect_flags) void Netplay::NetplayAdvanceFrame(Netplay::Input inputs[], int disconnect_flags)
{ {
Netplay::SetInputs(inputs); Netplay::SetInputs(inputs);
@ -1661,6 +1721,9 @@ void Netplay::NetplayAdvanceFrame(Netplay::Input inputs[], int disconnect_flags)
void Netplay::ExecuteNetplay() void Netplay::ExecuteNetplay()
{ {
// TODO: Fix this hackery to get out of the CPU loop...
System::SetState(System::State::Running);
while (s_state != SessionState::Inactive) while (s_state != SessionState::Inactive)
{ {
switch (s_state) switch (s_state)

7
src/core/netplay.h
View File

@ -28,10 +28,13 @@ enum : u8
NUM_ENET_CHANNELS, NUM_ENET_CHANNELS,
}; };
void StartNetplaySession(s32 local_handle, u16 local_port, std::string& remote_addr, u16 remote_port, s32 input_delay, void StartNetplaySession(s32 local_handle, u16 local_port, const std::string& remote_addr, u16 remote_port,
std::string game_path); s32 input_delay, std::string game_path);
void StopNetplaySession(); void StopNetplaySession();
bool CreateSession(std::string nickname, s32 port, s32 max_players, std::string password);
bool JoinSession(std::string nickname, const std::string& hostname, s32 port, std::string password);
bool IsActive(); bool IsActive();
/// Frees up resources associated with the current netplay session. /// Frees up resources associated with the current netplay session.

164
src/duckstation-qt/createnetplaysessiondialog.ui Normal file
View File

@ -0,0 +1,164 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CreateNetplaySessionDialog</class>
<widget class="QDialog" name="CreateNetplaySessionDialog">
<property name="windowModality">
<enum>Qt::WindowModal</enum>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>496</width>
<height>235</height>
</rect>
</property>
<property name="windowTitle">
<string comment="Window title">Create Netplay Session</string>
</property>
<property name="modal">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources/resources.qrc">:/icons/emblem-person-blue.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>14</pointsize>
<bold>false</bold>
</font>
</property>
<property name="text">
<string comment="Header text">Create Netplay Session</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Select a nickname and port to open your current game session to other players via netplay. A password may optionally be supplied to restrict who can join.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Nickname:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="nickname">
<property name="text">
<string>Netplay Host</string>
</property>
<property name="maxLength">
<number>128</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Port:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="port">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>31200</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Players:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="maxPlayers">
<property name="minimum">
<number>2</number>
</property>
<property name="maximum">
<number>8</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Password:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="password">
<property name="maxLength">
<number>128</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources>
<include location="resources/resources.qrc"/>
</resources>
<connections/>
</ui>

9
src/duckstation-qt/duckstation-qt.vcxproj
View File

@ -41,6 +41,7 @@
<ClCompile Include="mainwindow.cpp" /> <ClCompile Include="mainwindow.cpp" />
<ClCompile Include="memorycardsettingswidget.cpp" /> <ClCompile Include="memorycardsettingswidget.cpp" />
<ClCompile Include="memorycardeditordialog.cpp" /> <ClCompile Include="memorycardeditordialog.cpp" />
<ClCompile Include="netplaydialogs.cpp" />
<ClCompile Include="netplaywidget.cpp" /> <ClCompile Include="netplaywidget.cpp" />
<ClCompile Include="postprocessingchainconfigwidget.cpp" /> <ClCompile Include="postprocessingchainconfigwidget.cpp" />
<ClCompile Include="postprocessingshaderconfigwidget.cpp" /> <ClCompile Include="postprocessingshaderconfigwidget.cpp" />
@ -84,6 +85,7 @@
<QtMoc Include="colorpickerbutton.h" /> <QtMoc Include="colorpickerbutton.h" />
<ClInclude Include="controllersettingwidgetbinder.h" /> <ClInclude Include="controllersettingwidgetbinder.h" />
<QtMoc Include="memoryviewwidget.h" /> <QtMoc Include="memoryviewwidget.h" />
<QtMoc Include="netplaydialogs.h" />
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
<ClInclude Include="settingwidgetbinder.h" /> <ClInclude Include="settingwidgetbinder.h" />
<QtMoc Include="consolesettingswidget.h" /> <QtMoc Include="consolesettingswidget.h" />
@ -265,6 +267,7 @@
<ClCompile Include="$(IntDir)moc_inputbindingdialog.cpp" /> <ClCompile Include="$(IntDir)moc_inputbindingdialog.cpp" />
<ClCompile Include="$(IntDir)moc_inputbindingwidgets.cpp" /> <ClCompile Include="$(IntDir)moc_inputbindingwidgets.cpp" />
<ClCompile Include="$(IntDir)moc_mainwindow.cpp" /> <ClCompile Include="$(IntDir)moc_mainwindow.cpp" />
<ClCompile Include="$(IntDir)moc_netplaydialogs.cpp" />
<ClCompile Include="$(IntDir)moc_netplaywidget.cpp" /> <ClCompile Include="$(IntDir)moc_netplaywidget.cpp" />
<ClCompile Include="$(IntDir)moc_memorycardsettingswidget.cpp" /> <ClCompile Include="$(IntDir)moc_memorycardsettingswidget.cpp" />
<ClCompile Include="$(IntDir)moc_memorycardeditordialog.cpp" /> <ClCompile Include="$(IntDir)moc_memorycardeditordialog.cpp" />
@ -331,6 +334,12 @@
<QtUi Include="controllerledsettingsdialog.ui"> <QtUi Include="controllerledsettingsdialog.ui">
<FileType>Document</FileType> <FileType>Document</FileType>
</QtUi> </QtUi>
<QtUi Include="createnetplaysessiondialog.ui">
<FileType>Document</FileType>
</QtUi>
<QtUi Include="joinnetplaysessiondialog.ui">
<FileType>Document</FileType>
</QtUi>
<None Include="translations\duckstation-qt_es-es.ts" /> <None Include="translations\duckstation-qt_es-es.ts" />
<None Include="translations\duckstation-qt_tr.ts" /> <None Include="translations\duckstation-qt_tr.ts" />
</ItemGroup> </ItemGroup>

9
src/duckstation-qt/duckstation-qt.vcxproj.filters
View File

@ -94,6 +94,10 @@
<ClCompile Include="coverdownloaddialog.cpp" /> <ClCompile Include="coverdownloaddialog.cpp" />
<ClCompile Include="$(IntDir)moc_coverdownloaddialog.cpp" /> <ClCompile Include="$(IntDir)moc_coverdownloaddialog.cpp" />
<ClCompile Include="colorpickerbutton.cpp" /> <ClCompile Include="colorpickerbutton.cpp" />
<ClCompile Include="netplaywidget.cpp" />
<ClCompile Include="$(IntDir)moc_colorpickerbutton.cpp" />
<ClCompile Include="$(IntDir)moc_netplaywidget.cpp" />
<ClCompile Include="netplaydialogs.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="qtutils.h" /> <ClInclude Include="qtutils.h" />
@ -155,6 +159,8 @@
<QtMoc Include="foldersettingswidget.h" /> <QtMoc Include="foldersettingswidget.h" />
<QtMoc Include="coverdownloaddialog.h" /> <QtMoc Include="coverdownloaddialog.h" />
<QtMoc Include="colorpickerbutton.h" /> <QtMoc Include="colorpickerbutton.h" />
<QtMoc Include="netplaywidget.h" />
<QtMoc Include="netplaydialogs.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<QtUi Include="consolesettingswidget.ui" /> <QtUi Include="consolesettingswidget.ui" />
@ -196,6 +202,9 @@
<QtUi Include="controllerbindingwidget_mouse.ui" /> <QtUi Include="controllerbindingwidget_mouse.ui" />
<QtUi Include="coverdownloaddialog.ui" /> <QtUi Include="coverdownloaddialog.ui" />
<QtUi Include="controllerledsettingsdialog.ui" /> <QtUi Include="controllerledsettingsdialog.ui" />
<QtUi Include="netplaywidget.ui" />
<QtUi Include="createnetplaysessiondialog.ui" />
<QtUi Include="joinnetplaysessiondialog.ui" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Natvis Include="qt5.natvis" /> <Natvis Include="qt5.natvis" />

161
src/duckstation-qt/joinnetplaysessiondialog.ui Normal file
View File

@ -0,0 +1,161 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>JoinNetplaySessionDialog</class>
<widget class="QDialog" name="JoinNetplaySessionDialog">
<property name="windowModality">
<enum>Qt::WindowModal</enum>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>480</width>
<height>220</height>
</rect>
</property>
<property name="windowTitle">
<string comment="Window title">Create Netplay Session</string>
</property>
<property name="modal">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources/resources.qrc">:/icons/emblem-person-blue.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>14</pointsize>
<bold>false</bold>
</font>
</property>
<property name="text">
<string comment="Header text">Join Netplay Session</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Choose a nickname and enter the address/port of the netplay session you wish to join.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Nickname:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="nickname">
<property name="text">
<string>Netplay Peer</string>
</property>
<property name="maxLength">
<number>128</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Port:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="port">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>31200</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Hostname:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="hostname">
<property name="text">
<string>localhost</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Password:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="password">
<property name="maxLength">
<number>128</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources>
<include location="resources/resources.qrc"/>
</resources>
<connections/>
</ui>

22
src/duckstation-qt/mainwindow.cpp
View File

@ -22,6 +22,7 @@
#include "gamelistsettingswidget.h" #include "gamelistsettingswidget.h"
#include "gamelistwidget.h" #include "gamelistwidget.h"
#include "memorycardeditordialog.h" #include "memorycardeditordialog.h"
#include "netplaydialogs.h"
#include "qthost.h" #include "qthost.h"
#include "qtutils.h" #include "qtutils.h"
#include "settingsdialog.h" #include "settingsdialog.h"
@ -1716,6 +1717,9 @@ void MainWindow::updateEmulationActions(bool starting, bool running, bool cheevo
m_ui.actionViewGameProperties->setDisabled(starting || !running); m_ui.actionViewGameProperties->setDisabled(starting || !running);
m_ui.actionCreateNetplaySession->setDisabled(!running || cheevos_challenge_mode);
m_ui.actionJoinNetplaySession->setDisabled(cheevos_challenge_mode);
if (starting || running) if (starting || running)
{ {
if (!m_ui.toolBar->actions().contains(m_ui.actionPowerOff)) if (!m_ui.toolBar->actions().contains(m_ui.actionPowerOff))
@ -2100,7 +2104,9 @@ void MainWindow::connectSignals()
updateMenuSelectedTheme(); updateMenuSelectedTheme();
// Netplay UI , TODO // Netplay UI , TODO
connect(m_ui.actionCreateNetplaySession, &QAction::triggered, this, &MainWindow::onNetplaySessionCreated); connect(m_ui.actionSetupNetplaySession, &QAction::triggered, this, &MainWindow::onSetupNetplaySessionClicked);
connect(m_ui.actionCreateNetplaySession, &QAction::triggered, this, &MainWindow::onCreateNetplaySessionClicked);
connect(m_ui.actionJoinNetplaySession, &QAction::triggered, this, &MainWindow::onJoinNetplaySessionClicked);
} }
void MainWindow::addThemeToMenu(const QString& name, const QString& key) void MainWindow::addThemeToMenu(const QString& name, const QString& key)
@ -2765,7 +2771,7 @@ void MainWindow::onCPUDebuggerClosed()
m_debugger_window = nullptr; m_debugger_window = nullptr;
} }
void MainWindow::onNetplaySessionCreated() void MainWindow::onSetupNetplaySessionClicked()
{ {
Assert(!m_netplay_window); Assert(!m_netplay_window);
@ -2787,6 +2793,18 @@ void MainWindow::onNetplaySessionCreated()
}); });
} }
void MainWindow::onCreateNetplaySessionClicked()
{
CreateNetplaySessionDialog dlg(this);
dlg.exec();
}
void MainWindow::onJoinNetplaySessionClicked()
{
JoinNetplaySessionDialog dlg(this);
dlg.exec();
}
void MainWindow::onToolsOpenDataDirectoryTriggered() void MainWindow::onToolsOpenDataDirectoryTriggered()
{ {
QtUtils::OpenURL(this, QUrl::fromLocalFile(QString::fromStdString(EmuFolders::DataRoot))); QtUtils::OpenURL(this, QUrl::fromLocalFile(QString::fromStdString(EmuFolders::DataRoot)));

4
src/duckstation-qt/mainwindow.h
View File

@ -169,7 +169,9 @@ private Q_SLOTS:
void openCPUDebugger(); void openCPUDebugger();
void onCPUDebuggerClosed(); void onCPUDebuggerClosed();
void onNetplaySessionCreated(); void onSetupNetplaySessionClicked();
void onCreateNetplaySessionClicked();
void onJoinNetplaySessionClicked();
protected: protected:
void showEvent(QShowEvent* event) override; void showEvent(QShowEvent* event) override;

17
src/duckstation-qt/mainwindow.ui
View File

@ -27,7 +27,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>21</height> <height>22</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuSystem"> <widget class="QMenu" name="menuSystem">
@ -241,7 +241,10 @@
<property name="title"> <property name="title">
<string>Netplay</string> <string>Netplay</string>
</property> </property>
<addaction name="actionSetupNetplaySession"/>
<addaction name="separator"/>
<addaction name="actionCreateNetplaySession"/> <addaction name="actionCreateNetplaySession"/>
<addaction name="actionJoinNetplaySession"/>
</widget> </widget>
<addaction name="menuSystem"/> <addaction name="menuSystem"/>
<addaction name="menuSettings"/> <addaction name="menuSettings"/>
@ -983,9 +986,19 @@
<string>Cover Downloader</string> <string>Cover Downloader</string>
</property> </property>
</action> </action>
<action name="actionSetupNetplaySession">
<property name="text">
<string>Setup Session</string>
</property>
</action>
<action name="actionCreateNetplaySession"> <action name="actionCreateNetplaySession">
<property name="text"> <property name="text">
<string>Create Session</string> <string>Create Session...</string>
</property>
</action>
<action name="actionJoinNetplaySession">
<property name="text">
<string>Join Session...</string>
</property> </property>
</action> </action>
</widget> </widget>

101
src/duckstation-qt/netplaydialogs.cpp Normal file
View File

@ -0,0 +1,101 @@
// SPDX-FileCopyrightText: 2023 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
#include "netplaydialogs.h"
#include "qthost.h"
#include "core/netplay.h"
#include <QtWidgets/QPushButton>
CreateNetplaySessionDialog::CreateNetplaySessionDialog(QWidget* parent) : QDialog(parent)
{
m_ui.setupUi(this);
connect(m_ui.maxPlayers, &QSpinBox::valueChanged, this, &CreateNetplaySessionDialog::updateState);
connect(m_ui.port, &QSpinBox::valueChanged, this, &CreateNetplaySessionDialog::updateState);
connect(m_ui.nickname, &QLineEdit::textChanged, this, &CreateNetplaySessionDialog::updateState);
connect(m_ui.password, &QLineEdit::textChanged, this, &CreateNetplaySessionDialog::updateState);
connect(m_ui.buttonBox->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this,
&CreateNetplaySessionDialog::accept);
connect(m_ui.buttonBox->button(QDialogButtonBox::Cancel), &QAbstractButton::clicked, this,
&CreateNetplaySessionDialog::reject);
updateState();
}
CreateNetplaySessionDialog::~CreateNetplaySessionDialog() = default;
void CreateNetplaySessionDialog::accept()
{
if (!validate())
return;
const int players = m_ui.maxPlayers->value();
const int port = m_ui.port->value();
const QString& nickname = m_ui.nickname->text();
const QString& password = m_ui.password->text();
QDialog::accept();
g_emu_thread->createNetplaySession(nickname.trimmed(), port, players, password);
}
bool CreateNetplaySessionDialog::validate()
{
const int players = m_ui.maxPlayers->value();
const int port = m_ui.port->value();
const QString& nickname = m_ui.nickname->text();
return (!nickname.isEmpty() && players >= 2 && players <= Netplay::MAX_PLAYERS && port > 0 && port <= 65535);
}
void CreateNetplaySessionDialog::updateState()
{
m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(validate());
}
JoinNetplaySessionDialog::JoinNetplaySessionDialog(QWidget* parent)
{
m_ui.setupUi(this);
connect(m_ui.port, &QSpinBox::valueChanged, this, &JoinNetplaySessionDialog::updateState);
connect(m_ui.nickname, &QLineEdit::textChanged, this, &JoinNetplaySessionDialog::updateState);
connect(m_ui.password, &QLineEdit::textChanged, this, &JoinNetplaySessionDialog::updateState);
connect(m_ui.hostname, &QLineEdit::textChanged, this, &JoinNetplaySessionDialog::updateState);
connect(m_ui.buttonBox->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this,
&JoinNetplaySessionDialog::accept);
connect(m_ui.buttonBox->button(QDialogButtonBox::Cancel), &QAbstractButton::clicked, this,
&JoinNetplaySessionDialog::reject);
updateState();
}
JoinNetplaySessionDialog::~JoinNetplaySessionDialog() = default;
void JoinNetplaySessionDialog::accept()
{
if (!validate())
return;
const int port = m_ui.port->value();
const QString& nickname = m_ui.nickname->text();
const QString& hostname = m_ui.hostname->text();
const QString& password = m_ui.password->text();
QDialog::accept();
g_emu_thread->joinNetplaySession(nickname.trimmed(), hostname.trimmed(), port, password);
}
bool JoinNetplaySessionDialog::validate()
{
const int port = m_ui.port->value();
const QString& nickname = m_ui.nickname->text();
const QString& hostname = m_ui.hostname->text();
return (!nickname.isEmpty() && !hostname.isEmpty() && port > 0 && port <= 65535);
}
void JoinNetplaySessionDialog::updateState()
{
m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(validate());
}

50
src/duckstation-qt/netplaydialogs.h Normal file
View File

@ -0,0 +1,50 @@
// SPDX-FileCopyrightText: 2023 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
#pragma once
#include "ui_createnetplaysessiondialog.h"
#include "ui_joinnetplaysessiondialog.h"
#include <QtWidgets/QDialog>
class CreateNetplaySessionDialog : public QDialog
{
Q_OBJECT
public:
CreateNetplaySessionDialog(QWidget* parent);
~CreateNetplaySessionDialog();
public Q_SLOTS:
void accept() override;
private Q_SLOTS:
void updateState();
private:
bool validate();
Ui::CreateNetplaySessionDialog m_ui;
};
class JoinNetplaySessionDialog : public QDialog
{
Q_OBJECT
public:
JoinNetplaySessionDialog(QWidget* parent);
~JoinNetplaySessionDialog();
public Q_SLOTS:
void accept() override;
private Q_SLOTS:
void updateState();
private:
bool validate();
private:
Ui::JoinNetplaySessionDialog m_ui;
};

44
src/duckstation-qt/qthost.cpp
View File

@ -1099,6 +1099,45 @@ void EmuThread::sendNetplayMessage(const QString& message)
// Netplay::SendMsg(message.toStdString().c_str()); // Netplay::SendMsg(message.toStdString().c_str());
} }
void EmuThread::createNetplaySession(const QString& nickname, qint32 port, qint32 max_players, const QString& password)
{
if (!isOnThread())
{
QMetaObject::invokeMethod(this, "createNetplaySession", Qt::QueuedConnection, Q_ARG(const QString&, nickname),
Q_ARG(qint32, port), Q_ARG(qint32, max_players), Q_ARG(const QString&, password));
return;
}
if (!Netplay::CreateSession(nickname.toStdString(), port, max_players, password.toStdString()))
{
errorReported(tr("Netplay Error"), tr("Failed to create netplay session. The log may contain more information."));
return;
}
// TODO: Fix this junk.. for some reason, it stays sleeping...
g_emu_thread->wakeThread();
}
void EmuThread::joinNetplaySession(const QString& nickname, const QString& hostname, qint32 port,
const QString& password)
{
if (!isOnThread())
{
QMetaObject::invokeMethod(this, "joinNetplaySession", Qt::QueuedConnection, Q_ARG(const QString&, nickname),
Q_ARG(const QString&, hostname), Q_ARG(qint32, port), Q_ARG(const QString&, password));
return;
}
if (!Netplay::JoinSession(nickname.toStdString(), hostname.toStdString(), port, password.toStdString()))
{
errorReported(tr("Netplay Error"), tr("Failed to join netplay session. The log may contain more information."));
return;
}
// TODO: Fix this junk.. for some reason, it stays sleeping...
g_emu_thread->wakeThread();
}
void EmuThread::stopNetplaySession() void EmuThread::stopNetplaySession()
{ {
if (!isOnThread()) if (!isOnThread())
@ -1458,7 +1497,7 @@ void EmuThread::run()
// main loop // main loop
while (!m_shutdown_flag) while (!m_shutdown_flag)
{ {
if (Netplay::IsActive() && System::IsRunning()) if (Netplay::IsActive() && System::IsValid())
{ {
Netplay::ExecuteNetplay(); Netplay::ExecuteNetplay();
} }
@ -2227,8 +2266,7 @@ int main(int argc, char* argv[])
{ {
Host::RunOnCPUThread([]() { Host::RunOnCPUThread([]() {
const bool first = (s_netplay_test == 0); const bool first = (s_netplay_test == 0);
if (!first) QtHost::RunOnUIThread([first]() { g_main_window->move(QPoint(first ? 300 : 1400, 500)); });
QtHost::RunOnUIThread([]() { g_main_window->move(g_main_window->pos() + QPoint(1200, 0)); });
const int h = first ? 1 : 2; const int h = first ? 1 : 2;
const int nh = first ? 2 : 1; const int nh = first ? 2 : 1;

2
src/duckstation-qt/qthost.h
View File

@ -191,6 +191,8 @@ public Q_SLOTS:
int input_delay, const QString& game_path); int input_delay, const QString& game_path);
void stopNetplaySession(); void stopNetplaySession();
void sendNetplayMessage(const QString& message); void sendNetplayMessage(const QString& message);
void createNetplaySession(const QString& nickname, qint32 port, qint32 max_players, const QString& password);
void joinNetplaySession(const QString& nickname, const QString& hostname, qint32 port, const QString& password);
private Q_SLOTS: private Q_SLOTS:
void stopInThread(); void stopInThread();