moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-20 11:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into root

Browse Source
This commit is contained in:
Cameron Gutman 2014-10-03 23:35:12 -07:00
commit 247a19766c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/limelight/Game.java
View File

@ -553,15 +553,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
touchContextMap[i].touchMoveEvent(eventX, eventY); touchContextMap[i].touchMoveEvent(eventX, eventY);
} }
break; 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: default:
return false; return false;
} }
@ -570,6 +561,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
else if (event.getSource() == InputDevice.SOURCE_MOUSE) else if (event.getSource() == InputDevice.SOURCE_MOUSE)
{ {
int changedButtons = event.getButtonState() ^ lastButtonState; 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 ((changedButtons & MotionEvent.BUTTON_PRIMARY) != 0) {
if ((event.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0) { if ((event.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0) {