Mouse event fix for right-button and shift drag

BobHanson · BobHanson · commit 8a79cd1a8b14 · 2023-12-14T07:42:25.000-07:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java b/sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java
@@ -69,8 +69,7 @@ public boolean processEvent(int id, int x, int y, int modifiers, long time, Obje
 			return keyAction(id, jqevent, time);
 		}	
 		if (id != MouseEvent.MOUSE_WHEEL 
-				&& id != MouseEvent.MOUSE_MOVED
-				&& id != MouseEvent.MOUSE_DRAGGED)
+				&& id != MouseEvent.MOUSE_MOVED)
 			modifiers = applyLeftMouse(modifiers);
 		switch (id) {	
 		case MouseEvent.MOUSE_WHEEL:
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -1,5 +1,6 @@
 // j2sApplet.js BH = Bob Hanson hansonr@stolaf.edu
 
+// BH 2023.12.13 fixes RIGHT-DRAG and SHIFT-LEFT-DRAG modifier
 // BH 2023.12.07 fixes mouseUp on body causing (ignorable) error
 // BH 2023.11.06 adds css touch-action none
 // BH 2023.11.01 adds pointerup, pointerdown, and pointermove to J2S.setMouse
@@ -1686,26 +1687,6 @@ if (database == "_" && J2S._serverUrl.indexOf("//your.server.here/") >= 0) {
 		return ignore;
 	};
 
-	var getKeyModifiers = function(ev) {
-		var modifiers = 0;
-		if (ev.shiftKey)
-			modifiers |= (1 << 0) | (1 << 6); // InputEvent.SHIFT_MASK +
-												// InputEvent.SHIFT_DOWN_MASK;
-		if (ev.ctrlKey)
-			modifiers |= (1 << 1) | (1 << 7); // InputEvent.CTRL_MASK +
-												// InputEvent.CTRL_DOWN_MASK;
-		if (ev.metaKey)
-			modifiers |= (1 << 2) | (1 << 8); // InputEvent.META_MASK +
-												// InputEvent.META_DOWN_MASK;
-		if (ev.altKey)
-			modifiers |= (1 << 3) | (1 << 9); // InputEvent.ALT_MASK +
-												// InputEvent.ALT_DOWN_MASK;
-		if (ev.altGraphKey)
-			modifiers |= (1 << 5) | (1 << 13); // InputEvent.ALT_GRAPH_MASK +
-												// InputEvent.ALT_GRAPH_DOWN_MASK;
-		return modifiers;
-	}
-
 	J2S.setKeyListener = function(who) {
 		J2S.$bind(who, 'keydown keypress keyup', function(ev) {
 			if (doIgnore(ev))
@@ -2178,7 +2159,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 		// and also recognize a drag (503 + buttons pressed
 		var modifiers = 0;
 		if (id == 503) {
-			modifiers = ev.buttons << 10;
+			modifiers = (ev.buttons == 0 ? 0 : ev.buttons == 2 ? (1 << 12) : (1 << 10));
 		} else {
 			switch (ev.button) {
 			default:
@@ -2202,6 +2183,26 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 		return modifiers | getKeyModifiers(ev);
 	}
 
+	var getKeyModifiers = function(ev) {
+		var modifiers = 0;
+		if (ev.shiftKey)
+			modifiers |= (1 << 0) | (1 << 6); // InputEvent.SHIFT_MASK +
+												// InputEvent.SHIFT_DOWN_MASK;
+		if (ev.ctrlKey)
+			modifiers |= (1 << 1) | (1 << 7); // InputEvent.CTRL_MASK +
+												// InputEvent.CTRL_DOWN_MASK;
+		if (ev.metaKey)
+			modifiers |= (1 << 2) | (1 << 8); // InputEvent.META_MASK +
+												// InputEvent.META_DOWN_MASK;
+		if (ev.altKey)
+			modifiers |= (1 << 3) | (1 << 9); // InputEvent.ALT_MASK +
+												// InputEvent.ALT_DOWN_MASK;
+		if (ev.altGraphKey)
+			modifiers |= (1 << 5) | (1 << 13); // InputEvent.ALT_GRAPH_MASK +
+												// InputEvent.ALT_GRAPH_DOWN_MASK;
+		return modifiers;
+	}
+
 	var getXY = function(who, ev, id) {
 		// id 0, 502, or 503 only 
 		if (!who.applet._ready || J2S._touching && ev.type.indexOf("touch") < 0)
