Attachment 257249 Details for Bug 477979 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

Bug-477979-SWT-cant-receive-input-on-nonstandard-jvm.patch (text/plain), 3.66 KB, created by Lakshmi P Shanmugam

on 2015-10-14 02:17:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Lakshmi P Shanmugam

Created: 2015-10-14 02:17:47 EDT

Size: 3.66 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
>index b49e3f4..c8627a2 100644
>--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
>+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
>@@ -4758,6 +4758,7 @@
> 	<enum name="NSAlphaFirstBitmapFormat" swt_gen="true"></enum>
> 	<enum name="NSAlphaNonpremultipliedBitmapFormat" swt_gen="true"></enum>
> 	<enum name="NSAlternateKeyMask" swt_gen="true"></enum>
>+	<enum name="NSAnyEventMask" swt_gen="true"></enum>
> 	<enum name="NSAppKitDefined" swt_gen="true"></enum>
> 	<enum name="NSApplicationActivateIgnoringOtherApps" swt_gen="true"></enum>
> 	<enum name="NSApplicationActivationPolicyRegular" swt_gen="true"></enum>
>diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
>index 7f0a660..467ec20 100644
>--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
>+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
>@@ -2334,6 +2334,7 @@
> public static final int NSAlphaFirstBitmapFormat = 1;
> public static final int NSAlphaNonpremultipliedBitmapFormat = 2;
> public static final int NSAlternateKeyMask = 524288;
>+public static final int NSAnyEventMask = -1;
> public static final int NSAppKitDefined = 13;
> public static final int NSApplicationActivateIgnoringOtherApps = 2;
> public static final int NSApplicationActivationPolicyRegular = 0;
>diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
>index 90f7adb..483c29f 100644
>--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
>+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
>@@ -3686,7 +3686,7 @@
> 		events |= runTimers ();
> 		events |= runContexts ();
> 		events |= runPopups ();
>-		NSEvent event = application.nextEventMatchingMask(0, null, OS.NSDefaultRunLoopMode, true);
>+		NSEvent event = application.nextEventMatchingMask(OS.NSAnyEventMask, null, OS.NSDefaultRunLoopMode, true);
> 		if (event != null) {
> 			events = true;
> 			application.sendEvent(event);
>diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
>index 127ce11..9bc7f00 100644
>--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
>+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
>@@ -11,9 +11,9 @@
> package org.eclipse.swt.widgets;
> 
>  
>-import org.eclipse.swt.graphics.*;
> import org.eclipse.swt.*;
> import org.eclipse.swt.events.*;
>+import org.eclipse.swt.graphics.*;
> import org.eclipse.swt.internal.cocoa.*;
> 
> /**
>@@ -844,7 +844,7 @@
> 			if (parent != null && parent.isDisposed ()) break;
> 			display.runSkin ();
> 			display.runDeferredLayouts ();
>-			NSEvent event = application.nextEventMatchingMask(0, NSDate.distantFuture(), OS.NSDefaultRunLoopMode, true);
>+			NSEvent event = application.nextEventMatchingMask(OS.NSAnyEventMask, NSDate.distantFuture(), OS.NSDefaultRunLoopMode, true);
> 			if (event == null) continue;
> 			int type = (int)/*64*/event.type();
> 			switch (type) {
>@@ -914,6 +914,7 @@
> 	return !cancelled;
> }
> 
>+@Override
> void releaseWidget () {
> 	super.releaseWidget ();
> 	parent = null;

Actions: View | Diff

Attachments on bug 477979: 257249