Changeset 20940

Timestamp:

11/21/07 08:31:17 (1 year ago)

Author:

patrick

Message:

MFT r20939: 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/branches/2.2/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputAreaCocoa.mm (modified) (1 diff)
• juggler/branches/2.2/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputViewCocoa.mm (modified) (4 diffs)
• juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OGL/GlViewCocoa.mm (modified) (4 diffs)

juggler/branches/2.2/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputAreaCocoa.mm

@@ -244 +244 @@
-         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/branches/2.2/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/branches/2.2/modules/vrjuggler/vrj/Draw/OGL/GlViewCocoa.mm

@@ -318 +318 @@
-      if ( mHandleInput )
-      {
-
-
+
-                                         theEvent);
-      }
@@ -335 +334 @@
-      if ( mHandleInput )
-      {
-
-
+
-                                         theEvent);
-      }
@@ -362 +360 @@
-      if ( mHandleInput )
-      {
-
-
+
-                                         theEvent);
-      }
@@ -379 +376 @@
-      if ( mHandleInput )
-      {
-
-
+
-                                         theEvent);
-      }