Changeset 434 for trunk/orca/gl

Timestamp:

07/18/07 00:26:00 (16 months ago)

Author:

krobillard

Message:

GLView GLV_EVENT_MOTION now reports button state on Mac.

Location:

trunk/orca/gl/glv/mac

Files:

• glv.c (modified) (7 diffs)
• glv.h (modified) (1 diff)

trunk/orca/gl/glv/mac/glv.c

@@ -25 +25 @@
 #define FLAG_FULLSCREEN_MODE        0x0040
 #define FLAG_FILTER_REPEAT          0x0080
+
+
+static UInt32 mouseButtonModifier[3] =
+{
+    0, GLV_MASK_LEFT, GLV_MASK_RIGHT, GLV_MASK_MIDDLE
+};
 
 
@@ -71 +77 @@
         ve.type  = t; \
         ve.code  = code; \
-        ve.state = modifiers; \
+        ve.state = modifiers | view->buttonsHeld; \
         ve.x     = 0; \
         ve.y     = 0;
@@ -147 +153 @@
             case kEventMouseDown:
                 //printf( "KR mouse down\n" );
+
+                // Let system widgets get first crack at event.
+                result = CallNextEventHandler( myHandler, event );
+                if( eventNotHandledErr != result )
+                    break;
 
                 GetEventParameter( event, kEventParamMouseButton,
@@ -158 +169 @@
                                    sizeof(UInt32), NULL, &modifiers );
 
+                if( button < 4 )
+                    view->buttonsHeld |= mouseButtonModifier[ button ];
+
                 ve.type  = GLV_EVENT_BUTTON_DOWN;
                 ve.code  = button;
-                ve.state = modifiers;
+                ve.state = modifiers | view->buttonsHeld;
                 ve.x     = ((int) location.x) - view->bound.left;
                 ve.y     = ((int) location.y) - view->bound.top;
                 view->eventHandler( view, &ve );
 
-                // result remains eventNotHandledErr so it can propagate.
+                result = noErr;
                 break;
 
@@ -181 +195 @@
                                    sizeof(UInt32), NULL, &modifiers );
 
+                if( button < 4 )
+                    view->buttonsHeld &= ~mouseButtonModifier[ button ];
+
                 ve.type  = GLV_EVENT_BUTTON_UP;
                 ve.code  = button;
-                ve.state = modifiers;
+                ve.state = modifiers | view->buttonsHeld;
                 ve.x     = ((int) location.x) - view->bound.left;
                 ve.y     = ((int) location.y) - view->bound.top;
@@ -207 +224 @@
                 ve.type  = GLV_EVENT_MOTION;
                 ve.code  = button;
-                ve.state = modifiers;
+                ve.state = modifiers | view->buttonsHeld;
                 ve.x     = ((int) location.x) - view->bound.left;
                 ve.y     = ((int) location.y) - view->bound.top;
@@ -504 +521 @@
     view->windowEventUUP = NewEventHandlerUPP( windowEventHandler );
     view->modifiers      = 0;
+    view->buttonsHeld    = 0;
 
 

trunk/orca/gl/glv/mac/glv.h

@@ -49 +49 @@
     unsigned short flags;
     UInt32 modifiers;
+    UInt32 buttonsHeld;
     int modeId;
     Rect bound;