Changeset 19844

Timestamp:

02/28/07 19:22:29 (1 year ago)

Author:

patrick

Message:

Relocate code from InputViewCocoa? to gadget::InputAreaCocoa?. This is needed
because my plan to have VR Juggler OpenGL windows that receive keyboard/mouse
input using an NSOpenGLView that is a subview of InputViewCocoa? did not work
out. Overlapping views in Cocoa is not really supported and is definitely
not recommended. By moving code from InputViewCocoa? to gadget::InputAreaCocoa?,
it can be reused by the (yet to be committed) GlViewCocoa? class. The reuse is
not as elegant or as automatic, but at least it works.

Files:

• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputAreaCocoa.h (modified) (4 diffs)
• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputAreaCocoa.mm (modified) (5 diffs)
• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputViewCocoa.h (modified) (1 diff)
• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputViewCocoa.mm (modified) (8 diffs)

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

@@ -120 +120 @@
-   /**
-    * Adds a new mouse motion event to the event queue for this input area.
+    * The mouse button is determined by converting the value returned from
+    * the NSEvent method -buttonNumber.
+    *
+    * @post A new event (gadget::MouseEvent) is added to the event queue.
+    *
+    * @param type  The type of button event (MouseButtonPressEvent or
+    *              MouseButtonReleaseEvent).
+    * @param event A pointer to the Cocoa event structure associated with the
+    *              button event.
+    */
+   void addMouseButtonEvent(const gadget::EventType type, NSEvent* event);
+
+   /**
+    * Adds a new mouse motion event to the event queue for this input area.
-    *
-    * @post A new event (gadget::MouseEvent) is added to the event queue.
@@ -142 +156 @@
-    */
-   void addMouseMoveEvent(NSEvent* event);
+
+   /**
+    * Transforms a change in the modifier flags into a key press or key
+    * release event.
+    *
+    * @post \c mLastModifiers holds the new set of pressed modifier keys.
+    */
+   void flagsChanged(NSEvent* event);
-   //@}
-
@@ -148 +170 @@
-
-protected:
+   /**
+    * Translates the mouse button number into a gadget::Keys value.
+    */
+   gadget::Keys getButtonFromNum(const int buttonNum) const;
+
+   /**
+    * Converts \p mask into the gadget::Keys corresponding value. The value of
+    * \p mask must be a mask value.
+    */
+   gadget::Keys getKeyFromModifierMask(const unsigned int mask) const;
+
-   void warpCursorToCenter();
-
@@ -205 +238 @@
-   float mHeight;       /**< Input area height */
-
+   unsigned int mLastModifiers; /**< The current keyboard modifiers */
+
-   NSWindow* mCocoaWindow;      /**< The window for this input area. */
-   NSView*   mMainView;         /**< The window's view. */

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

@@ -54 +54 @@
-   , mWidth(0)
-   , mHeight(0)
+   , mLastModifiers(0)
-   , mCocoaWindow(nil)
-   , mMainView(nil)
@@ -118 +119 @@
-}
-
+void InputAreaCocoa::addMouseButtonEvent(const gadget::EventType type,
+                                         NSEvent* event)
+{
+   addMouseButtonEvent(getButtonFromNum([event buttonNumber]), type, event);
+}
+
-void InputAreaCocoa::addMouseButtonEvent(const gadget::Keys button,
-                                         const gadget::EventType type,
@@ -133 +140 @@
-}
-
+
-void InputAreaCocoa::addMouseMoveEvent(NSEvent* event)
-{
@@ -179 +187 @@
-}
-
+void InputAreaCocoa::flagsChanged(NSEvent* event)
+{
+   const unsigned int cur_modifiers = [event modifierFlags];
+
+   // Compare the new modifier set with the old to find out what modifier
+   // key has been pressed or released.
+   const unsigned int new_modifiers = ~mLastModifiers & cur_modifiers;
+   const unsigned int old_modifiers = mLastModifiers & ~cur_modifiers;
+
+   if ( new_modifiers != 0 )
+   {
+      addModifierEvent(getKeyFromModifierMask(new_modifiers),
+                       gadget::KeyPressEvent, event);
+   }
+   else if ( old_modifiers != 0 )
+   {
+      addModifierEvent(getKeyFromModifierMask(old_modifiers),
+                       gadget::KeyReleaseEvent, event);
+   }
+
+   mLastModifiers = cur_modifiers;
+}
+
-void InputAreaCocoa::updateOriginAndSize(const float x, const float y,
-                                         const float width,
@@ -187 +218 @@
-   mWidth  = width;
-   mHeight = height;
+}
+
+gadget::Keys InputAreaCocoa::getButtonFromNum(const int buttonNum) const
+{
+   gadget::Keys button(gadget::NO_MBUTTON);
+
+   switch ( buttonNum )
+   {
+      case 0:
+         button = gadget::MBUTTON1;
+         break;
+      case 1:
+         button = gadget::MBUTTON2;
+         break;
+      case 2:
+         button = gadget::MBUTTON3;
+         break;
+      case 3:
+         button = gadget::MBUTTON4;
+         break;
+      case 4:
+         button = gadget::MBUTTON5;
+         break;
+      case 5:
+         button = gadget::MBUTTON6;
+         break;
+      case 6:
+         button = gadget::MBUTTON7;
+         break;
+   }
+
+   return button;
+}
+
+gadget::Keys InputAreaCocoa::getKeyFromModifierMask(const unsigned int mask)
+   const
+{
+   gadget::Keys key(gadget::KEY_NONE);
+
+   if ( mask & NSCommandKeyMask )
+   {
+      key = gadget::KEY_COMMAND;
+   }
+   else if ( mask & NSAlternateKeyMask )
+   {
+      key = gadget::KEY_ALT;
+   }
+   else if ( mask & NSControlKeyMask )
+   {
+      key = gadget::KEY_CTRL;
+   }
+   else if ( mask & NSShiftKeyMask )
+   {
+      key = gadget::KEY_SHIFT;
+   }
+
+   return key;
-}
-

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

@@ -49 +49 @@
-{
-   gadget::InputAreaCocoa* mInputArea;  /**< The Gadgeteer input area */
-   unsigned int mLastModifiers;         /**< The current keyboard modifiers */
-   NSTrackingRectTag mTrackingRect;
-}

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

@@ -27 +27 @@
-#include <gadget/gadgetConfig.h>
-
-#import <Foundation/NSString.h>
-#import <AppKit/NSWindow.h>
-#import <AppKit/NSEvent.h>
@@ -43 +42 @@
- */
-@interface InputViewCocoa (PrivateMethods)
-   -(gadget::Keys) getButtonFromNum:(int) buttonNum;
-   -(void) flagsChanged:(NSEvent*) theEvent;
-   -(void) clearTrackingRect;
-   -(void) resetTrackingRect;
-   -(gadget::Keys) getKeyFromModifierMask:(unsigned int) mask;
-@end
-
@@ -54 +50 @@
-             inputArea:(gadget::InputAreaCocoa*) inputArea
-   {
-      mLastModifiers = 0;
-      mInputArea = inputArea;
+      mTrackingRect = 0;
-      return [self initWithFrame:frameRect];
-   }
@@ -212 +208 @@
-   -(void) otherMouseDown:(NSEvent*) theEvent
-   {
-
-
-
-
+
+
-   }
-
@@ -223 +217 @@
-   -(void) otherMouseUp:(NSEvent*) theEvent
-   {
-
-
-
-
+
+
-   }
-
@@ -252 +244 @@
-      mInputArea->addKeyEvent(gadget::KeyReleaseEvent, theEvent);
-   }
+
+   /**
+    * Responds to a change in the keyboard modifier flags.
+    */
+   -(void) flagsChanged:(NSEvent*) theEvent
+   {
+      mInputArea->flagsChanged(theEvent);
+   }
-   //@}
-
-   /** @name Private Methods */
-   //@{
-   /**
-    * Translates the mouse button number into a gadget::Keys value.
-    */
-   -(gadget::Keys) getButtonFromNum:(int) buttonNum
-   {
-      gadget::Keys button(gadget::NO_MBUTTON);
-
-      switch ( buttonNum )
-      {
-         case 0:
-            button = gadget::MBUTTON1;
-            break;
-         case 1:
-            button = gadget::MBUTTON2;
-            break;
-         case 2:
-            button = gadget::MBUTTON3;
-            break;
-         case 3:
-            button = gadget::MBUTTON4;
-            break;
-         case 4:
-            button = gadget::MBUTTON5;
-            break;
-         case 5:
-            button = gadget::MBUTTON6;
-            break;
-         case 6:
-            button = gadget::MBUTTON7;
-            break;
-      }
-
-      return button;
-   }
-
-   /**
-    * Transforms a change in the modifier flags into a key press or key
-    * release event.
-    *
-    * @post \c mLastModifiers holds the new set of pressed modifier keys.
-    */
-   -(void) flagsChanged:(NSEvent*) theEvent
-   {
-      const unsigned int cur_modifiers = [theEvent modifierFlags];
-
-      // Compare the new modifier set with the old to find out what modifier
-      // key has been pressed or released.
-      const unsigned int new_modifiers = ~mLastModifiers & cur_modifiers;
-      const unsigned int old_modifiers = mLastModifiers & ~cur_modifiers;
-
-      if ( new_modifiers != 0 )
-      {
-         mInputArea->addModifierEvent(
-            [self getKeyFromModifierMask:new_modifiers],
-            gadget::KeyPressEvent, theEvent
-         );
-      }
-      else if ( old_modifiers != 0 )
-      {
-         mInputArea->addModifierEvent(
-            [self getKeyFromModifierMask:old_modifiers],
-            gadget::KeyReleaseEvent, theEvent
-         );
-      }
-
-      mLastModifiers = cur_modifiers;
-   }
-
-   /**
@@ -338 +268 @@
-   }
-
+   /** @name Private Methods */
+   //@{
-   /**
-    * Removes the current tracking rectangle for this view (if it has one).
@@ -369 +301 @@
-                               assumeInside:NO];
-   }
-
-   /**
-    * Converts \p modifiers into the gadget::Keys corresponding value. The
-    * value of modifiers must be a mask value.
-    */
-   -(gadget::Keys) getKeyFromModifierMask:(unsigned int) mask
-   {
-      gadget::Keys key(gadget::KEY_NONE);
-
-      if ( mask & NSCommandKeyMask )
-      {
-         key = gadget::KEY_COMMAND;
-      }
-      else if ( mask & NSAlternateKeyMask )
-      {
-         key = gadget::KEY_ALT;
-      }
-      else if ( mask & NSControlKeyMask )
-      {
-         key = gadget::KEY_CTRL;
-      }
-      else if ( mask & NSShiftKeyMask )
-      {
-         key = gadget::KEY_SHIFT;
-      }
-
-      return key;
-   }
-   //@}
-@end