compressed it a bit

diff --git a/keystop.lsp b/keystop.lsp
index 5223f05fb5449f9f7a4333e94d5bbb5566e11c74..cd08cb3fcc4040ed1782d21713fe003c7c2bb798 100755 (executable)
--- a/keystop.lsp
+++ b/keystop.lsp
@@ -1,17 +1,9 @@
 #!/usr/bin/newlisp
 # Copyright 2025, Ralph Ronnquist <rrq@rrq.au>
 
-; This newlisp script is a "daemon" to make given window a stop window
-; for key press/release events, by registering interest in thses
-; events with a do-not-propagate mask set.
-;
-; https://tronche.com/gui/x/xlib/
-; http://refspecs.linuxfoundation.org/LSB_3.1.1/LSB-Desktop-generic/LSB-Desktop-generic/libx11-ddefs.html
-; https://specifications.freedesktop.org/wm-spec/1.3/index.html
-; https://www.x.org/archive/X11R7.7/doc/man/man3/Xinerama.3.xhtml
-
-; Set up to die on ^C
-(define (die x) (exit 0)) (signal 2 die)
+; This newlisp script set/reset propagation of key press/release
+; events.
+
 
 ; Utility to return the first of a series of terms.
 (define (prog1) (args 0))
@@ -27,39 +19,17 @@
 (global 'prog1 'p@ 'unpack-array)
 
 (context 'MAIN:X11) ; API for libX11.so
-(constant 'LIB "/usr/lib/x86_64-linux-gnu/libX11.so") ; Devuan 2.0
-
-(import LIB "XDefaultRootWindow" "void*"
-        "void*" ; display
-        )
-
-(import LIB "XFree" "void"
-        "void*" ; data
-        )
-
-(import LIB "XOpenDisplay" "void*"
-        "void*" ; display
-        )
-
-(import LIB "XQueryTree" "int"
-        "void*" "void*" ; display, window
-        "void*" "void*" ; root_return, parent_return
-        "void*" "void*" ; children_return, nchildren_return
-        )
-
-(import LIB "XGetWindowAttributes" "int"
-        "void*" "long" "void*" ; *display, w, *window_attributes_return;
-        )
-
-(import LIB "XChangeWindowAttributes" "int"
-        "void*" "long" ; display, window
-        "long" "void*" ; value mask, attributes
-)
-
-(struct 'XQueryTree_return
-        "long" "long" ; root_return, parent_return
-        "long" "int" ; children_return, nchildren_return
-        )
+(constant 'LIB "/usr/lib/x86_64-linux-gnu/libX11.so" )
+
+(import LIB "XFree" "void" "void*" )
+(import LIB "XDefaultRootWindow" "void*" "void*" ) ; display
+(import LIB "XOpenDisplay" "void*" "void*" ) ; display
+(import LIB "XQueryTree" "int" "void*" "void*" "void*" "void*" "void*" "void*")
+        ; display, window, root_ret, parent_ret, children_ret, nchildren_ret
+(import LIB "XGetWindowAttributes" "int" "void*" "long" "void*" )
+        ; *display, w, *window_attributes_return
+(import LIB "XChangeWindowAttributes" "int" "void*" "long" "long" "void*" )
+        ; display, window, value mask, attributes
 
 (struct 'XWindowAttributes
        "int" "int" "int" "int" ; x, y, width, height
@@ -72,7 +42,6 @@
         "long" "int" ; do_not_propagate_mask, override_redirect
        "void*" ; *screen
         )
-
 (struct 'XSetWindowAttributes
                "long" "long" ; Pixmap background_pixmap, background_pixel
        "long" "long" ; Pixmap border_pixmap, border_pixel
@@ -83,13 +52,10 @@
         )
 
 ; Initializing the X client, and defining some constants.
-(constant
- 'display (XOpenDisplay 0)
- 'root (XDefaultRootWindow display)
- 'KeyPressMask           (<< 1 0)
- 'KeyReleaseMask        (<< 1 1)
- 'CWDontPropagate         (<< 1 12)
- )
+(constant 'display (XOpenDisplay 0) 'root (XDefaultRootWindow display)
+          'KeyPressMask (<< 1 0) 'KeyReleaseMask (<< 1 1)
+          'CWDontPropagate (<< 1 12)
+          )
 
 (define (stop-propagate WINDOW)
   (let ((OLD (pack XWindowAttributes (dup 0 23))) (ATTR nil) (CUR nil))
@@ -109,16 +75,6 @@
                      (list 0 0 0 0 0 0 0 0 0 0 0 CUR 0 0 0)))
     (XChangeWindowAttributes display WINDOW CWDontPropagate ATTR)))
 
-(define (children w)
-  (let ((r (pack XQueryTree_return 0 0 0 0)))
-    (when (!= (XQueryTree display w (p@ r 0) (p@ r 8) (p@ r 16) (p@ r 24)))
-      (setf r (unpack XQueryTree_return r))
-      (prog1 (if (!= (r 3)) (map first (unpack-array "Lu" 1 (r 3) (r 2))))
-        (XFree (r 2))))))
-
-(define (windows W)
-  (cons W (map windows (or (children W) '()))))
-
 (context MAIN) ; ---- The main application starts here ----
 
 (setf WINDOW (int (main-args -2) 0 16) FLAG (= (int (main-args -1) 0 2)))