Changeset 2920

Timestamp:

Mar 27, 2012 2:30:05 AM (14 months ago)

Author:

wmb

Message:

Graphical menu - rearranged the mouse and touchscreen handling code so the multiplexing is done in one place, using the name "pointer" to mean the collection of positional input devices. That should make it easier to support additional devices. Ideally, there would be a multiplexor node to which devices could be attached, akin to the input and output mux nodes, but that improvement is left to a later date.

Files:

• cpu/x86/pc/olpc/via/mfgtest.fth (modified) (1 diff)
• ofw/gui/button.fth (modified) (1 diff)
• ofw/gui/dialog.fth (modified) (1 diff)
• ofw/gui/iconmenu.fth (modified) (5 diffs)
• ofw/gui/mouse.fth (modified) (5 diffs)
• ofw/gui/textfld.fth (modified) (1 diff)

cpu/x86/pc/olpc/via/mfgtest.fth

@@ -156 +156 @@
 
 : init-menu  ( -- )
-   ?open-screen  ?open-mouse  ?open-touchscreen
+   ?open-screen  ?open-pointer
    #mfgrows to rows
    #mfgcols to cols

ofw/gui/button.fth

@@ -219 +219 @@
 ;
 : setup  ( -- )
-   ?open-screen  set-menu-colors  ?open-mouse
+   ?open-screen  set-menu-colors  ?open-pointer
    clear-menu install-menu cursor-off  refresh
 ;

ofw/gui/dialog.fth

@@ -300 +300 @@
 
 : controls-mouse  ( list -- ?? flag )
-   mouse-ih 0=  if  drop false exit  then
+   pointer? 0=  if  drop false exit  then
    >r
    false to dialog-ready?
-   begin  mouse-event?  while         ( x y buttons )
-      remove-mouse-cursor             ( x y buttons )
-      -rot  update-position           ( buttons )
+   begin  pointer-event?  while       ( x y absolute? buttons )
+      remove-mouse-cursor             ( x y absolute? buttons )
+      >r  update-position  r>         ( buttons )
       r@ mouse-buttons                ( ?? )
       draw-mouse-cursor               ( ?? )

ofw/gui/iconmenu.fth

@@ -413 +413 @@
 ;
 
-: do-mouse  ( -- )
-   mouse-ih 0=  if  exit  then
-   begin  mouse-event?  while         ( x y buttons )
-      remove-mouse-cursor             ( x y buttons )
-      -rot  update-position           ( buttons )
-      new-sq?
-      draw-mouse-cursor
-   repeat
-;
-: do-touchscreen  ( -- )
-   touchscreen-ih 0=  if  exit  then
-   begin  touchscreen-event?  while   ( x y buttons )
-      remove-mouse-cursor             ( x y buttons )
-      -rot  set-xy                    ( buttons )
+: do-pointer  ( -- )
+   pointer? 0=  if  exit  then
+   begin  pointer-event?  while       ( x y absolute? buttons )
+      remove-mouse-cursor             ( x y absolute? buttons )
+      >r  update-position  r>         ( buttons )
       new-sq?
       draw-mouse-cursor
@@ -465 +456 @@
 : wait-buttons-up  ( -- )
    begin
-      mouse-event?  if   ( x y buttons )
-         nip nip  0=  if  exit  then
+      pointer-event?  if   ( x y buttons )
+         nip nip nip  0=  if  exit  then
       then
    again
@@ -477 +468 @@
    begin
       key?  if  key drop  refresh exit  then
-      mouse-ih  if
-         mouse-event?  if
+      pointer?  if
+         pointer-event?  if   ( x y absolute? buttons )
             \ Ignore movement, act only on a button down event
-            nip nip  if  wait-buttons-up  refresh exit  then
+            nip nip nip  if  wait-buttons-up  refresh exit  then
          then
       then
@@ -494 +485 @@
  
    false to done?
-   begin   do-touchscreen  do-mouse  do-key   done? until
+   begin   do-pointer  do-key   done? until
    false to done?
  
@@ -507 +498 @@
    save-scroller
    setup-graphics
-\  ?open-mouse
+\  ?open-pointer
    cursor-off
    gui-alerts
 ;
-: unsetup-menu  ( -- )  ?close-mouse  restore-scroller  ;
+: unsetup-menu  ( -- )  ?close-pointer  restore-scroller  ;
 
 defer current-menu  ' clear to current-menu

ofw/gui/mouse.fth

@@ -4 +4 @@
 headerless
 
-0 value mouse-ih
-
-false value mouse-absolute?  \ True if coordinates are absolute
+defer pointer-cursor?  ' false to pointer-cursor?
 
 \ Current mouse cursor position
@@ -137 +135 @@
 
 : remove-mouse-cursor  ( -- )
+   pointer-cursor? 0=  if  exit  then
    hardware-cursor?  if  " cursor-off" $call-screen  exit  then
-   mouse-ih 0=  if  exit  then
-   mouse-absolute?  if  exit  then
    xpos ypos  old-rect  put-cursor
 ;
 : draw-mouse-cursor  ( -- )
-   mouse-ih 0=  if  exit  then
-   mouse-absolute?  if  exit  then
+   pointer-cursor? 0=  if  exit  then
    hardware-cursor?  if
       xpos ypos " cursor-xy!" $call-screen
@@ -159 +155 @@
 
 : set-xy  ( x y -- )  to ypos  to xpos  ;
-: update-position  ( x y -- )
-   mouse-absolute?  if  set-xy  exit  then
+: update-position  ( x y absolute? -- )
+   if  set-xy  exit  then
    2dup or 0=  if  2drop exit  then  \ Avoid flicker if there is no movement
 
@@ -172 +168 @@
 
 headers
+
+\ XXX this should be structured as a multiplexor node instead of
+\ having explicit mouse and touchscreen cases.
+
+0 value mouse-ih
+
+false value mouse-absolute?  \ True if coordinates are absolute
 
 0 value close-mouse?
@@ -228 +231 @@
 : touchscreen-event?  ( -- false | x y buttons true )
    " stream-poll?" touchscreen-ih $call-method
+;
+
+: (pointer-cursor?)  ( -- flag )
+   mouse-ih  if  mouse-absolute? 0=  else  false  then
+;
+' (pointer-cursor?)  to pointer-cursor?
+
+: ?open-pointer  ( -- )  ?open-mouse ?open-touchscreen  ;
+: ?close-pointer  ( -- )  ?close-touchscreen ?close-mouse  ;
+
+: pointer?  ( -- flag )  mouse-ih 0<>  touchscreen-ih 0<>  or  ;
+: pointer-event?  ( -- false | x y absolute? buttons true )
+   mouse-event?  if   ( x y buttons )
+      mouse-absolute? swap  true  exit
+   then
+   touchscreen-event?   if
+      true swap  true exit
+   then
+   false
 ;
 

ofw/gui/textfld.fth

@@ -115 +115 @@
          (key remove-mouse-cursor exit
       then
-      mouse-ih  if
-         begin  mouse-event?  while
-            remove-mouse-cursor
-            -rot update-position
-            draw-mouse-cursor
+      pointer?  if
+         begin  pointer-event?  while  ( x y absolute? buttons )
+            remove-mouse-cursor        ( x y absolute? buttons )
+            >r  update-position  r>    ( buttons )
+            draw-mouse-cursor          ( buttons )
             interact-list edit-mouse-buttons  if  exit  then
          repeat