This repository was archived by the owner on Jan 15, 2020. It is now read-only.
Commit 3e2f7dd
CLOUDSTACK-5702: Fixed mouse doesn't work for console
1 parent 5941ac4 commit 3e2f7dd
1 file changed
Lines changed: 21 additions & 8 deletions
Lines changed: 21 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -161,22 +161,23 @@ public void sendClientMouseEvent(InputEventType event, int x, int y, int code, i | |||
| 161 | 161 | updateFrontEndActivityTime(); | |
| 162 | 162 | ||
| 163 | 163 | int mousecode = mapMouseButton(code); | |
| 164 | - int modifier = mapMouseModifier(code, modifiers); | ||
| 165 | 164 | ||
| 166 | - /*if (event == InputEventType.MOUSE_DOWN) { | ||
| 167 | - _mouseEventSource.mousePressed(new MouseEvent(_canvas, MouseEvent.MOUSE_PRESSED, System.currentTimeMillis(), modifier, x, y, 1, false, mousecode)); | ||
| 165 | + if (event == InputEventType.MOUSE_DOWN) { | ||
| 166 | + _mouseEventSource.mousePressed(new MouseEvent(_canvas, MouseEvent.MOUSE_PRESSED, System.currentTimeMillis(), mapMouseDownModifier(code, modifiers), x, y, 1, false, | ||
| 167 | + mousecode)); | ||
| 168 | 168 | } | |
| 169 | 169 | ||
| 170 | 170 | if (event == InputEventType.MOUSE_UP) { | |
| 171 | - _mouseEventSource.mouseReleased((new MouseEvent(_canvas, MouseEvent.MOUSE_RELEASED, System.currentTimeMillis(), modifier, x, y, 1, false, mousecode))); | ||
| 171 | + _mouseEventSource.mouseReleased((new MouseEvent(_canvas, MouseEvent.MOUSE_RELEASED, System.currentTimeMillis(), mapMouseUpModifier(code, modifiers), x, y, 1, false, | ||
| 172 | + mousecode))); | ||
| 172 | 173 | } | |
| 173 | 174 | ||
| 174 | - if (event == InputEventType.MOUSE_DBLCLICK) { | ||
| 175 | - _mouseEventSource.mouseReleased((new MouseEvent(_canvas, MouseEvent.MOUSE_RELEASED, System.currentTimeMillis(), modifier, x, y, 2, false, mousecode))); | ||
| 176 | - }*/ | ||
| 175 | + if (event == InputEventType.MOUSE_MOVE) { | ||
| 176 | + _mouseEventSource.mouseMoved(new MouseEvent(_canvas, MouseEvent.MOUSE_MOVED, System.currentTimeMillis(), mapModifier(modifiers), x, y, 0, false)); | ||
| 177 | + } | ||
| 177 | 178 | } | |
| 178 | 179 | ||
| 179 | - public int mapMouseModifier(int code, int modifiers) { | ||
| 180 | + public int mapMouseDownModifier(int code, int modifiers) { | ||
| 180 | 181 | int mod = mapModifier(modifiers); | |
| 181 | 182 | switch (code) { | |
| 182 | 183 | case 0: | |
@@ -188,6 +189,18 @@ public int mapMouseModifier(int code, int modifiers) { | |||
| 188 | 189 | return mod; | |
| 189 | 190 | } | |
| 190 | 191 | ||
| 192 | + public int mapMouseUpModifier(int code, int modifiers) { | ||
| 193 | + int mod = mapModifier(modifiers); | ||
| 194 | + switch (code) { | ||
| 195 | + case 0: | ||
| 196 | + return mod = mod | MouseEvent.BUTTON1_MASK; | ||
| 197 | + case 2: | ||
| 198 | + return mod = mod | MouseEvent.BUTTON3_MASK; | ||
| 199 | + default: | ||
| 200 | + } | ||
| 201 | + return mod; | ||
| 202 | + } | ||
| 203 | + | ||
| 191 | 204 | private int mapModifier(int modifiers) { | |
| 192 | 205 | int mod = 0; | |
| 193 | 206 | if ((modifiers & SHIFT_KEY_MASK) != (_lastModifierStates & SHIFT_KEY_MASK)) { | |
0 commit comments