include/SDL_events.h
changeset 4465 3e69e077cb95
parent 4435 e953700da4ca
child 4503 524dfefd554c
     1.1 --- a/include/SDL_events.h	Sun May 09 19:55:28 2010 -0700
     1.2 +++ b/include/SDL_events.h	Sun May 09 20:47:22 2010 -0700
     1.3 @@ -75,9 +75,13 @@
     1.4      SDL_MOUSEBUTTONUP,          /**< Mouse button released */
     1.5      SDL_MOUSEWHEEL,             /**< Mouse wheel motion */
     1.6  
     1.7 -    /* Tablet events */
     1.8 -    SDL_PROXIMITYIN    = 0x500, /**< Proximity In event */
     1.9 -    SDL_PROXIMITYOUT,           /**< Proximity Out event */
    1.10 +    /* Tablet or multiple mice input device events */
    1.11 +    SDL_INPUTMOTION    = 0x500, /**< Input moved */
    1.12 +    SDL_INPUTBUTTONDOWN,        /**< Input button pressed */
    1.13 +    SDL_INPUTBUTTONUP,          /**< Input button released */
    1.14 +    SDL_INPUTWHEEL,             /**< Input wheel motion */
    1.15 +    SDL_INPUTPROXIMITYIN,       /**< Input pen entered proximity */
    1.16 +    SDL_INPUTPROXIMITYOUT,      /**< Input pen left proximity */
    1.17  
    1.18      /* Joystick events */
    1.19      SDL_JOYAXISMOTION  = 0x600, /**< Joystick axis motion */
    1.20 @@ -124,10 +128,10 @@
    1.21  {
    1.22      Uint32 type;        /**< ::SDL_KEYDOWN or ::SDL_KEYUP */
    1.23      Uint32 windowID;    /**< The window with keyboard focus, if any */
    1.24 -    Uint8 which;        /**< The keyboard device index */
    1.25      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
    1.26      Uint8 padding1;
    1.27      Uint8 padding2;
    1.28 +    Uint8 padding3;
    1.29      SDL_keysym keysym;  /**< The key that was pressed or released */
    1.30  } SDL_KeyboardEvent;
    1.31  
    1.32 @@ -139,7 +143,6 @@
    1.33  {
    1.34      Uint32 type;                                /**< ::SDL_TEXTEDITING */
    1.35      Uint32 windowID;                            /**< The window with keyboard focus, if any */
    1.36 -    Uint8 which;                                /**< The keyboard device index */
    1.37      char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
    1.38      int start;                                  /**< The start cursor of selected editing text */
    1.39      int length;                                 /**< The length of selected editing text */
    1.40 @@ -154,10 +157,6 @@
    1.41  {
    1.42      Uint32 type;                              /**< ::SDL_TEXTINPUT */
    1.43      Uint32 windowID;                          /**< The window with keyboard focus, if any */
    1.44 -    Uint8 which;                              /**< The keyboard device index */
    1.45 -    Uint8 padding1;
    1.46 -    Uint8 padding2;
    1.47 -    Uint8 padding3;
    1.48      char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];  /**< The input text */
    1.49  } SDL_TextInputEvent;
    1.50  
    1.51 @@ -168,20 +167,12 @@
    1.52  {
    1.53      Uint32 type;        /**< ::SDL_MOUSEMOTION */
    1.54      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.55 -    Uint8 which;        /**< The mouse device index */
    1.56      Uint8 state;        /**< The current button state */
    1.57      Uint8 padding1;
    1.58      Uint8 padding2;
    1.59 +    Uint8 padding3;
    1.60      int x;              /**< X coordinate, relative to window */
    1.61      int y;              /**< Y coordinate, relative to window */
    1.62 -    int z;              /**< Z coordinate, for future use */
    1.63 -    int pressure;       /**< Pressure reported by tablets */
    1.64 -    int pressure_max;   /**< Maximum value of the pressure reported by the device */
    1.65 -    int pressure_min;   /**< Minimum value of the pressure reported by the device */
    1.66 -    int rotation;       /**< For future use */
    1.67 -    int tilt_x;         /**< For future use */
    1.68 -    int tilt_y;         /**< For future use */
    1.69 -    int cursor;         /**< The cursor being used in the event */
    1.70      int xrel;           /**< The relative motion in the X direction */
    1.71      int yrel;           /**< The relative motion in the Y direction */
    1.72  } SDL_MouseMotionEvent;
    1.73 @@ -193,10 +184,10 @@
    1.74  {
    1.75      Uint32 type;        /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */
    1.76      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.77 -    Uint8 which;        /**< The mouse device index */
    1.78      Uint8 button;       /**< The mouse button index */
    1.79      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
    1.80      Uint8 padding1;
    1.81 +    Uint8 padding2;
    1.82      int x;              /**< X coordinate, relative to window */
    1.83      int y;              /**< Y coordinate, relative to window */
    1.84  } SDL_MouseButtonEvent;
    1.85 @@ -208,31 +199,11 @@
    1.86  {
    1.87      Uint32 type;        /**< ::SDL_MOUSEWHEEL */
    1.88      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.89 -    Uint8 which;        /**< The mouse device index */
    1.90 -    Uint8 padding1;
    1.91 -    Uint8 padding2;
    1.92 -    Uint8 padding3;
    1.93      int x;              /**< The amount scrolled horizontally */
    1.94      int y;              /**< The amount scrolled vertically */
    1.95  } SDL_MouseWheelEvent;
    1.96  
    1.97  /**
    1.98 - * \brief Tablet pen proximity event
    1.99 - */
   1.100 -typedef struct SDL_ProximityEvent
   1.101 -{
   1.102 -    Uint32 type;        /**< ::SDL_PROXIMITYIN or ::SDL_PROXIMITYOUT */
   1.103 -    Uint32 windowID;    /**< The associated window */
   1.104 -    Uint8 which;
   1.105 -    Uint8 padding1;
   1.106 -    Uint8 padding2;
   1.107 -    Uint8 padding3;
   1.108 -    int cursor;
   1.109 -    int x;
   1.110 -    int y;
   1.111 -} SDL_ProximityEvent;
   1.112 -
   1.113 -/**
   1.114   *  \brief Joystick axis motion event structure (event.jaxis.*)
   1.115   */
   1.116  typedef struct SDL_JoyAxisEvent
   1.117 @@ -371,7 +342,6 @@
   1.118      SDL_QuitEvent quit;             /**< Quit request event data */
   1.119      SDL_UserEvent user;             /**< Custom event data */
   1.120      SDL_SysWMEvent syswm;           /**< System dependent window event data */
   1.121 -    SDL_ProximityEvent proximity;   /**< Proximity In or Out event */
   1.122  
   1.123      /** Temporarily here for backwards compatibility */
   1.124      /*@{*/