Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv30783/Drei

Modified Files: drawing-options.lisp drei-redisplay.lisp Log Message: Changed lots of defconstants to defvars in Drei.

This removes the need for make-load-forms.

--- /project/mcclim/cvsroot/mcclim/Drei/drawing-options.lisp 2008/01/17 17:01:47 1.5 +++ /project/mcclim/cvsroot/mcclim/Drei/drawing-options.lisp 2008/01/30 13:49:30 1.6 @@ -25,34 +25,34 @@

;;; Some general styles.

-(defconstant +roman-face+ (make-face :style (make-text-style nil :roman nil)) +(defvar +roman-face+ (make-face :style (make-text-style nil :roman nil)) "A face specifying a roman style, but with unspecified family and size.")

-(defconstant +italic-face+ (make-face :style (make-text-style nil :italic nil)) +(defvar +italic-face+ (make-face :style (make-text-style nil :italic nil)) "A face specifying an italic style, but with unspecified family and size.")

-(defconstant +bold-face+ (make-face :style (make-text-style nil :bold nil)) +(defvar +bold-face+ (make-face :style (make-text-style nil :bold nil)) "A face specifying a boldface style, but with unspecified family and size.")

-(defconstant +bold-italic-face+ (make-face :style (make-text-style nil :bold nil)) +(defvar +bold-italic-face+ (make-face :style (make-text-style nil :bold nil)) "A face specifying an italic boldface style, but with unspecified family and size.")

;;; ...and their drawing options.

-(defconstant +roman-face-drawing-options+ (make-drawing-options :face +roman-face+) +(defvar +roman-face-drawing-options+ (make-drawing-options :face +roman-face+) "Options used for drawing with a roman face.")

-(defconstant +italic-face-drawing-options+ (make-drawing-options :face +italic-face+) +(defvar +italic-face-drawing-options+ (make-drawing-options :face +italic-face+) "Options used for drawing with an italic face.")

-(defconstant +bold-face-drawing-options+ (make-drawing-options :face +bold-face+) +(defvar +bold-face-drawing-options+ (make-drawing-options :face +bold-face+) "Options used for drawing with boldface.")

-(defconstant +bold-italic-face-drawing-options+ (make-drawing-options :face +bold-italic-face+) +(defvar +bold-italic-face-drawing-options+ (make-drawing-options :face +bold-italic-face+) "Options used for drawing with italic boldface.")

;;; Some drawing options for specific syntactical elements, --- /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/30 12:46:12 1.53 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/30 13:49:30 1.54 @@ -91,14 +91,13 @@ ;;; ;;; The standard redisplay implementation for buffer views.

-(eval-when (:compile-toplevel :load-toplevel :execute) - (defstruct face - "A face is a description of how to draw (primarily) text, it +(defstruct face + "A face is a description of how to draw (primarily) text, it consists of an ink (a colour) and a text style. The text style may be incomplete, in which case it is merged with the default text style whenever it needs to be used." - (ink +foreground-ink+) - (style nil))) + (ink +foreground-ink+) + (style nil))

(defconstant +default-stroke-drawer-dispatcher+ #'(lambda (stream view stroke cursor-x cursor-y default-drawing-fn draw) @@ -108,11 +107,10 @@ arguments. Used as the default drawing-function of `drawing-options' objects.")

-(eval-when (:compile-toplevel :load-toplevel :execute) - (defstruct drawing-options - "A set of options for how to display a stroke." - (face (make-face)) - (function +default-stroke-drawer-dispatcher+))) +(defstruct drawing-options + "A set of options for how to display a stroke." + (face (make-face)) + (function +default-stroke-drawer-dispatcher+))

(defun drawing-options-equal (o1 o2) "Return true if `o1' and `o2' are equal, that is, they specify @@ -134,7 +132,7 @@ (eq (drawing-options-function o1) +default-stroke-drawer-dispatcher+)))))

-(defconstant +default-drawing-options+ (make-drawing-options) +(defvar +default-drawing-options+ (make-drawing-options) "The default set of drawing options used for strokes when nothing else has been specified, or when the default is good enough. Under these options, the region will be printed as a @@ -512,7 +510,7 @@ (vector-push-extend width widths)))) finally (return (values width parts widths))))

-(defconstant +roman-face-style+ (make-text-style nil :roman nil) +(defvar +roman-face-style+ (make-text-style nil :roman nil) "A text style specifying a roman face, but with unspecified family and size.")