Changeset 505 for trunk/src/sdl/sdl_input.cc

Timestamp:

07/12/16 20:22:23 (9 years ago)

Author:

epyon

Message:

• several STL updates
• several minor fixes

File:

• trunk/src/sdl/sdl_input.cc (modified) (5 diffs)

trunk/src/sdl/sdl_input.cc

@@ -20 +20 @@
 static bool sdl_key_event_to_io_event( const SDL_KeyboardEvent& ke, io_event& kevent )
 {
-        kevent.type        = EV_KEY;
-        kevent.key.pressed = ( ke.state != SDL_RELEASED );
-        kevent.key.ascii   = 0;
-        kevent.key.code    = KEY_NONE;
+        kevent.type          = EV_KEY;
+        kevent.key.window_id = ke.windowID;
+        kevent.key.pressed   = ( ke.state != SDL_RELEASED );
+        kevent.key.ascii     = 0;
+        kevent.key.code      = KEY_NONE;
 
         uint32 ucode = static_cast<uint32>( ke.keysym.sym );
@@ -107 +108 @@
 static bool sdl_mouse_button_to_io_event( const SDL_MouseButtonEvent& mb, io_event& mevent )
 {
-        mevent.type            = EV_MOUSE_BUTTON;
-        mevent.mbutton.button  = MOUSE_NONE;
-        mevent.mbutton.pressed = (mb.state != SDL_RELEASED);
-        mevent.mbutton.x       = static_cast< uint16 >( mb.x );
-        mevent.mbutton.y       = static_cast< uint16 >( mb.y );
+        mevent.type              = EV_MOUSE_BUTTON;
+        mevent.mbutton.window_id = mb.windowID;
+        mevent.mbutton.button    = MOUSE_NONE;
+        mevent.mbutton.pressed   = (mb.state != SDL_RELEASED);
+        mevent.mbutton.x         = static_cast< uint16 >( mb.x );
+        mevent.mbutton.y         = static_cast< uint16 >( mb.y );
 
         switch ( mb.button )
@@ -126 +128 @@
 static bool sdl_mouse_wheel_to_io_event( const SDL_MouseWheelEvent& mm, io_event& mevent )
 {
-        mevent.type          = EV_MOUSE_WHEEL;
-        mevent.mwheel.x      = static_cast< sint32 >( mm.x );
-        mevent.mwheel.y      = static_cast< sint32 >( mm.y );
+        mevent.type             = EV_MOUSE_WHEEL;
+        mevent.mwheel.window_id = mm.windowID;
+        mevent.mwheel.x         = static_cast< sint32 >( mm.x );
+        mevent.mwheel.y         = static_cast< sint32 >( mm.y );
         return true;
 }
@@ -134 +137 @@
 static bool sdl_mouse_motion_to_io_event( const SDL_MouseMotionEvent& mm, io_event& mevent )
 {
-        mevent.type          = EV_MOUSE_MOVE;
-        mevent.mmove.pressed = (mm.state != SDL_RELEASED);
-        mevent.mmove.x       = static_cast< uint16 >( mm.x );
-        mevent.mmove.y       = static_cast< uint16 >( mm.y );
-        mevent.mmove.rx      = static_cast< sint16 >( mm.xrel );
-        mevent.mmove.ry      = static_cast< sint16 >( mm.yrel );
+        mevent.type            = EV_MOUSE_MOVE;
+        mevent.mmove.window_id = mm.windowID;
+        mevent.mmove.pressed   = (mm.state != SDL_RELEASED);
+        mevent.mmove.x         = static_cast< uint16 >( mm.x );
+        mevent.mmove.y         = static_cast< uint16 >( mm.y );
+        mevent.mmove.rx        = static_cast< sint16 >( mm.xrel );
+        mevent.mmove.ry        = static_cast< sint16 >( mm.yrel );
         return true;
 }
@@ -222 +226 @@
         case SDL_VIDEOEXPOSE     : return false;
 */
+        case SDL_WINDOWEVENT_ENTER: ioevent.type = EV_SYSTEM; ioevent.system.param1 = 1; ioevent.system.param1 = e.window.windowID; return true;
+        case SDL_WINDOWEVENT_LEAVE: ioevent.type = EV_SYSTEM; ioevent.system.param1 = 0; ioevent.system.param1 = e.window.windowID; return true;
         case SDL_SYSWMEVENT      : ioevent.type = EV_SYSTEM; return true;
         case SDL_QUIT            : ioevent.type = EV_QUIT;   return true;