diff options
Diffstat (limited to 'starling/minibuffer.scm')
| -rw-r--r-- | starling/minibuffer.scm | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/starling/minibuffer.scm b/starling/minibuffer.scm index 489ee7e..690445f 100644 --- a/starling/minibuffer.scm +++ b/starling/minibuffer.scm @@ -39,7 +39,7 @@ (define-class <minibuffer> (<scene-2d>) (commands #:accessor commands #:allocation #:class #:init-thunk make-hash-table) (scene-mux #:getter scene-mux #:init-keyword #:scene-mux) - (overlay-scene #:getter overlay-scene #:init-keyword #:overlay-scene) + (overlay-scene #:accessor overlay-scene) (user-text #:accessor user-text #:init-form "")) (define (minibuffer-commands) @@ -48,19 +48,9 @@ (define-method (add-minibuffer-command name thunk) (hash-set! (minibuffer-commands) name thunk)) -(define-method (open-minibuffer scene-mux) - (let ((minibuffer (make <minibuffer> - #:name 'minibuffer - #:scene-mux scene-mux - #:overlay-scene (current-scene scene-mux)))) - ;; We need to delay the minibuffer by one frame so that the text - ;; input event for the "x" character (part of the M-x key - ;; shortcut) is not processed by the minibuffer, thus adding an - ;; "x" to the user text entry area before the user has actually - ;; typed anything. - (run-script scene-mux - (sleep 1) - (push-scene scene-mux minibuffer)))) +(define-method (open-minibuffer minibuffer) + (set! (overlay-scene minibuffer) (current-scene (scene-mux minibuffer))) + (push-scene (scene-mux minibuffer) minibuffer)) (define-method (close-minibuffer (minibuffer <minibuffer>)) (pop-scene (scene-mux minibuffer))) @@ -68,6 +58,7 @@ (define-method (run-command (minibuffer <minibuffer>)) (let ((thunk (hash-ref (minibuffer-commands) (user-text minibuffer)))) (when (procedure? thunk) + (modify-user-text minibuffer "") (close-minibuffer minibuffer) (thunk)))) |