Kdecoration2 ->KDecoration3

 Added a naive null check for transient
 Added the nextStateChanged handler (not sure if correct)
 Added deco->create call to init the state
 Run time tested X11 not wayland

Author: jsm222

CMakeLists.txt

@@ -127,7 +127,7 @@ set_package_properties(Plasma PROPERTIES
     TYPE RUNTIME
 )
 
-find_package(KDecoration2 ${KDE_PLASMA_VERSION}
+find_package(KDecoration3 ${KDE_PLASMA_VERSION}
   CONFIG REQUIRED
 )
 

como/base/CMakeLists.txt

@@ -18,7 +18,7 @@ target_sources(base
   PUBLIC
     FILE_SET HEADERS
     FILES
-      os/clock/linux_skew_notifier_engine.h
+      os/clock/skew_notifier_engine.h
       os/clock/skew_notifier.h
       seat/backend/logind/session.h
       seat/session.h

como/base/wayland/app_singleton.h

@@ -19,12 +19,17 @@ class app_singleton : public base::app_singleton
         setenv("QT_QPA_PLATFORM", "wayland-org.kde.kwin.qpa", true);
         setenv("KWIN_FORCE_OWN_QPA", "1", true);
 
-#if HAVE_SCHED_RESET_ON_FORK
         int const minPriority = sched_get_priority_min(SCHED_RR);
         sched_param sp;
         sp.sched_priority = minPriority;
-        sched_setscheduler(0, SCHED_RR | SCHED_RESET_ON_FORK, &sp);
-#endif
+        if (pthread_setschedparam(pthread_self(), SCHED_RR, &sp))
+            return;
+
+        pthread_atfork(NULL, NULL, []() {
+            sched_param sp;
+            sp.sched_priority = 0;
+            pthread_setschedparam(pthread_self(), SCHED_OTHER, &sp);
+        });
 
         qapp = std::make_unique<QApplication>(argc, argv);
         prepare_qapp();

como/input/device_redirect.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include <KDecoration2/Private/DecoratedClientPrivate>
+#include <KDecoration3/Private/DecoratedWindowPrivate>
 #include <QWindow>
 #include <optional>
 
@@ -38,7 +38,7 @@ struct device_redirect_focus {
     QWindow* internal_window{nullptr};
 
     struct {
-        KDecoration2::DecoratedClientPrivate* client{nullptr};
+        KDecoration3::DecoratedWindowPrivate* client{nullptr};
 
         // TODO(romangg): Make this unnecessary. Reuse instead the normal focus window.
         std::optional<Window> window;

como/render/deco_shadow.h

@@ -11,29 +11,29 @@
 #include <como/win/deco.h>
 #include <como/win/scene.h>
 
-#include <KDecoration2/Decoration>
-#include <KDecoration2/DecorationShadow>
+#include <KDecoration3/Decoration>
+#include <KDecoration3/DecorationShadow>
 
 namespace como::render
 {
 
 template<typename Shadow>
-bool update_deco_shadow(Shadow& impl, KDecoration2::Decoration* decoration)
+bool update_deco_shadow(Shadow& impl, KDecoration3::Decoration* decoration)
 {
     if (!std::visit(overload{[&](auto&& ref_win) {
                         if (impl.m_decorationShadow) {
                             // disconnect previous connections
                             QObject::disconnect(
                                 impl.m_decorationShadow.get(),
-                                &KDecoration2::DecorationShadow::innerShadowRectChanged,
+                                &KDecoration3::DecorationShadow::innerShadowRectChanged,
                                 ref_win->qobject.get(),
                                 nullptr);
                             QObject::disconnect(impl.m_decorationShadow.get(),
-                                                &KDecoration2::DecorationShadow::shadowChanged,
+                                                &KDecoration3::DecorationShadow::shadowChanged,
                                                 ref_win->qobject.get(),
                                                 nullptr);
                             QObject::disconnect(impl.m_decorationShadow.get(),
-                                                &KDecoration2::DecorationShadow::paddingChanged,
+                                                &KDecoration3::DecorationShadow::paddingChanged,
                                                 ref_win->qobject.get(),
                                                 nullptr);
                         }
@@ -47,15 +47,15 @@ bool update_deco_shadow(Shadow& impl, KDecoration2::Decoration* decoration)
                         auto update_shadow = [ref_win]() { win::update_shadow(ref_win); };
 
                         QObject::connect(impl.m_decorationShadow.get(),
-                                         &KDecoration2::DecorationShadow::innerShadowRectChanged,
+                                         &KDecoration3::DecorationShadow::innerShadowRectChanged,
                                          ref_win->qobject.get(),
                                          update_shadow);
                         QObject::connect(impl.m_decorationShadow.get(),
-                                         &KDecoration2::DecorationShadow::shadowChanged,
+                                         &KDecoration3::DecorationShadow::shadowChanged,
                                          ref_win->qobject.get(),
                                          update_shadow);
                         QObject::connect(impl.m_decorationShadow.get(),
-                                         &KDecoration2::DecorationShadow::paddingChanged,
+                                         &KDecoration3::DecorationShadow::paddingChanged,
                                          ref_win->qobject.get(),
                                          update_shadow);
                         return true;

como/render/effect/interface/effect_window.h

@@ -14,7 +14,7 @@
 #include <QObject>
 #include <QWindow>
 
-namespace KDecoration2
+namespace KDecoration3
 {
 class Decoration;
 }
@@ -436,7 +436,7 @@ class COMO_EXPORT EffectWindow : public QObject
      * Returns the decoration
      * @since 5.25
      */
-    virtual KDecoration2::Decoration* decoration() const = 0;
+    virtual KDecoration3::Decoration* decoration() const = 0;
     virtual QByteArray readProperty(long atom, long type, int format) const = 0;
     virtual void deleteProperty(long atom) const = 0;
 

como/render/effect/window_impl.h

@@ -677,7 +677,7 @@ class effects_window_impl : public EffectWindow
                           *window.ref_win);
     }
 
-    KDecoration2::Decoration* decoration() const override
+    KDecoration3::Decoration* decoration() const override
     {
         return std::visit(overload{[](auto&& ref_win) { return win::decoration(ref_win); }},
                           *window.ref_win);

como/render/effects.cpp

@@ -22,7 +22,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 #include <como/render/gl/interface/framebuffer.h>
 #include <como/render/gl/interface/platform.h>
 
-#include <KDecoration2/DecorationSettings>
+#include <KDecoration3/DecorationSettings>
 
 namespace como::render
 {

como/render/effects.h

@@ -981,7 +981,7 @@ class effects_handler_impl : public effects_handler_wrap
             // TODO: this could become per window and be derived from the actual position in the
             // deco
             auto deco_settings = get_space().deco->settings();
-            auto close_enum = KDecoration2::DecorationButtonType::Close;
+            auto close_enum = KDecoration3::DecorationButtonType::Close;
             return deco_settings && deco_settings->decorationButtonsLeft().contains(close_enum)
                 ? Qt::TopLeftCorner
                 : Qt::TopRightCorner;

como/render/gl/shadow.h

@@ -81,7 +81,7 @@ class DecorationShadowTextureCache
         QSharedPointer<GLTexture> texture;
         QVector<Shadow*> shadows;
     };
-    QHash<KDecoration2::DecorationShadow*, Data> m_cache;
+    QHash<KDecoration3::DecorationShadow*, Data> m_cache;
 };
 
 template<typename Window, typename Scene>