diff --git a/extra/processing/gadget/gadget.factor b/extra/processing/gadget/gadget.factor index bac3f8ac6d..4621bab855 100644 --- a/extra/processing/gadget/gadget.factor +++ b/extra/processing/gadget/gadget.factor @@ -1,25 +1,14 @@ USING: kernel namespaces combinators - ui.gestures qualified accessors ui.gadgets.frame-buffer ; + ui.gestures accessors ui.gadgets.frame-buffer ; IN: processing.gadget -QUALIFIED: ui.gadgets - ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -TUPLE: processing-gadget button-down button-up key-down key-up ; +TUPLE: processing-gadget < frame-buffer button-down button-up key-down key-up ; -! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -: set-gadget-delegate ( tuple gadget -- tuple ) - over ui.gadgets:set-gadget-delegate ; - -! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -: ( -- gadget ) - processing-gadget new - set-gadget-delegate ; +: ( -- gadget ) processing-gadget new-frame-buffer ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/extra/processing/processing.factor b/extra/processing/processing.factor old mode 100755 new mode 100644 index 4c9dd787e5..f786628c79 --- a/extra/processing/processing.factor +++ b/extra/processing/processing.factor @@ -374,7 +374,7 @@ SYMBOL: setup-called 500 sleep - size-val get >>dim + size-val get >>pdim dup "Processing" open-window 500 sleep diff --git a/extra/ui/gadgets/frame-buffer/frame-buffer.factor b/extra/ui/gadgets/frame-buffer/frame-buffer.factor index 7d77db24cc..2d58037982 100644 --- a/extra/ui/gadgets/frame-buffer/frame-buffer.factor +++ b/extra/ui/gadgets/frame-buffer/frame-buffer.factor @@ -7,7 +7,7 @@ IN: ui.gadgets.frame-buffer ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -TUPLE: frame-buffer action dim last-dim graft ungraft pixels ; +TUPLE: frame-buffer < gadget action pdim last-dim graft ungraft pixels ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -18,13 +18,15 @@ TUPLE: frame-buffer action dim last-dim graft ungraft pixels ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: ( -- frame-buffer ) - frame-buffer construct-gadget +: new-frame-buffer ( class -- gadget ) + new-gadget [ ] >>action - { 100 100 } >>dim + { 100 100 } >>pdim [ ] >>graft [ ] >>ungraft ; +: ( -- frame-buffer ) frame-buffer new-frame-buffer ; + ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! : draw-pixels ( fb -- fb ) @@ -44,7 +46,7 @@ TUPLE: frame-buffer action dim last-dim graft ungraft pixels ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -M: frame-buffer pref-dim* dim>> ; +M: frame-buffer pref-dim* pdim>> ; M: frame-buffer graft* graft>> call ; M: frame-buffer ungraft* ungraft>> call ;