diff --git a/tk/gcontext.lisp b/tk/gcontext.lisp index e8a7574c62f82c799e8f7f31190527c3e2164031..fc683b596ca05960d9e94b416f412edc1c1392ba 100644 --- a/tk/gcontext.lisp +++ b/tk/gcontext.lisp @@ -20,7 +20,7 @@ ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as ;; applicable. ;; -;; $fiHeader: gcontext.lisp,v 1.21 92/12/16 16:50:23 cer Exp $ +;; $fiHeader: gcontext.lisp,v 1.22 92/12/17 15:33:37 cer Exp $ (in-package :tk) @@ -330,26 +330,9 @@ gc nv)) -(defmethod (setf gcontext-clip-mask) ((nv cons) (gc gcontext)) - (let ((r (x11:make-xrectangle))) - (setf (x11:xrectangle-x r) (first nv) - (x11:xrectangle-y r) (second nv) - (x11:xrectangle-width r) (third nv) - (x11:xrectangle-height r) (fourth nv)) - (x11:xsetcliprectangles - (object-display gc) - gc - 0 ; clip-x-origin - 0 ; clip-y-origin - r - 1 - x11:unsorted))) - -;; this will come in useful when we can handle region sets for clip regions -#+ignore -(defmethod (setf gcontext-clip-mask) ((nv cons) (gc gcontext)) - (let ((n (length nv)) - (rs (x11:make-xrectangle-array :number n))) +(defmethod (setf gcontext-clip-mask) ((nv list) (gc gcontext)) + (let* ((n (length nv)) + (rs (x11:make-xrectangle-array :number n))) (dotimes (i n) (let ((r (pop nv))) (setf (x11:xrectangle-array-x rs i) (first r) diff --git a/utils/region-arithmetic.lisp b/utils/region-arithmetic.lisp index d175385a8c7ed76a19aeed83ec703f2e627b338e..90bebd138c7979d50bb8eef377771fdf8e1f2e4f 100644 --- a/utils/region-arithmetic.lisp +++ b/utils/region-arithmetic.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-UTILS; Base: 10; Lowercase: Yes -*- -;; $fiHeader: region-arithmetic.lisp,v 1.12 93/03/19 09:47:30 cer Exp $ +;; $fiHeader: region-arithmetic.lisp,v 1.13 93/03/31 10:40:41 cer Exp $ (in-package :clim-utils) @@ -359,7 +359,7 @@ ;;; Special cases for bounding rectangles -(defclass standard-rectangle-set (region-set bounding-rectangle) +(defclass standard-rectangle-set (region-set) ((left :initarg :left :type coordinate) (top :initarg :top :type coordinate) (right :initarg :right :type coordinate)