Listener cleanup

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index ab1e3bc86e28bb8951bd9aa1ac472999d6de6076..5da07cd6811e4f85e1c0610111e7e271369e69c6 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -9,7 +9,6 @@
 - slider needs to be modelized
 - some way of intercepting all gestures
 - better help result ranking
-- clean up listener's minibuffer-related code
 - help search looks funny
 - menus should not require mouse to be held
 - tab completion: add a USE: if necessary

diff --git a/library/ui/tools/listener.factor b/library/ui/tools/listener.factor
index 3d5390f5b33d453b77bb04da5df03e41c493154a..2d7107634674c45a344b2148dc1aedfe09b4dc5b 100644 (file)
--- a/library/ui/tools/listener.factor
+++ b/library/ui/tools/listener.factor
@@ -106,40 +106,42 @@ M: listener-gadget tool-help
     [ set-listener-gadget-minibuffer ] 2keep
     dupd track-add request-focus ;
 
+: minibuffer-action ( quot -- quot )
+    [ find-listener hide-minibuffer ] swap append ;
+
 : show-word-search ( listener action -- )
+    minibuffer-action
     >r dup listener-gadget-input selected-word r>
     <word-search> "Word search" <labelled-gadget>
     swap show-minibuffer ;
 
 : show-source-files-search ( listener action -- )
+    minibuffer-action
     "" swap <source-files-search>
     "Source file search" <labelled-gadget>
     swap show-minibuffer ;
 
 : show-vocabs-search ( listener action -- )
+    minibuffer-action
     >r dup listener-gadget-input selected-word r>
     <vocabs-search> "Vocabulary search" <labelled-gadget>
     swap show-minibuffer ;
 
 : show-list ( seq presenter action listener -- )
-    >r >r >r <model> r> r> <list> <scroller> r>
-    show-minibuffer ;
+    >r minibuffer-action <list> <scroller> r> show-minibuffer ;
+
+: listener-history ( listener -- seq )
+    listener-gadget-input interactor-history <reversed> ;
 
 : show-history ( listener -- )
     [
-        listener-gadget-input interactor-history <reversed>
+        listener-gadget-input <model>
         [ [ dup print-input ] make-pane ]
-        [
-            find-listener
-            [ listener-gadget-input set-editor-text ] keep
-            hide-minibuffer
-        ]
+        [ listener-gadget-input set-editor-text ]
     ] keep show-list ;
 
 : insert-completion ( completion -- )
-    find-listener [
-        >r word-name r> listener-gadget-input user-input
-    ] keep hide-minibuffer ;
+    word-name find-listener listener-gadget-input user-input ;
 
 listener-gadget "Toolbar" {
     { "Restart" T{ key-down f { C+ } "r" } [ start-listener ] }
@@ -170,21 +172,12 @@ listener-gadget "Listener commands" {
     {
         "Edit file"
         T{ key-down f { C+ } "e" }
-        [
-            [ find-listener hide-minibuffer edit-file ]
-            show-source-files-search
-        ]
+        [ [ edit-file ] show-source-files-search ]
     }
     {
         "Use vocabulary"
         T{ key-down f { C+ } "u" }
-        [
-            [
-                find-listener hide-minibuffer
-                [ use+ ] curry call-listener
-            ]
-            show-vocabs-search
-        ]
+        [ [ [ use+ ] curry call-listener ] show-vocabs-search ]
     }
     {
         "Hide minibuffer"