X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_input.h;h=af0ac6882d9ff285cdbe6e95ba91d71a930553a8;hb=40382fa2a3d250ef1e0f1716f3608d0d60e0e655;hp=1052c42937f1c61ce535b8199d8857494b08e57d;hpb=bc9d0792623d0839920fc09bbffe339e6dc104ee;p=vg.git

diff --git a/vg_input.h b/vg_input.h
index 1052c42..af0ac68 100644
--- a/vg_input.h
+++ b/vg_input.h
@@ -59,6 +59,7 @@ struct input_binding
       {
          SDL_GameControllerButton gamepad_id;
          SDL_Keycode              keyboard_id;
+         int                      mouse_id;
          int value, prev;
       }
       button;
@@ -97,6 +98,7 @@ VG_STATIC void vg_create_unnamed_input( struct input_binding *bind,
    bind->axis.keyboard_negative = -1;
    bind->button.gamepad_id = -1;
    bind->button.keyboard_id = -1;
+   bind->button.mouse_id = -1;
 }
 
 VG_STATIC struct input_binding *vg_create_named_input( const char *name,
@@ -115,6 +117,7 @@ VG_STATIC struct input_binding *vg_create_named_input( const char *name,
    bind->axis.keyboard_negative = -1;
    bind->button.gamepad_id = -1;
    bind->button.keyboard_id = -1;
+   bind->button.mouse_id = -1;
 
    return bind;
 }
@@ -179,7 +182,10 @@ vg_all_bindable_inputs[] =
  {k_input_type_gamepad_button, "gp-dpad-left", SDL_CONTROLLER_BUTTON_DPAD_LEFT},
  {k_input_type_gamepad_button,"gp-dpad-right",SDL_CONTROLLER_BUTTON_DPAD_RIGHT},
  {k_input_type_gamepad_button, "gp-dpad-up", SDL_CONTROLLER_BUTTON_DPAD_UP},
- {k_input_type_gamepad_button, "\2gp-menu", SDL_CONTROLLER_BUTTON_BACK}
+ {k_input_type_gamepad_button, "\2gp-menu", SDL_CONTROLLER_BUTTON_BACK},
+
+ {k_input_type_mouse_button,   "mouse1", SDL_BUTTON_LEFT },
+ {k_input_type_mouse_button,   "mouse2", SDL_BUTTON_RIGHT }
 };
 
 VG_STATIC const char *vg_input_to_str( u32 input, enum input_type input_type )
@@ -289,6 +295,9 @@ VG_STATIC void vg_print_binding_info( struct input_binding *bind )
       vg_info( "      keyboard_id: %s\n",
          vg_input_to_str(bind->button.keyboard_id,
                          k_input_type_keyboard_key));
+      vg_info( "      mouse_id: %s\n",
+         vg_input_to_str(bind->button.mouse_id,
+                         k_input_type_mouse_button));
    }
 }
 
@@ -331,6 +340,8 @@ VG_STATIC void vg_apply_bind_str( struct input_binding *bind,
 
       if( type == k_input_type_keyboard_key )
          bind->button.keyboard_id = id;
+      else if( type == k_input_type_mouse_button )
+         bind->button.mouse_id = id;
       else if( type == k_input_type_gamepad_button )
          bind->button.gamepad_id = id;
       else
@@ -486,7 +497,16 @@ VG_STATIC void vg_input_update( u32 num, struct input_binding *binds )
                vg_input.controller_buttons[ bind->button.gamepad_id ];
 
          if( bind->button.keyboard_id != -1 )
+         {
             bind->button.value |= vg_getkey( bind->button.keyboard_id );
+         }
+
+         if( bind->button.mouse_id != -1 )
+         {
+            if( SDL_GetMouseState(NULL, NULL) & 
+                                    SDL_BUTTON( bind->button.mouse_id ) )
+               bind->button.value |= 1;
+         }
       }
       else if( bind->type == k_input_type_axis )
       {