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

limelight-pc/src/com/limelight/gui/StreamFrame.java

@@ -33,7 +33,7 @@ public class StreamFrame extends JFrame {
 	private MouseHandler mouse;
 	private JProgressBar spinner;
 	private JLabel spinnerLabel;
-	
+	private Cursor noCursor;
 	private NvConnection conn;
 
 	public StreamFrame() {
@@ -43,6 +43,16 @@ public class StreamFrame extends JFrame {
 		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) {
 		this.conn = conn;
 
@@ -84,18 +94,25 @@ public class StreamFrame extends JFrame {
 	}
 
 	private void hideCursor() {
+		if (noCursor == null) {
 			// 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(
+			noCursor = Toolkit.getDefaultToolkit().createCustomCursor(
 					cursorImg, new Point(0, 0), "blank cursor");
-
+		}
 		// 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) {
 
 		if (spinner == null) {

limelight-pc/src/com/limelight/input/KeyboardHandler.java

@@ -40,18 +40,32 @@ public class KeyboardHandler implements KeyListener {
 				event.getKeyCode() == KeyEvent.VK_Q) {
 			System.out.println("quitting");
 			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);
 	}
 
 	@Override
 	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());
 
 		byte modifier = 0x0;
 
-		int modifiers = event.getModifiersEx();
 		if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0) {
 			modifier |= KeyboardPacket.MODIFIER_SHIFT;
 		}

limelight-pc/src/com/limelight/input/MouseHandler.java

@@ -20,6 +20,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener {
 	private JFrame parent;
 	private int lastX = 0;
 	private int lastY = 0;
+	private boolean captureMouse = true;
 
 	public MouseHandler(NvConnection conn, JFrame parent) {
 		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
 	public void mouseClicked(MouseEvent e) {
 	}
@@ -43,13 +54,16 @@ public class MouseHandler implements MouseListener, MouseMotionListener {
 
 	@Override
 	public void mouseExited(MouseEvent e) {
+		if (captureMouse) {
 			parent.getSize(size);
-		moveMouse((int)parent.getLocation().getX() + (size.width/2),
-			      (int)parent.getLocation().getY() + (size.height/2));
+			moveMouse((int)parent.getLocationOnScreen().getX() + (size.width/2),
+					(int)parent.getLocationOnScreen().getY() + (size.height/2));
+		}
 	}
 
 	@Override
 	public void mousePressed(MouseEvent e) {
+		if (captureMouse) {
 			byte mouseButton = 0x0;
 
 			if (SwingUtilities.isLeftMouseButton(e)) {
@@ -68,9 +82,11 @@ public class MouseHandler implements MouseListener, MouseMotionListener {
 				conn.sendMouseButtonDown(mouseButton);
 			}
 		}
+	}
 
 	@Override
 	public void mouseReleased(MouseEvent e) {
+		if (captureMouse) {
 			byte mouseButton = 0x0;
 
 			if (SwingUtilities.isLeftMouseButton(e)) {
@@ -89,14 +105,18 @@ public class MouseHandler implements MouseListener, MouseMotionListener {
 				conn.sendMouseButtonUp(mouseButton);
 			}
 		}
+	}
 
 	@Override
 	public void mouseDragged(MouseEvent e) {
+		if (captureMouse) {
 			mouseMoved(e);
 		}
+	}
 
 	@Override
 	public void mouseMoved(MouseEvent e) {
+		if (captureMouse) {
 			int x = e.getX();
 			int y = e.getY();
 			conn.sendMouseMove((short)(x - lastX), (short)(y - lastY));
@@ -105,9 +125,9 @@ public class MouseHandler implements MouseListener, MouseMotionListener {
 
 			parent.getSize(size);
 
-		int leftEdge = (int) parent.getLocation().getX();
+			int leftEdge = (int) parent.getLocationOnScreen().getX();
 			int rightEdge = leftEdge + size.width;
-		int upperEdge = (int) parent.getLocation().getY();
+			int upperEdge = (int) parent.getLocationOnScreen().getY();
 			int lowerEdge = upperEdge + size.height;
 
 			if (x < leftEdge + 100 || x > rightEdge - 100) {
@@ -116,7 +136,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener {
 			if (y < upperEdge + 100 || y > lowerEdge - 100) {
 				moveMouse((leftEdge+rightEdge)/2, (upperEdge+lowerEdge)/2);
 			}
-		
+		}
 	}
 
 	private void moveMouse(int x, int y) {