#2: ignore windows that are no windows (for the wm?!?)

lcarsde · Feb 20, 2021 · 2056f56 · 2056f56
1 parent 45552ab
commit 2056f56
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,7 @@
 * fix window toggling (forward)
 * fix linking for systems with /usr/lib64
 * add window toggling backwards
+* fixed issue where frames have no content
 
 21.1
 * fix memory leak

diff --git a/src/nativeMain/kotlin/de/atennert/lcarswm/window/WindowHandler.kt b/src/nativeMain/kotlin/de/atennert/lcarswm/window/WindowHandler.kt
@@ -43,7 +43,11 @@ class WindowHandler(
     override fun addWindow(windowId: Window, isSetup: Boolean) {
         system.grabServer()
         val windowAttributes = nativeHeap.alloc<XWindowAttributes>()
-        system.getWindowAttributes(windowId, windowAttributes.ptr)
+        if (system.getWindowAttributes(windowId, windowAttributes.ptr) == X_FALSE) {
+            system.ungrabServer()
+            // not a window or something ...
+            return
+        }
 
         if (windowAttributes.override_redirect != X_FALSE ||
             (isSetup && windowAttributes.map_state != IsViewable)) {

diff --git a/src/nativeTest/kotlin/de/atennert/lcarswm/system/SystemFacadeMock.kt b/src/nativeTest/kotlin/de/atennert/lcarswm/system/SystemFacadeMock.kt
@@ -486,7 +486,7 @@ open class SystemFacadeMock : SystemApi {
     val windowBorderWidth = 2
     override fun getWindowAttributes(window: Window, attributes: CPointer<XWindowAttributes>): Int {
         attributes.pointed.border_width = windowBorderWidth
-        return 0
+        return 1
     }
 
     override fun changeWindowAttributes(window: Window, mask: ULong, attributes: CPointer<XSetWindowAttributes>): Int {

diff --git a/src/nativeTest/kotlin/de/atennert/lcarswm/window/WindowHandlerTest.kt b/src/nativeTest/kotlin/de/atennert/lcarswm/window/WindowHandlerTest.kt
@@ -59,7 +59,7 @@ class WindowHandlerTest {
         val systemApi = object : SystemFacadeMock() {
             override fun getWindowAttributes(window: Window, attributes: CPointer<XWindowAttributes>): Int {
                 attributes.pointed.map_state = IsViewable
-                return 0
+                return 1
             }
         }
         val windowId: Window = systemApi.getNewWindowId()
@@ -146,7 +146,7 @@ class WindowHandlerTest {
         val systemApi = object : SystemFacadeMock() {
             override fun getWindowAttributes(window: Window, attributes: CPointer<XWindowAttributes>): Int {
                 attributes.pointed.map_state = IsUnmapped
-                return 0
+                return 1
             }
         }
         testForNoActionDuringSetup(systemApi)
@@ -157,7 +157,7 @@ class WindowHandlerTest {
         val systemApi = object : SystemFacadeMock() {
             override fun getWindowAttributes(window: Window, attributes: CPointer<XWindowAttributes>): Int {
                 attributes.pointed.override_redirect = X_TRUE
-                return 0
+                return 1
             }
         }
         testForNoActionDuringSetup(systemApi)
@@ -203,7 +203,7 @@ class WindowHandlerTest {
         val systemApi = object : SystemFacadeMock() {
             override fun getWindowAttributes(window: Window, attributes: CPointer<XWindowAttributes>): Int {
                 attributes.pointed.override_redirect = X_TRUE
-                return 0
+                return 1
             }
         }
         val windowId: Window = systemApi.getNewWindowId()