mcclim-cvs January 2008

mcclim-cvs@common-lisp.net

7 participants
255 discussions

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 15 Jan '08

15 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv15912/Drei Modified Files: drei-redisplay.lisp Log Message: Removed unused values in a multiple-value-bind. --- /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/15 07:56:15 1.31 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/15 09:10:29 1.32 @@ -465,18 +465,16 @@ (mod (+ width x-position) tab-width))) (vector-push-extend width widths)) (object - (multiple-value-bind (w ignore1 ignore2 ignore3 ignore4) + (multiple-value-bind (w) (text-size stream object :text-style text-style) - (declare (ignore ignore1 ignore2 ignore3 ignore4)) (incf width w) (vector-push-extend width widths))) (t - (multiple-value-bind (w ignore1 ignore2 ignore3 ignore4) + (multiple-value-bind (w) (text-size stream stroke-string :start start :end end :text-style text-style) - (declare (ignore ignore1 ignore2 ignore3 ignore4)) (incf width w) (vector-push-extend width widths)))) finally (return (values width parts widths))))

1 0

[mcclim-cvs] CVS mcclim/Experimental/freetype
by ahefner 15 Jan '08

15 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Experimental/freetype In directory clnet:/tmp/cvs-serv15462 Modified Files: freetype-fonts.lisp Log Message: Fix busted text size calculation in the fixed-width path. Typed (length string), meant (- end start). Could happen to anyone. --- /project/mcclim/cvsroot/mcclim/Experimental/freetype/freetype-fonts.lisp 2008/01/13 23:02:34 1.17 +++ /project/mcclim/cvsroot/mcclim/Experimental/freetype/freetype-fonts.lisp 2008/01/15 09:06:52 1.18 @@ -252,15 +252,15 @@ ;; out of here, but I doubt it would shave more than a few percent ;; off a draw-text benchmark. (macrolet ((compute () - `(loop with cache = (slot-value font 'glyph-width-cache) + `(loop with width-cache = (slot-value font 'glyph-width-cache) for i from start below end as char = (aref string i) as code = (char-code char) - sum (or (gcache-get cache code) - (gcache-set cache code (clim-clx::font-glyph-width font char))) + sum (or (gcache-get width-cache code) + (gcache-set width-cache code (clim-clx::font-glyph-width font char))) #+NIL (clim-clx::font-glyph-width font char)))) (if (numberp (slot-value font 'fixed-width)) - (* (slot-value font 'fixed-width) (length string)) + (* (slot-value font 'fixed-width) (- end start)) (typecase string (simple-string (locally (declare (type simple-string string))

1 0

[mcclim-cvs] CVS mcclim/ESA
by thenriksen 15 Jan '08

15 Jan '08

Update of /project/mcclim/cvsroot/mcclim/ESA In directory clnet:/tmp/cvs-serv4848/ESA Modified Files: esa-io.lisp Log Message: When saving a buffer with no associated pathname, act as Write Buffer. This needs some more thought, the save/write buffer dichotomy is not awesome. --- /project/mcclim/cvsroot/mcclim/ESA/esa-io.lisp 2008/01/13 22:22:06 1.6 +++ /project/mcclim/cvsroot/mcclim/ESA/esa-io.lisp 2008/01/15 08:05:09 1.7 @@ -269,18 +269,22 @@ (setf (needs-saving buffer) nil))) (define-command (com-save-buffer :name t :command-table esa-io-table) () - "Write the contents of the buffer to a file. + "Write the contents of the buffer to a file. If there is filename associated with the buffer, write to that file, replacing its contents. If not, prompt for a filename." (let ((buffer (current-buffer))) - (if (or (null (filepath buffer)) - (needs-saving buffer)) - (handler-case (save-buffer buffer) - (buffer-writing-error (e) - (with-minibuffer-stream (minibuffer) - (let ((*print-escape* nil)) - (print-object e minibuffer))))) - (display-message "No changes need to be saved from ~a" (name buffer))))) + (if (null (filepath buffer)) + (com-write-buffer (accept 'pathname :prompt "Write Buffer to File: " + :prompt-mode :raw + :default (directory-of-current-buffer) :insert-default t + :default-type 'pathname)) + (if (needs-saving buffer) + (handler-case (save-buffer buffer) + (buffer-writing-error (e) + (with-minibuffer-stream (minibuffer) + (let ((*print-escape* nil)) + (print-object e minibuffer))))) + (display-message "No changes need to be saved from ~a" (name buffer)))))) (set-key 'com-save-buffer 'esa-io-table '((#\x :control) (#\s :control)))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 15 Jan '08

15 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv2727/Drei Modified Files: drei-redisplay.lisp Log Message: Removed optimisation that destroyed tab support. Also some other cleanup as a bonus. --- /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/14 21:43:48 1.30 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/15 07:56:15 1.31 @@ -455,7 +455,7 @@ of the stroke." (loop with parts = (analyse-stroke-string stroke-string) with width = 0 - with widths = (make-array (length parts) :adjustable t :fill-pointer t) + with widths = (make-array 1 :adjustable t :fill-pointer t) with tab-width for (start end object) in parts do (cond ((and object (eql object #\Tab)) @@ -567,14 +567,12 @@ (y2 dimensions) (+ y1 line-height)))) (defun end-line-cleaning-up (stream line line-x1 line-y1 - line-width old-line-width - line-height old-line-height) + line-width line-height) "End the addition of strokes to `line' for now, and update the dimensions of `line'. Update all undisplayed lines to have no associated dimensions. Also clear from the bottom of strokes to the bottom of the line, and from the end of the line to the end of the sheet." - (declare (ignore old-line-width)) (end-line line line-x1 line-y1 line-width line-height) (with-accessors ((line-x1 x1) (line-y1 y1) (line-x2 x2) (line-y2 y2)) (line-dimensions line) @@ -603,8 +601,6 @@ buffer offset `start-offset', and will be drawn starting at (`cursor-x', `cursor-y')." (let* ((line (line-information view (displayed-lines-count view))) - (old-line-height (dimensions-height (line-dimensions line))) - (old-line-width (dimensions-width (line-dimensions line))) (orig-x-offset cursor-x) (offset-change (- start-offset (line-start-offset line))) (line-spacing (stream-vertical-spacing pane))) @@ -651,8 +647,7 @@ for stroke-dimensions = (stroke-dimensions stroke) do (draw-stroke pane view stroke (x1 stroke-dimensions) baseline) finally (progn (end-line-cleaning-up pane line orig-x-offset cursor-y - line-width old-line-width - line-height old-line-height) + line-width line-height) (incf (displayed-lines-count view)) (return (values pump-state line-height)))))))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 15 Jan '08

15 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv1160/Drei Modified Files: views.lisp Log Message: Removed attempts at figuring out when not to reparse from view code, only the syntax modules can really make that decision. --- /project/mcclim/cvsroot/mcclim/Drei/views.lisp 2008/01/13 10:33:10 1.18 +++ /project/mcclim/cvsroot/mcclim/Drei/views.lisp 2008/01/15 07:43:05 1.19 @@ -662,14 +662,10 @@ force-p (begin 0) (end (size (buffer view)))) (assert (>= end begin)) ;; If nothing changed, then don't call the other methods. - (let ((high-offset (- (size (buffer view)) (suffix-size view)))) - (when (or (and (> begin (prefix-size view)) - (> high-offset begin)) - (and (> end (prefix-size view)) - (>= (prefix-size view) begin)) - (/= (size (buffer view)) (buffer-size view)) - force-p) - (call-next-method)))) + (when (or (not (= (prefix-size view) (suffix-size view) + (buffer-size view) (size (buffer view)))) + force-p) + (call-next-method))) (defmethod synchronize-view ((view drei-syntax-view) &key (begin 0) (end (size (buffer view))))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 15 Jan '08

15 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv31482/Drei Modified Files: syntax.lisp Log Message: Removed default method on update-syntax that did nothing but confuse the results and sometimes lower performance. --- /project/mcclim/cvsroot/mcclim/Drei/syntax.lisp 2008/01/13 10:33:10 1.14 +++ /project/mcclim/cvsroot/mcclim/Drei/syntax.lisp 2008/01/15 07:27:14 1.15 @@ -94,11 +94,7 @@ delimited by `begin' and `end' has an up to date parse. Returns two values, offsets into the buffer of the syntax, denoting the buffer region thas has an up to date parse.") - (:method-combination values-max-min :most-specific-last) - (:method values-max-min ((syntax syntax) (unchanged-prefix integer) - (unchanged-suffix integer) &optional (begin 0) - (end (- (size (buffer syntax)) unchanged-suffix))) - (values begin end))) + (:method-combination values-max-min :most-specific-last)) (defgeneric eval-defun (mark syntax))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 15 Jan '08

15 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv21518/Drei Modified Files: motion.lisp Log Message: Make paragraph-movement commands move the beginning or end of buffer even if no paragraph delimiter can be found. --- /project/mcclim/cvsroot/mcclim/Drei/motion.lisp 2008/01/05 20:08:32 1.6 +++ /project/mcclim/cvsroot/mcclim/Drei/motion.lisp 2008/01/15 06:55:30 1.7 @@ -476,10 +476,9 @@ (unless (beginning-of-buffer-p mark) (backward-object mark 1) (if (search-backward mark (coerce (paragraph-delimiter syntax) 'vector)) - (progn (forward-object mark (length (paragraph-delimiter syntax))) - t) - (progn (beginning-of-buffer mark) - nil)))) + (forward-object mark (length (paragraph-delimiter syntax))) + (beginning-of-buffer mark)) + t)) (defgeneric forward-one-paragraph (mark syntax) (:documentation @@ -490,10 +489,9 @@ (unless (end-of-buffer-p mark) (forward-object mark 1) (if (search-forward mark (coerce (paragraph-delimiter syntax) 'vector)) - (progn (backward-object mark (length (paragraph-delimiter syntax))) - t) - (progn (end-of-buffer mark) - nil)))) + (backward-object mark (length (paragraph-delimiter syntax))) + (end-of-buffer mark)) + t)) (define-motion-fns paragraph)

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 14 Jan '08

14 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv2479/Drei Modified Files: drei-redisplay.lisp Log Message: Don't draw the cursor if the result would be a null rectangle. --- /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/14 20:58:29 1.29 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/14 21:43:48 1.30 @@ -875,10 +875,11 @@ (multiple-value-bind (cursor-x cursor-y stroke-height object-width) (offset-to-screen-position stream view (offset (mark cursor))) (letf (((stream-current-output-record stream) cursor)) - (draw-rectangle* stream - cursor-x cursor-y - (+ cursor-x object-width) (+ cursor-y stroke-height) - :ink (ink cursor))))) + (unless (zerop (* object-width stroke-height)) + (draw-rectangle* stream + cursor-x cursor-y + (+ cursor-x object-width) (+ cursor-y stroke-height) + :ink (ink cursor)))))) (defmethod display-drei-view-cursor :after ((stream extended-output-stream) (view drei-view) (cursor point-cursor))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 14 Jan '08

14 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv25330/Drei Modified Files: drei-redisplay.lisp Log Message: Fixed cursor-height calculation when at end of line. --- /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/14 19:57:02 1.28 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/14 20:58:29 1.29 @@ -822,9 +822,12 @@ (- (x2 stroke-dimensions) absolute-x-position) (- (offset-in-stroke-position pane view stroke (1+ offset)) relative-x-position))))))))) - (return-from - worker (values (x2 line-dimensions) (y1 line-dimensions) - (dimensions-height line-dimensions)))))))) + ;; If we reach this point, we are just past the last + ;; stroke, so let's extract information from it. + (let ((stroke-dimensions (stroke-dimensions (line-last-stroke line)))) + (return-from + worker (values (x2 stroke-dimensions) (y1 stroke-dimensions) + (dimensions-height stroke-dimensions))))))))) (with-accessors ((buffer buffer) (top top) (bot bot)) view (let ((default-object-width (text-style-width

1 0

[mcclim-cvs] CVS mcclim/ESA
by thenriksen 14 Jan '08

14 Jan '08

Update of /project/mcclim/cvsroot/mcclim/ESA In directory clnet:/tmp/cvs-serv24744/ESA Modified Files: esa.lisp Log Message: Fixed ESA macro replaying. --- /project/mcclim/cvsroot/mcclim/ESA/esa.lisp 2007/12/19 11:01:57 1.13 +++ /project/mcclim/cvsroot/mcclim/ESA/esa.lisp 2008/01/14 20:50:11 1.14 @@ -1542,7 +1542,7 @@ (define-command (com-call-last-kbd-macro :name t :command-table keyboard-macro-table) - ((count 'integer :prompt "How many times?")) + ((count 'integer :prompt "How many times?" :default 1)) "Run the last keyboard macro that was defined. Use C-x ( to start and C-x ) to finish recording a keyboard macro." (setf (remaining-keys *command-processor*)

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

mcclim-cvs January 2008