Multimonitor fix (flameshot-org#4498)

* Rework capture system to only enter fullscreen widget on one monitor

* Sort monitor previews by screen position instead of Qt index (flameshot-org#4522)

The monitor selection dialog displayed monitors in Qt's default
screen order (by connector name, e.g. DP-1 before DP-2), which
can differ from the physical arrangement configured in the display
settings. This sorts the preview widgets by their X geometry
position so they match the user's actual left-to-right layout.

---------

Co-authored-by: Brian J. Cohen <brianjcohen@gmail.com>

Author: borgmanJeremy

PKGBUILD

@@ -10,7 +10,6 @@ depends=('qt6-base' 'qt6-svg' 'hicolor-icon-theme' 'kguiaddons')
 makedepends=('qt6-tools' 'cmake' 'ninja')
 optdepends=(
     'gnome-shell-extension-appindicator: for system tray icon if you are using Gnome'
-    'grim: for wlroots wayland support'
     'xdg-desktop-portal: for wayland support, you will need the implementation for your wayland desktop environment'
     'qt6-imageformats: for additional export image formats (e.g. tiff, webp, and more)'
 )

docs/Sway and wlroots support.md

@@ -2,7 +2,7 @@
 Flameshot currently supports Sway and other wlroots based Wayland compositors through [xdg-desktop-portal-wlr](https://github.com/emersion/xdg-desktop-portal-wlr). However, due to the way dbus works, there may be some extra steps required for the integration to work properly.
 
 ## Basic steps
-The following packages need to be installed: `xdg-desktop-portal xdg-desktop-portal-wlr grim`. Please ensure your distro packages these, or install them manually.
+The following packages need to be installed: `xdg-desktop-portal xdg-desktop-portal-wlr`. Please ensure your distro packages these, or install them manually.
 
 Ensure that environment variables are set properly. If your distro does not set them automatically, use a launch script to export `XDG_CURRENT_DESKTOP=sway` or `XDG_CURRENT_DESKTOP=river` **before** Sway or River is launched.
 ```sh

flameshot.example.ini

@@ -54,12 +54,6 @@
 ;; Whether the tray icon is disabled (bool)
 ;disabledTrayIcon=false
 ;
-;; Use grim-based wayland universal screenshot adapter (bool)
-;useGrimAdapter=false
-;
-;; Disable Grim Warning notification (bool)
-;disabledGrimWarning=true
-;
 ;; Automatically close daemon when it's not needed (bool)
 ;; (This option is not available on Windows)
 ;autoCloseIdleDaemon=false

src/config/generalconf.cpp

@@ -37,7 +37,6 @@ GeneralConf::GeneralConf(QWidget* parent)
     initAutoCloseIdleDaemon();
 #endif
     initShowTrayIcon();
-    initUseGrimAdapter();
     initShowDesktopNotification();
     initShowAbortNotification();
 #if !defined(DISABLE_UPDATE_CHECKER)
@@ -124,10 +123,6 @@ void GeneralConf::_updateComponents(bool allowEmptySavePath)
 #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
     m_showTray->setChecked(!config.disabledTrayIcon());
 #endif
-
-#if defined(Q_OS_LINUX)
-    m_useGrimAdapter->setChecked(config.useGrimAdapter());
-#endif
 }
 
 void GeneralConf::updateComponents()
@@ -160,11 +155,6 @@ void GeneralConf::showAbortNotificationChanged(bool checked)
     ConfigHandler().setShowAbortNotification(checked);
 }
 
-void GeneralConf::useGrimAdapter(bool checked)
-{
-    ConfigHandler().useGrimAdapter(checked);
-}
-
 #if !defined(DISABLE_UPDATE_CHECKER)
 void GeneralConf::checkForUpdatesChanged(bool checked)
 {
@@ -343,24 +333,6 @@ void GeneralConf::initShowTrayIcon()
 #endif
 }
 
-void GeneralConf::initUseGrimAdapter()
-{
-#if defined(Q_OS_LINUX)
-    m_useGrimAdapter =
-      new QCheckBox(tr("Use grim to capture screenshots"), this);
-    m_useGrimAdapter->setToolTip(
-      tr("Grim is a wayland only utility to capture screens based on the "
-         "screencopy protocol. Generally only enable on minimal wayland window "
-         "managers like sway, hyprland, etc."));
-    m_scrollAreaLayout->addWidget(m_useGrimAdapter);
-
-    connect(m_useGrimAdapter,
-            &QCheckBox::clicked,
-            this,
-            &GeneralConf::useGrimAdapter);
-#endif
-}
-
 void GeneralConf::initHistoryConfirmationToDelete()
 {
     m_historyConfirmationToDelete = new QCheckBox(

src/config/generalconf.h

@@ -38,7 +38,6 @@ private slots:
     void showSidePanelButtonChanged(bool checked);
     void showDesktopNotificationChanged(bool checked);
     void showAbortNotificationChanged(bool checked);
-    void useGrimAdapter(bool checked);
 #if !defined(DISABLE_UPDATE_CHECKER)
     void checkForUpdatesChanged(bool checked);
 #endif
@@ -89,7 +88,6 @@ private slots:
     void initShowSidePanelButton();
     void initShowStartupLaunchMessage();
     void initShowTrayIcon();
-    void initUseGrimAdapter();
     void initSquareMagnifier();
     void initUndoLimit();
     void initUploadWithoutConfirmation();
@@ -111,7 +109,6 @@ private slots:
     QCheckBox* m_sysNotifications;
     QCheckBox* m_abortNotifications;
     QCheckBox* m_showTray;
-    QCheckBox* m_useGrimAdapter;
     QCheckBox* m_helpMessage;
     QCheckBox* m_sidePanelButton;
 #if !defined(DISABLE_UPDATE_CHECKER)

src/core/capturerequest.cpp

@@ -18,6 +18,8 @@ CaptureRequest::CaptureRequest(CaptureRequest::CaptureMode mode,
   , m_delay(delay)
   , m_tasks(tasks)
   , m_data(std::move(data))
+  , m_selectedMonitor(-1)
+  , m_hasSelectedMonitor(false)
 {
 
     ConfigHandler config;
@@ -86,3 +88,19 @@ void CaptureRequest::setInitialSelection(const QRect& selection)
 {
     m_initialSelection = selection;
 }
+
+void CaptureRequest::setSelectedMonitor(int monitorIndex)
+{
+    m_selectedMonitor = monitorIndex;
+    m_hasSelectedMonitor = true;
+}
+
+int CaptureRequest::selectedMonitor() const
+{
+    return m_selectedMonitor;
+}
+
+bool CaptureRequest::hasSelectedMonitor() const
+{
+    return m_hasSelectedMonitor;
+}

src/core/capturerequest.h

@@ -49,6 +49,9 @@ class CaptureRequest
     void addSaveTask(const QString& path = QString());
     void addPinTask(const QRect& pinWindowGeometry);
     void setInitialSelection(const QRect& selection);
+    void setSelectedMonitor(int monitorIndex);
+    int selectedMonitor() const;
+    bool hasSelectedMonitor() const;
 
 private:
     CaptureMode m_mode;
@@ -57,6 +60,8 @@ class CaptureRequest
     ExportTask m_tasks;
     QVariant m_data;
     QRect m_pinWindowGeometry, m_initialSelection;
+    int m_selectedMonitor;
+    bool m_hasSelectedMonitor;
 
     CaptureRequest() {}
 };

src/utils/CMakeLists.txt

@@ -14,6 +14,7 @@ target_sources(
   PRIVATE abstractlogger.cpp
           filenamehandler.cpp
           screengrabber.cpp
+          monitorpreview.cpp
           confighandler.cpp
           systemnotification.cpp
           valuehandler.cpp

src/utils/confighandler.cpp

@@ -79,8 +79,6 @@ static QMap<class QString, QSharedPointer<ValueHandler>>
     OPTION("showDesktopNotification"     ,Bool               ( true          )),
     OPTION("showAbortNotification"       ,Bool               ( true          )),
     OPTION("disabledTrayIcon"            ,Bool               ( false         )),
-    OPTION("useGrimAdapter"              ,Bool               ( false         )),
-    OPTION("disabledGrimWarning"         ,Bool               ( false         )),
     OPTION("historyConfirmationToDelete" ,Bool               ( true          )),
 #if !defined(DISABLE_UPDATE_CHECKER)
     OPTION("checkForUpdates"             ,Bool               ( true          )),

src/utils/confighandler.h

@@ -90,8 +90,6 @@ class ConfigHandler : public QObject
     CONFIG_GETTER_SETTER(showAbortNotification, setShowAbortNotification, bool)
     CONFIG_GETTER_SETTER(filenamePattern, setFilenamePattern, QString)
     CONFIG_GETTER_SETTER(disabledTrayIcon, setDisabledTrayIcon, bool)
-    CONFIG_GETTER_SETTER(useGrimAdapter, useGrimAdapter, bool)
-    CONFIG_GETTER_SETTER(disabledGrimWarning, disabledGrimWarning, bool)
     CONFIG_GETTER_SETTER(drawThickness, setDrawThickness, int)
     CONFIG_GETTER_SETTER(drawFontSize, setDrawFontSize, int)
     CONFIG_GETTER_SETTER(drawCircleCounterSize, setDrawCircleCounterSize, int)