From e146dfe78decd4f26b0c4b8427561cdafe5f26e6 Mon Sep 17 00:00:00 2001
From: Wesley Kerfoot <wjak56@gmail.com>
Date: Sun, 26 Jul 2020 15:35:05 -0400
Subject: [PATCH] Fix buggy fucking XGetAtomNames garbage

---
 src/nimwin.nim | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/nimwin.nim b/src/nimwin.nim
index 6c57efb..9d42b1c 100644
--- a/src/nimwin.nim
+++ b/src/nimwin.nim
@@ -37,9 +37,9 @@ type Window = ref object of RootObj
   screen : PScreen
   props : seq[WinProp]
 
-proc unpackCardinal(typeFormat : int,
-                    nItems : int,
-                    buf : ptr cuchar) : seq[uint] =
+proc unpackPropValue(typeFormat : int,
+                     nItems : int,
+                     buf : ptr cuchar) : seq[uint] =
 
   # See https://www.x.org/releases/current/doc/man/man3/XGetWindowProperty.3.xhtml
 
@@ -109,30 +109,27 @@ proc getPropertyValue(display : PDisplay, window : TWindow, property : TAtom) :
               WinProp(
                 name: atomName,
                 kind: pkCardinal,
-                cardinalProp: unpackCardinal(actualTypeFormat.int, nItemsReturn.int, propValue)
+                cardinalProp: unpackPropValue(actualTypeFormat.int, nItemsReturn.int, propValue)
               )
             )
   elif typeName == "ATOM":
     var currentAtomName : cstring
-    var atomNames : seq[string]
-    discard display.XGetAtomNames(cast[PAtom](propValue), nItemsReturn.cint, currentAtomName.addr)
-    var currentAtomNames : ptr cstring = currentAtomName.addr
+    var atomPropNames : seq[string]
 
-    for i in 0..(nItemsReturn.int - 1):
-      currentAtomName = (cast[ptr cstring](
-        cast[int](currentAtomNames) + cast[int](i * currentAtomNames[].sizeof)
-      ))[]
+    for atom in unpackPropValue(actualTypeFormat.int, nItemsReturn.int, propValue):
+      let atomPropNameCS = display.XGetAtomName(atom.culong)
+      var atomPropName = newString(atomPropNameCS.len)
+      if atomPropName.len > 0:
+        copyMem(addr(atomPropName[0]), atomPropNameCS, atomPropNameCS.len)
+        atomPropNames &= atomPropName
 
-      var atomStrValue : string = newString(currentAtomName.len)
-      copyMem(addr(atomStrValue[0]), currentAtomName, currentAtomName.len)
-      if atomStrValue.len > 0:
-        atomNames &= atomStrValue
+      discard atomPropNameCS.XFree
 
     result = some(
               WinProp(
                 name: atomName,
                 kind: pkAtom,
-                atomProps: atomNames
+                atomProps: atomPropNames
               )
             )
   else: