Merge remote-tracking branch 'origin/main' into window-rules

Author: taj-ny

.github/workflows/arch-linux.yml

@@ -6,7 +6,7 @@ on:
     paths-ignore: [ "**.md" ]
   pull_request:
     branches: [ main ]
-    paths: [ "**/arch-linux.yml" ]
+    paths-ignore: [ "**.md" ]
   schedule:
     - cron: "0 0 * * *"
 

.github/workflows/fedora-40.yml

@@ -6,7 +6,7 @@ on:
     paths-ignore: [ "**.md" ]
   pull_request:
     branches: [ main ]
-    paths: [ "**/fedora-40.yml" ]
+    paths-ignore: [ "**.md" ]
   schedule:
     - cron: "0 0 * * *"
 

.github/workflows/nixos-plasma-6-0-5.yml

@@ -6,7 +6,7 @@ on:
     paths-ignore: [ "**.md" ]
   pull_request:
     branches: [ main ]
-    paths: [ "**/nixos-plasma-6-0-5.yml" ]
+    paths-ignore: [ "**.md" ]
   schedule:
     - cron: "0 0 * * *"
 

.github/workflows/nixos-plasma-6-1-5.yml

@@ -6,7 +6,7 @@ on:
     paths-ignore: [ "**.md" ]
   pull_request:
     branches: [ main ]
-    paths: [ "**/nixos-plasma-6-1-5.yml" ]
+    paths-ignore: [ "**.md" ]
   schedule:
     - cron: "0 0 * * *"
 

.github/workflows/nixos-unstable.yml

@@ -6,7 +6,7 @@ on:
     paths-ignore: [ "**.md" ]
   pull_request:
     branches: [ main ]
-    paths: [ "**/nixos-unstable.yml" ]
+    paths-ignore: [ "**.md" ]
   schedule:
     - cron: "0 0 * * *"
 

CMakeLists.txt

@@ -66,10 +66,11 @@ find_package(KWin REQUIRED COMPONENTS
     kwineffects
 )
 
-if(${KWin_VERSION} VERSION_LESS_EQUAL 6.0.5)
-    add_compile_definitions(KWIN_6_0)
-elseif(${KWin_VERSION} VERSION_LESS_EQUAL 6.1.5)
-    add_compile_definitions(KWIN_6_1)
+if(${KWin_VERSION} VERSION_GREATER_EQUAL 6.0.90)
+    add_compile_definitions(KWIN_6_1_OR_GREATER)
+endif()
+if(${KWin_VERSION} VERSION_GREATER_EQUAL 6.1.90)
+    add_compile_definitions(KWIN_6_2_OR_GREATER)
 endif()
 
 find_package(KDecoration2 REQUIRED)

src/blur.cpp

@@ -335,10 +335,10 @@ bool BlurEffect::enabledByDefault()
 
 bool BlurEffect::supported()
 {
-#ifdef KWIN_6_0
-    return effects->isOpenGLCompositing() && GLFramebuffer::supported() && GLFramebuffer::blitSupported();
-#else
+#ifdef KWIN_6_1_OR_GREATER
     return effects->openglContext() && (effects->openglContext()->supportsBlits() || effects->waylandDisplay());
+#else
+    return effects->isOpenGLCompositing() && GLFramebuffer::supported() && GLFramebuffer::blitSupported();
 #endif
 }
 
@@ -879,10 +879,10 @@ GLTexture *BlurEffect::wallpaper(EffectWindow *desktop, const qreal &scale, cons
     const RenderViewport renderViewport(desktop->frameGeometry(), scale, renderTarget);
     WindowPaintData data;
 
-#ifdef KWIN_6_0
+#ifndef KWIN_6_1_OR_GREATER
     QMatrix4x4 projectionMatrix;
-        projectionMatrix.ortho(geometry);
-        data.setProjectionMatrix(projectionMatrix);
+    projectionMatrix.ortho(geometry);
+    data.setProjectionMatrix(projectionMatrix);
 #endif
 
     GLFramebuffer::pushFramebuffer(desktopFramebuffer.get());
@@ -928,7 +928,7 @@ GLTexture *BlurEffect::createStaticBlurTextureWayland(const Output *output, cons
     auto *shader = ShaderManager::instance()->pushShader(ShaderTrait::MapTexture | ShaderTrait::TransformColorspace);
     shader->setColorspaceUniforms(
         ColorDescription::sRGB, renderTarget.colorDescription()
-#if !(defined(KWIN_6_1) || defined(KWIN_6_0))
+#ifdef KWIN_6_2_OR_GREATER
         , RenderingIntent::RelativeColorimetricWithBPC
 #endif
     );

src/blurwindow.cpp

@@ -1,4 +1,3 @@
-#include "utils.h"
 #include "blurwindow.h"
 
 #include "effect/effecthandler.h"
@@ -9,6 +8,10 @@
 #include "wayland/surface.h"
 #include "window.h"
 
+#ifdef KWIN_6_2_OR_GREATER
+#include "scene/windowitem.h"
+#endif
+
 #include <KDecoration2/Decoration>
 
 namespace BetterBlur
@@ -104,10 +107,16 @@ void Window::updateBlurRegion(bool geometryChanged)
     if (content.has_value() || frame.has_value()) {
         m_contentBlurRegion = content;
         m_frameBlurRegion = frame;
+#ifdef KWIN_6_2_OR_GREATER
+        m_windowEffect = std::make_unique<KWin::ItemEffect>(w->windowItem());
+#endif
     } else if (!geometryChanged) { // Blur may disappear if this method is called when window geometry changes
         m_contentBlurRegion = {};
         m_frameBlurRegion = {};
         render.clear();
+#ifdef KWIN_6_2_OR_GREATER
+        m_windowEffect.reset();
+#endif
     }
 }
 

src/blurwindow.h

@@ -7,6 +7,10 @@
 #include "effect/effectwindow.h"
 #include "opengl/glutils.h"
 
+#ifdef KWIN_6_2_OR_GREATER
+#include "scene/item.h"
+#endif
+
 namespace BetterBlur
 {
 
@@ -72,6 +76,10 @@ public Q_SLOTS:
     long net_wm_blur_region = 0;
     bool m_blurWhenTransformed = false;
 
+#ifdef KWIN_6_2_OR_GREATER
+    std::unique_ptr<KWin::ItemEffect> m_windowEffect;
+#endif
+
     QSizeF m_size;
     bool m_hasWindowBehind = false;
     std::unique_ptr<WindowProperties> m_properties;