Changeset 8071 for code/branches/kicklib/src/external/ois/linux/LinuxMouse.cpp

Timestamp:

Mar 14, 2011, 3:53:38 AM (14 years ago)

Author:

rgrieder

Message:

Merged ois_update branch (before it was renamed to mac_osx) into kicklib branch.

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• src/external/ois/linux/LinuxMouse.cpp (modified) (2 diffs)

code/branches/kicklib/src/external/ois/linux/LinuxMouse.cpp

@@ -173 +173 @@
 
                         //Compute this frames Relative X & Y motion
-                        mState.X.rel = event.xmotion.x - oldXMouseX;
-                        mState.Y.rel = event.xmotion.y - oldXMouseY;
+                        int dx = event.xmotion.x - oldXMouseX;
+                        int dy = event.xmotion.y - oldXMouseY;
                 
                         //Store old values for next time to compute relative motion
@@ -180 +180 @@
                         oldXMouseY = event.xmotion.y;
 
-                        mState.X.abs += mState.X.rel;
-                        mState.Y.abs += mState.Y.rel;
+                        mState.X.abs += dx;
+                        mState.Y.abs += dy;
+                        mState.X.rel += dx;
+                        mState.Y.rel += dy;
 
                         //Check to see if we are grabbing the mouse to the window (requires clipping and warping)