You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/06/14 01:46:39 UTC
git commit: Merge fix from community
Updated Branches:
refs/heads/master 52c8feb67 -> c3713a586
Merge fix from community
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c3713a58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c3713a58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c3713a58
Branch: refs/heads/master
Commit: c3713a5861715623867b9b38f80b225224c8d3a6
Parents: 52c8feb
Author: Kelven Yang <ke...@cloud.com>
Authored: Wed Jun 13 16:42:42 2012 -0700
Committer: Kelven Yang <ke...@cloud.com>
Committed: Wed Jun 13 16:46:16 2012 -0700
----------------------------------------------------------------------
.../cloud/consoleproxy/ConsoleProxyVncClient.java | 35 ++++++++-------
1 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c3713a58/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java
----------------------------------------------------------------------
diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java
index b23b6c3..77a9977 100644
--- a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java
+++ b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java
@@ -189,24 +189,25 @@ public class ConsoleProxyVncClient extends ConsoleProxyClientBase {
updateFrontEndActivityTime();
- int pointerMask = 0;
- int mask = 1;
- if(code == 2)
- mask = 4;
-
- if(event == InputEventType.MOUSE_DOWN) {
- pointerMask = mask;
- lastPointerMask = pointerMask;
- } else if(event == InputEventType.MOUSE_UP) {
- lastPointerMask = 0;
- } else if(event == InputEventType.MOUSE_MOVE) {
- if(lastPointerMask != 0)
- pointerMask = lastPointerMask;
- }
-
+ if (event == InputEventType.MOUSE_DOWN) {
+ if (code == 2) {
+ lastPointerMask |= 4;
+ } else if (code == 0) {
+ lastPointerMask |= 1;
+ }
+ }
+
+ if (event == InputEventType.MOUSE_UP) {
+ if (code == 2) {
+ lastPointerMask ^= 4;
+ } else if (code == 0) {
+ lastPointerMask ^= 1;
+ }
+ }
+
sendModifierEvents(modifiers);
- client.sendClientMouseEvent(pointerMask, x, y, code, modifiers);
- if(pointerMask == 0)
+ client.sendClientMouseEvent(lastPointerMask, x, y, code, modifiers);
+ if(lastPointerMask == 0)
sendModifierEvents(0);
}