anchor.diff:  		      (incf y new-h)
   		      (setf height (abs new-h)))
   		     (t (setf height new-h)))))
  -    (with-state (window)
  -      (setf (drawable-x window) x
  -    	    (drawable-y window) y
  -    	    (drawable-width window) width
  -    	    (drawable-height window) height))
  +    (xlib:with-state (window)
  +      (setf (xlib:drawable-x window) x
  +            (xlib:drawable-y window) y
  +            (xlib:drawable-width window) width
  +            (xlib:drawable-height window) height))
       (values x y width height dx dy dw dh)))
   
   (defun memove (window &optional x y w h)
     "Memory Move a window (i.e. toggle between current position and the
   given one). Without a given new position reset position or does
   nothing."
  -  (let ((dim (getf (window-plist window) 'original-dimension)))
  +  (let ((dim (getf (xlib:window-plist window) 'original-dimension)))
       (cond (dim
              (apply #'move window dim)
  -           (remf (window-plist window) 'original-dimension))
  +           (remf (xlib:window-plist window) 'original-dimension))
             (t (when (and x y w h)
  -               (setf (getf (window-plist window) 'original-dimension)
  -                     (list :x (drawable-x window) :y (drawable-y window)
  -                           :width (drawable-width window) :height (drawable-height window)))
  +               (setf (getf (xlib:window-plist window) 'original-dimension)
  +                     (list :x (xlib:drawable-x window) :y (xlib:drawable-y window)
  +                           :width (xlib:drawable-width window) :height (xlib:drawable-height window)))
                  (move window :x x :y y :width w :height h))))))
   
   (defun win= (a b)
  -  (and (typep a 'window) (typep b 'window) (window-equal a b)))
  +  (and (typep a 'xlib:window) (typep b 'xlib:window) (xlib:window-equal a b)))
   
   (defun grouper (window)
     "Get the grouper function of a window if there is one."
  
positive.code:        (setf (elt *handlers* (position ,event xlib::*event-key-vector*)) #',fn-name))))
  
  (defun xclass (window) (multiple-value-bind (name class)
                             (restart-case (get-wm-class window)
                               (window-error (c)
                                 (format t "~&No class on ~a~%" window)
                                 (values "" "I'm dead")))
  
negative.code: (defparameter *close* (compile-shortcut :control :mod-1 2) "Mouse button to close a window")
  
  (defun send-prefix (window)
    (xlib:send-event window :key-press (xlib:make-event-mask :key-press)
                            :window window
                            :code (code *prefix*)
                            :state (first (states *prefix*))))
  
  (defun grab-it (shortcut &key inverse-p)
    "Grab a given key or button shortcut in all its
  