Attachment 176214 Details for Bug 304399

[patch] create-notify.diff

create-notify.diff (text/plain), 2.62 KB, created by Federico Mena Quintero on 2007-10-03 19:49:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Federico Mena Quintero

Created: 2007-10-03 19:49:04 UTC

Size: 2.62 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 9bc00da..abfaa6d 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2007-10-03  Federico Mena Quintero  <federico@novell.com>
>+
>+	* src/gs-window-x11.c (setup_xvkbd_window): Log the ID of the
>+	window we use.
>+	(gs_window_xevent): Watch for CreateNotify to set up the
>+	xvkbd_window.  Don't do it in MapNotify (we won't get that event,
>+	as the window manager will intercept the map request).
>+	(gs_window_xevent): Don't raise the xvkbd_window.
>+
> ==== 2.20.0 ====
> 
> 2007-09-17  William Jon McCann  <mccann@jhu.edu>
>diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
>index bad6566..a5374b5 100644
>--- a/src/gs-window-x11.c
>+++ b/src/gs-window-x11.c
>@@ -670,6 +670,8 @@ is_xvkbd_window (Window window)
> static void
> setup_xvkbd_window (GSWindow *gswindow, Window window)
> {
>+        gs_debug ("Setting up xvkbd_window from window %d", (int) window);
>+
> 	xvkbd_window = gdk_window_foreign_new (window);
>         gdk_window_hide (xvkbd_window);
>         gdk_window_set_override_redirect (xvkbd_window, TRUE);
>@@ -707,15 +709,23 @@ gs_window_xevent (GSWindow  *window,
>         /* MapNotify is used to tell us when new windows are mapped.
>            ConfigureNofify is used to tell us when windows are raised. */
>         switch (ev->xany.type) {
>+        case CreateNotify:
>+	        {
>+                        XCreateWindowEvent *create_event;
>+
>+                        create_event = &ev->xcreatewindow;
>+
>+                        if (!x11_window_is_ours (create_event->window) && is_xvkbd_window (create_event->window))
>+                                setup_xvkbd_window (window, create_event->window);
>+
>+                        break;
>+        	}
>         case MapNotify:
>                 {
>                         XMapEvent *xme = &ev->xmap;
> 
>                         if (! x11_window_is_ours (xme->window)) {
>-                                if (is_xvkbd_window (xme->window))
>-                                        setup_xvkbd_window (window, xme->window);
>-                                else
>-                                        gs_window_raise (window);
>+                                gs_window_raise (window);
>                         } else {
>                                 gs_debug ("not raising our windows");
>                         }
>@@ -728,7 +738,7 @@ gs_window_xevent (GSWindow  *window,
> 
>                         if (! x11_window_is_ours (xce->window)) {
> 				gs_window_raise (window);
>-				gs_window_raise (xvkbd_window);
>+/* 				gs_window_raise (xvkbd_window); */
>                         } else {
>                                 gs_debug ("not raising our windows");
>                         }

Actions: View | Diff

Attachments on bug 304399: 175991 | 176123 | 176214 | 176294 | 176295 | 176296 | 176628 | 182807 | 183888 | 183897