From a2f6c6dfde40cdfbc4e3b586a28130d321f39ade Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 1 Aug 2008 17:32:30 -0500 Subject: [PATCH 1/3] prettyprint: Use color objects --- basis/prettyprint/prettyprint.factor | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/basis/prettyprint/prettyprint.factor b/basis/prettyprint/prettyprint.factor index 4b5dd8542d..f78d12a310 100755 --- a/basis/prettyprint/prettyprint.factor +++ b/basis/prettyprint/prettyprint.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2003, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -IN: prettyprint + USING: arrays generic generic.standard assocs io kernel math namespaces sequences strings io.styles io.streams.string vectors words prettyprint.backend prettyprint.sections @@ -8,7 +8,9 @@ prettyprint.config sorting splitting grouping math.parser vocabs definitions effects classes.builtin classes.tuple io.files classes continuations hashtables classes.mixin classes.union classes.intersection classes.predicate classes.singleton -combinators quotations sets accessors ; +combinators quotations sets accessors colors ; + +IN: prettyprint : make-pprint ( obj quot -- block in use ) [ @@ -95,7 +97,7 @@ combinators quotations sets accessors ; SYMBOL: -> \ -> -{ { foreground { 1 1 1 1 } } { background { 0 0 0 1 } } } +{ { foreground T{ rgba f 1 1 1 1 } } { background T{ rgba f 0 0 0 1 } } } "word-style" set-word-prop : remove-step-into ( word -- ) From 90d6948e9d32dc46df2991db048b31b710ca8938 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 1 Aug 2008 17:43:05 -0500 Subject: [PATCH 2/3] Add demo launcher --- extra/demos/demos.factor | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 extra/demos/demos.factor diff --git a/extra/demos/demos.factor b/extra/demos/demos.factor new file mode 100644 index 0000000000..ba906fc08b --- /dev/null +++ b/extra/demos/demos.factor @@ -0,0 +1,22 @@ + +USING: kernel fry sequences + vocabs.loader tools.vocabs.browser + ui ui.gadgets ui.gadgets.buttons ui.gadgets.packs ui.gadgets.scrollers + ui.tools.listener + accessors ; + +IN: demos + +: demo-vocabs ( -- seq ) "demos" tagged [ second ] map concat [ name>> ] map ; + +: ( vocab-name -- button ) + dup '[ drop [ , run ] call-listener ] ; + +: ( -- gadget ) + 1 >>fill demo-vocabs [ add-gadget ] each ; + +: demos ( -- ) "Demos" open-window ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +MAIN: demos \ No newline at end of file From 6bc363b08d039266247ee899f025fba257a8140d Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 1 Aug 2008 17:43:41 -0500 Subject: [PATCH 3/3] Edit some demo tags --- extra/boids/tags.txt | 1 - extra/{automata => boids/ui}/tags.txt | 0 2 files changed, 1 deletion(-) delete mode 100644 extra/boids/tags.txt rename extra/{automata => boids/ui}/tags.txt (100%) diff --git a/extra/boids/tags.txt b/extra/boids/tags.txt deleted file mode 100644 index cb5fc203e1..0000000000 --- a/extra/boids/tags.txt +++ /dev/null @@ -1 +0,0 @@ -demos diff --git a/extra/automata/tags.txt b/extra/boids/ui/tags.txt similarity index 100% rename from extra/automata/tags.txt rename to extra/boids/ui/tags.txt