Commit a1a93ce1 authored by Ken Thomases's avatar Ken Thomases Committed by Alexandre Julliard

winemac: Change the processEvents parameter of -[WineEventQueue…

winemac: Change the processEvents parameter of -[WineEventQueue query:timeout:processEvents:] to a flags bitmask. Signed-off-by: 's avatarKen Thomases <ken@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 3482c474
...@@ -22,6 +22,11 @@ ...@@ -22,6 +22,11 @@
#include "macdrv_cocoa.h" #include "macdrv_cocoa.h"
enum {
WineQueryProcessEvents = 1 << 0,
};
@class WineWindow; @class WineWindow;
...@@ -42,7 +47,7 @@ ...@@ -42,7 +47,7 @@
- (void) postEvent:(macdrv_event*)inEvent; - (void) postEvent:(macdrv_event*)inEvent;
- (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window; - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window;
- (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout flags:(NSUInteger)flags;
- (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout;
- (void) resetMouseEventPositions:(CGPoint)pos; - (void) resetMouseEventPositions:(CGPoint)pos;
......
...@@ -294,7 +294,7 @@ static const OSType WineHotKeySignature = 'Wine'; ...@@ -294,7 +294,7 @@ static const OSType WineHotKeySignature = 'Wine';
}]; }];
} }
- (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout flags:(NSUInteger)flags
{ {
macdrv_event* event; macdrv_event* event;
NSDate* timeoutDate = [NSDate dateWithTimeIntervalSinceNow:timeout]; NSDate* timeoutDate = [NSDate dateWithTimeIntervalSinceNow:timeout];
...@@ -308,13 +308,13 @@ static const OSType WineHotKeySignature = 'Wine'; ...@@ -308,13 +308,13 @@ static const OSType WineHotKeySignature = 'Wine';
macdrv_release_event(event); macdrv_release_event(event);
timedout = ![[WineApplicationController sharedController] waitUntilQueryDone:&query->done timedout = ![[WineApplicationController sharedController] waitUntilQueryDone:&query->done
timeout:timeoutDate timeout:timeoutDate
processEvents:processEvents]; processEvents:(flags & WineQueryProcessEvents) != 0];
return !timedout && query->status; return !timedout && query->status;
} }
- (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout
{ {
return [self query:query timeout:timeout processEvents:FALSE]; return [self query:query timeout:timeout flags:0];
} }
- (void) resetMouseEventPositions:(CGPoint)pos - (void) resetMouseEventPositions:(CGPoint)pos
......
...@@ -2657,7 +2657,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi ...@@ -2657,7 +2657,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
query->drag_drop.op = [sender draggingSourceOperationMask]; query->drag_drop.op = [sender draggingSourceOperationMask];
query->drag_drop.pasteboard = (CFTypeRef)[pb retain]; query->drag_drop.pasteboard = (CFTypeRef)[pb retain];
[self.queue query:query timeout:3 * 60 processEvents:YES]; [self.queue query:query timeout:3 * 60 flags:WineQueryProcessEvents];
ret = query->status; ret = query->status;
macdrv_release_query(query); macdrv_release_query(query);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment