Contrib fixes

diff --git a/contrib/action-field.factor b/contrib/action-field.factor
index 0cf0fdace6455f9691ab2737e3d6860414a68ae5..f1f01e9ad6deb2a78ae2d58beaec87fcdb9963a6 100644 (file)
--- a/contrib/action-field.factor
+++ b/contrib/action-field.factor
@@ -1,8 +1,24 @@
-
-USING: kernel models namespaces math sequences arrays hashtables gadgets
-       gadgets-text gadgets-buttons ;
+USING: kernel models namespaces math sequences arrays hashtables
+gadgets gadgets-text gadgets-buttons generic ;
 IN: action-field
 
+TUPLE: field model ;
+
+C: field ( model -- field )
+<editor> over set-delegate
+[ set-field-model ] keep
+dup dup set-control-self ;
+
+: field-commit ( field -- string )
+[ editor-text ] keep
+[ field-model [ dupd set-model ] when* ] keep
+select-all ;
+
+field "Field commands" {
+    { "Clear input" T{ key-down f { C+ } "k" } [ control-model clear-doc ] }
+    { "Accept input" T{ key-down f f "RETURN" } [ field-commit drop ] }
+} define-commands
+
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 TUPLE: action-field quot ;

diff --git a/contrib/all.factor b/contrib/all.factor
index 5fd97c4cf6065f88387789dd3f3fc5b7489f8656..e4975c4d16f89ea02768bf83af2373b684395b2a 100644 (file)
--- a/contrib/all.factor
+++ b/contrib/all.factor
@@ -4,7 +4,7 @@ REQUIRES: contrib/action-field contrib/alien contrib/automata
 contrib/benchmarks contrib/boids contrib/cairo contrib/calendar
 contrib/concurrency contrib/coroutines contrib/crypto
 contrib/dlists contrib/emacs contrib/embedded contrib/furnace
-contrib/furance-pastebin contrib/gap-buffer contrib/hexdump
+contrib/furnace-pastebin contrib/gap-buffer contrib/hexdump
 contrib/http contrib/httpd contrib/http-client contrib/jedit
 contrib/jni contrib/json contrib/lambda contrib/lazy-lists
 contrib/lindenmayer contrib/match contrib/math

diff --git a/contrib/gap-buffer/circular.factor b/contrib/gap-buffer/circular.factor
index 1aa1a672b200a5bf4770843c8c716de4830c8b84..461ad22edccb4bed39879c2656b0e742a6f2ebcc 100644 (file)
--- a/contrib/gap-buffer/circular.factor
+++ b/contrib/gap-buffer/circular.factor
@@ -5,7 +5,7 @@ IN: circular
 ! element in the underlying sequence.
 TUPLE: circular start ;
 
-C: circular ( seq circular -- circular )
+C: circular ( seq -- circular )
     0 over set-circular-start [ set-delegate ] keep ;
 
 : circular@ ( n circular -- n seq )

diff --git a/contrib/gap-buffer/gap-buffer.factor b/contrib/gap-buffer/gap-buffer.factor
index a3268545764c301e33cf6ad3318c046a33b69de4..4acfe860a539955bd51f209ce19be56bd7547343 100644 (file)
--- a/contrib/gap-buffer/gap-buffer.factor
+++ b/contrib/gap-buffer/gap-buffer.factor
@@ -19,7 +19,7 @@ TUPLE: gb
 : required-space ( n gb -- n )
     tuck gb-expand-factor * ceiling >fixnum swap gb-min-size max ;
 
-C: gb ( seq gb -- gb )
+C: gb ( seq -- gb )
     5 over set-gb-min-size
     1.5 over set-gb-expand-factor
     [ >r length r> set-gb-gap-start ] 2keep