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

PROPERLY detect EOF, remove copyrect (again)

Browse Source
This commit is contained in:
Michael Jumper
2010-09-07 23:49:19 -07:00
parent 5b1f538f10
commit af0b4d933d
4 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
guacamole/proxy/client.c
View File

@@ -78,6 +78,7 @@ void guac_free_client(guac_client* client) {
void guac_start_client(guac_client* client) {
guac_instruction instruction;
GUACIO* io = client->io;
int wait_result;
@@ -93,36 +94,42 @@ void guac_start_client(guac_client* client) {
wait_result = guac_instructions_waiting(io);
if (wait_result > 0) {
guac_instruction* instruction;
if ((instruction = guac_read_instruction(io))) {
int retval;
retval = guac_read_instruction(io, &instruction); /* 0 if no instructions finished yet, <0 if error or EOF */
if (retval > 0) {
do {
if (strcmp(instruction->opcode, "mouse") == 0) {
if (strcmp(instruction.opcode, "mouse") == 0) {
if (client->mouse_handler)
client->mouse_handler(
client,
atoi(instruction->argv[0]), /* x */
atoi(instruction->argv[1]), /* y */
atoi(instruction->argv[2]) /* mask */
atoi(instruction.argv[0]), /* x */
atoi(instruction.argv[1]), /* y */
atoi(instruction.argv[2]) /* mask */
);
}
else if (strcmp(instruction->opcode, "key") == 0) {
else if (strcmp(instruction.opcode, "key") == 0) {
if (client->key_handler)
client->key_handler(
client,
atoi(instruction->argv[0]), /* keysym */
atoi(instruction->argv[1]) /* pressed */
atoi(instruction.argv[0]), /* keysym */
atoi(instruction.argv[1]) /* pressed */
);
}
guac_free_instruction(instruction);
} while ((instruction = guac_read_instruction(io)));
} while ((retval = guac_read_instruction(io, &instruction)) > 0);
if (retval < 0)
return;
}
else
return;
if (retval < 0)
return; /* EOF or error */
/* Otherwise, retval == 0 implies unfinished instruction */
}
else if (wait_result < 0)