[mcclim-cvs] CVS mcclim/Backends/beagle/input

[rschlatte]

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/input
In directory clnet:/tmp/cvs-serv30166/Backends/beagle/input

Modified Files:
	events.lisp 
Log Message:
Beagle backend fixes
  * functionality not tested, but it loads under clozure cl snapshot
  * Patches by Greg Pfeil

Signed-off-by: Rudi Schlatte <rudi at constantly.at>


--- /project/mcclim/cvsroot/mcclim/Backends/beagle/input/events.lisp	2006/03/24 11:18:27	1.11
+++ /project/mcclim/cvsroot/mcclim/Backends/beagle/input/events.lisp	2007/12/18 10:54:21	1.12
@@ -28,7 +28,7 @@
 
 #||
 
-$Id: events.lisp,v 1.11 2006/03/24 11:18:27 tmoore Exp $
+$Id: events.lisp,v 1.12 2007/12/18 10:54:21 rschlatte Exp $
 
 Events in Cocoa
 ---------------
@@ -162,9 +162,8 @@
 ;;; (there is no event process calling process-next-event).
 #-(and)
 (defmethod get-next-event ((port beagle-port) &key wait-function (timeout nil))
-  (declare (special *mcclim-event-queue* *beagle-port*)
+  (declare (special *mcclim-event-queue*)
 	   (ignore wait-function))
-  (setf *beagle-port* port)  ; TODO: don't think this <- is needed.
   ;; When event queue is empty, wait for an event to be posted.
   (if (eq timeout nil)
       (ccl:wait-on-semaphore (beagle-port-event-semaphore port))
@@ -571,9 +570,11 @@
 		    (frame (pane-frame target-sheet))
 		    ;; Works out which sheet *should* be the focus, not which
 		    ;; is currently... or at least, so I think.
-		    (focus (climi::keyboard-input-focus frame)))
+		    (focus (port-frame-keyboard-input-focus *beagle-port*
+                                                            frame)))
 	       (unless (null target-sheet)
-		 (setf (port-keyboard-input-focus *beagle-port*) focus))))
+		 (setf (port-frame-keyboard-input-focus *beagle-port* frame)
+                       focus))))
 	   nil)
 	  ((eq :did-expose n-type)
 	   (make-instance 'window-repaint-event