The Beirc in CVS behaves incorrectly wrt. its "input-memory" feature when changing tabs - it inserts the memorised input every time the editing stream rescans, which worked by accident in Goatee, because Goatee silently ignored any calls to `replace-input' during a rescan (which is not correct). Drei is more strict, and this patch is necessary to make Beirc work properly again.
Troels Henriksen athas@sigkill.dk writes:
this patch is > necessary to make Beirc work properly again.
Here it is:
Index: application.lisp =================================================================== RCS file: /project/beirc/cvsroot/beirc/application.lisp,v retrieving revision 1.84 diff -u -r1.84 application.lisp --- application.lisp 31 May 2006 19:35:39 -0000 1.84 +++ application.lisp 17 Dec 2006 15:28:28 -0000 @@ -1046,61 +1046,64 @@ (defmethod read-frame-command ((frame beirc) &key (stream *standard-input*)) (let ((bad-input nil)) (unwind-protect - (clim:with-input-editing (stream) - (when (and (current-receiver frame) (incomplete-input (current-receiver frame))) - (replace-input stream (incomplete-input (current-receiver frame)) :rescan t)) - (with-input-context ('command) (object) - (with-command-table-keystrokes (*accelerator-gestures* (frame-command-table frame)) - (catch 'keystroke-command - (let ((force-restore-input-state nil)) - (labels ((reset-saved-input () - (when (current-receiver frame) - (setf (incomplete-input (current-receiver frame)) "")))) - (handler-bind ((accelerator-gesture - (lambda (gesture) - (save-input-line stream frame) - (throw 'keystroke-command (lookup-keystroke-command-item - (accelerator-gesture-event gesture) - (frame-command-table frame))))) - (abort-gesture - (lambda (gesture) - (declare (ignore gesture)) - (reset-saved-input) - (setf force-restore-input-state nil))) - (invoked-command-by-clicking - (lambda (cond) - (declare (ignore cond)) - (save-input-line stream frame) - (setf force-restore-input-state t) - (invoke-restart 'acknowledged)))) - (let ((c (clim:read-gesture :stream stream :peek-p t))) - (multiple-value-prog1 - (cond ((eql c #/) - (handler-case - (progn - (clim:read-gesture :stream stream) - (accept 'command :stream stream :prompt nil)) - (simple-completion-error (c) - #+mcclim - (let ((preliminary-line (save-input-line stream frame))) - (setf (incomplete-input (current-receiver frame)) - (subseq preliminary-line 0 - (search (climi::completion-error-input-so-far c) - preliminary-line)) - bad-input (subseq preliminary-line - (search (climi::completion-error-input-so-far c) - preliminary-line)) - force-restore-input-state t)) - (beep) - nil))) - (t - (list 'com-say (accept 'mumble :history 'mumble :prompt nil :stream stream)))) - (if force-restore-input-state - (setf force-restore-input-state nil) - (reset-saved-input))))))))) - (command - (save-input-line stream frame) - object))) + (clim:with-input-editing (stream) + (when (and (current-receiver frame) (incomplete-input (current-receiver frame)) + (not (stream-rescanning-p stream))) + (replace-input stream + (incomplete-input (current-receiver frame)) + :rescan t)) + (with-input-context ('command) (object) + (with-command-table-keystrokes (*accelerator-gestures* (frame-command-table frame)) + (catch 'keystroke-command + (let ((force-restore-input-state nil)) + (labels ((reset-saved-input () + (when (current-receiver frame) + (setf (incomplete-input (current-receiver frame)) "")))) + (handler-bind ((accelerator-gesture + (lambda (gesture) + (save-input-line stream frame) + (throw 'keystroke-command (lookup-keystroke-command-item + (accelerator-gesture-event gesture) + (frame-command-table frame))))) + (abort-gesture + (lambda (gesture) + (declare (ignore gesture)) + (reset-saved-input) + (setf force-restore-input-state nil))) + (invoked-command-by-clicking + (lambda (cond) + (declare (ignore cond)) + (save-input-line stream frame) + (setf force-restore-input-state t) + (invoke-restart 'acknowledged)))) + (let ((c (clim:read-gesture :stream stream :peek-p t))) + (multiple-value-prog1 + (cond ((eql c #/) + (handler-case + (progn + (clim:read-gesture :stream stream) + (accept 'command :stream stream :prompt "" :prompt-mode :raw)) + (simple-completion-error (c) + #+mcclim + (let ((preliminary-line (save-input-line stream frame))) + (setf (incomplete-input (current-receiver frame)) + (subseq preliminary-line 0 + (search (climi::completion-error-input-so-far c) + preliminary-line)) + bad-input (subseq preliminary-line + (search (climi::completion-error-input-so-far c) + preliminary-line)) + force-restore-input-state t)) + (beep) + nil))) + (t + (list 'com-say (accept 'mumble :history 'mumble :prompt nil :stream stream)))) + (if force-restore-input-state + (setf force-restore-input-state nil) + (reset-saved-input))))))))) + (command + (save-input-line stream frame) + object))) (window-clear stream) (when bad-input (format stream "Bad input "")
Troels Henriksen wrote:
Troels Henriksen athas@sigkill.dk writes:
this patch is > necessary to make Beirc work properly again.
Here it is:
Right. I finally committed it.
Thanks,
-
Andreas Fuchs -
Troels Henriksen