skin: separate out the MouseListener

separate out the MouseListener for maru_sdl and maru_shm

Change-Id: Ibe3ced987aeb13e25dddee87a56ece0ec2b28295
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
index 699353c377f266fbe32552fb9955e3c964365ad1..2255db962d613806123018228bd2f2b2a3118e29 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
@@ -32,6 +32,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.graphics.Image;
@@ -41,7 +42,10 @@ import org.eclipse.swt.graphics.Transform;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
+import org.tizen.emulator.skin.comm.ICommunicator.MouseButtonType;
+import org.tizen.emulator.skin.comm.ICommunicator.MouseEventType;
 import org.tizen.emulator.skin.comm.ICommunicator.SendCommand;
+import org.tizen.emulator.skin.comm.sock.data.MouseEventData;
 import org.tizen.emulator.skin.config.EmulatorConfig;
 import org.tizen.emulator.skin.config.EmulatorConfig.ArgsConstants;
 import org.tizen.emulator.skin.exception.ScreenShotException;
@@ -50,6 +54,7 @@ import org.tizen.emulator.skin.info.SkinInformation;
 import org.tizen.emulator.skin.log.SkinLogger;
 import org.tizen.emulator.skin.screenshot.ShmScreenShotWindow;
 import org.tizen.emulator.skin.util.SkinUtil;
+import org.tizen.emulator.skin.util.SwtUtil;
 
 public class EmulatorShmSkin extends EmulatorSkin {
        public static final int RED_MASK = 0x00FF0000;
@@ -363,6 +368,98 @@ public class EmulatorShmSkin extends EmulatorSkin {
 //             }
        }
 
+       @Override
+       protected void mouseMoveDelivery(MouseEvent e, int eventType) {
+               int[] geometry = SkinUtil.convertMouseGeometry(e.x, e.y,
+                               currentState.getCurrentResolutionWidth(),
+                               currentState.getCurrentResolutionHeight(),
+                               currentState.getCurrentScale(), currentState.getCurrentAngle());
+
+               //eventType = MouseEventType.DRAG.value();
+               if (finger.getMultiTouchEnable() == 1) {
+                       finger.maruFingerProcessing1(eventType,
+                                       e.x, e.y, geometry[0], geometry[1]);
+                       return;
+               } else if (finger.getMultiTouchEnable() == 2) {
+                       finger.maruFingerProcessing2(eventType,
+                                       e.x, e.y, geometry[0], geometry[1]);
+                       return;
+               }
+
+               MouseEventData mouseEventData = new MouseEventData(
+                               MouseButtonType.LEFT.value(), eventType,
+                               e.x, e.y, geometry[0], geometry[1], 0);
+
+               communicator.sendToQEMU(
+                               SendCommand.SEND_MOUSE_EVENT, mouseEventData, false);
+       }
+
+       @Override
+       protected void mouseUpDelivery(MouseEvent e) {
+               int[] geometry = SkinUtil.convertMouseGeometry(e.x, e.y,
+                               currentState.getCurrentResolutionWidth(),
+                               currentState.getCurrentResolutionHeight(),
+                               currentState.getCurrentScale(), currentState.getCurrentAngle());
+               logger.info("mouseUp in display" +
+                               " x:" + geometry[0] + " y:" + geometry[1]);
+
+               pressingX = pressingY = -1;
+               pressingOriginX = pressingOriginY = -1;
+
+               if (finger.getMultiTouchEnable() == 1) {
+                       logger.info("maruFingerProcessing 1");
+                       finger.maruFingerProcessing1(MouseEventType.RELEASE.value(),
+                                       e.x, e.y, geometry[0], geometry[1]);
+                       return;
+               } else if (finger.getMultiTouchEnable() == 2) {
+                       logger.info("maruFingerProcessing 2");
+                       finger.maruFingerProcessing2(MouseEventType.RELEASE.value(),
+                                       e.x, e.y, geometry[0], geometry[1]);
+                       return;
+               }
+
+               MouseEventData mouseEventData = new MouseEventData(
+                               MouseButtonType.LEFT.value(), MouseEventType.RELEASE.value(),
+                               e.x, e.y, geometry[0], geometry[1], 0);
+
+               communicator.sendToQEMU(
+                               SendCommand.SEND_MOUSE_EVENT, mouseEventData, false);
+       }
+
+       @Override
+       protected void mouseDownDelivery(MouseEvent e) {
+               int[] geometry = SkinUtil.convertMouseGeometry(e.x, e.y,
+                               currentState.getCurrentResolutionWidth(),
+                               currentState.getCurrentResolutionHeight(),
+                               currentState.getCurrentScale(), currentState.getCurrentAngle());
+               logger.info("mouseDown in display" +
+                               " x:" + geometry[0] + " y:" + geometry[1]);
+
+               pressingX = geometry[0];
+               pressingY = geometry[1];
+               pressingOriginX = e.x;
+               pressingOriginY = e.y;
+
+               if (finger.getMultiTouchEnable() == 1) {
+                       logger.info("maruFingerProcessing 1");
+                       finger.maruFingerProcessing1(MouseEventType.PRESS.value(),
+                                       e.x, e.y, geometry[0], geometry[1]);
+                       return;
+               } else if (finger.getMultiTouchEnable() == 2) {
+                       logger.info("maruFingerProcessing 2");
+                       finger.maruFingerProcessing2(MouseEventType.PRESS.value(),
+                                       e.x, e.y, geometry[0], geometry[1]);
+                       return;
+               }
+
+               MouseEventData mouseEventData = new MouseEventData(
+                               MouseButtonType.LEFT.value(), MouseEventType.PRESS.value(),
+                               e.x, e.y, geometry[0], geometry[1], 0);
+
+               communicator.sendToQEMU(
+                               SendCommand.SEND_MOUSE_EVENT, mouseEventData, false);
+       }
+
        @Override
        protected void openScreenShotWindow() {
                if (screenShotDialog != null) {

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 ad3d072515fd7bfd37dee9544e5fb254a0b35ad4..a420e400ae5554f4aa008e1bb71ff7739030e27a 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
@@ -166,7 +166,7 @@ public class EmulatorSkin {
 
        protected EmulatorSkinState currentState;
 
-       private boolean isDragStartedInLCD;
+       private boolean isDisplayDragging;
        private boolean isShutdownRequested;
        private boolean isAboutToReopen;
        private boolean isOnTop;
@@ -197,8 +197,8 @@ public class EmulatorSkin {
        private LinkedList<KeyEventData> pressedKeyEventList;
 
        /* touch values */
-       private static int pressingX = -1, pressingY = -1;
-       private static int pressingOriginX = -1, pressingOriginY = -1;
+       protected static int pressingX = -1, pressingY = -1;
+       protected static int pressingOriginX = -1, pressingOriginY = -1;
 
 
        private EmulatorSkin reopenSkin;
@@ -584,7 +584,7 @@ public class EmulatorSkin {
                                Menu menu = EmulatorSkin.this.contextMenu;
                                keyForceRelease(true);
 
-                               if (menu != null && EmulatorSkin.this.isDragStartedInLCD == false) {
+                               if (menu != null && isDisplayDragging == false) {
                                        lcdCanvas.setMenu(menu);
                                        menu.setVisible(true);
                                        e.doit = false;
@@ -638,58 +638,33 @@ public class EmulatorSkin {
                canvas.addDragDetectListener(canvasDragDetectListener);*/
 
                canvasMouseMoveListener = new MouseMoveListener() {
-
                        @Override
-                       public void mouseMove( MouseEvent e ) {
-                               if ( true == EmulatorSkin.this.isDragStartedInLCD ) { //true = mouse down
+                       public void mouseMove(MouseEvent e) {
+                               if (true == isDisplayDragging) {
                                        int eventType = MouseEventType.DRAG.value();
                                        Point canvasSize = canvas.getSize();
 
-                                       if ( e.x < 0 ) {
+                                       if (e.x < 0) {
                                                e.x = 0;
                                                eventType = MouseEventType.RELEASE.value();
-                                               EmulatorSkin.this.isDragStartedInLCD = false;
-                                       } else if ( e.x >= canvasSize.x ) {
+                                               isDisplayDragging = false;
+                                       } else if (e.x >= canvasSize.x) {
                                                e.x = canvasSize.x - 1;
                                                eventType = MouseEventType.RELEASE.value();
-                                               EmulatorSkin.this.isDragStartedInLCD = false;
+                                               isDisplayDragging = false;
                                        }
 
-                                       if ( e.y < 0 ) {
+                                       if (e.y < 0) {
                                                e.y = 0;
                                                eventType = MouseEventType.RELEASE.value();
-                                               EmulatorSkin.this.isDragStartedInLCD = false;
-                                       } else if ( e.y >= canvasSize.y ) {
+                                               isDisplayDragging = false;
+                                       } else if (e.y >= canvasSize.y) {
                                                e.y = canvasSize.y - 1;
                                                eventType = MouseEventType.RELEASE.value();
-                                               EmulatorSkin.this.isDragStartedInLCD = false;
+                                               isDisplayDragging = false;
                                        }
 
-                                       int[] geometry = SkinUtil.convertMouseGeometry(e.x, e.y,
-                                                       currentState.getCurrentResolutionWidth(),
-                                                       currentState.getCurrentResolutionHeight(),
-                                                       currentState.getCurrentScale(), currentState.getCurrentAngle());
-
-                                       if (SwtUtil.isMacPlatform()) {
-                                               //eventType = MouseEventType.DRAG.value();
-                                               if (finger.getMultiTouchEnable() == 1) {
-                                                       finger.maruFingerProcessing1(eventType,
-                                                                       e.x, e.y, geometry[0], geometry[1]);
-                                                       return;
-                                               }
-                                               else if (finger.getMultiTouchEnable() == 2) {
-                                                       finger.maruFingerProcessing2(eventType,
-                                                                       e.x, e.y, geometry[0], geometry[1]);
-                                                       return;
-                                               }
-                                       }
-       
-                                       MouseEventData mouseEventData = new MouseEventData(
-                                                       MouseButtonType.LEFT.value(), eventType,
-                                                       e.x, e.y, geometry[0], geometry[1], 0);
-
-                                       communicator.sendToQEMU(
-                                                       SendCommand.SEND_MOUSE_EVENT, mouseEventData, false);
+                                       mouseMoveDelivery(e, eventType);
                                }
                        }
                };
@@ -697,91 +672,31 @@ public class EmulatorSkin {
                canvas.addMouseMoveListener(canvasMouseMoveListener);
 
                canvasMouseListener = new MouseListener() {
-
                        @Override
                        public void mouseUp(MouseEvent e) {
-                               if (1 == e.button) { /* left button */
-
-                                       int[] geometry = SkinUtil.convertMouseGeometry(e.x, e.y,
-                                                       currentState.getCurrentResolutionWidth(),
-                                                       currentState.getCurrentResolutionHeight(),
-                                                       currentState.getCurrentScale(), currentState.getCurrentAngle());
-                                       logger.info("mouseUp in display" +
-                                                       " x:" + geometry[0] + " y:" + geometry[1]);
-
-                                       if (true == EmulatorSkin.this.isDragStartedInLCD) {
-                                               EmulatorSkin.this.isDragStartedInLCD = false;
+                               if (1 == e.button) /* left button */
+                               {
+                                       if (true == isDisplayDragging) {
+                                               isDisplayDragging = false;
                                        }
 
-                                       if (SwtUtil.isMacPlatform()) {
-                                               pressingX = pressingY = -1;
-                                               pressingOriginX = pressingOriginY = -1;
-                                               if (finger.getMultiTouchEnable() == 1) {
-                                                       logger.info("maruFingerProcessing1");
-                                                       finger.maruFingerProcessing1(MouseEventType.RELEASE.value(),
-                                                                       e.x, e.y, geometry[0], geometry[1]);
-                                                       return;
-                                               }
-                                               else if (finger.getMultiTouchEnable() == 2) {
-                                                       logger.info("maruFingerProcessing2");
-                                                       finger.maruFingerProcessing2(MouseEventType.RELEASE.value(),
-                                                                       e.x, e.y, geometry[0], geometry[1]);
-                                                       return;
-                                               }
-                                       }
-                                       
-                                       MouseEventData mouseEventData = new MouseEventData(
-                                                       MouseButtonType.LEFT.value(), MouseEventType.RELEASE.value(),
-                                                       e.x, e.y, geometry[0], geometry[1], 0);
-
-                                       communicator.sendToQEMU(
-                                                       SendCommand.SEND_MOUSE_EVENT, mouseEventData, false);
-                               } else if (2 == e.button) { /* wheel button */
+                                       mouseUpDelivery(e);
+                               }
+                               else if (2 == e.button) /* wheel button */
+                               {
                                        logger.info("wheelUp in display");
                                }
                        }
 
                        @Override
                        public void mouseDown(MouseEvent e) {
-                               if (1 == e.button) { /* left button */
-
-                                       int[] geometry = SkinUtil.convertMouseGeometry(e.x, e.y,
-                                                       currentState.getCurrentResolutionWidth(),
-                                                       currentState.getCurrentResolutionHeight(),
-                                                       currentState.getCurrentScale(), currentState.getCurrentAngle());
-                                       logger.info("mouseDown in display" +
-                                                       " x:" + geometry[0] + " y:" + geometry[1]);
-
-                                       if (false == EmulatorSkin.this.isDragStartedInLCD) {
-                                               EmulatorSkin.this.isDragStartedInLCD = true;
+                               if (1 == e.button) /* left button */
+                               {
+                                       if (false == isDisplayDragging) {
+                                               isDisplayDragging = true;
                                        }
 
-                                       if (SwtUtil.isMacPlatform()) {
-                                               pressingX = geometry[0];
-                                               pressingY = geometry[1];
-                                               pressingOriginX = e.x;
-                                               pressingOriginY = e.y;
-       
-                                               if (finger.getMultiTouchEnable() == 1) {
-                                                       logger.info("maruFingerProcessing1");
-                                                       finger.maruFingerProcessing1(MouseEventType.PRESS.value(),
-                                                                       e.x, e.y, geometry[0], geometry[1]);
-                                                       return;
-                                               }
-                                               else if (finger.getMultiTouchEnable() == 2) {
-                                                       logger.info("maruFingerProcessing2");
-                                                       finger.maruFingerProcessing2(MouseEventType.PRESS.value(),
-                                                                       e.x, e.y, geometry[0], geometry[1]);
-                                                       return;
-                                               }
-                                       }
-               
-                                       MouseEventData mouseEventData = new MouseEventData(
-                                                       MouseButtonType.LEFT.value(), MouseEventType.PRESS.value(),
-                                                       e.x, e.y, geometry[0], geometry[1], 0);
-
-                                       communicator.sendToQEMU(
-                                                       SendCommand.SEND_MOUSE_EVENT, mouseEventData, false);
+                                       mouseDownDelivery(e);
                                }
                        }
 
@@ -1000,6 +915,53 @@ public class EmulatorSkin {
                canvas.addKeyListener(canvasKeyListener);
        }
 
+       /* for display */
+       protected void mouseMoveDelivery(MouseEvent e, int eventType) {
+               int[] geometry = SkinUtil.convertMouseGeometry(e.x, e.y,
+                               currentState.getCurrentResolutionWidth(),
+                               currentState.getCurrentResolutionHeight(),
+                               currentState.getCurrentScale(), currentState.getCurrentAngle());
+
+               MouseEventData mouseEventData = new MouseEventData(
+                               MouseButtonType.LEFT.value(), eventType,
+                               e.x, e.y, geometry[0], geometry[1], 0);
+
+               communicator.sendToQEMU(
+                               SendCommand.SEND_MOUSE_EVENT, mouseEventData, false);
+       }
+
+       protected void mouseUpDelivery(MouseEvent e) {
+               int[] geometry = SkinUtil.convertMouseGeometry(e.x, e.y,
+                               currentState.getCurrentResolutionWidth(),
+                               currentState.getCurrentResolutionHeight(),
+                               currentState.getCurrentScale(), currentState.getCurrentAngle());
+               logger.info("mouseUp in display" +
+                               " x:" + geometry[0] + " y:" + geometry[1]);
+
+               MouseEventData mouseEventData = new MouseEventData(
+                               MouseButtonType.LEFT.value(), MouseEventType.RELEASE.value(),
+                               e.x, e.y, geometry[0], geometry[1], 0);
+
+               communicator.sendToQEMU(
+                               SendCommand.SEND_MOUSE_EVENT, mouseEventData, false);
+       }
+
+       protected void mouseDownDelivery(MouseEvent e) {
+               int[] geometry = SkinUtil.convertMouseGeometry(e.x, e.y,
+                               currentState.getCurrentResolutionWidth(),
+                               currentState.getCurrentResolutionHeight(),
+                               currentState.getCurrentScale(), currentState.getCurrentAngle());
+               logger.info("mouseDown in display" +
+                               " x:" + geometry[0] + " y:" + geometry[1]);
+
+               MouseEventData mouseEventData = new MouseEventData(
+                               MouseButtonType.LEFT.value(), MouseEventType.PRESS.value(),
+                               e.x, e.y, geometry[0], geometry[1], 0);
+
+               communicator.sendToQEMU(
+                               SendCommand.SEND_MOUSE_EVENT, mouseEventData, false);
+       }
+
        private boolean isMetaKey(int keyCode) {
                if (SWT.CTRL == keyCode ||
                                SWT.ALT == keyCode ||