climacs-cvs

climacs-cvs@common-lisp.net

847 discussions

[climacs-cvs] CVS esa
by thenriksen 08 Apr '06

08 Apr '06

Update of /project/climacs/cvsroot/esa In directory clnet:/tmp/cvs-serv15002 Modified Files: esa.asd Log Message: Added somewhat proper file dependencies. --- /project/climacs/cvsroot/esa/esa.asd 2006/03/25 00:08:07 1.1.1.1 +++ /project/climacs/cvsroot/esa/esa.asd 2006/04/08 22:34:09 1.2 @@ -8,5 +8,5 @@ :components ((:file "packages") (:file "colors" :depends-on ("packages")) (:file "esa" :depends-on ("colors" "packages")) - (:file "esa-buffer" :depends-on ("packages")) - (:file "esa-io" :depends-on ("packages")))) + (:file "esa-buffer" :depends-on ("packages" "esa")) + (:file "esa-io" :depends-on ("packages" "esa"))))

1 0

[climacs-cvs] CVS climacs
by thenriksen 03 Apr '06

03 Apr '06

Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv24499 Modified Files: lisp-syntax.lisp Log Message: Added new `form-operator' utility function, added some minor performance improvements and made the paren-matcher highlight both matching parens. --- /project/climacs/cvsroot/climacs/lisp-syntax.lisp 2006/03/01 19:32:07 1.46 +++ /project/climacs/cvsroot/climacs/lisp-syntax.lisp 2006/04/03 20:51:51 1.47 @@ -1252,7 +1252,7 @@ (defmethod display-parse-tree (parse-symbol syntax pane) (loop for child in (children parse-symbol) - do (display-parse-tree child syntax pane))) + do (display-parse-tree child syntax pane))) (defmethod display-parse-tree ((parse-symbol error-symbol) (syntax lisp-syntax) pane) (let ((children (children parse-symbol))) @@ -1282,7 +1282,7 @@ (or (symbolp object) (stringp object))) (defmethod display-parse-tree ((parse-symbol token-mixin) (syntax lisp-syntax) pane) - (if (> (end-offset parse-symbol) (start-offset parse-symbol)) + (if (> (the fixnum (end-offset parse-symbol)) (the fixnum (start-offset parse-symbol))) (let ((string (coerce (buffer-sequence (buffer syntax) (start-offset parse-symbol) (end-offset parse-symbol)) @@ -1431,13 +1431,22 @@ #'eval-fc conditionals))))))))) (defmethod display-parse-tree ((parse-symbol complete-list-form) (syntax lisp-syntax) pane) - (let ((children (children parse-symbol))) - (if (= (end-offset parse-symbol) (offset (point pane))) + (let* ((children (children parse-symbol)) + (point-offset (the fixnum (offset (point pane)))) + ;; The following is set to true if the location if the point + ;; warrants highlighting of a set of matching parantheses. + (should-highlight (or (= (the fixnum (end-offset parse-symbol)) point-offset) + (= (the fixnum (start-offset parse-symbol)) point-offset)))) + (if should-highlight (with-text-face (pane :bold) (display-parse-tree (car children) syntax pane)) (display-parse-tree (car children) syntax pane)) - (loop for child in (cdr children) - do (display-parse-tree child syntax pane)))) + (loop for child-list on (cdr children) + if (and should-highlight (null (cdr child-list))) do + (with-text-face (pane :bold) + (display-parse-tree (car child-list) syntax pane)) + else do + (display-parse-tree (car child-list) syntax pane)))) (defmethod redisplay-pane-with-syntax ((pane climacs-pane) (syntax lisp-syntax) current-p) (with-slots (top bot) pane @@ -1447,7 +1456,7 @@ (setf *white-space-start* (offset top))) (let ((*current-faces* *standard-faces*)) (with-slots (stack-top) syntax - (display-parse-tree stack-top syntax pane))) + (display-parse-tree stack-top syntax pane))) (when (mark-visible-p pane) (display-mark pane syntax)) (display-cursor pane syntax current-p)) @@ -1665,6 +1674,17 @@ (defun in-comment-p (mark syntax) (in-type-p mark syntax 'comment)) +(defgeneric form-operator (form syntax) + (:documentation "Return the operator of `form' as a +symbol. Returns nil if none can be found.") + (:method (form syntax) nil)) + +(defmethod form-operator ((form list-form) syntax) + (let* ((operator-token (first-form (rest (children form)))) + (operator-symbol (when operator-token + (token-to-symbol syntax operator-token)))) + operator-symbol)) + ;;; shamelessly replacing SWANK code ;; We first work through the string removing the characters and noting ;; which ones are escaped. We then replace each character with the

1 0

[climacs-cvs] CVS climacs
by thenriksen 30 Mar '06

30 Mar '06

Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv23697 Modified Files: window-commands.lisp Log Message: Added checks to make sure point is not placed in typeout panes. --- /project/climacs/cvsroot/climacs/window-commands.lisp 2006/03/03 19:38:57 1.5 +++ /project/climacs/cvsroot/climacs/window-commands.lisp 2006/03/30 16:10:18 1.6 @@ -180,12 +180,16 @@ (defun other-window (&optional pane) (if (and pane (find pane (windows *application-frame*))) (setf (windows *application-frame*) - (append (list pane) - (remove pane (windows *application-frame*)))) + (append (list pane) + (remove pane (windows *application-frame*)))) (setf (windows *application-frame*) - (append (cdr (windows *application-frame*)) - (list (car (windows *application-frame*)))))) - (setf *standard-output* (car (windows *application-frame*)))) + (append (cdr (windows *application-frame*)) + (list (car (windows *application-frame*)))))) + ;; Try to avoid setting the point in a typeout pane. FIXME: This is a kludge. + (if (and (subtypep 'typeout-pane (type-of (car (windows *application-frame*)))) + (> (length (windows *application-frame*)) 1)) + (other-window) + (setf *standard-output* (car (windows *application-frame*))))) (define-command (com-other-window :name t :command-table window-table) () (other-window)) @@ -220,7 +224,12 @@ (click-to-offset window x y)))) (define-presentation-to-command-translator blank-area-to-switch-to-this-window - (blank-area com-switch-to-this-window window-table :echo nil) + (blank-area com-switch-to-this-window window-table + :echo nil + ;; Putting the point in typeout-panes can cause errors. + :tester ((object presentation) + (declare (ignore presentation)) + (not (typep object 'typeout-pane)))) (window x y) (list window x y))

1 0

[climacs-cvs] CVS climacs
by thenriksen 27 Mar '06

27 Mar '06

Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv25826 Modified Files: pane.lisp Log Message: Change to using spaces for indentation by default, added parameter to change back to using tabs. --- /project/climacs/cvsroot/climacs/pane.lisp 2006/03/03 19:38:57 1.35 +++ /project/climacs/cvsroot/climacs/pane.lisp 2006/03/27 19:24:07 1.36 @@ -30,6 +30,9 @@ ;;; ;;; Tabify +(defvar *use-tabs-for-indentation* nil + "If non-NIL, use tabs when indenting lines. Otherwise, use spaces.") + (defgeneric space-width (tabify)) (defgeneric tab-width (tabify)) (defgeneric tab-space-count (tabify)) @@ -239,7 +242,8 @@ ((needs-saving :initform nil :accessor needs-saving) (syntax :accessor syntax) (point :initform nil :initarg :point :accessor point) - (indent-tabs-mode :initarg indent-tabs-mode :initform t + (indent-tabs-mode :initarg indent-tabs-mode + :initform *use-tabs-for-indentation* :accessor indent-tabs-mode)) (:default-initargs :name "*scratch*"

1 0

[climacs-cvs] CVS climacs
by crhodes 27 Mar '06

27 Mar '06

Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv31294 Modified Files: gui.lisp Log Message: Make kill-buffer do a full redisplay of the replacement buffer. --- /project/climacs/cvsroot/climacs/gui.lisp 2006/03/27 15:43:17 1.208 +++ /project/climacs/cvsroot/climacs/gui.lisp 2006/03/27 15:54:31 1.209 @@ -462,7 +462,9 @@ ;; Always need one buffer. (when (null buffers) (make-buffer "*scratch*")) - (setf (buffer (current-window)) (car buffers)))) + (setf (buffer (current-window)) (car buffers)) + (full-redisplay (current-window)) + (buffer (current-window)))) (defmethod kill-buffer ((name string)) (let ((buffer (find name (buffers *application-frame*)

1 0

[climacs-cvs] CVS climacs
by crhodes 27 Mar '06

27 Mar '06

Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv29597 Modified Files: file-commands.lisp gui.lisp Log Message: The order of events when executing a command must go: 1. execute the command 2. (a) update-syntax; (b) update needs-saving; 3. redisplay panes 4. clear-modify Put 1. and 2. in execute-frame-command :after and 4. in execute-frame-command :around; 3. happens in execute-frame-command :around ESA. It's not the tidiest implementation right now but it sort of works. Make sure that a loaded file has an up-to-date syntax and a cleared modified flag. --- /project/climacs/cvsroot/climacs/file-commands.lisp 2006/03/25 20:58:41 1.4 +++ /project/climacs/cvsroot/climacs/file-commands.lisp 2006/03/27 15:43:17 1.5 @@ -164,9 +164,8 @@ (name buffer) (filepath-filename filepath) (needs-saving buffer) nil) (beginning-of-buffer (point pane)) - ;; this one is needed so that the buffer modification protocol - ;; resets the low and high marks after redisplay - (redisplay-frame-panes *application-frame*) + (update-syntax buffer (syntax buffer)) + (clear-modify buffer) buffer)))))) (defun directory-of-buffer (buffer) --- /project/climacs/cvsroot/climacs/gui.lisp 2006/03/27 14:10:24 1.207 +++ /project/climacs/cvsroot/climacs/gui.lisp 2006/03/27 15:43:17 1.208 @@ -188,15 +188,6 @@ "Return the current buffer." (buffer (current-window))) -(defmethod redisplay-frame-panes :around ((frame climacs) &rest args) - (declare (ignore args)) - (let ((buffers (remove-duplicates (loop for pane in (windows frame) - when (buffer-pane-p pane) - collect (buffer pane))))) - (loop for buffer in buffers - do (update-syntax buffer (syntax buffer))) - (call-next-method))) - (defun climacs (&key new-process (process-name "Climacs") (width 900) (height 400)) "Starts up a climacs session" @@ -288,10 +279,14 @@ (defmethod execute-frame-command :around ((frame climacs) command) (let ((current-window (car (windows frame)))) (handler-case - (if (buffer-pane-p current-window) - (with-undo ((buffer current-window)) + (progn + (if (buffer-pane-p current-window) + (with-undo ((buffer current-window)) + (call-next-method)) (call-next-method)) - (call-next-method)) + (loop for buffer in (buffers frame) + do (when (modified-p buffer) + (clear-modify buffer)))) (offset-before-beginning () (beep) (display-message "Beginning of buffer")) (offset-after-end () @@ -309,9 +304,9 @@ (defmethod execute-frame-command :after ((frame climacs) command) (loop for buffer in (buffers frame) + do (update-syntax buffer (syntax buffer)) do (when (modified-p buffer) - (setf (needs-saving buffer) t) - (clear-modify buffer)))) + (setf (needs-saving buffer) t)))) (defmethod find-applicable-command-table ((frame climacs)) (or

1 0

[climacs-cvs] CVS esa
by crhodes 27 Mar '06

27 Mar '06

Update of /project/climacs/cvsroot/esa In directory clnet:/tmp/cvs-serv29371 Modified Files: esa.lisp Log Message: This protocol makes the Baby Jesus cry. If we call REDISPLAY-FRAME-PANES from EXECUTE-FRAME-COMMAND, we must absolutely make sure that it's called at a defined time, so that ESAs can make sure that their state is up to date when the redisplay occurs. Call REDISPLAY-FRAME-PANES from EXECUTE-FRAME-COMMAND :AROUND (ESA-FRAME-MIXIN T) so that application bookkeeping can happen in primary/:before/:after methods (before redisplay-frame-panes) and in :AROUND (APP T) methods (for stuff to occur /after/ redisplay-frame-panes). See upcoming commit in climacs CVS for use of this. --- /project/climacs/cvsroot/esa/esa.lisp 2006/03/26 20:59:36 1.4 +++ /project/climacs/cvsroot/esa/esa.lisp 2006/03/27 15:38:19 1.5 @@ -286,7 +286,10 @@ (setf (previous-command (car (windows frame))) (if (consp command) (car command) - command)) + command))) + +(defmethod execute-frame-command :around ((frame esa-frame-mixin) command) + (call-next-method) (when (eq frame *application-frame*) (redisplay-frame-panes frame)))

1 0

[climacs-cvs] CVS climacs
by crhodes 27 Mar '06

27 Mar '06

Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv19330 Modified Files: gui.lisp Log Message: Argh. Now that EXECUTE-FRAME-COMMAND calls REDISPLAY-FRAME-PANES, we mustn't clear-modify in REDISPLAY-FRAME-PANES because otherwise we never notice that we have to save anything. Band-aid fix because I need to produce binaries this afternoon. --- /project/climacs/cvsroot/climacs/gui.lisp 2006/03/26 14:17:04 1.206 +++ /project/climacs/cvsroot/climacs/gui.lisp 2006/03/27 14:10:24 1.207 @@ -195,9 +195,7 @@ collect (buffer pane))))) (loop for buffer in buffers do (update-syntax buffer (syntax buffer))) - (call-next-method) - (loop for buffer in buffers - do (clear-modify buffer)))) + (call-next-method))) (defun climacs (&key new-process (process-name "Climacs") (width 900) (height 400)) @@ -312,7 +310,8 @@ (defmethod execute-frame-command :after ((frame climacs) command) (loop for buffer in (buffers frame) do (when (modified-p buffer) - (setf (needs-saving buffer) t)))) + (setf (needs-saving buffer) t) + (clear-modify buffer)))) (defmethod find-applicable-command-table ((frame climacs)) (or

1 0

[climacs-cvs] CVS esa
by thenriksen 26 Mar '06

26 Mar '06

Update of /project/climacs/cvsroot/esa In directory clnet:/tmp/cvs-serv2883 Modified Files: esa.lisp Log Message: Added minimum display time for minibuffer messages. --- /project/climacs/cvsroot/esa/esa.lisp 2006/03/26 14:29:42 1.3 +++ /project/climacs/cvsroot/esa/esa.lisp 2006/03/26 20:59:36 1.4 @@ -37,8 +37,13 @@ ;;; ;;; Minibuffer pane +(defvar *minimum-message-time* 1 + "The minimum number of seconds a minibuffer message will be + displayed." ) + (defclass minibuffer-pane (application-pane) - ((message :initform nil :accessor message)) + ((message :initform nil :accessor message) + (message-time :initform 0 :accessor message-time)) (:default-initargs :scroll-bars nil :display-function 'display-minibuffer)) @@ -48,7 +53,9 @@ (with-slots (message) pane (unless (null message) (princ message pane) - (setf message nil)))) + (when (> (get-universal-time) + (+ *minimum-message-time* (message-time pane))) + (setf message nil))))) (defmethod stream-accept :before ((pane minibuffer-pane) type &rest args) (declare (ignore type args)) @@ -56,7 +63,9 @@ (defun display-message (format-string &rest format-args) (setf (message *standard-input*) - (apply #'format nil format-string format-args))) + (apply #'format nil format-string format-args)) + (setf (message-time *standard-input*) + (get-universal-time))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;

1 0

[climacs-cvs] CVS climacs/Doc
by thenriksen 26 Mar '06

26 Mar '06

Update of /project/climacs/cvsroot/climacs/Doc In directory clnet:/tmp/cvs-serv32627/Doc Modified Files: climacs-internals.texi Log Message: Fix minor typo. --- /project/climacs/cvsroot/climacs/Doc/climacs-internals.texi 2005/09/13 23:45:39 1.19 +++ /project/climacs/cvsroot/climacs/Doc/climacs-internals.texi 2006/03/26 16:40:00 1.20 @@ -703,7 +703,7 @@ Inform the syntax module that it must update its syntactic analysis to cover the region between the two marks from and to. It is acceptable -to pass and offset instead of a mark for either or both of the last +to pass an offset instead of a mark for either or both of the last two arguments. @end deffn

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
85
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

climacs-cvs