You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/01/25 00:26:28 UTC
[1/2] incubator-guacamole-server git commit: GUACAMOLE-178: Ensure
shared cursor layer is always above all other layers.
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/master a1886f51b -> 396eaa21f
GUACAMOLE-178: Ensure shared cursor layer is always above all other layers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/6645e858
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/6645e858
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/6645e858
Branch: refs/heads/master
Commit: 6645e858cade63e89c3f076c1977e129c46c0e93
Parents: a1886f5
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Oct 2 11:07:58 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jan 24 16:17:42 2017 -0800
----------------------------------------------------------------------
src/common/cursor.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/6645e858/src/common/cursor.c
----------------------------------------------------------------------
diff --git a/src/common/cursor.c b/src/common/cursor.c
index 6dd000f..e63ada1 100644
--- a/src/common/cursor.c
+++ b/src/common/cursor.c
@@ -31,6 +31,7 @@
#include <guacamole/socket.h>
#include <guacamole/user.h>
+#include <limits.h>
#include <stdlib.h>
#include <string.h>
@@ -94,7 +95,7 @@ void guac_common_cursor_dup(guac_common_cursor* cursor, guac_user* user,
guac_protocol_send_move(socket, cursor->layer, GUAC_DEFAULT_LAYER,
cursor->x - cursor->hotspot_x,
cursor->y - cursor->hotspot_y,
- 0);
+ INT_MAX);
/* Synchronize cursor image */
if (cursor->surface != NULL) {
@@ -172,7 +173,7 @@ void guac_common_cursor_move(guac_common_cursor* cursor, guac_user* user,
GUAC_DEFAULT_LAYER,
x - cursor->hotspot_x,
y - cursor->hotspot_y,
- 0);
+ INT_MAX);
guac_socket_flush(cursor->client->socket);
@@ -299,7 +300,7 @@ void guac_common_cursor_set_argb(guac_common_cursor* cursor, int hx, int hy,
GUAC_DEFAULT_LAYER,
cursor->x - hx,
cursor->y - hy,
- 0);
+ INT_MAX);
/* Broadcast new cursor image to all users */
guac_protocol_send_size(cursor->client->socket, cursor->layer,
[2/2] incubator-guacamole-server git commit: GUACAMOLE-178: Merge
cursor layer z index fix.
Posted by jm...@apache.org.
GUACAMOLE-178: Merge cursor layer z index fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/396eaa21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/396eaa21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/396eaa21
Branch: refs/heads/master
Commit: 396eaa21f28825d53e13a7e7ff95517a6d387e80
Parents: a1886f5 6645e85
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue Jan 24 16:25:35 2017 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue Jan 24 16:25:35 2017 -0800
----------------------------------------------------------------------
src/common/cursor.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------