clean up window on non-local exit from xi2 test

lispgames · Jan 3, 2013 · c735209 · c735209
1 parent 8dfac44
commit c735209
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/test/test.lisp b/test/test.lisp
@@ -372,6 +372,10 @@
   (declare (ignore window event))
   )
 
+(defmethod glop:on-event ((window xi2-window) (event glop::extended-mouse-motion-event))
+  (declare (ignore window event))
+  )
+
 (defmethod glop:on-event ((window xi2-window) (event glop:resize-event))
   (declare (ignore window))
    (gl:viewport 0 0 (glop:width event) (glop:height event))
@@ -383,8 +387,7 @@
      (continue () :report "Continue"  )))
 
 (defun test-xinput-2 ()
-  (let ((win (glop:create-window "Glop test window" 800 600
-                                 :win-class 'xi2-window)))
+  (glop:with-window (win "Glop test window" 800 600 :win-class 'xi2-window)
     (format t "~&Created window: ~S~%" win)
     (format t "XInput-p : ~s~%"
             (multiple-value-list
@@ -416,8 +419,6 @@
            (gl:clear :color-buffer)
            (gl:flush)
            (glop:swap-buffers win)))
-    (format t "destroy window~%")
-    (glop:destroy-window win)
     (format t "done~%")))
 
 #++