File keepassxc-Fix-window-hiding-after-shown.patch of Package keepassxc

Overview Repositories Revisions Requests Users Attributes Meta

File keepassxc-Fix-window-hiding-after-shown.patch of Package keepassxc (Revision b24349552fbf204136fb8a81ac68f540)

Currently displaying revision b24349552fbf204136fb8a81ac68f540 , Show latest

From d1a82f6bd7b8eaa05c9a9a6c3d95f8e3fe1f3c75 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Fri, 21 Feb 2020 01:17:20 +0100
Subject: [PATCH 1/5] gui: Use proper windowing system detection.

The GUI features depend on windowing system used, not OS.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 src/gui/MainWindow.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 6452c051..e1fea310 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1238,13 +1238,13 @@ void MainWindow::processTrayIconTrigger()
 void MainWindow::hideWindow()
 {
     saveWindowInformation();
-#if !defined(Q_OS_LINUX) && !defined(Q_OS_MACOS)
-    // On some Linux systems, the window should NOT be minimized and hidden (i.e. not shown), at
-    // the same time (which would happen if both minimize on startup and minimize to tray are set)
-    // since otherwise it causes problems on restore as seen on issue #1595. Hiding it is enough.
-    // TODO: Add an explanation for why this is also not done on Mac (or remove the check)
-    setWindowState(windowState() | Qt::WindowMinimized);
-#endif
+    if (QGuiApplication::platformName() == "xcb") {
+        // In X11 the window should NOT be minimized and hidden (i.e. not
+        // shown) at the same time (which would happen if both minimize on
+        // startup and minimize to tray are set) since otherwise it causes
+        // problems on restore as seen on issue #1595. Hiding it is enough.
+        setWindowState(windowState() | Qt::WindowMinimized);
+    }
     // Only hide if tray icon is active, otherwise window will be gone forever
     if (isTrayIconEnabled()) {
         hide();
-- 
2.25.0

From f66ae4b30f4f7ebc3255f9c7480c6f343985eb71 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Sun, 16 Feb 2020 22:38:35 +0100
Subject: [PATCH 2/5] gui: Fix main window hiding after shown

Sometimes the main window hides just after clicking the tray icon to
show it.  Add a timer to not hide window immediately after it is shown.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 src/core/Clock.cpp     |  5 +++++
 src/core/Clock.h       |  1 +
 src/gui/MainWindow.cpp | 22 ++++++++++++++++++++++
 src/gui/MainWindow.h   |  4 ++++
 4 files changed, 32 insertions(+)

diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
index be9e91dc..a1bd6943 100644
--- a/src/core/Clock.cpp
+++ b/src/core/Clock.cpp
@@ -34,6 +34,11 @@ uint Clock::currentSecondsSinceEpoch()
     return instance().currentDateTimeImpl().toTime_t();
 }
 
+qint64 Clock::currentMiliSecondsSinceEpoch()
+{
+    return instance().currentDateTimeImpl().toMSecsSinceEpoch();
+}
+
 QDateTime Clock::serialized(const QDateTime& dateTime)
 {
     auto time = dateTime.time();
diff --git a/src/core/Clock.h b/src/core/Clock.h
index 8f81b096..ec6a28ad 100644
--- a/src/core/Clock.h
+++ b/src/core/Clock.h
@@ -28,6 +28,7 @@ public:
     static QDateTime currentDateTime();
 
     static uint currentSecondsSinceEpoch();
+    static qint64 currentMiliSecondsSinceEpoch();
 
     static QDateTime serialized(const QDateTime& dateTime);
 
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index e1fea310..b72b73c3 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1235,6 +1235,28 @@ void MainWindow::processTrayIconTrigger()
     }
 }
 
+void MainWindow::show()
+{
+    m_lastShowTime = Clock::currentMiliSecondsSinceEpoch();
+    QMainWindow::show();
+}
+
+bool MainWindow::shouldHide()
+{
+    qint64 current_time = Clock::currentMiliSecondsSinceEpoch();
+
+    if (current_time - m_lastShowTime < 50)
+        return false;
+
+    return true;
+}
+
+void MainWindow::hide()
+{
+    if (shouldHide())
+        QMainWindow::hide();
+}
+
 void MainWindow::hideWindow()
 {
     saveWindowInformation();
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index 89501eff..f29afb55 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -70,6 +70,8 @@ public slots:
     void hideGlobalMessage();
     void showYubiKeyPopup();
     void hideYubiKeyPopup();
+    void hide();
+    void show();
     void hideWindow();
     void toggleWindow();
     void bringToFront();
@@ -132,6 +134,7 @@ private:
 
     static const QString BaseWindowTitle;
 
+    bool shouldHide();
     void saveWindowInformation();
     bool saveLastDatabases();
     void updateTrayIcon();
@@ -163,6 +166,7 @@ private:
     bool m_appExiting = false;
     bool m_contextMenuFocusLock = false;
     uint m_lastFocusOutTime = 0;
+    qint64 m_lastShowTime = 0;
     QTimer m_trayIconTriggerTimer;
     QSystemTrayIcon::ActivationReason m_trayIconTriggerReason;
 };
-- 
2.25.0

From e4e4902cb676ca3f1789dbaeddd52152dd1ce62c Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mon, 17 Feb 2020 14:54:29 +0100
Subject: [PATCH 3/5] gui: Do not apply workaround for main window hiding on
 Windows

The bug with main window hiding just after shown is not observed on
Windows and applying the workaround break Windows GUI tests. Do not
apply it on Windows.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 src/gui/MainWindow.cpp | 2 ++
 src/gui/MainWindow.h   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index b72b73c3..68fb0c31 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1235,6 +1235,7 @@ void MainWindow::processTrayIconTrigger()
     }
 }
 
+#ifndef _WIN32
 void MainWindow::show()
 {
     m_lastShowTime = Clock::currentMiliSecondsSinceEpoch();
@@ -1256,6 +1257,7 @@ void MainWindow::hide()
     if (shouldHide())
         QMainWindow::hide();
 }
+#endif
 
 void MainWindow::hideWindow()
 {
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index f29afb55..51685c13 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -70,8 +70,10 @@ public slots:
     void hideGlobalMessage();
     void showYubiKeyPopup();
     void hideYubiKeyPopup();
+#ifndef _WIN32
     void hide();
     void show();
+#endif
     void hideWindow();
     void toggleWindow();
     void bringToFront();
-- 
2.25.0

From 7d748310b161a1720b0b34c03ed1c91baa3bf7fe Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Fri, 21 Feb 2020 01:29:20 +0100
Subject: [PATCH 4/5] test X11 detection.

---
 src/main.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index dd503d95..3458caa5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,6 +20,8 @@
 #include <QFile>
 #include <QTextStream>
 
+#include <iostream>
+
 #include "cli/Utils.h"
 #include "config-keepassx.h"
 #include "core/Bootstrap.h"
@@ -44,10 +46,20 @@ Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
 #endif
 #endif
 
+std::ostream& operator<<(std::ostream& str, const QString& string) {
+    return str << string.toUtf8().constData();
+}
+
 int main(int argc, char** argv)
 {
     QT_REQUIRE_VERSION(argc, argv, QT_VERSION_STR)
 
+    if (QGuiApplication::platformName() == "xcb") {
+        std::cerr << "X11 system detected" << std::endl;
+    }
+
+    std::cerr << "Platform : \"" << QGuiApplication::platformName() << "\"" << std::endl;
+
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #ifdef Q_OS_LINUX
@@ -66,6 +78,12 @@ int main(int argc, char** argv)
     // QStandardPaths::writableLocation(QDesktopServices::DataLocation)
     Bootstrap::bootstrapApplication();
 
+    if (QGuiApplication::platformName() == "xcb") {
+        std::cerr << "X11 system detected" << std::endl;
+    }
+
+    std::cerr << "Platform : \"" << QGuiApplication::platformName() << "\"" << std::endl;
+
     QCommandLineParser parser;
     parser.setApplicationDescription(QObject::tr("KeePassXC - cross-platform password manager"));
     parser.addPositionalArgument(
-- 
2.25.0

From 182132a2ccf19d5fbee75da03f9960251a51d8fc Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Sun, 16 Feb 2020 22:38:35 +0100
Subject: [PATCH 5/5] gui: Debug window hiding after shown

Print stacktrace when window is hidden just after it's shown.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 CMakeLists.txt         | 11 +++++------
 src/CMakeLists.txt     |  3 +++
 src/gui/MainWindow.cpp | 20 ++++++++++++++++++--
 src/gui/MainWindow.h   |  1 +
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac4c8a9a..721fdf99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -213,8 +213,6 @@ endif()
 add_gcc_compiler_flags("-fno-common")
 add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
 add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
-add_gcc_compiler_flags("-fvisibility=hidden")
-add_gcc_compiler_cxxflags("-fvisibility-inlines-hidden")
 
 if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
     add_gcc_compiler_flags("-Werror")
@@ -228,7 +226,7 @@ else()
 endif()
 endif()
 
-add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti")
+add_gcc_compiler_cxxflags("-fexceptions -fno-rtti -rdynamic")
 add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
 add_gcc_compiler_cflags("-Wchar-subscripts -Wwrite-strings")
 
@@ -281,9 +279,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     endif()
     add_gcc_compiler_flags("-pie -fPIE")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed -Wl,--no-undefined")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now -rdynamic")
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro,-z,now -rdynamic")
 endif()
 
 add_gcc_compiler_cflags("-std=c99")
@@ -421,6 +419,7 @@ find_package(Argon2 REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(QREncode REQUIRED)
 find_package(sodium 1.0.12 REQUIRED)
+find_package(Boost 1.4 REQUIRED)
 
 set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
 
@@ -428,7 +427,7 @@ if(ZLIB_VERSION_STRING VERSION_LESS "1.2.0")
     message(FATAL_ERROR "zlib 1.2.0 or higher is required to use the gzip format")
 endif()
 
-include_directories(SYSTEM ${ARGON2_INCLUDE_DIR} ${sodium_INCLUDE_DIR})
+include_directories(SYSTEM ${ARGON2_INCLUDE_DIR} ${sodium_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
 
 # Optional
 if(WITH_XC_YUBIKEY)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af9b9bb5..d916aeb6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,8 @@ if(NOT ZXCVBN_LIBRARIES)
     set(ZXCVBN_LIBRARIES zxcvbn)
 endif(NOT ZXCVBN_LIBRARIES)
 
+find_library(LIBDL dl)
+
 set(keepassx_SOURCES
         core/Alloc.cpp
         core/AutoTypeAssociations.cpp
@@ -307,6 +309,7 @@ target_link_libraries(keepassx_core
         ${ARGON2_LIBRARIES}
         ${GCRYPT_LIBRARIES}
         ${GPGERROR_LIBRARIES}
+        ${LIBDL}
         ${ZLIB_LIBRARIES})
 
 if(WITH_XC_SSHAGENT)
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 68fb0c31..e2bf6b1e 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -27,6 +27,11 @@
 #include <QTimer>
 #include <QWindow>
 
+#include <iostream>
+
+#define BOOST_STACKTRACE_USE_ADDR2LINE
+#include <boost/stacktrace.hpp>
+
 #include "config-keepassx.h"
 
 #include "autotype/AutoType.h"
@@ -1024,7 +1029,7 @@ void MainWindow::changeEvent(QEvent* event)
         if (isTrayIconEnabled() && m_trayIcon && m_trayIcon->isVisible()
             && config()->get("GUI/MinimizeToTray").toBool()) {
             event->ignore();
-            QTimer::singleShot(0, this, SLOT(hide()));
+            QTimer::singleShot(0, this, SLOT(timerHide()));
         }
 
         if (config()->get("security/lockdatabaseminimize").toBool()) {
@@ -1240,18 +1245,28 @@ void MainWindow::show()
 {
     m_lastShowTime = Clock::currentMiliSecondsSinceEpoch();
     QMainWindow::show();
+    std::cerr << "show" << std::endl;
 }
 
 bool MainWindow::shouldHide()
 {
     qint64 current_time = Clock::currentMiliSecondsSinceEpoch();
 
-    if (current_time - m_lastShowTime < 50)
+    if (current_time - m_lastShowTime < 50) {
+        std::cerr << "Hiding after " << current_time - m_lastShowTime << "ms" << std::endl
+                  << boost::stacktrace::stacktrace() << std::endl;
         return false;
+    }
 
     return true;
 }
 
+void MainWindow::timerHide()
+{
+    std::cerr << "timerHide" << std::endl;
+    hide();
+}
+
 void MainWindow::hide()
 {
     if (shouldHide())
@@ -1270,6 +1285,7 @@ void MainWindow::hideWindow()
         setWindowState(windowState() | Qt::WindowMinimized);
     }
     // Only hide if tray icon is active, otherwise window will be gone forever
+    std::cerr << "hideWindow" << std::endl;
     if (isTrayIconEnabled()) {
         hide();
     } else {
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index 51685c13..2455607b 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -70,6 +70,7 @@ public slots:
     void hideGlobalMessage();
     void showYubiKeyPopup();
     void hideYubiKeyPopup();
+    void timerHide();
 #ifndef _WIN32
     void hide();
     void show();
-- 
2.25.0

Places

File keepassxc-Fix-window-hiding-after-shown.patch of Package keepassxc (Revision b24349552fbf204136fb8a81ac68f540)

Places