safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed event ordering (added queues)

Browse Source
This commit is contained in:
Michael Jumper
2010-09-06 23:23:17 -07:00
parent 5a5be19518
commit 8bd6d947d7
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
guacamole/client/src/net/sourceforge/guacamole/GuacamoleClient.java
View File

@@ -33,6 +33,8 @@ import java.io.OutputStreamWriter;
import net.sourceforge.guacamole.instruction.Instruction; import net.sourceforge.guacamole.instruction.Instruction;
import net.sourceforge.guacamole.GuacamoleException; import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.event.EventQueue;
import net.sourceforge.guacamole.event.EventHandler;
import net.sourceforge.guacamole.event.KeyEvent; import net.sourceforge.guacamole.event.KeyEvent;
import net.sourceforge.guacamole.event.PointerEvent; import net.sourceforge.guacamole.event.PointerEvent;
@@ -55,24 +57,24 @@ public class GuacamoleClient extends Client {
} }
public void send(KeyEvent event) throws GuacamoleException {
try { private static final int EVENT_DEADLINE = 500;
private EventQueue<KeyEvent> keyEvents = new EventQueue<KeyEvent>(new EventHandler<KeyEvent>() {
public void handle(KeyEvent event) throws IOException {
int pressed = 0; int pressed = 0;
if (event.getPressed()) pressed = 1; if (event.getPressed()) pressed = 1;
output.write("key:" + event.getKeySym() + "," + pressed + ";"); output.write("key:" + event.getKeySym() + "," + pressed + ";");
output.flush(); output.flush();
} }
catch (IOException e) {
throw new GuacamoleException(e);
}
} }, EVENT_DEADLINE);
public void send(PointerEvent event) throws GuacamoleException { private EventQueue<PointerEvent> pointerEvents = new EventQueue<PointerEvent>(new EventHandler<PointerEvent>() {
try { public void handle(PointerEvent event) throws IOException {
int mask = 0; int mask = 0;
if (event.isLeftButtonPressed()) mask |= 1; if (event.isLeftButtonPressed()) mask |= 1;
if (event.isMiddleButtonPressed()) mask |= 2; if (event.isMiddleButtonPressed()) mask |= 2;
@@ -84,6 +86,26 @@ public class GuacamoleClient extends Client {
output.write("mouse:" + event.getX() + "," + event.getY() + "," + mask + ";"); output.write("mouse:" + event.getX() + "," + event.getY() + "," + mask + ";");
output.flush(); output.flush();
} }
}, EVENT_DEADLINE);
public void send(KeyEvent event) throws GuacamoleException {
try {
keyEvents.add(event);
}
catch (IOException e) {
throw new GuacamoleException(e);
}
}
public void send(PointerEvent event) throws GuacamoleException {
try {
pointerEvents.add(event);
}
catch (IOException e) { catch (IOException e) {
throw new GuacamoleException(e); throw new GuacamoleException(e);
} }