From 9ed810a4c66df04eef0ed40cb8a1df1c4e46c327 Mon Sep 17 00:00:00 2001 From: slava Date: Sat, 14 Oct 2006 20:14:55 +0000 Subject: [PATCH] Contrib fixes --- contrib/action-field.factor | 22 +++++++++++++++++++--- contrib/all.factor | 2 +- contrib/gap-buffer/circular.factor | 2 +- contrib/gap-buffer/gap-buffer.factor | 2 +- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/contrib/action-field.factor b/contrib/action-field.factor index 0cf0fdace6..f1f01e9ad6 100644 --- 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 ) + 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 5fd97c4cf6..e4975c4d16 100644 --- 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 1aa1a672b2..461ad22edc 100644 --- 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 a326854576..4acfe860a5 100644 --- 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 -- 2.34.1