Merge branch 'master' into root

src/com/limelight/Game.java

@@ -553,15 +553,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 						touchContextMap[i].touchMoveEvent(eventX, eventY);
 					}
 					break;
-				case MotionEvent.ACTION_HOVER_MOVE:
-					// Send a mouse move update (if neccessary)
-					updateMousePosition((int)event.getX(), (int)event.getY());
-					break;
-				case MotionEvent.ACTION_SCROLL:
-					// Send the vertical scroll packet
-					byte vScrollClicks = (byte) event.getAxisValue(MotionEvent.AXIS_VSCROLL);
-					conn.sendMouseScroll(vScrollClicks);
-					break;
 				default:
 					return false;
 				}
@@ -570,6 +561,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 			else if (event.getSource() == InputDevice.SOURCE_MOUSE)
 			{
 				int changedButtons = event.getButtonState() ^ lastButtonState;
+				
+				if (event.getActionMasked() == MotionEvent.ACTION_SCROLL) {
+					// Send the vertical scroll packet
+					byte vScrollClicks = (byte) event.getAxisValue(MotionEvent.AXIS_VSCROLL);
+					conn.sendMouseScroll(vScrollClicks);
+				}
 
 				if ((changedButtons & MotionEvent.BUTTON_PRIMARY) != 0) {
 					if ((event.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0) {