Merge abca0803d1a18ab313b1ce3e1054b2012b39e45a into cb9406f6a3cb69d5ea36d9f0f6a07101ae7c47aa

2025-03-13 09:12:27 +01:00 · 2025-03-11 16:44:43 +00:00 · 2025-03-11 16:44:43 +00:00 · f962fa5d65
commit f962fa5d65
parent cb9406f6a3 abca0803d1
3 changed files with 86 additions and 31 deletions
--- a/src/citra_qt/multiplayer/host_room.cpp
+++ b/src/citra_qt/multiplayer/host_room.cpp
@ -3,12 +3,16 @@
 // Refer to the license.txt file included.

 #include <future>
+#include <QApplication>
+#include <QClipboard>
 #include <QColor>
+#include <QHostInfo>
 #include <QImage>
 #include <QList>
 #include <QLocale>
 #include <QMessageBox>
 #include <QMetaType>
+#include <QNetworkInterface>
 #include <QTime>
 #include <QtConcurrent/QtConcurrentRun>
 #include "citra_qt/game_list_p.h"
@ -49,6 +53,7 @@ HostRoomWindow::HostRoomWindow(Core::System& system_, QWidget* parent, QStandard

    // Connect all the widgets to the appropriate events
    connect(ui->host, &QPushButton::clicked, this, &HostRoomWindow::Host);
+    connect(ui->copy_ip_button, &QPushButton::clicked, this, &HostRoomWindow::CopyIPToClipboard);

    // Restore the settings:
    ui->username->setText(UISettings::values.room_nickname);
@ -68,6 +73,8 @@ HostRoomWindow::HostRoomWindow(Core::System& system_, QWidget* parent, QStandard
        ui->game_list->setCurrentIndex(index);
    }
    ui->room_description->setText(UISettings::values.room_description);
+
+    SetLocalIPAddress();
 }

 HostRoomWindow::~HostRoomWindow() = default;
@ -130,6 +137,7 @@ void HostRoomWindow::Host() {
            }
        }
        ui->host->setDisabled(true);
+        std::string ip_address = ui->server_address_box->text().toStdString();

        auto game_name = ui->game_list->currentData(Qt::DisplayRole).toString();
        auto game_id = ui->game_list->currentData(GameListItemPath::ProgramIdRole).toLongLong();
@ -141,11 +149,12 @@ void HostRoomWindow::Host() {
            ban_list = UISettings::values.ban_list;
        }
        if (auto room = Network::GetRoom().lock()) {
-            bool created = room->Create(ui->room_name->text().toStdString(),
-                                        ui->room_description->toPlainText().toStdString(), "",
-                                        static_cast<u16>(port), password, ui->max_player->value(),
-                                        NetSettings::values.citra_username, game_name.toStdString(),
-                                        game_id, CreateVerifyBackend(is_public), ban_list);
+            bool created =
+                room->Create(ui->room_name->text().toStdString(),
+                             ui->room_description->toPlainText().toStdString(), ip_address,
+                             static_cast<u16>(port), password, ui->max_player->value(),
+                             NetSettings::values.citra_username, game_name.toStdString(), game_id,
+                             CreateVerifyBackend(is_public), ban_list);
            if (!created) {
                NetworkMessage::ErrorManager::ShowError(
                    NetworkMessage::ErrorManager::COULD_NOT_CREATE_ROOM);
@ -193,8 +202,8 @@ void HostRoomWindow::Host() {
        }
 #endif
        member->Join(ui->username->text().toStdString(), Service::CFG::GetConsoleIdHash(system),
-                     "127.0.0.1", static_cast<u16>(port), 0, Network::NoPreferredMac, password,
-                     token);
+                     ip_address.c_str(), static_cast<u16>(port), 0, Network::NoPreferredMac,
+                     password, token);

        // Store settings
        UISettings::values.room_nickname = ui->username->text();
@ -234,3 +243,26 @@ bool ComboBoxProxyModel::lessThan(const QModelIndex& left, const QModelIndex& ri
    auto rightData = right.data(GameListItemPath::TitleRole).toString();
    return leftData.compare(rightData) < 0;
 }
+
+void HostRoomWindow::SetLocalIPAddress() {
+    QString local_ip;
+
+    foreach (const QHostAddress& address, QNetworkInterface::allAddresses()) {
+        if (address.protocol() == QAbstractSocket::IPv4Protocol &&
+            address != QHostAddress(QHostAddress::LocalHost)) {
+            local_ip = address.toString();
+            break;
+        }
+    }
+
+    if (!local_ip.isEmpty()) {
+        ui->server_address_box->setText(local_ip);
+    } else {
+        ui->server_address_box->setPlaceholderText(tr("Enter Server Address"));
+    }
+}
+
+void HostRoomWindow::CopyIPToClipboard() {
+    QClipboard* clipboard = QApplication::clipboard();
+    clipboard->setText(ui->server_address_box->text());
+}
--- a/src/citra_qt/multiplayer/host_room.h
+++ b/src/citra_qt/multiplayer/host_room.h
@ -49,6 +49,8 @@ public:

 private:
    void Host();
+    void SetLocalIPAddress();
+    void CopyIPToClipboard();
    std::unique_ptr<Network::VerifyUser::Backend> CreateVerifyBackend(bool use_validation) const;

    std::unique_ptr<Ui::HostRoom> ui;
--- a/src/citra_qt/multiplayer/host_room.ui
+++ b/src/citra_qt/multiplayer/host_room.ui
@ -7,13 +7,34 @@
    <x>0</x>
    <y>0</y>
    <width>607</width>
-    <height>211</height>
+    <height>236</height>
   </rect>
  </property>
  <property name="windowTitle">
   <string>Create Room</string>
  </property>
  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="server_address_label">
+       <property name="text">
+        <string>Server Address:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="server_address_box"/>
+     </item>
+     <item>
+      <widget class="QPushButton" name="copy_ip_button">
+       <property name="text">
+        <string>Copy</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   <item>
    <widget class="QWidget" name="settings" native="true">
     <layout class="QHBoxLayout">
@ -31,38 +52,38 @@
        <property name="labelAlignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
-        <item row="0" column="0">
+        <item row="1" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
           <string>Room Name</string>
          </property>
         </widget>
        </item>
-        <item row="0" column="1">
+        <item row="1" column="1">
         <widget class="QLineEdit" name="room_name">
          <property name="maxLength">
           <number>50</number>
          </property>
         </widget>
        </item>
-        <item row="1" column="0">
+        <item row="2" column="0">
         <widget class="QLabel" name="label_3">
          <property name="text">
           <string>Preferred Application</string>
          </property>
         </widget>
        </item>
-        <item row="1" column="1">
+        <item row="2" column="1">
         <widget class="QComboBox" name="game_list"/>
        </item>
-        <item row="2" column="0">
+        <item row="3" column="0">
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string>Max Players</string>
          </property>
         </widget>
        </item>
-        <item row="2" column="1">
+        <item row="3" column="1">
         <widget class="QSpinBox" name="max_player">
          <property name="minimum">
           <number>2</number>
@ -82,9 +103,6 @@
        <property name="labelAlignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="username"/>
-        </item>
        <item row="0" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
@ -92,6 +110,16 @@
          </property>
         </widget>
        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="username"/>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>Password</string>
+          </property>
+         </widget>
+        </item>
        <item row="1" column="1">
         <widget class="QLineEdit" name="password">
          <property name="echoMode">
@ -102,6 +130,13 @@
          </property>
         </widget>
        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>Port</string>
+          </property>
+         </widget>
+        </item>
        <item row="2" column="1">
         <widget class="QLineEdit" name="port">
          <property name="inputMethodHints">
@ -112,20 +147,6 @@
          </property>
         </widget>
        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>Password</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_4">
-          <property name="text">
-           <string>Port</string>
-          </property>
-         </widget>
-        </item>
       </layout>
      </item>
     </layout>