include/SDL_events.h
changeset 4661 03dcb795c583
parent 4659 063b9455bd1a
parent 4503 524dfefd554c
child 4662 3c4e0130c9b1
     1.1 --- a/include/SDL_events.h	Mon Jul 12 22:03:25 2010 -0400
     1.2 +++ b/include/SDL_events.h	Mon Jul 12 21:09:23 2010 -0700
     1.3 @@ -77,9 +77,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 @@ -88,18 +92,21 @@
    1.21      SDL_JOYBUTTONDOWN,          /**< Joystick button pressed */
    1.22      SDL_JOYBUTTONUP,            /**< Joystick button released */
    1.23  
    1.24 -    /*Touch events*/
    1.25 -    SDL_FINGERDOWN     = 0x700,
    1.26 +    /* Touch events */
    1.27 +    SDL_FINGERDOWN      = 0x700,
    1.28      SDL_FINGERUP,
    1.29      SDL_FINGERMOTION,
    1.30      SDL_TOUCHBUTTONDOWN,
    1.31      SDL_TOUCHBUTTONUP,    
    1.32  
    1.33 -    /*Gesture events*/
    1.34 -    SDL_DOLLARGESTURE     = 0x800,
    1.35 +    /* Gesture events */
    1.36 +    SDL_DOLLARGESTURE   = 0x800,
    1.37      SDL_DOLLARRECORD,
    1.38      SDL_MULTIGESTURE,
    1.39  
    1.40 +    /* Clipboard events */
    1.41 +    SDL_CLIPBOARDUPDATE = 0x900, /**< The clipboard changed */
    1.42 +
    1.43      /* Obsolete events */
    1.44      SDL_EVENT_COMPAT1 = 0x7000, /**< SDL 1.2 events for compatibility */
    1.45      SDL_EVENT_COMPAT2,
    1.46 @@ -139,10 +146,10 @@
    1.47  {
    1.48      Uint32 type;        /**< ::SDL_KEYDOWN or ::SDL_KEYUP */
    1.49      Uint32 windowID;    /**< The window with keyboard focus, if any */
    1.50 -    Uint8 which;        /**< The keyboard device index */
    1.51      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
    1.52      Uint8 padding1;
    1.53      Uint8 padding2;
    1.54 +    Uint8 padding3;
    1.55      SDL_keysym keysym;  /**< The key that was pressed or released */
    1.56  } SDL_KeyboardEvent;
    1.57  
    1.58 @@ -154,7 +161,6 @@
    1.59  {
    1.60      Uint32 type;                                /**< ::SDL_TEXTEDITING */
    1.61      Uint32 windowID;                            /**< The window with keyboard focus, if any */
    1.62 -    Uint8 which;                                /**< The keyboard device index */
    1.63      char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
    1.64      int start;                                  /**< The start cursor of selected editing text */
    1.65      int length;                                 /**< The length of selected editing text */
    1.66 @@ -169,10 +175,6 @@
    1.67  {
    1.68      Uint32 type;                              /**< ::SDL_TEXTINPUT */
    1.69      Uint32 windowID;                          /**< The window with keyboard focus, if any */
    1.70 -    Uint8 which;                              /**< The keyboard device index */
    1.71 -    Uint8 padding1;
    1.72 -    Uint8 padding2;
    1.73 -    Uint8 padding3;
    1.74      char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];  /**< The input text */
    1.75  } SDL_TextInputEvent;
    1.76  
    1.77 @@ -183,20 +185,12 @@
    1.78  {
    1.79      Uint32 type;        /**< ::SDL_MOUSEMOTION */
    1.80      Uint32 windowID;    /**< The window with mouse focus, if any */
    1.81 -    Uint8 which;        /**< The mouse device index */
    1.82      Uint8 state;        /**< The current button state */
    1.83      Uint8 padding1;
    1.84      Uint8 padding2;
    1.85 +    Uint8 padding3;
    1.86      int x;              /**< X coordinate, relative to window */
    1.87      int y;              /**< Y coordinate, relative to window */
    1.88 -    int z;              /**< Z coordinate, for future use */
    1.89 -    int pressure;       /**< Pressure reported by tablets */
    1.90 -    int pressure_max;   /**< Maximum value of the pressure reported by the device */
    1.91 -    int pressure_min;   /**< Minimum value of the pressure reported by the device */
    1.92 -    int rotation;       /**< For future use */
    1.93 -    int tilt_x;         /**< For future use */
    1.94 -    int tilt_y;         /**< For future use */
    1.95 -    int cursor;         /**< The cursor being used in the event */
    1.96      int xrel;           /**< The relative motion in the X direction */
    1.97      int yrel;           /**< The relative motion in the Y direction */
    1.98  } SDL_MouseMotionEvent;
    1.99 @@ -208,10 +202,10 @@
   1.100  {
   1.101      Uint32 type;        /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */
   1.102      Uint32 windowID;    /**< The window with mouse focus, if any */
   1.103 -    Uint8 which;        /**< The mouse device index */
   1.104      Uint8 button;       /**< The mouse button index */
   1.105      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
   1.106      Uint8 padding1;
   1.107 +    Uint8 padding2;
   1.108      int x;              /**< X coordinate, relative to window */
   1.109      int y;              /**< Y coordinate, relative to window */
   1.110  } SDL_MouseButtonEvent;
   1.111 @@ -223,31 +217,11 @@
   1.112  {
   1.113      Uint32 type;        /**< ::SDL_MOUSEWHEEL */
   1.114      Uint32 windowID;    /**< The window with mouse focus, if any */
   1.115 -    Uint8 which;        /**< The mouse device index */
   1.116 -    Uint8 padding1;
   1.117 -    Uint8 padding2;
   1.118 -    Uint8 padding3;
   1.119      int x;              /**< The amount scrolled horizontally */
   1.120      int y;              /**< The amount scrolled vertically */
   1.121  } SDL_MouseWheelEvent;
   1.122  
   1.123  /**
   1.124 - * \brief Tablet pen proximity event
   1.125 - */
   1.126 -typedef struct SDL_ProximityEvent
   1.127 -{
   1.128 -    Uint32 type;        /**< ::SDL_PROXIMITYIN or ::SDL_PROXIMITYOUT */
   1.129 -    Uint32 windowID;    /**< The associated window */
   1.130 -    Uint8 which;
   1.131 -    Uint8 padding1;
   1.132 -    Uint8 padding2;
   1.133 -    Uint8 padding3;
   1.134 -    int cursor;
   1.135 -    int x;
   1.136 -    int y;
   1.137 -} SDL_ProximityEvent;
   1.138 -
   1.139 -/**
   1.140   *  \brief Joystick axis motion event structure (event.jaxis.*)
   1.141   */
   1.142  typedef struct SDL_JoyAxisEvent
   1.143 @@ -459,7 +433,6 @@
   1.144      SDL_QuitEvent quit;             /**< Quit request event data */
   1.145      SDL_UserEvent user;             /**< Custom event data */
   1.146      SDL_SysWMEvent syswm;           /**< System dependent window event data */
   1.147 -    SDL_ProximityEvent proximity;   /**< Proximity In or Out event */
   1.148      SDL_TouchFingerEvent tfinger;   /**< Touch finger event data */
   1.149      SDL_TouchButtonEvent tbutton;   /**< Touch button event data */
   1.150      SDL_MultiGestureEvent mgesture; /**< Multi Finger Gesture data*/