ui.gadgets.framebuffer: convert to inheritance. Rename slot dim to pdim.
parent
a2eb8a0431
commit
01c6c8608e
|
@ -1,25 +1,14 @@
|
||||||
|
|
||||||
USING: kernel namespaces combinators
|
USING: kernel namespaces combinators
|
||||||
ui.gestures qualified accessors ui.gadgets.frame-buffer ;
|
ui.gestures accessors ui.gadgets.frame-buffer ;
|
||||||
|
|
||||||
IN: processing.gadget
|
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 ;
|
||||||
|
|
||||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
: <processing-gadget> ( -- gadget ) processing-gadget new-frame-buffer ;
|
||||||
|
|
||||||
: set-gadget-delegate ( tuple gadget -- tuple )
|
|
||||||
over ui.gadgets:set-gadget-delegate ;
|
|
||||||
|
|
||||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
||||||
|
|
||||||
: <processing-gadget> ( -- gadget )
|
|
||||||
processing-gadget new
|
|
||||||
<frame-buffer> set-gadget-delegate ;
|
|
||||||
|
|
||||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
|
|
||||||
|
|
|
@ -374,7 +374,7 @@ SYMBOL: setup-called
|
||||||
500 sleep
|
500 sleep
|
||||||
|
|
||||||
<processing-gadget>
|
<processing-gadget>
|
||||||
size-val get >>dim
|
size-val get >>pdim
|
||||||
dup "Processing" open-window
|
dup "Processing" open-window
|
||||||
|
|
||||||
500 sleep
|
500 sleep
|
||||||
|
|
|
@ -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 )
|
: new-frame-buffer ( class -- gadget )
|
||||||
frame-buffer construct-gadget
|
new-gadget
|
||||||
[ ] >>action
|
[ ] >>action
|
||||||
{ 100 100 } >>dim
|
{ 100 100 } >>pdim
|
||||||
[ ] >>graft
|
[ ] >>graft
|
||||||
[ ] >>ungraft ;
|
[ ] >>ungraft ;
|
||||||
|
|
||||||
|
: <frame-buffer> ( -- frame-buffer ) frame-buffer new-frame-buffer ;
|
||||||
|
|
||||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
|
|
||||||
: draw-pixels ( fb -- fb )
|
: 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 graft* graft>> call ;
|
||||||
M: frame-buffer ungraft* ungraft>> call ;
|
M: frame-buffer ungraft* ungraft>> call ;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue