multitouch: change multitouch key

change from alt key to command key

Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java
index a6031818b96cf8c8827ef866a6eb1bed0d16a900..3463e281a86a3decc88e3cd3283a4d4bf86934a3 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java
@@ -199,7 +199,7 @@ public class EmulatorFingers {
                        finger.x = x;
                        finger.y = y;
                        if (finger.id != 0) {
-                               logger.info(String.format("id %d finger multi-touch dragging = (%d, %d)", this.grabFingerID, x, y));
+                               //logger.info(String.format("id %d finger multi-touch dragging = (%d, %d)", this.grabFingerID, x, y));
                                mouseEventData = new MouseEventData(
                                                                MouseButtonType.LEFT.value(), MouseEventType.PRESS.value(),
                                                                originX, originY, x, y, grabFingerID -1);
@@ -308,7 +308,7 @@ public class EmulatorFingers {
                                                                MouseButtonType.LEFT.value(), MouseEventType.PRESS.value(),
                                                                originX, originY, finger.x, finger.y, i);
                                                communicator.sendToQEMU( SendCommand.SEND_MOUSE_EVENT, mouseEventData );        
-                                               logger.info(String.format("id %d finger multi-touch dragging = (%d, %d)", i + 1, finger.x, finger.y));
+                                               //logger.info(String.format("id %d finger multi-touch dragging = (%d, %d)", i + 1, finger.x, finger.y));
                                }
                                try {
                                                                Thread.sleep(2);

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
index 000815394be3f49c85326bde9e8832e5e08b393c..bebe7f0907039e541dc71bba9e75940d5d568453 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -709,9 +709,9 @@ public class EmulatorSkin {
                                        }
                                }
                 else if(SwtUtil.isMacPlatform()) {
-                       //if(finger.getMaxTouchPoint() > 1) {
-                                               int tempStateMask = stateMask & ~SWT.BUTTON1;
-                                               if(tempStateMask == (SWT.SHIFT | SWT.ALT)) {
+                       if(keyCode == SWT.SHIFT || keyCode == SWT.COMMAND) {
+                               int tempStateMask = stateMask & ~SWT.BUTTON1;
+                                               if(tempStateMask == (SWT.SHIFT | SWT.COMMAND)) {
                                                        finger.setMultiTouchEnable(1);
                                                        logger.info("enable multi-touch = mode1");
                                                }
@@ -720,7 +720,7 @@ public class EmulatorSkin {
                                                        finger.clearFingerSlot();
                                                        logger.info("disable multi-touch");
                                                }
-              //       }
+                       }
                                }
 
                                KeyEventData keyEventData = new KeyEventData(
@@ -772,13 +772,13 @@ public class EmulatorSkin {
                 else if(SwtUtil.isMacPlatform()) {
                 //     if(finger.getMaxTouchPoint() > 1) {
                                                int tempStateMask = stateMask & ~SWT.BUTTON1;
-                                               if((keyCode == SWT.SHIFT && (tempStateMask & SWT.ALT) != 0) || 
-                                                               (keyCode == SWT.ALT && (tempStateMask & SWT.SHIFT) != 0))
+                                               if((keyCode == SWT.SHIFT && (tempStateMask & SWT.COMMAND) != 0) || 
+                                                               (keyCode == SWT.COMMAND && (tempStateMask & SWT.SHIFT) != 0))
                                                {
                                                        finger.setMultiTouchEnable(2);
                                                        logger.info("enable multi-touch = mode2");
                                                }
-                                               else if(keyCode == SWT.SHIFT || keyCode == SWT.ALT) {
+                                               else if(keyCode == SWT.SHIFT || keyCode == SWT.COMMAND) {
                                                        finger.setMultiTouchEnable(1);
                                                        logger.info("enable multi-touch = mode1");
                                                }