moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-06-15 21:31:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

holding CTRL + ALT + SHIFT will now release the mouse. Also fixed mouse re-centering issue (i believe cannot test for sure on my system)

Browse Source
This commit is contained in:
Diego Waxemberg
2013-12-12 19:45:35 -05:00
parent ca9f6489a5
commit 81178ca997
3 changed files with 143 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
limelight-pc/src/com/limelight/gui/StreamFrame.java
+25 -8
View File
@@ -33,7 +33,7 @@ public class StreamFrame extends JFrame {
private MouseHandler mouse; private MouseHandler mouse;
private JProgressBar spinner; private JProgressBar spinner;
private JLabel spinnerLabel; private JLabel spinnerLabel;
private Cursor noCursor;
private NvConnection conn; private NvConnection conn;
public StreamFrame() { public StreamFrame() {
@@ -43,6 +43,16 @@ public class StreamFrame extends JFrame {
centerY = dim.height/2-this.getSize().height/2; centerY = dim.height/2-this.getSize().height/2;
} }
public void freeMouse() {
mouse.free();
showCursor();
}
public void captureMouse() {
mouse.capture();
hideCursor();
}
public void build(NvConnection conn, boolean fullscreen) { public void build(NvConnection conn, boolean fullscreen) {
this.conn = conn; this.conn = conn;
@@ -84,18 +94,25 @@ public class StreamFrame extends JFrame {
} }
private void hideCursor() { private void hideCursor() {
// Transparent 16 x 16 pixel cursor image. if (noCursor == null) {
BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB); // Transparent 16 x 16 pixel cursor image.
BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
// Create a new blank cursor.
Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
cursorImg, new Point(0, 0), "blank cursor");
// Create a new blank cursor.
noCursor = Toolkit.getDefaultToolkit().createCustomCursor(
cursorImg, new Point(0, 0), "blank cursor");
}
// Set the blank cursor to the JFrame. // Set the blank cursor to the JFrame.
this.getContentPane().setCursor(blankCursor); this.setCursor(noCursor);
this.getContentPane().setCursor(noCursor);
} }
private void showCursor() {
this.setCursor(Cursor.getDefaultCursor());
this.getContentPane().setCursor(Cursor.getDefaultCursor());
}
public void showSpinner(Stage stage) { public void showSpinner(Stage stage) {
if (spinner == null) { if (spinner == null) {
limelight-pc/src/com/limelight/input/KeyboardHandler.java
+18 -4
View File
@@ -35,23 +35,37 @@ public class KeyboardHandler implements KeyListener {
} }
if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0 && if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0 &&
(modifiers & KeyEvent.ALT_DOWN_MASK) != 0 && (modifiers & KeyEvent.ALT_DOWN_MASK) != 0 &&
(modifiers & KeyEvent.CTRL_DOWN_MASK) != 0 && (modifiers & KeyEvent.CTRL_DOWN_MASK) != 0 &&
event.getKeyCode() == KeyEvent.VK_Q) { event.getKeyCode() == KeyEvent.VK_Q) {
System.out.println("quitting"); System.out.println("quitting");
parent.close(); parent.close();
} else if (
(modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0 &&
(modifiers & KeyEvent.ALT_DOWN_MASK) != 0 &&
(modifiers & KeyEvent.CTRL_DOWN_MASK) != 0) {
parent.freeMouse();
} }
translator.sendKeyDown(keyMap, modifier); translator.sendKeyDown(keyMap, modifier);
} }
@Override @Override
public void keyReleased(KeyEvent event) { public void keyReleased(KeyEvent event) {
int modifiers = event.getModifiersEx();
if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0 ||
(modifiers & KeyEvent.ALT_DOWN_MASK) != 0 ||
(modifiers & KeyEvent.CTRL_DOWN_MASK) != 0) {
parent.captureMouse();
}
short keyMap = translator.translate(event.getKeyCode()); short keyMap = translator.translate(event.getKeyCode());
byte modifier = 0x0; byte modifier = 0x0;
int modifiers = event.getModifiersEx();
if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0) { if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0) {
modifier |= KeyboardPacket.MODIFIER_SHIFT; modifier |= KeyboardPacket.MODIFIER_SHIFT;
} }
limelight-pc/src/com/limelight/input/MouseHandler.java
+64 -44
View File
@@ -20,6 +20,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener {
private JFrame parent; private JFrame parent;
private int lastX = 0; private int lastX = 0;
private int lastY = 0; private int lastY = 0;
private boolean captureMouse = true;
public MouseHandler(NvConnection conn, JFrame parent) { public MouseHandler(NvConnection conn, JFrame parent) {
this.conn = conn; this.conn = conn;
@@ -33,6 +34,16 @@ public class MouseHandler implements MouseListener, MouseMotionListener {
} }
public void free() {
captureMouse = false;
}
public void capture() {
moveMouse((int)parent.getLocationOnScreen().getX() + (size.width/2),
(int)parent.getLocationOnScreen().getY() + (size.height/2));
captureMouse = true;
}
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
} }
@@ -43,80 +54,89 @@ public class MouseHandler implements MouseListener, MouseMotionListener {
@Override @Override
public void mouseExited(MouseEvent e) { public void mouseExited(MouseEvent e) {
parent.getSize(size); if (captureMouse) {
moveMouse((int)parent.getLocation().getX() + (size.width/2), parent.getSize(size);
(int)parent.getLocation().getY() + (size.height/2)); moveMouse((int)parent.getLocationOnScreen().getX() + (size.width/2),
(int)parent.getLocationOnScreen().getY() + (size.height/2));
}
} }
@Override @Override
public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e) {
byte mouseButton = 0x0; if (captureMouse) {
byte mouseButton = 0x0;
if (SwingUtilities.isLeftMouseButton(e)) { if (SwingUtilities.isLeftMouseButton(e)) {
mouseButton = MouseButtonPacket.BUTTON_1; mouseButton = MouseButtonPacket.BUTTON_1;
} }
if (SwingUtilities.isMiddleMouseButton(e)) { if (SwingUtilities.isMiddleMouseButton(e)) {
mouseButton = MouseButtonPacket.BUTTON_2; mouseButton = MouseButtonPacket.BUTTON_2;
} }
if (SwingUtilities.isRightMouseButton(e)) { if (SwingUtilities.isRightMouseButton(e)) {
mouseButton = MouseButtonPacket.BUTTON_3; mouseButton = MouseButtonPacket.BUTTON_3;
} }
if (mouseButton > 0) { if (mouseButton > 0) {
conn.sendMouseButtonDown(mouseButton); conn.sendMouseButtonDown(mouseButton);
}
} }
} }
@Override @Override
public void mouseReleased(MouseEvent e) { public void mouseReleased(MouseEvent e) {
byte mouseButton = 0x0; if (captureMouse) {
byte mouseButton = 0x0;
if (SwingUtilities.isLeftMouseButton(e)) { if (SwingUtilities.isLeftMouseButton(e)) {
mouseButton = MouseButtonPacket.BUTTON_1; mouseButton = MouseButtonPacket.BUTTON_1;
} }
if (SwingUtilities.isMiddleMouseButton(e)) { if (SwingUtilities.isMiddleMouseButton(e)) {
mouseButton = MouseButtonPacket.BUTTON_2; mouseButton = MouseButtonPacket.BUTTON_2;
} }
if (SwingUtilities.isRightMouseButton(e)) { if (SwingUtilities.isRightMouseButton(e)) {
mouseButton = MouseButtonPacket.BUTTON_3; mouseButton = MouseButtonPacket.BUTTON_3;
} }
if (mouseButton > 0) { if (mouseButton > 0) {
conn.sendMouseButtonUp(mouseButton); conn.sendMouseButtonUp(mouseButton);
}
} }
} }
@Override @Override
public void mouseDragged(MouseEvent e) { public void mouseDragged(MouseEvent e) {
mouseMoved(e); if (captureMouse) {
mouseMoved(e);
}
} }
@Override @Override
public void mouseMoved(MouseEvent e) { public void mouseMoved(MouseEvent e) {
int x = e.getX(); if (captureMouse) {
int y = e.getY(); int x = e.getX();
conn.sendMouseMove((short)(x - lastX), (short)(y - lastY)); int y = e.getY();
lastX = x; conn.sendMouseMove((short)(x - lastX), (short)(y - lastY));
lastY = y; lastX = x;
lastY = y;
parent.getSize(size); parent.getSize(size);
int leftEdge = (int) parent.getLocation().getX(); int leftEdge = (int) parent.getLocationOnScreen().getX();
int rightEdge = leftEdge + size.width; int rightEdge = leftEdge + size.width;
int upperEdge = (int) parent.getLocation().getY(); int upperEdge = (int) parent.getLocationOnScreen().getY();
int lowerEdge = upperEdge + size.height; int lowerEdge = upperEdge + size.height;
if (x < leftEdge + 100 || x > rightEdge - 100) { if (x < leftEdge + 100 || x > rightEdge - 100) {
moveMouse((leftEdge+rightEdge)/2, (upperEdge+lowerEdge)/2); moveMouse((leftEdge+rightEdge)/2, (upperEdge+lowerEdge)/2);
}
if (y < upperEdge + 100 || y > lowerEdge - 100) {
moveMouse((leftEdge+rightEdge)/2, (upperEdge+lowerEdge)/2);
}
} }
if (y < upperEdge + 100 || y > lowerEdge - 100) {
moveMouse((leftEdge+rightEdge)/2, (upperEdge+lowerEdge)/2);
}
} }
private void moveMouse(int x, int y) { private void moveMouse(int x, int y) {