diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-10-16 22:17:16 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-10-21 13:43:14 -0400 |
| commit | 809aab2c8ec88c7b10254a948ba8754a766b1f7c (patch) | |
| tree | 49a52eaed1a8a57b2d3673368e68154a14660eff /gdk/x11/gdkwindow-x11.c | |
| parent | a093cd2a22173369424878eb6d8c38124e7aa1f9 (diff) | |
| download | gtk+-809aab2c8ec88c7b10254a948ba8754a766b1f7c.tar.gz | |
gdkwindow-x11: Don't set WM_TAKE_FOCUS if accept_focus is FALSE
Otherwise, we'll be in the "Globally Active" mode instead of the
"No Input" mode.
https://bugzilla.gnome.org/show_bug.cgi?id=710389
Diffstat (limited to 'gdk/x11/gdkwindow-x11.c')
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index fd6fbdfb2f..6ee7a9602f 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -772,9 +772,11 @@ set_wm_protocols (GdkWindow *window) int n = 0; protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "WM_DELETE_WINDOW"); - protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "WM_TAKE_FOCUS"); protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_PING"); + if (window->accept_focus) + protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "WM_TAKE_FOCUS"); + #ifdef HAVE_XSYNC if (GDK_X11_DISPLAY (display)->use_sync) protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_SYNC_REQUEST"); @@ -3489,7 +3491,10 @@ gdk_x11_window_set_accept_focus (GdkWindow *window, if (!GDK_WINDOW_DESTROYED (window) && WINDOW_IS_TOPLEVEL_OR_FOREIGN (window)) - update_wm_hints (window, FALSE); + { + update_wm_hints (window, FALSE); + set_wm_protocols (window); + } } } |