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

This commit is contained in:
Diego Waxemberg
2013-12-12 19:45:35 -05:00
parent af3369ec5c
commit c8235da7bb
3 changed files with 149 additions and 95 deletions

View File

@@ -8,21 +8,21 @@ import com.limelight.nvstream.NvConnection;
import com.limelight.nvstream.input.KeyboardPacket;
public class KeyboardHandler implements KeyListener {
private static KeyboardTranslator translator;
private StreamFrame parent;
public KeyboardHandler(NvConnection conn, StreamFrame parent) {
translator = new KeyboardTranslator(conn);
this.parent = parent;
}
@Override
public void keyPressed(KeyEvent event) {
short keyMap = translator.translate(event.getKeyCode());
byte modifier = 0x0;
int modifiers = event.getModifiersEx();
if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0) {
modifier |= KeyboardPacket.MODIFIER_SHIFT;
@@ -35,23 +35,37 @@ public class KeyboardHandler implements KeyListener {
}
if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0 &&
(modifiers & KeyEvent.ALT_DOWN_MASK) != 0 &&
(modifiers & KeyEvent.CTRL_DOWN_MASK) != 0 &&
event.getKeyCode() == KeyEvent.VK_Q) {
(modifiers & KeyEvent.ALT_DOWN_MASK) != 0 &&
(modifiers & KeyEvent.CTRL_DOWN_MASK) != 0 &&
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) {
short keyMap = translator.translate(event.getKeyCode());
byte modifier = 0x0;
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;
if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0) {
modifier |= KeyboardPacket.MODIFIER_SHIFT;
}
@@ -61,7 +75,7 @@ public class KeyboardHandler implements KeyListener {
if ((modifiers & KeyEvent.ALT_DOWN_MASK) != 0) {
modifier |= KeyboardPacket.MODIFIER_ALT;
}
translator.sendKeyUp(keyMap, modifier);
}