Attachment 180752 Details for Bug 305696 – Proposed workaround

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

[patch] Proposed workaround

bug305696_workaround.diff (text/plain), 1.32 KB, created by ppdkseth222

on 2010-10-13 07:19:51 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: ppdkseth222

Created: 2010-10-13 07:19:51 EDT

Size: 1.32 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.swt
>Index: Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java,v
>retrieving revision 1.297.2.1
>diff -u -r1.297.2.1 Shell.java
>--- Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java	6 Aug 2010 20:15:53 -0000	1.297.2.1
>+++ Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java	13 Oct 2010 11:01:32 -0000
>@@ -534,9 +534,15 @@
> 	* window, gdk_window_focus() does not give focus to the
> 	* window.  The fix is to use XSetInputFocus() to force
> 	* the focus.
>+	* 
>+	* NOTE: Temporary workaround for bug #305696. The code below
>+	* that makes use of XSetInputFocus() seems to be causing the
>+	* loss of focus described in bug #305696. The workaround here
>+	* bypasses the use of XSetInputFocus() for GTK+ 2.17.x and
>+	* later.
> 	*/
> 	int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);
>-	if ((xFocus || (style & SWT.ON_TOP) != 0) && OS.GDK_WINDOWING_X11 ()) {
>+	if ( OS.GTK_VERSION < OS.VERSION (2, 17, 0) && ((xFocus || (style & SWT.ON_TOP) != 0) && OS.GDK_WINDOWING_X11 ()) ) {
> 		int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
> 		int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
> 		OS.gdk_error_trap_push ();

Actions: View | Diff

Attachments on bug 305696: 180752