Update of /project/closure/cvsroot/closure/src/gui In directory common-lisp.net:/tmp/cvs-serv7926/src/gui

Modified Files: clim-gui.lisp Log Message: Complete the renaming *MEDIUM* -> *PANE*.

Panes are CLIM extended-streams, and remember output to them in output records. Mediums are much simpler, and don't have this kind of memory. So, though the same drawing functions (DRAW-TEXT, DRAW-LINE) can have the same initial effect applied to a pane and a medium, the output-record state is very different.

Date: Mon Jul 11 17:58:04 2005 Author: crhodes

Index: closure/src/gui/clim-gui.lisp diff -u closure/src/gui/clim-gui.lisp:1.19 closure/src/gui/clim-gui.lisp:1.20 --- closure/src/gui/clim-gui.lisp:1.19 Sun Jul 10 13:18:34 2005 +++ closure/src/gui/clim-gui.lisp Mon Jul 11 17:58:03 2005 @@ -4,7 +4,7 @@ ;;; Created: 2002-07-22 ;;; Author: Gilbert Baumann gilbert@base-engineering.com ;;; License: MIT style (see below) -;;; $Id: clim-gui.lisp,v 1.19 2005/07/10 11:18:34 emarsden Exp $ +;;; $Id: clim-gui.lisp,v 1.20 2005/07/11 15:58:03 crhodes Exp $ ;;; --------------------------------------------------------------------------- ;;; (c) copyright 2002 by Gilbert Baumann

@@ -28,6 +28,15 @@ ;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

;; $Log: clim-gui.lisp,v $ +;; Revision 1.20 2005/07/11 15:58:03 crhodes +;; Complete the renaming *MEDIUM* -> *PANE*. +;; +;; Panes are CLIM extended-streams, and remember output to them in output +;; records. Mediums are much simpler, and don't have this kind of +;; memory. So, though the same drawing functions (DRAW-TEXT, DRAW-LINE) +;; can have the same initial effect applied to a pane and a medium, the +;; output-record state is very different. +;; ;; Revision 1.19 2005/07/10 11:18:34 emarsden ;; Distinguish between pane and medium in the CLIM GUI. This should ;; fix image display. @@ -128,7 +137,6 @@ (:menu-bar menubar-command-table) (:panes (canvas (make-pane 'closure-pane - :name 'canvas :height 2000 :width 800 :display-time nil)) @@ -620,17 +628,6 @@

;;;; ----------------------------------------------------------------------------------------------------

-#+NIL -(define-closure-command com-reflow () - (window-clear (find-pane-named *frame* 'canvas)) - (let ((*medium* (find-pane-named *frame* 'canvas))) - (let ((device (make-instance 'closure/clim-device::clim-device :medium *medium*))) - (let ((closure-protocol:*document-language* - (make-instance 'r2::html-4.0-document-language)) - (closure-protocol:*user-agent* - nil)) - (r2::reflow))))) - (define-presentation-translator url-from-string (string url closure) (x) @@ -684,7 +681,7 @@ (min (gadget-max-value scrollbar) (+ current-y (* 0.9 window-height))))))

(define-closure-command (com-redraw :name t :keystroke (#\r :control)) () - (let* ((*medium* (find-pane-named *frame* 'canvas)) ) - (handle-repaint *medium* (sheet-region (pane-viewport *medium*)))) + (let* ((*pane* (find-pane-named *frame* 'canvas)) ) + (handle-repaint *pane* (sheet-region (pane-viewport *pane*)))) (xlib:display-finish-output (clim-clx::clx-port-display (find-port))))