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

Modified Files: clim-gui.lisp clue-input.lisp gui.lisp Log Message: Move a number of global variables from the CL-USER to the GUI package.

Date: Sun Jul 10 12:57:20 2005 Author: emarsden

Index: closure/src/gui/clim-gui.lisp diff -u closure/src/gui/clim-gui.lisp:1.17 closure/src/gui/clim-gui.lisp:1.18 --- closure/src/gui/clim-gui.lisp:1.17 Tue Apr 12 12:28:55 2005 +++ closure/src/gui/clim-gui.lisp Sun Jul 10 12:57:20 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.17 2005/04/12 10:28:55 tdalyjr Exp $ +;;; $Id: clim-gui.lisp,v 1.18 2005/07/10 10:57:20 emarsden Exp $ ;;; --------------------------------------------------------------------------- ;;; (c) copyright 2002 by Gilbert Baumann

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

;; $Log: clim-gui.lisp,v $ +;; Revision 1.18 2005/07/10 10:57:20 emarsden +;; Move a number of global variables from the CL-USER to the GUI package. +;; ;; Revision 1.17 2005/04/12 10:28:55 tdalyjr ;; Since closure-frame-top-level is no longer used, comment it out. ;; @@ -101,13 +104,11 @@ ;;;;;;;

(defvar *medium*) +(defvar *frame*) +(defvar *pane*)

(defvar *initial-url* nil)

-(defvar closure:*home-page* "http://www.stud.uni-karlsruhe.de/~unk6/closure/user.html") -(defvar closure:*user-wants-images-p* t) -(defvar closure::*zoom-factor* 1.0) - (defvar *closure-process* nil)

(defclass closure-pane (application-pane) @@ -337,11 +338,11 @@ (foo (first *back-history*))))))

(define-closure-command (com-images-off :name t) () - (setf closure:*user-wants-images-p* nil) + (setf gui:*user-wants-images-p* nil) (format *query-io* "Images are now off.~%"))

(define-closure-command (com-images-on :name t) () - (setf closure:*user-wants-images-p* t) + (setf gui:*user-wants-images-p* t) (format *query-io* "Images are now on. You may want to reload.~%"))

(define-closure-command (com-quit :name t) () @@ -364,7 +365,7 @@ (com-visit-url (make-google-search-url what)))

(define-closure-command (com-home :name t) () - (com-visit-url closure:*home-page*)) + (com-visit-url gui:*home-page*))

(define-presentation-translator fofo (url command closure @@ -420,7 +421,7 @@ #'(lambda () (apply command args)))))

-(defun closure:visit (&optional (url closure:*home-page*)) +(defun closure:visit (&optional (url gui:*home-page*)) (and url (setf url (parse-url* url))) (cond ((and (null *closure-process*) (null url)) (setf *initial-url* url) @@ -453,9 +454,6 @@ *closure-inited-p*)))))

-(defvar *frame*) -(defvar *pane*) - (defun run-closure () ;; Care for proxy (let* ((proxy (glisp:getenv "http_proxy")) @@ -651,18 +649,18 @@

(define-closure-command (com-zoom-100% :name t) () - (setq closure::*zoom-factor* 1.0) + (setq gui:*zoom-factor* 1.0) (send-closure-command 'com-reflow))

;; FIXME the :shift here is a McCLIM bug (define-closure-command (com-zoom-in :name t :keystroke (#+ :control :shift)) () (write-status "Zooming in...") - (setq closure::*zoom-factor* (* closure::*zoom-factor* 1.2)) + (setq gui:*zoom-factor* (* gui:*zoom-factor* 1.2)) (send-closure-command 'com-reflow))

(define-closure-command (com-zoom-out :name t :keystroke (#- :control :shift)) () (write-status "Zooming out...") - (setq closure::*zoom-factor* (* closure::*zoom-factor* 0.8)) + (setq gui:*zoom-factor* (* gui:*zoom-factor* 0.8)) (send-closure-command 'com-reflow))

(define-closure-command (com-page-up :name t

Index: closure/src/gui/clue-input.lisp diff -u closure/src/gui/clue-input.lisp:1.4 closure/src/gui/clue-input.lisp:1.5 --- closure/src/gui/clue-input.lisp:1.4 Sun Mar 13 19:01:37 2005 +++ closure/src/gui/clue-input.lisp Sun Jul 10 12:57:20 2005 @@ -45,9 +45,6 @@

(in-package :CLUE-GUI2)

-(defparameter cl-user::*debug-submit-p* nil - "Whether to dump the values about to be submit by a <FORM> to the server on the listener.") - ;;; Input elements

;; Input elements as such are replaced objects and obey to the robj

Index: closure/src/gui/gui.lisp diff -u closure/src/gui/gui.lisp:1.5 closure/src/gui/gui.lisp:1.6 --- closure/src/gui/gui.lisp:1.5 Sun Mar 13 19:01:37 2005 +++ closure/src/gui/gui.lisp Sun Jul 10 12:57:20 2005 @@ -43,6 +43,23 @@

(in-package :GUI)

+(defparameter *home-page* "http://common-lisp.net/project/closure/") + +(defvar *user-wants-images-p* t) + +(defvar *closure-dpi* 96) + +(defvar *zoom-factor* 1.0) + +(defparameter *debug-submit-p* nil + "Whether to dump the values about to be submit by a <FORM> to the server on the listener.") + +;; experimental code that is not activated by default +(defvar *tex-mode-p* nil) +(defvar *hyphenate-p* nil) + + + (defstruct display-list document items)