From 8ac5789834e46fee55c23a6d85790aaace43bf62 Mon Sep 17 00:00:00 2001
From: hrzlgnm <hrzlgnm@users.noreply.github.com>
Date: Wed, 25 Oct 2023 21:17:27 +0200
Subject: [PATCH] Support most recent zoomer nim version and dependencies

---
 boomer.nimble      |  2 +-
 src/boomer.nim     | 18 +++++++++---------
 src/screenshot.nim |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/boomer.nimble b/boomer.nimble
index c9a7ab4..55d080c 100644
--- a/boomer.nimble
+++ b/boomer.nimble
@@ -5,4 +5,4 @@ license     = "MIT"
 srcDir      = "src"
 bin         = @["boomer"]
 
-requires "nim >= 0.18.0", "x11#30b3a190ef9ec1621c53d501b4da0133281f108e", "opengl >= 1.2.3"
+requires "nim >= 0.18.0", "x11 >= 1.1", "opengl >= 1.2.3"
diff --git a/src/boomer.nim b/src/boomer.nim
index c250ffc..98c0309 100644
--- a/src/boomer.nim
+++ b/src/boomer.nim
@@ -125,7 +125,7 @@ proc draw(screenshot: PXImage, camera: Camera, shader, vao, texture: GLuint,
   glDrawElements(GL_TRIANGLES, count = 6, GL_UNSIGNED_INT, indices = nil)
 
 proc getCursorPosition(display: PDisplay): Vec2f =
-  var root, child: TWindow
+  var root, child: Window
   var root_x, root_y, win_x, win_y: cint
   var mask: cuint
   discard XQueryPointer(
@@ -137,7 +137,7 @@ proc getCursorPosition(display: PDisplay): Vec2f =
   result.x = root_x.float32
   result.y = root_y.float32
 
-proc selectWindow(display: PDisplay): TWindow =
+proc selectWindow(display: PDisplay): Window =
   var cursor = XCreateFontCursor(display, XC_crosshair)
   defer: discard XFreeCursor(display, cursor)
 
@@ -156,7 +156,7 @@ proc selectWindow(display: PDisplay): TWindow =
                         CurrentTime)
   defer: discard XUngrabKeyboard(display, CurrentTime)
 
-  var event: TXEvent
+  var event: XEvent
   while true:
     discard XNextEvent(display, addr event)
     case event.theType
@@ -307,7 +307,7 @@ proc main() =
 
 
   echo "Visual ", vi.visualid, " selected"
-  var swa: TXSetWindowAttributes
+  var swa: XSetWindowAttributes
   swa.colormap = XCreateColormap(display, DefaultRootWindow(display),
                                  vi.visual, AllocNone)
   swa.event_mask = ButtonPressMask or ButtonReleaseMask or
@@ -317,7 +317,7 @@ proc main() =
     swa.override_redirect = 1
     swa.save_under = 1
 
-  var attributes: TXWindowAttributes
+  var attributes: XWindowAttributes
   discard XGetWindowAttributes(
     display,
     DefaultRootWindow(display),
@@ -332,7 +332,7 @@ proc main() =
 
   var wmName = "boomer"
   var wmClass = "Boomer"
-  var hints = TXClassHint(res_name: wmName, res_class: wmClass)
+  var hints = XClassHint(res_name: wmName, res_class: wmClass)
 
   discard XStoreName(display, win, wmName)
   discard XSetClassHint(display, win, addr(hints))
@@ -438,11 +438,11 @@ proc main() =
     if not windowed:
       discard XSetInputFocus(display, win, RevertToParent, CurrentTime);
 
-    var wa: TXWindowAttributes
+    var wa: XWindowAttributes
     discard XGetWindowAttributes(display, win, addr wa)
     glViewport(0, 0, wa.width, wa.height)
 
-    var xev: TXEvent
+    var xev: XEvent
     while XPending(display) > 0:
       discard XNextEvent(display, addr xev)
 
@@ -479,7 +479,7 @@ proc main() =
         mouse.prev = mouse.curr
 
       of ClientMessage:
-        if cast[TAtom](xev.xclient.data.l[0]) == wmDeleteMessage:
+        if cast[Atom](xev.xclient.data.l[0]) == wmDeleteMessage:
           quitting = true
 
       of KeyPress:
diff --git a/src/screenshot.nim b/src/screenshot.nim
index ff268d8..0110a6c 100644
--- a/src/screenshot.nim
+++ b/src/screenshot.nim
@@ -36,8 +36,8 @@ type Screenshot* = object
   when defined(mitshm):
     shminfo*: PXShmSegmentInfo
 
-proc newScreenshot*(display: PDisplay, window: TWindow): Screenshot =
-  var attributes: TXWindowAttributes
+proc newScreenshot*(display: PDisplay, window: Window): Screenshot =
+  var attributes: XWindowAttributes
   discard XGetWindowAttributes(display, window, addr attributes)
 
   when defined(mitshm):
@@ -91,8 +91,8 @@ proc destroy*(screenshot: Screenshot, display: PDisplay) =
     discard XDestroyImage(screenshot.image)
 
 # TODO(#92): there is too much X11 error logging when the tracked live update window is resized
-proc refresh*(screenshot: var Screenshot, display: PDisplay, window: TWindow) =
-  var attributes: TXWindowAttributes
+proc refresh*(screenshot: var Screenshot, display: PDisplay, window: Window) =
+  var attributes: XWindowAttributes
   discard XGetWindowAttributes(display, window, addr attributes)
 
   when defined(mitshm):