[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#23924: [PATCH] Only check for AppDefined events in OS X 10.10 (bug#2
From: |
Alan Third |
Subject: |
bug#23924: [PATCH] Only check for AppDefined events in OS X 10.10 (bug#23924) |
Date: |
Wed, 13 Jul 2016 22:03:45 +0100 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
* src/nsterm.m (ns_send_appdefined): Limit bugfix for bug#18993 to OS X
10.10.
---
src/nsterm.m | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index a6160ed..a7e2649 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3942,16 +3942,21 @@ overwriting cursor (usually when cursor on a tab) */
this moment. */
#ifdef NS_IMPL_COCOA
- if (! send_appdefined)
- {
- /* OSX 10.10.1 swallows the AppDefined event we are sending ourselves
- in certain situations (rapid incoming events).
- So check if we have one, if not add one. */
- NSEvent *appev = [NSApp nextEventMatchingMask:NSApplicationDefinedMask
- untilDate:[NSDate distantPast]
- inMode:NSDefaultRunLoopMode
- dequeue:NO];
- if (! appev) send_appdefined = YES;
+ if ([[NSProcessInfo processInfo]
respondsToSelector:@selector(operatingSystemVersion)])
+ {
+ NSOperatingSystemVersion v = [[NSProcessInfo processInfo]
operatingSystemVersion];
+
+ if (! send_appdefined && v.majorVersion == 10 && v.minorVersion == 10)
+ {
+ /* OSX 10.10.1 swallows the AppDefined event we are sending ourselves
+ in certain situations (rapid incoming events).
+ So check if we have one, if not add one. */
+ NSEvent *appev = [NSApp
nextEventMatchingMask:NSApplicationDefinedMask
+ untilDate:[NSDate distantPast]
+ inMode:NSDefaultRunLoopMode
+ dequeue:NO];
+ if (! appev) send_appdefined = YES;
+ }
}
#endif
--
Hi Bob, can you try applying this patch? The fix was originally put in
place for bug#18993 which seems to be specific to OS X 10.10 (or at
least, I can't replicate it here in 10.11) so I've limited the fix to
that specific version and completely removed it for everything else.
Hopefully it's not going to break everything, but it seems OK here.
--
Alan Third
- bug#23924: 25.1.50; Emacs NSInternalInconsistencyException on macos Sierra developer beta 2, Bob Halley, 2016/07/08
- bug#23924: 25.1.50; Emacs NSInternalInconsistencyException on macos Sierra developer beta 2, Alan Third, 2016/07/10
- bug#23924: 25.1.50; Emacs NSInternalInconsistencyException on macos Sierra developer beta 2, Bob Halley, 2016/07/10
- bug#23924: 25.1.50; Emacs NSInternalInconsistencyException on macos Sierra developer beta 2, Alan Third, 2016/07/10
- bug#23924: 25.1.50; Emacs NSInternalInconsistencyException on macos Sierra developer beta 2, Bob Halley, 2016/07/10
- bug#23924: 25.1.50; Emacs NSInternalInconsistencyException on macos Sierra developer beta 2, Bob Halley, 2016/07/10
- bug#23924: 25.1.50; Emacs NSInternalInconsistencyException on macos Sierra developer beta 2, Bob Halley, 2016/07/11
- bug#23924: 25.1.50; Emacs NSInternalInconsistencyException on macos Sierra developer beta 2, Bob Halley, 2016/07/11
- bug#23924: [PATCH] Only check for AppDefined events in OS X 10.10 (bug#23924),
Alan Third <=
- bug#23924: [PATCH] Only check for AppDefined events in OS X 10.10 (bug#23924), Bob Halley, 2016/07/13
- bug#23924: [PATCH] Only check for AppDefined events in OS X 10.10 (bug#23924), Alan Third, 2016/07/17
- bug#23924: [PATCH] Only check for AppDefined events in OS X 10.10 (bug#23924), Bob Halley, 2016/07/20
- bug#23924: [PATCH] Only check for AppDefined events in OS X 10.10 (bug#23924), Alan Third, 2016/07/20
- bug#23924: [PATCH] Post AppDefined events from the main thread ONLY (bug#23934), Alan Third, 2016/07/20
- bug#23924: [PATCH] Post AppDefined events from the main thread ONLY (bug#23934), Bob Halley, 2016/07/21
- bug#23924: [PATCH] Post AppDefined events from the main thread ONLY (bug#23934), Bob Halley, 2016/07/22
- bug#23924: [PATCH] Post AppDefined events from the main thread ONLY (bug#23934), Alan Third, 2016/07/22