Merge pull request #87 from johanberntsson/fix/map-copy-paste-crash

Fix crash and menu no-op in map copy/paste

Author: ricardoquesada

CMakeLists.txt

@@ -11,6 +11,29 @@ if(NOT DEFINED INSTALL_DIR)
 endif()
 
 find_package(Qt6 REQUIRED COMPONENTS Widgets LinguistTools)
+
+# Fix macOS CI build failure due to AGL framework removal in macOS 14+ SDK
+if(APPLE)
+    foreach(_target WrapOpenGL::WrapOpenGL Qt6::Gui Qt::Gui Qt6::Gui_private Qt::Gui_private)
+        if(TARGET ${_target})
+            get_target_property(_libs ${_target} INTERFACE_LINK_LIBRARIES)
+            if(_libs)
+                set(_new_libs "")
+                set(_changed FALSE)
+                foreach(_lib ${_libs})
+                    if(_lib MATCHES "AGL" OR _lib STREQUAL "AGL")
+                        set(_changed TRUE)
+                    else()
+                        list(APPEND _new_libs "${_lib}")
+                    endif()
+                endforeach()
+                if(_changed)
+                    set_target_properties(${_target} PROPERTIES INTERFACE_LINK_LIBRARIES "${_new_libs}")
+                endif()
+            endif()
+        endif()
+    endforeach()
+endif()
 qt_standard_project_setup(
     I18N_SOURCE_LANGUAGE en
     I18N_TRANSLATED_LANGUAGES es

src/CMakeLists.txt

@@ -84,6 +84,29 @@ find_package(Qt6
     REQUIRED
 )
 
+# Fix macOS CI build failure due to AGL framework removal in macOS 14+ SDK
+if(APPLE)
+    foreach(_target WrapOpenGL::WrapOpenGL Qt6::Gui Qt::Gui Qt6::Gui_private Qt::Gui_private)
+        if(TARGET ${_target})
+            get_target_property(_libs ${_target} INTERFACE_LINK_LIBRARIES)
+            if(_libs)
+                set(_new_libs "")
+                set(_changed FALSE)
+                foreach(_lib ${_libs})
+                    if(_lib MATCHES "AGL" OR _lib STREQUAL "AGL")
+                        set(_changed TRUE)
+                    else()
+                        list(APPEND _new_libs "${_lib}")
+                    endif()
+                endforeach()
+                if(_changed)
+                    set_target_properties(${_target} PROPERTIES INTERFACE_LINK_LIBRARIES "${_new_libs}")
+                endif()
+            endif()
+        endif()
+    endforeach()
+endif()
+
 qt_add_big_resources(RESOURCES
     resources.qrc
 )

src/mainwindow.cpp

@@ -26,6 +26,7 @@ limitations under the License.
 #include <QDir>
 #include <QDockWidget>
 #include <QErrorMessage>
+#include <QEvent>
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QGuiApplication>
@@ -98,6 +99,12 @@ MainWindow::MainWindow(QWidget* parent)
     setupMapDock();
     setupStatusBar();
     checkForUpdates();
+
+    // needed so Copy/Paste (triggered from the Edit menu) know which widget
+    // was last being edited, since opening the menu steals keyboard focus
+    _ui->charsetWidget->installEventFilter(this);
+    _ui->tilesetWidget->installEventFilter(this);
+    _ui->mapWidget->installEventFilter(this);
 }
 
 MainWindow::~MainWindow()
@@ -246,6 +253,15 @@ void MainWindow::closeEvent(QCloseEvent* event)
     }
 }
 
+bool MainWindow::eventFilter(QObject* watched, QEvent* event)
+{
+    if (event->type() == QEvent::FocusIn
+        && (watched == _ui->charsetWidget || watched == _ui->tilesetWidget || watched == _ui->mapWidget)) {
+        _lastFocusedEditorWidget = qobject_cast<QWidget*>(watched);
+    }
+    return QMainWindow::eventFilter(watched, event);
+}
+
 void MainWindow::createUndoView()
 {
     auto undoDock = new QDockWidget(tr("Undo List"), this);
@@ -1268,8 +1284,8 @@ void MainWindow::on_actionPaste_triggered()
         // src: TILES  dst: Charset / Tileset
         // src: MAP    dst: Map
         if (!(((range->type == State::CopyRange::CHARS || range->type == State::CopyRange::TILES)
-                  && (_ui->charsetWidget->hasFocus() || _ui->tilesetWidget->hasFocus()))
-                || (range->type == State::CopyRange::MAP && _ui->mapWidget->hasFocus()))) {
+                  && (_lastFocusedEditorWidget == _ui->charsetWidget || _lastFocusedEditorWidget == _ui->tilesetWidget))
+                || (range->type == State::CopyRange::MAP && _lastFocusedEditorWidget == _ui->mapWidget))) {
             QApplication::beep();
             return;
         }
@@ -1579,11 +1595,11 @@ State* MainWindow::getState() const
 State::CopyRange MainWindow::bufferToClipboard(State* state) const
 {
     State::CopyRange copyRange = {};
-    if (_ui->charsetWidget->hasFocus()) {
+    if (_lastFocusedEditorWidget == _ui->charsetWidget) {
         _ui->charsetWidget->getSelectionRange(&copyRange);
-    } else if (_ui->tilesetWidget->hasFocus()) {
+    } else if (_lastFocusedEditorWidget == _ui->tilesetWidget) {
         _ui->tilesetWidget->getSelectionRange(&copyRange);
-    } else if (_ui->mapWidget->hasFocus()) {
+    } else if (_lastFocusedEditorWidget == _ui->mapWidget) {
         _ui->mapWidget->getSelectionRange(&copyRange);
     } else {
         copyRange.offset = -1;

src/mainwindow.h

@@ -26,9 +26,10 @@ QT_BEGIN_NAMESPACE
 class QUndoView;
 class QLabel;
 class QMdiSubWindow;
-class QUndoView;
 class QSpinBox;
 class QComboBox;
+class QEvent;
+class QCloseEvent;
 QT_END_NAMESPACE
 
 namespace Ui {
@@ -122,6 +123,7 @@ public slots:
     void updateMenus();
 
     void closeEvent(QCloseEvent* event) override;
+    bool eventFilter(QObject* watched, QEvent* event) override;
 
     BigCharWidget* getBigcharWidget() const;
     State* getState() const;
@@ -235,4 +237,9 @@ private slots:
 
     // FIXME: Should be moved to the "charset dock" once it is implemented
     QComboBox* _comboBoxTilesetZoom;
+
+    // Tracks whichever of charsetWidget/tilesetWidget/mapWidget last had keyboard focus.
+    // Needed because triggering Copy/Paste from the Edit menu momentarily steals focus
+    // away from these widgets, so a plain hasFocus() check fails at that point.
+    QWidget* _lastFocusedEditorWidget = nullptr;
 };

src/state.cpp

@@ -1044,7 +1044,7 @@ void State::_pasteMap(int charIndex, const CopyRange& copyRange, const quint8* o
     const quint8* src = origBuffer + copyRange.offset;
 
     while (count > 0) {
-        const auto lastByte = &_map[_mapSize.width() * _mapSize.height()];
+        const auto lastByte = _map.data() + _mapSize.width() * _mapSize.height();
         int bytesToCopy = std::min((qint64)copyRange.blockSize, (qint64)(lastByte - dst));
         if (bytesToCopy < 0)
             break;

tests/unit_tests/CMakeLists.txt

@@ -7,6 +7,29 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Test Widgets Network)
+
+# Fix macOS CI build failure due to AGL framework removal in macOS 14+ SDK
+if(APPLE)
+    foreach(_target WrapOpenGL::WrapOpenGL Qt6::Gui Qt::Gui Qt6::Gui_private Qt::Gui_private)
+        if(TARGET ${_target})
+            get_target_property(_libs ${_target} INTERFACE_LINK_LIBRARIES)
+            if(_libs)
+                set(_new_libs "")
+                set(_changed FALSE)
+                foreach(_lib ${_libs})
+                    if(_lib MATCHES "AGL" OR _lib STREQUAL "AGL")
+                        set(_changed TRUE)
+                    else()
+                        list(APPEND _new_libs "${_lib}")
+                    endif()
+                endforeach()
+                if(_changed)
+                    set_target_properties(${_target} PROPERTIES INTERFACE_LINK_LIBRARIES "${_new_libs}")
+                endif()
+            endif()
+        endif()
+    endforeach()
+endif()
 set(CMAKE_AUTOMOC ON)
 
 # We need to compile the sources from src/ but we cannot easily link against an executable target