diff --git a/clim/cursor.lisp b/clim/cursor.lisp index 236cd2bd814c75655776c226d7a87a6fe2a74163..b3d3ec982d05caee9f1e6c1262507105f8d50f5a 100644 --- a/clim/cursor.lisp +++ b/clim/cursor.lisp @@ -69,8 +69,8 @@ (with-slots (x y) cursor (values x y))) -(defgeneric (setf cursor-position) (x y cursor)) -(defmethod (setf cursor-position) (x y (cursor standard-text-cursor)) +(defgeneric* (setf cursor-position) (x y cursor)) +(defmethod* (setf cursor-position) (x y (cursor standard-text-cursor)) (cursor-set-position cursor x y)) (defmethod cursor-set-position ((cursor standard-text-cursor) nx ny &optional fastp) diff --git a/clim/db-stream.lisp b/clim/db-stream.lisp index bea8e48525e86f80a8326908a0aaed2f9ced7346..1b5fd9125f0bd2166d817285ab07f9018cc3a7d9 100644 --- a/clim/db-stream.lisp +++ b/clim/db-stream.lisp @@ -559,8 +559,8 @@ (when (pane-viewport stream) (scroll-extent stream x y))) -(defgeneric (setf window-viewport-position) (x y stream)) -(defmethod (setf window-viewport-position) (x y (stream clim-stream-sheet)) +(defgeneric* (setf window-viewport-position) (x y stream)) +(defmethod* (setf window-viewport-position) (x y (stream clim-stream-sheet)) (window-set-viewport-position stream x y)) (defmethod window-inside-edges ((stream clim-stream-sheet)) diff --git a/clim/input-defs.lisp b/clim/input-defs.lisp index fb619d4d7b2c39ad0e3213c72688832f92d188c1..4319a5f15a102d5aeadccbf7f168049a87a3bcaa 100644 --- a/clim/input-defs.lisp +++ b/clim/input-defs.lisp @@ -134,8 +134,8 @@ (port-set-pointer-position (port pointer) pointer native-x native-y)) (values x y))) -(defgeneric (setf pointer-position) (x y pointer)) -(defmethod (setf pointer-position) (x y (pointer standard-pointer)) +(defgeneric* (setf pointer-position) (x y pointer)) +(defmethod* (setf pointer-position) (x y (pointer standard-pointer)) (pointer-set-position pointer x y)) ;; X and Y are in stream coordinates @@ -190,8 +190,8 @@ (declare (ignore x y native-x native-y)) (values root-x root-y)))) -(defgeneric (setf pointer-native-position) (x y pointer)) -(defmethod (setf pointer-native-position) (x y (pointer standard-pointer)) +(defgeneric* (setf pointer-native-position) (x y pointer)) +(defmethod* (setf pointer-native-position) (x y (pointer standard-pointer)) (pointer-set-native-position pointer x y)) ;; X and Y are in native (device) coordinates diff --git a/clim/input-protocol.lisp b/clim/input-protocol.lisp index 4473d30be9b6b9d9ab22ae12772c3b0b2ae85195..11d488ae76c0375a0551cdae3d0149e1372024fa 100644 --- a/clim/input-protocol.lisp +++ b/clim/input-protocol.lisp @@ -690,8 +690,8 @@ ;; Make sure the pointer is on the right sheet (set-sheet-pointer-position stream pointer x y)) -(defgeneric (setf stream-pointer-position) (x y stream)) -(defmethod (setf stream-pointer-position) (x y (stream t)) +(defgeneric* (setf stream-pointer-position) (x y stream)) +(defmethod* (setf stream-pointer-position) (x y (stream t)) (stream-set-pointer-position stream x y)) (defmethod stream-set-input-focus ((stream input-protocol-mixin)) diff --git a/clim/output-protocol.lisp b/clim/output-protocol.lisp index a811a8e5d5664d8da1ac5ab6f019723122328116..4ac4fce6241871447fdd541038270372934103db 100644 --- a/clim/output-protocol.lisp +++ b/clim/output-protocol.lisp @@ -147,8 +147,8 @@ (setf cursor-y (coordinate y)))) (stream-ensure-cursor-visible stream x y)) -(defgeneric (setf stream-cursor-position) (x y stream)) -(defmethod (setf stream-cursor-position) (x y (stream t)) +(defgeneric* (setf stream-cursor-position) (x y stream)) +(defmethod* (setf stream-cursor-position) (x y (stream t)) (stream-set-cursor-position stream x y)) ;; NB: X and Y are already coordinates! diff --git a/clim/recording-protocol.lisp b/clim/recording-protocol.lisp index 1b6e07a55ae2f826e9ef272880befb1152eaa115..28676576e0f24fe824d95de492f45cf6041cc732 100644 --- a/clim/recording-protocol.lisp +++ b/clim/recording-protocol.lisp @@ -133,8 +133,8 @@ (declare (type coordinate x y)) (bounding-rectangle-set-position record (coordinate x) (coordinate y))) -(defgeneric (setf output-record-position) (x y record)) -(defmethod (setf output-record-position) (x y (record t)) +(defgeneric* (setf output-record-position) (x y record)) +(defmethod* (setf output-record-position) (x y (record t)) (output-record-set-position record x y)) (defmethod output-record-start-cursor-position ((record output-record-element-mixin)) @@ -157,8 +157,8 @@ (+ left dx) (+ top dy) (+ right dx) (+ bottom dy)) (setf start-x nx start-y ny)))))) -(defgeneric (setf output-record-start-cursor-position) (x y record)) -(defmethod (setf output-record-start-cursor-position) (x y (record t)) +(defgeneric* (setf output-record-start-cursor-position) (x y record)) +(defmethod* (setf output-record-start-cursor-position) (x y (record t)) (output-record-set-start-cursor-position record x y)) (defmethod output-record-end-cursor-position ((record output-record-element-mixin)) @@ -171,8 +171,8 @@ (setf end-x (coordinate nx)) (setf end-y (coordinate ny)))) -(defgeneric (setf output-record-end-cursor-position) (x y record)) -(defmethod (setf output-record-end-cursor-position) (x y (record t)) +(defgeneric* (setf output-record-end-cursor-position) (x y record)) +(defmethod* (setf output-record-end-cursor-position) (x y (record t)) (output-record-set-end-cursor-position record x y)) (defmethod output-record-old-start-cursor-position ((record output-record-element-mixin)) diff --git a/utils/regions.lisp b/utils/regions.lisp index 390b43161c16b5e4b46203271dd9ae21966c0b59..55ced0b40697f124e8f6c7edcde9ea9fc80b7869 100644 --- a/utils/regions.lisp +++ b/utils/regions.lisp @@ -765,30 +765,30 @@ top)) (define-bounding-rectangle-setf top) -(defun-inline bounding-rectangle-right (region) - (with-bounding-rectangle-ltrb (left top right bottom) region +(defun-inline bounding-rectangle-right (region) + (with-bounding-rectangle-ltrb (left top right bottom) region (declare (ignore left top bottom)) right)) (define-bounding-rectangle-setf right) -(defun-inline bounding-rectangle-bottom (region) - (with-bounding-rectangle-ltrb (left top right bottom) region +(defun-inline bounding-rectangle-bottom (region) + (with-bounding-rectangle-ltrb (left top right bottom) region (declare (ignore left top right)) bottom)) (define-bounding-rectangle-setf bottom) -(defgeneric (setf bounding-rectangle*) (left top right bottom region)) -(defmethod (setf bounding-rectangle*) +(defgeneric* (setf bounding-rectangle*) (left top right bottom region)) +(defmethod* (setf bounding-rectangle*) (left top right bottom (region standard-bounding-rectangle)) (bounding-rectangle-set-edges region left top right bottom)) -(defgeneric (setf bounding-rectangle-position) (x y region)) -(defmethod (setf bounding-rectangle-position) +(defgeneric* (setf bounding-rectangle-position) (x y region)) +(defmethod* (setf bounding-rectangle-position) (x y (region standard-bounding-rectangle)) (bounding-rectangle-set-position region x y)) -(defgeneric (setf bounding-rectangle-size) (width height region)) -(defmethod (setf bounding-rectangle-size) +(defgeneric* (setf bounding-rectangle-size) (width height region)) +(defmethod* (setf bounding-rectangle-size) (width height (region standard-bounding-rectangle)) (bounding-rectangle-set-size region width height))