Update of /cvsroot/jake2/jake2/src/jake2/sys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28687/src/jake2/sys
Modified Files:
JOGLKBD.java
Log Message:
correct mouse button numbering for jogl (left->K_MOUSE1, center->K_MOUSE3, right->K_MOUSE2)
Index: JOGLKBD.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/JOGLKBD.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JOGLKBD.java 16 Dec 2004 22:45:55 -0000 1.4
--- JOGLKBD.java 20 Feb 2005 14:39:23 -0000 1.5
***************
*** 39,43 ****
private void HandleEvents()
{
! int b;
Jake2InputEvent event;
--- 39,43 ----
private void HandleEvents()
{
! int key;
Jake2InputEvent event;
***************
*** 62,74 ****
}
break;
!
case Jake2InputEvent.ButtonPress:
! b=((MouseEvent)event.ev).getButton()-1;
! Do_Key_Event(Key.K_MOUSE1 + b, true);
break;
case Jake2InputEvent.ButtonRelease:
! b=((MouseEvent)event.ev).getButton()-1;
! Do_Key_Event(Key.K_MOUSE1 + b, false);
break;
--- 62,74 ----
}
break;
! // see java.awt.MouseEvent
case Jake2InputEvent.ButtonPress:
! key = mouseEventToKey((MouseEvent)event.ev);
! Do_Key_Event(key, true);
break;
case Jake2InputEvent.ButtonRelease:
! key = mouseEventToKey((MouseEvent)event.ev);
! Do_Key_Event(key, false);
break;
***************
*** 111,114 ****
--- 111,128 ----
}
+ // strange button numbering in java.awt.MouseEvent
+ // BUTTON1(left) BUTTON2(center) BUTTON3(right)
+ // K_MOUSE1 K_MOUSE3 K_MOUSE2
+ private final int mouseEventToKey(MouseEvent ev) {
+ switch (ev.getButton()) {
+ case MouseEvent.BUTTON3:
+ return Key.K_MOUSE2;
+ case MouseEvent.BUTTON2:
+ return Key.K_MOUSE3;
+ default:
+ return Key.K_MOUSE1;
+ }
+ }
+
private static int XLateKey(KeyEvent ev) {
|
