core: subseq-index? -> subseq-of?

[factor.git] / extra / gopher / ui / ui.factor

diff --git a/extra/gopher/ui/ui.factor b/extra/gopher/ui/ui.factor
index f60ad7e2459ef9a1b4275ca5d5f257328bfbe7ec..be7f9b8d9fd8967241f1451c1a6750cf806a1b55 100644 (file)
--- a/extra/gopher/ui/ui.factor
+++ b/extra/gopher/ui/ui.factor
@@ -1,12 +1,13 @@
 ! Copyright (C) 2014 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: accessors arrays debugger fonts fry gopher gopher.private
-kernel math.vectors models present sequences ui ui.commands ui.gadgets
-ui.gadgets.editors ui.gadgets.panes ui.gadgets.scrollers
-ui.gadgets.status-bar ui.gadgets.toolbar ui.gadgets.tracks
-ui.gadgets.viewports ui.gestures ui.operations ui.tools.browser
-ui.tools.browser.history ui.tools.common urls ;
+USING: accessors arrays debugger fonts gopher gopher.private
+kernel math.vectors models present sequences ui ui.commands
+ui.gadgets ui.gadgets.editors ui.gadgets.panes
+ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.toolbar
+ui.gadgets.tracks ui.gadgets.viewports ui.gestures ui.operations
+ui.tools.browser ui.tools.browser.history ui.tools.common urls
+webbrowser ;
 
 IN: gopher.ui
 
@@ -27,17 +28,22 @@ M: gopher-gadget model-changed
     [ value>> present ]
     [ url-field>> editor>> set-editor-string ] bi* ;
 
+: ?gopher-url ( obj -- url )
+    present dup "://" subseq-of? [ "gopher://" prepend ] unless >url ;
+
 : show-gopher ( url gopher-gadget -- )
-    [ [ >url ] [ f ] if* ] dip
-    [
-        2dup control-value =
-        [ 2drop ] [ nip history>> add-history ] if
-    ]
-    [ set-control-value ]
-    2bi ;
+    [ [ ?gopher-url ] [ f ] if* ] dip
+    over [ protocol>> "gopher" = ] [ t ] if* [
+        [
+            2dup control-value =
+            [ 2drop ] [ nip history>> add-history ] if
+        ]
+        [ set-control-value ]
+        2bi
+    ] [ drop open-url ] if ;
 
 : <url-field> ( gopher-gadget -- field )
-    '[ >url _ show-gopher ] <action-field>
+    '[ _ show-gopher ] <action-field>
         "Gopher URL" >>default-text
         white-interior ;