move mouse wakeup from SR to VG

diff --git a/menu.c b/menu.c
index b8695bb417612a13e42a1270e853df36299f161c..daeb61a2b6057ce7c3d7422c1f03edd9c236d3f6 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -78,7 +78,7 @@ static bool menu_slider( ui_rect inout_panel, bool select, const char *label,
          k_ui_button_click,
       mask_brighter = mask_using | k_ui_button_hover;
 
-   if( menu.input_mode == k_menu_input_mode_keys )
+   if( vg_input.display_input_method == k_input_method_controller )
    {
       if( select )
       {
@@ -112,7 +112,7 @@ static bool menu_button( ui_rect inout_panel, bool select, const char *text )
 
    enum ui_button_state state = k_ui_button_none;
 
-   if( menu.input_mode == k_menu_input_mode_keys )
+   if( vg_input.display_input_method == k_input_method_controller )
    {
       if( select )
       {
@@ -168,7 +168,7 @@ static bool menu_checkbox( ui_rect inout_panel, bool select,
    
    enum ui_button_state state = k_ui_button_none;
 
-   if( menu.input_mode == k_menu_input_mode_keys )
+   if( vg_input.display_input_method == k_input_method_controller )
    {
       if( select )
       {
@@ -267,30 +267,8 @@ void menu_gui(void)
        mv = mu-md,
        enter = button_down( k_srbind_maccept );
 
-   if( mh||mv||enter )
+   if( vg_input.display_input_method == k_input_method_kbm )
    {
-      menu.input_mode = k_menu_input_mode_keys;
-   }
-
-   /* get mouse inputs 
-    * --------------------------------------------------------------------*/
-   menu.mouse_dist += v2_length( vg.mouse_delta ); /* TODO: Move to UI */
-   if( menu.mouse_dist > 10.0f )
-   {
-      menu.input_mode = k_menu_input_mode_mouse;
-      menu.mouse_dist = 0.0f;
-   }
-
-   if( ui_clicking(UI_MOUSE_LEFT) || ui_clicking(UI_MOUSE_RIGHT) )
-   {
-      menu.input_mode = k_menu_input_mode_mouse;
-   }
-
-   if( menu.input_mode == k_menu_input_mode_mouse )
-   {
-      /* 
-       * handle mouse input
-       * ------------------------------------------------------------*/
       vg_ui.wants_mouse = 1;
    }
 
@@ -342,7 +320,9 @@ void menu_gui(void)
             "Khronos Group      - OpenGL\n"
             , 1, k_ui_align_left, 0 );
 
-      if( button_down( k_srbind_mback ) )
+      ui_rect end = { panel[0], panel[1] + panel[3] - 64, panel[2], 64 };
+
+      if( menu_button( end, 1, "Back" ) || button_down( k_srbind_mback ) )
       {
          menu.page = k_menu_page_main;
       }
@@ -398,7 +378,7 @@ void menu_gui(void)
    ui_px x = 0, spacer = 8;
    for( u32 draw=0; draw<2; draw ++ )
    {
-      if( menu.input_mode == k_menu_input_mode_keys )
+      if( vg_input.display_input_method == k_input_method_controller )
       {
          if( draw )
          {
@@ -444,7 +424,7 @@ void menu_gui(void)
          x += box[2] + spacer;
       }
 
-      if( menu.input_mode == k_menu_input_mode_keys )
+      if( vg_input.display_input_method == k_input_method_controller )
       {
          if( draw )
          {

diff --git a/menu.h b/menu.h
index 6d9b880f3d09068ad02c3debff0cb780736b4aeb..6cbe297485dc78f073dbd5206d578ebf1f8c5b41 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -31,13 +31,6 @@ struct global_menu
        main_row,
        settings_row,
        guides_row;
-
-   enum menu_input_mode
-   {
-      k_menu_input_mode_keys,
-      k_menu_input_mode_mouse
-   }
-   input_mode;
    f32 mouse_dist;  /* used for waking up mouse */
 
    f32 repeater;