Changeset 20939

Timestamp:

11/21/07 08:29:19 (8 months ago)

Author:

patrick

Message:

With Cocoa, identify the right mouse button as MBUTTON3 to be consistent
with X11 and Win32. As for buttons other than the left and right, use the
integer identifier in the NSEvent to determine which Gadgeteer button value
to use. The only special case is value 2, which we assume will be the middle
mouse button (MBUTTON2).

Files:

• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputAreaCocoa.mm (modified) (1 diff)
• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputViewCocoa.mm (modified) (4 diffs)
• juggler/trunk/modules/vrjuggler/vrj/Draw/OpenGL/VRJOpenGLView.mm (modified) (4 diffs)

juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputAreaCocoa.mm

@@ -225 +225 @@
-         button = gadget::MBUTTON1;
-         break;
+      // To be consistent with other windowing systems, we treat button 1 (the
+      // right button in AppKit's view) as button 3.
-      case 1:
+         button = gadget::MBUTTON3;
+         break;
+      // We treat button 2 (the first "other" button for AppKit, which tends
+      // to be the middle button) as button 2.
+      case 2:
-         button = gadget::MBUTTON2;
-         break;
-      case 2:
-         button = gadget::MBUTTON3;
-         break;
-      case 3:

juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputViewCocoa.mm

@@ -169 +169 @@
-   -(void) mouseDown:(NSEvent*) theEvent
-   {
-
-
+
-                                      theEvent);
-   }
@@ -179 +178 @@
-   -(void) mouseUp:(NSEvent*) theEvent
-   {
-
-
+
-                                      theEvent);
-   }
@@ -197 +195 @@
-   -(void) rightMouseDown:(NSEvent*) theEvent
-   {
-
-
+
-                                      theEvent);
-   }
@@ -207 +204 @@
-   -(void) rightMouseUp:(NSEvent*) theEvent
-   {
-
-
+
-                                      theEvent);
-   }

juggler/trunk/modules/vrjuggler/vrj/Draw/OpenGL/VRJOpenGLView.mm

@@ -320 +320 @@
-      if ( mHandleInput )
-      {
-
-
+
-                                         theEvent);
-      }
@@ -337 +336 @@
-      if ( mHandleInput )
-      {
-
-
+
-                                         theEvent);
-      }
@@ -364 +362 @@
-      if ( mHandleInput )
-      {
-
-
+
-                                         theEvent);
-      }
@@ -381 +378 @@
-      if ( mHandleInput )
-      {
-
-
+
-                                         theEvent);
-      }