From 2f1534d80eadce4bd1b89fb3dd6e10980d888bea Mon Sep 17 00:00:00 2001
From: Johan Ceuppens <jceuppen@vub.ac.be>
Date: Tue, 17 Jan 2012 00:52:04 +0000
Subject: [PATCH] *** empty log message ***

---
 scsh/scgame/scgame.scm        |  6 +++---
 scsh/scgame/scgamewidgets.scm | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/scsh/scgame/scgame.scm b/scsh/scgame/scgame.scm
index d2c9e41..d10df54 100644
--- a/scsh/scgame/scgame.scm
+++ b/scsh/scgame/scgame.scm
@@ -141,7 +141,7 @@
     (define (load-xpm-image-native filename)
       (xputxpm filename))
 
-    (define (load-xpm-image-scx filename)
+    (define (load-xpm-image-scx win filename)
       (read-file-to-pixmap win filename #()));;FIXME xpm-attributes == '()
 
     (define (load-xpm-image filename)
@@ -173,12 +173,12 @@
 
     ;; public methods
 
-    (define (load-image filename)
+    (define (load-image win filename)
       ;; FIXME read in xpm or png
       (display-msg "loading image..")
       (cond ((string<=? ".xpm" filename)
              (display-msg "loading xpm suffixed file..")
-	     (load-xpm-image-scx filename)
+	     (load-xpm-image-scx win filename)
 	     )
             (else (display-msg "no supported image format found"))))
 
diff --git a/scsh/scgame/scgamewidgets.scm b/scsh/scgame/scgamewidgets.scm
index b628f85..b1e3ee7 100644
--- a/scsh/scgame/scgamewidgets.scm
+++ b/scsh/scgame/scgamewidgets.scm
@@ -49,15 +49,15 @@
         (width 0)
         (height 0))
 
-    (define (set-image filename)
-      (set! image (((make-scimage2)'load-image) filename))
+    (define (set-image win filename)
+      (set! image (((make-scimage2)'load-image) win filename))
       (let ((wh (vector-ref (list->vector image) 1)))
         (set! width (car wh))
         (set! height (cadr wh))
         ))
 
-    (define (set-pressed-image filename)
-      (set! pressed-image (((make-scimage2)'load-image) filename))
+    (define (set-pressed-image win filename)
+      (set! pressed-image (((make-scimage2)'load-image) win filename))
       (let ((wh (vector-ref (list->vector image) 1)))
         (set! width (car wh))
         (set! height (cadr wh))
@@ -84,11 +84,14 @@
                (else #f)))
             (loop))))))
 
+    (define (release-button dpy win gc)
+      (press-button dpy win gc))
+
     (define (draw-pressed-image dpy win gc)
       (init-sync-x-events dpy)
       (map-window dpy win)
       (call-with-event-channel
-       dpy win (event-mask exposure)
+       dpy win (event-mask exposure map)
        (lambda (channel)
          (let loop ()
            (if
@@ -143,9 +146,11 @@
       (map-window dpy win))
 
     (define (press!)
+      (press-button dpy win gc)
       (set! pressed #t))
 
     (define (release!)
+      (release-button dpy win gc)
       (set! pressed #f))
 
     (lambda (msg)