Mercurial > dwindows

changeset 701:c91a1b345f2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for button press and context menus.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 11 Mar 2011 05:23:17 +0000
parents 7953f0471e4d
children e9a3d1da3d3e
files mac/dw.m
diffstat 1 files changed, 30 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Fri Mar 11 03:02:58 2011 +0000
+++ b/mac/dw.m	Fri Mar 11 05:23:17 2011 +0000
@@ -141,24 +141,12 @@
 			case 4:
 			{
 				int (* API buttonfunc)(HWND, int, int, int, void *) = (int (* API)(HWND, int, int, int, void *))handler->signalfunction;
-				int flags = (int)[object pressedMouseButtons];
-				NSPoint point = [object mouseLocation];
-				int button = 0;
-			
-				if(flags & 1)
-				{
-					button = 1;
-				}
-				else if(flags & (1 << 1))
-				{
-					button = 2;
-				}
-				else if(flags & (1 << 2))
-				{
-					button = 3;
-				}
-			
-				return buttonfunc(object, point.x, point.y, button, handler->data);
+				int button = (int)event;
+				LONG x,y;
+				
+				dw_pointer_query_pos(&x, &y);
+                
+				return buttonfunc(object, (int)x, (int)y, button, handler->data);
 			}
 			case 6:
 			{
@@ -332,6 +320,10 @@
 -(BOOL)isFlipped;
 -(void)mouseDown:(NSEvent *)theEvent;
 -(void)mouseUp:(NSEvent *)theEvent;
+-(NSMenu *)menuForEvent:(NSEvent *)theEvent;
+-(void)rightMouseUp:(NSEvent *)theEvent;
+-(void)otherMouseDown:(NSEvent *)theEvent;
+-(void)otherMouseUp:(NSEvent *)theEvent;
 -(void)setColor:(unsigned long)input;
 @end
 
@@ -365,8 +357,12 @@
 	}
 }
 -(BOOL)isFlipped { return YES; }
--(void)mouseDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); }
--(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
+-(void)mouseDown:(NSEvent *)theEvent { _event_handler(self, (void *)1, 3); }
+-(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)1, 4); }
+-(NSMenu *)menuForEvent:(NSEvent *)theEvent { _event_handler(self, (void *)2, 3); return nil; }
+-(void)rightMouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)2, 4); }
+-(void)otherMouseDown:(NSEvent *)theEvent { _event_handler(self, (void *)3, 3); }
+-(void)otherMouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)3, 4); }
 -(void)setColor:(unsigned long)input
 {
 	if(input == _colors[DW_CLR_DEFAULT])
@@ -646,18 +642,26 @@
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
--(void)drawRect:(NSRect)rect;
 -(void)mouseDown:(NSEvent *)theEvent;
 -(void)mouseUp:(NSEvent *)theEvent;
+-(NSMenu *)menuForEvent:(NSEvent *)theEvent;
+-(void)rightMouseUp:(NSEvent *)theEvent;
+-(void)otherMouseDown:(NSEvent *)theEvent;
+-(void)otherMouseUp:(NSEvent *)theEvent;
+-(void)drawRect:(NSRect)rect;
 -(BOOL)isFlipped;
 @end
 
 @implementation DWRender
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
+-(void)mouseDown:(NSEvent *)theEvent { _event_handler(self, (void *)1, 3); }
+-(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)1, 4); }
+-(NSMenu *)menuForEvent:(NSEvent *)theEvent { _event_handler(self, (void *)2, 3); return nil; }
+-(void)rightMouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)2, 4); }
+-(void)otherMouseDown:(NSEvent *)theEvent { _event_handler(self, (void *)3, 3); }
+-(void)otherMouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)3, 4); }
 -(void)drawRect:(NSRect)rect { _event_handler(self, nil, 7); }
--(void)mouseDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); }
--(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
 -(BOOL)isFlipped { return NO; }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
 @end
@@ -4953,19 +4957,10 @@
  */
 void API dw_menu_popup(HMENUI *menu, HWND parent, int x, int y)
 {
-	NSMenu *thismenu = (NSMenu *)menu;
+	NSMenu *thismenu = (NSMenu *)*menu;
 	NSView *view = parent;
-	NSEvent* fake = [[NSEvent alloc]
-					mouseEventWithType:NSLeftMouseDown
-					location:NSMakePoint(x,y)
-					modifierFlags:0
-					timestamp:1
-					windowNumber:[[view window] windowNumber]
-					context:[NSGraphicsContext currentContext]
-					eventNumber:1
-					clickCount:1
-					pressure:0.0];
-	[NSMenu popUpContextMenu:thismenu withEvent:fake forView:view];
+    NSEvent *event = [DWApp currentEvent];
+    [NSMenu popUpContextMenu:thismenu withEvent:event forView:view];
 }
 
 char _removetilde(char *dest, char *src)