mcclim-cvs February 2008

mcclim-cvs@common-lisp.net

6 participants
86 discussions

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

08 Feb '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv31674/Drei Modified Files: lisp-syntax-commands.lisp Log Message: Added argument hinting for Lisp when entering newlines and right parentheses. --- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-commands.lisp 2008/01/17 11:29:55 1.16 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-commands.lisp 2008/02/08 18:05:51 1.17 @@ -90,16 +90,21 @@ "Show argument list for a given symbol." (show-arglist (current-syntax) symbol)) -(define-command (com-space :command-table lisp-table) +(define-command (com-self-insert-then-arglist :command-table lisp-table) () - "Insert a space and display argument hints in the minibuffer." - (insert-character #\Space) - ;; We must update the syntax in order to reflect any changes to - ;; the parse tree our insertion of a space character may have - ;; done. + "Insert the gesture used to invoke this command and display +argument hints in the minibuffer." + (insert-character *current-gesture*) (show-arglist-for-form-at-mark (point) (current-syntax)) (clear-completions)) +(define-command (com-newline-indent-then-arglist :command-table lisp-table) () + "Inserts a newline, indents the new line, then displays +argument hints in the minibuffer." + (insert-object (point) #\Newline) + (indent-current-line (current-view) (point)) + (show-arglist-for-form-at-mark (point) (current-syntax))) + (define-command (com-complete-symbol :name t :command-table lisp-table) () "Attempt to complete the symbol at mark. If successful, move point @@ -216,10 +221,14 @@ 'lisp-table '((#\c :control) (#\d :control) (#\a))) -(set-key 'com-space +(set-key 'com-self-insert-then-arglist 'lisp-table '((#\Space))) +(set-key 'com-self-insert-then-arglist + 'lisp-table + '((#\)))) + (set-key 'com-complete-symbol 'lisp-table '((#\Tab :meta))) @@ -232,7 +241,7 @@ 'lisp-table '((#\Tab))) -(set-key 'drei-commands::com-newline-and-indent +(set-key 'com-newline-indent-then-arglist 'lisp-table '(#\Newline))

1 0

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

08 Feb '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv19251/Drei Modified Files: input-editor.lisp Log Message: Finally make that ridiculously complated input-editor do as I want it do to! Slowish, but who cares? Perhaps the input-editor needs a special buffer implementation... --- /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/02/08 12:43:59 1.45 +++ /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/02/08 13:24:48 1.46 @@ -558,9 +558,11 @@ if stuff is inserted after the insertion pointer." (assert (<= (input-position stream) (stream-scan-pointer stream))) (let* ((drei (drei-instance stream)) + (buffer (buffer (view drei))) (*command-processor* drei) (was-directly-processing (directly-processing-p drei)) - (*drei-input-editing-stream* stream)) + (*drei-input-editing-stream* stream) + (old-buffer-contents (buffer-sequence buffer 0 (size buffer)))) (with-bound-drei-special-variables (drei :prompt "M-x ") (update-drei-buffer stream) ;; Commands are permitted to signal immediate rescans, but @@ -573,7 +575,7 @@ (drei-core:with-narrowed-buffer (drei (loop for index from (1- (input-position stream)) above 0 - when (typep (buffer-object (buffer (view drei)) index) + when (typep (buffer-object buffer index) 'noise-string) return (1+ index) finally (return 0)) @@ -589,8 +591,7 @@ (when was-directly-processing (display-message "Aborted"))))))) (update-drei-buffer stream)) - (let ((first-mismatch (when (plusp (prefix-size (view drei))) - (prefix-size (view drei))))) + (let ((first-mismatch (buffer-array-mismatch buffer old-buffer-contents))) (display-drei drei :redisplay-minibuffer t) (cond ((null first-mismatch) ;; No change actually took place, even though IP may

1 0

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

08 Feb '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv2460/Drei Modified Files: input-editor.lisp Log Message: Now actually fixed some more things. Net result: input-editing should be more stable and predictable. --- /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/02/08 11:36:35 1.44 +++ /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/02/08 12:43:59 1.45 @@ -556,6 +556,7 @@ `stream-read-gesture' for the stream encapsulated by `stream'. The second return value of this function will be `type' if stuff is inserted after the insertion pointer." + (assert (<= (input-position stream) (stream-scan-pointer stream))) (let* ((drei (drei-instance stream)) (*command-processor* drei) (was-directly-processing (directly-processing-p drei)) @@ -588,13 +589,14 @@ (when was-directly-processing (display-message "Aborted"))))))) (update-drei-buffer stream)) - (let ((first-mismatch (prefix-size (view drei)))) + (let ((first-mismatch (when (plusp (prefix-size (view drei))) + (prefix-size (view drei))))) (display-drei drei :redisplay-minibuffer t) (cond ((null first-mismatch) ;; No change actually took place, even though IP may ;; have moved. nil) - ((<= first-mismatch (stream-scan-pointer stream)) + ((< first-mismatch (stream-scan-pointer stream)) ;; Eek, change before scan pointer - this probably ;; changes the scan, so we'll have to rescan ;; everything. Bummer!

1 0

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

08 Feb '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv16323/Drei Modified Files: input-editor.lisp Log Message: Fixed yet another random input-editor issue. --- /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/02/08 11:29:17 1.43 +++ /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/02/08 11:36:35 1.44 @@ -594,7 +594,7 @@ ;; No change actually took place, even though IP may ;; have moved. nil) - ((< first-mismatch (stream-scan-pointer stream)) + ((<= first-mismatch (stream-scan-pointer stream)) ;; Eek, change before scan pointer - this probably ;; changes the scan, so we'll have to rescan ;; everything. Bummer!

1 0

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

08 Feb '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv14662/Drei Modified Files: input-editor.lisp Log Message: Removed stale hack. --- /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/02/08 11:17:08 1.42 +++ /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/02/08 11:29:17 1.43 @@ -625,15 +625,9 @@ (setf (activation-gesture stream) gesture) (rescan-if-necessary stream) (return-from stream-process-gesture gesture)) - ;; XXX: The problem is that `*original-stream*' is a subclass of - ;; DREI-INPUT-EDITING-MIXIN (`stream', actually) at this point, - ;; which has an array as input buffer (as demanded by the spec), - ;; while the `stream-unread-gesture' method expects an event queue. - (let ((*original-stream* nil) - (*standard-input* (encapsulating-stream-stream stream))) - (when (proper-gesture-p gesture) - (unread-gesture gesture)) - (read-gestures-and-act stream gesture type))) + (when (proper-gesture-p gesture) + (unread-gesture gesture :stream (encapsulating-stream-stream stream))) + (read-gestures-and-act stream gesture type)) (defmethod reset-scan-pointer ((stream drei-input-editing-mixin) &optional (scan-pointer 0))

1 0

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

08 Feb '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv11149/Drei Modified Files: input-editor.lisp Log Message: Fixed obscure input-editing issue where the input position was sometimes set erroneously. --- /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/02/04 19:06:17 1.41 +++ /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/02/08 11:17:08 1.42 @@ -161,17 +161,17 @@ (stream-scan-pointer stream)) (call-next-method)) (setf (stream-insertion-pointer stream) (offset ip-clone))) - (redraw-input-buffer stream)) - ;; We skip ahead of any noise strings to put us past the - ;; prompt. This is safe, because the noise strings are to be - ;; ignored anyway, but we need to be ahead to set the input - ;; position properly (ie. after the prompt). - (loop with buffer = (buffer (view (drei-instance stream))) - until (>= (stream-scan-pointer stream) (size buffer)) - while (or (typep #1=(buffer-object buffer (stream-scan-pointer stream)) 'noise-string) - (delimiter-gesture-p #1#)) - do (incf (stream-scan-pointer stream))) - (setf (input-position stream) (stream-scan-pointer stream)))) + (redraw-input-buffer stream))) + ;; We skip ahead of any noise strings to put us past the + ;; prompt. This is safe, because the noise strings are to be + ;; ignored anyway, but we need to be ahead to set the input + ;; position properly (ie. after the prompt). + (loop with buffer = (buffer (view (drei-instance stream))) + until (>= (stream-scan-pointer stream) (size buffer)) + while (or (typep #1=(buffer-object buffer (stream-scan-pointer stream)) 'noise-string) + (delimiter-gesture-p #1#)) + do (incf (stream-scan-pointer stream))) + (setf (input-position stream) (stream-scan-pointer stream))) (defmethod stream-accept :after ((stream drei-input-editing-mixin) type &key &allow-other-keys) ;; If we end up asking for more input using the stream, we do not @@ -514,9 +514,7 @@ (t (unless peek-p (incf scan-pointer)) - (return-from stream-read-gesture gesture)) - (t (incf scan-pointer) - (setf last-was-noisy nil))))) + (return-from stream-read-gesture gesture))))) (unless last-was-noisy ; This prevents double-prompting. (setf (stream-rescanning stream) nil)) (when activation-gesture

1 0

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

08 Feb '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv1392/Drei Modified Files: lisp-syntax-swank.lisp Log Message: Let's try not rebinding *standard-output* when asking Swank to compile stuff for us. This makes C-c C-c'ing in Climacs much more verbose. --- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swank.lisp 2008/01/09 22:15:49 1.11 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swank.lisp 2008/02/08 10:37:46 1.12 @@ -61,9 +61,6 @@ (view drei-buffer-view) (buffer-mark mark)) (let* ((view-name (name view)) (buffer-file-name (filepath (buffer view))) - ;; swank::compile-string-for-emacs binds *compile-verbose* to t - ;; so we need to do this to avoid scribbles on the pane - (*standard-output* *debug-io*) (swank::*buffer-package* package) (swank::*buffer-readtable* *readtable*)) (let ((result (swank::compile-string-for-emacs

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 07 Feb '08

07 Feb '08

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv4973 Modified Files: input-editing.lisp Log Message: Use `format-items' when displaying inline completions. This makes it work better in the ESA minibuffer. --- /project/mcclim/cvsroot/mcclim/input-editing.lisp 2008/02/04 19:15:35 1.73 +++ /project/mcclim/cvsroot/mcclim/input-editing.lisp 2008/02/07 20:20:04 1.74 @@ -641,19 +641,14 @@ (with-input-editor-typeout (stream :erase t) (surrounding-output-with-border (stream :shape :drop-shadow :background +cornsilk1+) (surrounding-output-with-border (stream :shape :rectangle) - (let* ((possibility-count (length possibilities)) - (row-length (sqrt possibility-count)) - (ptype `(completion ,possibilities))) - (formatting-table (stream) - (loop until (null possibilities) - do (formatting-row (stream) - (loop for cell-index from 0 below row-length - until (null possibilities) - do (formatting-cell (stream) - (funcall possibility-printer - (pop possibilities) - ptype - stream))))))))))) + (let ((ptype `(completion ,possibilities))) + (format-items possibilities + :stream stream + :printer #'(lambda (possibility stream) + (funcall possibility-printer + possibility + ptype + stream)))))))) ;;; Helper returns gesture (or nil if gesture shouldn't be part of the input) ;;; and completion mode, if any.

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 05 Feb '08

05 Feb '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv30487/Drei Modified Files: lisp-syntax-swine.lisp Log Message: Use frame-manager-menu-choose and find-frame-manager instead of menu-choose when asking for symbol completion. This permits Drei variants to use with-frame-manager to provide their own look and feel for the menu. --- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swine.lisp 2008/02/04 17:44:50 1.15 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swine.lisp 2008/02/05 21:51:29 1.16 @@ -868,15 +868,20 @@ t) (t (replace-symbol-at-mark syntax mark - (or (menu-choose (mapcar - #'(lambda (completion) - (if (listp completion) - (cons completion - (first completion)) - completion)) - completions) - :label "Possible completions" - :scroll-bars :vertical) + (or (when (or useful-token + (accept 'boolean + :prompt "You are asking for a list of all exported symbols, proceed?")) + (frame-manager-menu-choose + (find-frame-manager) + (mapcar + #'(lambda (completion) + (if (listp completion) + (cons completion + (first completion)) + completion)) + completions) + :label "Possible completions" + :scroll-bars :vertical)) longest)) t))))))

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 05 Feb '08

05 Feb '08

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv23781 Modified Files: menu-choose.lisp Log Message: Don't kill the menu-choose popup at any gesture. --- /project/mcclim/cvsroot/mcclim/menu-choose.lisp 2008/02/05 13:44:33 1.22 +++ /project/mcclim/cvsroot/mcclim/menu-choose.lisp 2008/02/05 16:58:51 1.23 @@ -374,7 +374,7 @@ (handler-case (with-input-context (`(or ,presentation-type blank-area) :override t) (object type event) - (prog1 nil (read-gesture :stream menu)) + (prog1 nil (loop (read-gesture :stream menu))) (blank-area nil) (t (values object event))) (abort-gesture () nil)))))

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

mcclim-cvs February 2008