merge: Arch-dev

CMakeLists.txt

@@ -12,9 +12,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)
 
-set(QT Core Gui Widgets Quick QuickControls2 DBus Xml X11Extras LinguistTools)
-find_package(Qt5 REQUIRED ${QT})
-# find_package(LingmoUI REQUIRED)
+set(QT Core Gui Widgets Quick QuickControls2 DBus Xml LinguistTools)
+find_package(Qt6 COMPONENTS ${QT} REQUIRED)
+
 find_package(PkgConfig REQUIRED)
 
 include(GNUInstallDirs)

chotkeys/CMakeLists.txt

@@ -1,7 +1,7 @@
 find_package(ECM REQUIRED NO_MODULE)
 list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
-find_package(Qt5 COMPONENTS Core Widgets DBus X11Extras REQUIRED)
+find_package(Qt6 COMPONENTS Core Widgets DBus REQUIRED)
 find_package(XCB MODULE REQUIRED COMPONENTS XCB KEYSYMS)
 find_package(X11)
 
@@ -19,10 +19,9 @@ add_executable(lingmo-chotkeys
 
 target_link_libraries(lingmo-chotkeys
     PRIVATE
-    Qt5::Core
-    Qt5::Widgets
-    Qt5::DBus
-    Qt5::X11Extras
+    Qt6::Core
+    Qt6::Widgets
+    Qt6::DBus
     ${XCB_LIBS}
     ${X11_LIBRARIES}
     XCB::KEYSYMS

chotkeys/QHotkey/qhotkey_x11.cpp

@@ -5,7 +5,6 @@
 	#include <QGuiApplication>
 #else
 	#include <QDebug>
-	#include <QX11Info>
 #endif
 
 #include <QThreadStorage>

chotkeys/hotkeys.cpp

@@ -2,7 +2,7 @@
 
 #include <QApplication>
 #include <QKeySequence>
-#include <QX11Info>
+#include <QGuiApplication>
 #include <QTimer>
 #include <QDebug>
 
@@ -16,6 +16,15 @@
 
 #include <X11/XKBlib.h>
 
+#include <xcb/composite.h>
+#include <xcb/damage.h>
+#include <xcb/randr.h>
+#include <xcb/shm.h>
+#include <xcb/xcb.h>
+#include <xcb/xcb_atom.h>
+#include <xcb/xcb_event.h>
+#include <X11/Xlib-xcb.h>
+
 Hotkeys::Hotkeys(QObject *parent)
     : QObject(parent)
 {
@@ -27,7 +36,7 @@ Hotkeys::~Hotkeys()
     qApp->removeNativeEventFilter(this);
 }
 
-bool Hotkeys::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
+bool Hotkeys::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
 {
     Q_UNUSED(result);
 
@@ -61,7 +70,7 @@ bool Hotkeys::nativeEventFilter(const QByteArray &eventType, void *message, long
 
 //        // Keyboard needs to be ungrabed after XGrabKey() activates the grab,
 //        // otherwise it becomes frozen.
-//        xcb_connection_t *c = QX11Info::connection();
+//        xcb_connection_t *c = dynamic_cast<QNativeInterface::QX11Application *>(qApp)->connection();
 //        xcb_void_cookie_t cookie = xcb_ungrab_keyboard_checked(c, XCB_TIME_CURRENT_TIME);
 //        xcb_flush(c);
 
@@ -148,17 +157,18 @@ void Hotkeys::registerKey(quint32 keycode)
 
 void Hotkeys::registerKey(quint32 key, quint32 mods)
 {
-    xcb_grab_key(QX11Info::connection(),
+    auto *native = dynamic_cast<QNativeInterface::QX11Application *>(qApp);
+    xcb_grab_key(native->connection(),
                  1,
-                 QX11Info::appRootWindow(),
+                 DefaultRootWindow(native->display()),
                  mods,
                  key,
                  XCB_GRAB_MODE_ASYNC,
                  XCB_GRAB_MODE_ASYNC);
 
-    xcb_grab_key(QX11Info::connection(),
+    xcb_grab_key(native->connection(),
                  1,
-                 QX11Info::appRootWindow(),
+                 DefaultRootWindow(native->display()),
                  mods | XCB_MOD_MASK_2,
                  key,
                  XCB_GRAB_MODE_ASYNC,
@@ -167,7 +177,8 @@ void Hotkeys::registerKey(quint32 key, quint32 mods)
 
 void Hotkeys::unregisterKey(quint32 key, quint32 mods)
 {
-    xcb_ungrab_key(QX11Info::connection(), key, QX11Info::appRootWindow(), mods);
+    auto *native = dynamic_cast<QNativeInterface::QX11Application *>(qApp);
+    xcb_ungrab_key(native->connection(), key, DefaultRootWindow(native->display()), mods);
 }
 
 quint32 Hotkeys::nativeKeycode(Qt::Key k)
@@ -244,7 +255,7 @@ quint32 Hotkeys::nativeKeycode(Qt::Key k)
             key = 0;
         }
     }
-    return XKeysymToKeycode(QX11Info::display(), key);
+    return XKeysymToKeycode(dynamic_cast<QNativeInterface::QX11Application *>(qApp)->display(), key);
 }
 
 quint32 Hotkeys::nativeModifiers(Qt::KeyboardModifiers m)

chotkeys/hotkeys.h

@@ -18,7 +18,7 @@ class Hotkeys : public QObject, public QAbstractNativeEventFilter
     explicit Hotkeys(QObject *parent = nullptr);
     ~Hotkeys();
 
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
 
     void registerKey(QKeySequence keySequence);
     void registerKey(quint32 keycode);

cpufreq/CMakeLists.txt

@@ -7,10 +7,9 @@ set(SOURCES
 
 add_executable(${TARGET} ${SOURCES} ${DBUS_SOURCES})
 target_link_libraries(${TARGET}
-        Qt5::Core
-        Qt5::Quick
-        Qt5::DBus
-        Qt5::X11Extras
+        Qt6::Core
+        Qt6::Quick
+        Qt6::DBus
 )
 
 configure_file(

cupdatecursor/CMakeLists.txt

@@ -1,13 +1,12 @@
-find_package(Qt5 COMPONENTS Core Gui X11Extras REQUIRED)
+find_package(Qt6 COMPONENTS Core Gui REQUIRED)
 find_package(X11)
 
 add_executable(cupdatecursor
   main.cpp
 )
 target_link_libraries(cupdatecursor
-    Qt5::Core
-    Qt5::Gui
-    Qt5::X11Extras
+    Qt6::Core
+    Qt6::Gui
     ${X11_LIBRARIES}
     X11::X11
     X11::Xi

cupdatecursor/main.cpp

@@ -1,5 +1,4 @@
 #include <QGuiApplication>
-#include <QX11Info>
 #include <QFile>
 #include <QDebug>
 #include <QSettings>
@@ -10,7 +9,10 @@
 
 inline void applyTheme(const QString &theme, int size)
 {
-    Display *display = QX11Info::display();
+
+    auto *x11App = qApp->nativeInterface<QNativeInterface::QX11Application>();
+    auto *display = x11App->display();
+
 
     if (!theme.isEmpty())
         XcursorSetTheme(display, QFile::encodeName(theme));
@@ -41,7 +43,8 @@ int main(int argc, char *argv[])
     if (argc != 3)
         return 1;
 
-    if (!QX11Info::isPlatformX11())
+    auto isPlatformX11 = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
+    if (!isPlatformX11)
         return 2;
 
     QString theme = QFile::decodeName(argv[1]);

gmenuproxy/CMakeLists.txt

@@ -3,8 +3,8 @@ list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 
 find_package(AppMenuGtkModule)
-find_package(KF5WindowSystem)
-find_package(KF5CoreAddons)
+find_package(KF6WindowSystem)
+find_package(KF6CoreAddons)
 set_package_properties(AppMenuGtkModule PROPERTIES TYPE RUNTIME)
 
 add_definitions(-DQT_NO_CAST_TO_ASCII
@@ -38,12 +38,11 @@ add_executable(lingmo-gmenuproxy ${GMENU_DBUSMENU_PROXY_SRCS})
 set_package_properties(XCB PROPERTIES TYPE REQUIRED)
 
 target_link_libraries(lingmo-gmenuproxy
-    Qt5::Core
-    Qt5::X11Extras
-    Qt5::DBus
-    Qt5::Widgets
-    KF5::CoreAddons
-    KF5::WindowSystem
+    Qt6::Core
+    Qt6::DBus
+    Qt6::Widgets
+    KF6::CoreAddons
+    KF6::WindowSystem
     XCB::XCB
     ${AppMenuGtkModule}
 )

gmenuproxy/actions.h

@@ -11,7 +11,7 @@
 
 #include "gdbusmenutypes_p.h"
 
-class QStringList;
+// class QStringList;
 
 class Actions : public QObject
 {

gmenuproxy/dbusmenuadaptor.h

@@ -20,7 +20,7 @@ class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;
 class QString;
-class QStringList;
+// class QStringList;
 class QVariant;
 QT_END_NAMESPACE
 

gmenuproxy/menu.cpp

@@ -104,10 +104,9 @@ void Menu::stop(const QList<uint> &ids)
             qDebug() << "Failed to stop subscription to" << ids << "on" << m_serviceName << "at" << m_objectPath << reply.error();
         } else {
             // remove all subscriptions that we unsubscribed from
-            // TODO is there a nicer algorithm for that?
-            // TODO remove all m_menus also?
             m_subscriptions.erase(
-                std::remove_if(m_subscriptions.begin(), m_subscriptions.end(), std::bind(&QList<uint>::contains, m_subscriptions, std::placeholders::_1)),
+                std::remove_if(m_subscriptions.begin(), m_subscriptions.end(),
+                            [this](uint id) { return m_subscriptions.contains(id); }),
                 m_subscriptions.end());
 
             if (m_subscriptions.isEmpty()) {
@@ -116,6 +115,7 @@ void Menu::stop(const QList<uint> &ids)
         }
         watcher->deleteLater();
     });
+
 }
 
 bool Menu::hasMenu() const

gmenuproxy/menuproxy.cpp

@@ -16,13 +16,15 @@
 #include <QTimer>
 #include <QSettings>
 #include <QDebug>
+#include <QGuiApplication>
 
 // #include <KConfigGroup>
 #include <KDirWatch>
 // #include <KSharedConfig>
 #include <KWindowSystem>
+#include <KX11Extras>
+#include <KWindowInfo>
 
-#include <QX11Info>
 #include <xcb/xcb.h>
 
 #include "window.h"
@@ -48,7 +50,7 @@ static const QString s_appMenuGtkModule = QStringLiteral("appmenu-gtk-module");
 
 MenuProxy::MenuProxy()
     : QObject()
-    , m_xConnection(QX11Info::connection())
+    , m_xConnection(qApp->nativeInterface<QNativeInterface::QX11Application>()->connection())
     , m_serviceWatcher(new QDBusServiceWatcher(this))
     , m_gtk2RcWatch(new KDirWatch(this))
     , m_writeGtk2SettingsTimer(new QTimer(this))
@@ -109,10 +111,11 @@ bool MenuProxy::init()
 
     enableGtkSettings(true);
 
-    connect(KWindowSystem::self(), &KWindowSystem::windowAdded, this, &MenuProxy::onWindowAdded);
-    connect(KWindowSystem::self(), &KWindowSystem::windowRemoved, this, &MenuProxy::onWindowRemoved);
+    // 使用KX11Extras的windowAdded信号
+    connect(KX11Extras::self(), &KX11Extras::windowAdded, this, &MenuProxy::onWindowAdded);
+    connect(KX11Extras::self(), &KX11Extras::windowRemoved, this, &MenuProxy::onWindowRemoved);
 
-    const auto windows = KWindowSystem::windows();
+    const auto windows = KX11Extras::windows();
     for (WId id : windows) {
         onWindowAdded(id);
     }
@@ -130,8 +133,8 @@ void MenuProxy::teardown()
 
     QDBusConnection::sessionBus().unregisterService(s_ourServiceName);
 
-    disconnect(KWindowSystem::self(), &KWindowSystem::windowAdded, this, &MenuProxy::onWindowAdded);
-    disconnect(KWindowSystem::self(), &KWindowSystem::windowRemoved, this, &MenuProxy::onWindowRemoved);
+    disconnect(KX11Extras::self(), &KX11Extras::windowAdded, this, &MenuProxy::onWindowAdded);
+    disconnect(KX11Extras::self(), &KX11Extras::windowRemoved, this, &MenuProxy::onWindowRemoved);
 
     qDeleteAll(m_windows);
     m_windows.clear();

gmenuproxy/window.cpp

@@ -251,7 +251,7 @@ void Window::menuChanged(const QVector<uint> &menuIds)
 void Window::onMenuSubscribed(uint id)
 {
     // When it was a delayed GetLayout request, send the reply now
-    const auto pendingReplies = m_pendingGetLayouts.values(id);
+    const auto pendingReplies = m_pendingGetLayouts.values(static_cast<int>(id));
     if (!pendingReplies.isEmpty()) {
         for (const auto &pendingReply : pendingReplies) {
             if (pendingReply.type() != QDBusMessage::InvalidMessage) {
@@ -424,7 +424,7 @@ uint Window::GetLayout(int parentId, int recursionDepth, const QStringList &prop
 
     if (!m_currentMenu->hasSubscription(subscription)) {
         // let's serve multiple similar requests in one go once we've processed them
-        m_pendingGetLayouts.insertMulti(subscription, message());
+        m_pendingGetLayouts.insert(subscription, message());
         setDelayedReply(true);
 
         m_currentMenu->start(subscription);

gmenuproxy/window.h

@@ -10,6 +10,7 @@
 #include <QObject>
 #include <QString>
 #include <QVector>
+#include <QMultiHash>
 #include <QWindow> // for WId
 
 #include <functional>
@@ -111,7 +112,7 @@ class Window : public QObject, protected QDBusContext
 
     QString m_proxyObjectPath; // our object path on this proxy app
 
-    QHash<int, QDBusMessage> m_pendingGetLayouts;
+    QMultiHash<int, QDBusMessage> m_pendingGetLayouts;
 
     Menu *m_applicationMenu = nullptr;
     Menu *m_menuBar = nullptr;

notificationd/CMakeLists.txt

@@ -17,10 +17,10 @@ set(SRCS main.cpp
 # for Ubuntu
 # qt_add_dbus_adaptor(SRCS org.freedesktop.Notifications.xml notificationserver.h NotificationServer)
 
-qt5_add_dbus_adaptor(DBUS_SOURCES com.lingmo.Notification.xml application.h Application)
+qt_add_dbus_adaptor(DBUS_SOURCES com.lingmo.Notification.xml application.h Application)
 set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON)
 
-find_package(KF5WindowSystem)
+find_package(KF6WindowSystem)
 
 add_executable(lingmo-notificationd ${SRCS} ${DBUS_SOURCES})
 
@@ -29,14 +29,14 @@ foreach(filepath ${TS_FILES})
     string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
     list(APPEND ts_files_replaced ${filename})
 endforeach()
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ${ts_files_replaced})
+qt_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ${ts_files_replaced})
 
 target_link_libraries(lingmo-notificationd
-    Qt5::Core
-    Qt5::DBus
-    Qt5::Quick
-    Qt5::Widgets
-    KF5::WindowSystem
+    Qt6::Core
+    Qt6::DBus
+    Qt6::Quick
+    Qt6::Widgets
+    KF6::WindowSystem
 )
 
 install(TARGETS lingmo-notificationd

notificationd/datehelper.cpp

@@ -1,5 +1,6 @@
 #include "datehelper.h"
 #include <QDateTime>
+#include <QLocale>
 
 DateHelper::DateHelper(QObject *parent) : QObject(parent)
 {
@@ -30,5 +31,5 @@ QString DateHelper::friendlyTime(const QDateTime &time)
     else if (days <= 10)
         return tr("%1 days ago").arg(days);
 
-    return time.toString(Qt::DefaultLocaleShortDate);
+    return time.toString(QLocale::system().dateFormat(QLocale::ShortFormat));
 }