From 4bf7c3e051034b5524d4ab23d05212216b853c3c Mon Sep 17 00:00:00 2001 From: Sepalani Date: Sun, 10 May 2020 23:27:21 +0400 Subject: NetworkWidget: Add Blocking column --- Source/Core/DolphinQt/Debugger/NetworkWidget.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinQt/Debugger/NetworkWidget.cpp') diff --git a/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp b/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp index 537bf4be65..0b0af84f96 100644 --- a/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp @@ -90,6 +90,15 @@ QTableWidgetItem* GetSocketState(s32 host_fd) return new QTableWidgetItem(QTableWidget::tr("Unbound")); } +QTableWidgetItem* GetSocketBlocking(s32 wii_fd) +{ + const auto& socket_manager = IOS::HLE::WiiSockMan::GetInstance(); + if (socket_manager.GetHostSocket(wii_fd) < 0) + return new QTableWidgetItem(); + const bool is_blocking = socket_manager.IsSocketBlocking(wii_fd); + return new QTableWidgetItem(is_blocking ? QTableWidget::tr("Yes") : QTableWidget::tr("No")); +} + static QString GetAddressAndPort(const sockaddr_in& addr) { char buffer[16]; @@ -214,7 +223,8 @@ void NetworkWidget::Update() m_socket_table->setItem(wii_fd, 1, GetSocketDomain(host_fd)); m_socket_table->setItem(wii_fd, 2, GetSocketType(host_fd)); m_socket_table->setItem(wii_fd, 3, GetSocketState(host_fd)); - m_socket_table->setItem(wii_fd, 4, GetSocketName(host_fd)); + m_socket_table->setItem(wii_fd, 4, GetSocketBlocking(wii_fd)); + m_socket_table->setItem(wii_fd, 5, GetSocketName(host_fd)); } m_socket_table->resizeColumnsToContents(); @@ -253,7 +263,7 @@ QGroupBox* NetworkWidget::CreateSocketTableGroup() m_socket_table = new QTableWidget(); // i18n: FD stands for file descriptor (and in this case refers to sockets, not regular files) - QStringList header{tr("FD"), tr("Domain"), tr("Type"), tr("State"), tr("Name")}; + QStringList header{tr("FD"), tr("Domain"), tr("Type"), tr("State"), tr("Blocking"), tr("Name")}; m_socket_table->setColumnCount(header.size()); m_socket_table->setHorizontalHeaderLabels(header); -- cgit v1.2.3