Implement simple X11 screen/window picker

CMakeLists.txt

@@ -90,6 +90,7 @@ set(discord-screenaudio_SRC
   src/userscript.cpp
   src/centralwidget.cpp
   src/localserver.cpp
+  src/mediapicker.cpp
   resources.qrc
 )
 

src/discordpage.cpp

@@ -5,6 +5,7 @@
 #include "discordpage.h"
 #include "log.h"
 #include "mainwindow.h"
+#include "src/mediapicker.h"
 #include "virtmic.h"
 
 #include <QApplication>
@@ -16,17 +17,21 @@
 #include <QTemporaryFile>
 #include <QTimer>
 #include <QWebChannel>
+#include <QWebEngineProfile>
 #include <QWebEngineScript>
 #include <QWebEngineScriptCollection>
 #include <QWebEngineSettings>
 
-DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
+DiscordPage::DiscordPage(QWidget *parent)
+    : QWebEnginePage(new QWebEngineProfile("discord-screenaudio"), parent) {
   setBackgroundColor(QColor("#313338"));
 
   connect(this, &QWebEnginePage::featurePermissionRequested, this,
           &DiscordPage::featurePermissionRequested);
   connect(this, &DiscordPage::fullScreenRequested, MainWindow::instance(),
           &MainWindow::fullScreenRequested);
+  connect(this, &DiscordPage::desktopMediaRequested, this,
+          &DiscordPage::handleDesktopMediaRequest);
 
   setupPermissions();
 
@@ -339,3 +344,8 @@ void DiscordPage::setupArrpc() {
                ":/assets/arrpc/arrpc_bridge_mod.js");
   }
 }
+
+void DiscordPage::handleDesktopMediaRequest(
+    const QWebEngineDesktopMediaRequest &request) {
+  (new MediaPicker(request, MainWindow::instance()))->exec();
+}

src/discordpage.h

@@ -55,6 +55,7 @@ class DiscordPage : public QWebEnginePage {
 private Q_SLOTS:
   void featurePermissionRequested(const QUrl &securityOrigin,
                                   QWebEnginePage::Feature feature);
+  void handleDesktopMediaRequest(const QWebEngineDesktopMediaRequest &request);
 
 public Q_SLOTS:
   void getUserStyles(QString url);

src/mediapicker.cpp

@@ -0,0 +1,70 @@
+#include "mediapicker.h"
+
+#include <QBoxLayout>
+#include <QLabel>
+#include <QListView>
+#include <QPushButton>
+#include <qicon.h>
+
+MediaPicker::MediaPicker(const QWebEngineDesktopMediaRequest &request,
+                         QWidget *parent)
+    : QDialog(parent), m_request(request) {
+  auto layout = new QVBoxLayout(this);
+  layout->setSizeConstraint(QLayout::SetFixedSize);
+
+  auto screensLabel = new QLabel("Screens", this);
+  layout->addWidget(screensLabel);
+
+  auto screensView = new QListView(this);
+  screensView->setModel(request.screensModel());
+  screensView->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
+  layout->addWidget(screensView);
+
+  auto windowsLabel = new QLabel("Windows", this);
+  layout->addWidget(windowsLabel);
+
+  auto windowsView = new QListView(this);
+  windowsView->setModel(request.windowsModel());
+  windowsView->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
+  windowsView->setMaximumWidth(300);
+  layout->addWidget(windowsView);
+
+  auto startButton = new QPushButton("Start Stream", this);
+  layout->addWidget(startButton);
+
+  setWindowTitle("discord-screenaudio Media Picker");
+
+  connect(screensView, &QListView::clicked,
+          [&, windowsView](const QModelIndex &index) {
+            m_selectedWindow = false;
+            m_selectedIndex = index;
+            windowsView->clearSelection();
+          });
+
+  connect(windowsView, &QListView::clicked,
+          [&, screensView](const QModelIndex &index) {
+            m_selectedWindow = true;
+            m_selectedIndex = index;
+            screensView->clearSelection();
+          });
+
+  connect(startButton, &QPushButton::clicked, this, &MediaPicker::startStream);
+  connect(screensView, &QListView::doubleClicked, this,
+          &MediaPicker::startStream);
+  connect(windowsView, &QListView::doubleClicked, this,
+          &MediaPicker::startStream);
+}
+
+void MediaPicker::startStream() {
+  if (m_selectedWindow) {
+    m_request.selectWindow(m_selectedIndex);
+  } else {
+    m_request.selectScreen(m_selectedIndex);
+  }
+  accept();
+}
+
+void MediaPicker::reject() {
+  m_request.cancel();
+  QDialog::reject();
+}

src/mediapicker.h

@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2022 Malte Jürgens and contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <QDialog>
+#include <QWebEngineDesktopMediaRequest>
+
+class MediaPicker : public QDialog {
+  Q_OBJECT
+
+public:
+  explicit MediaPicker(const QWebEngineDesktopMediaRequest &request,
+                       QWidget *parent = nullptr);
+
+private:
+  bool m_selectedWindow;
+  QModelIndex m_selectedIndex;
+  const QWebEngineDesktopMediaRequest &m_request;
+
+private slots:
+  void startStream();
+  void reject() override;
+};

src/streamdialog.cpp

@@ -8,6 +8,7 @@
 #include <QComboBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
+#include <QIcon>
 #include <QLabel>
 #include <QPushButton>
 #include <QSizePolicy>
@@ -97,7 +98,8 @@ StreamDialog::StreamDialog(QWidget *parent) : QDialog(parent) {
     }
 
     auto button = new QPushButton(this);
-    button->setText("Start Stream");
+    button->setText("Select Screen Area");
+    button->setIcon(QIcon::fromTheme("next"));
     connect(button, &QPushButton::clicked, this, &StreamDialog::startStream);
     layout->addWidget(button, Qt::AlignRight | Qt::AlignBottom);
   }