callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always trap errors around calls to XSetInputFocus since we have no way of

Browse Source 
Wed May  2 17:26:22 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkevents-x11.c gdk/x11/gdkwindow-x11.c: Always
	trap errors around calls to XSetInputFocus since we have
	no way of knowing reliably whether we are viewable or
	not. (#53947)
This commit is contained in:
Owen Taylor
2001-05-02 21:31:52 +00:00
committed by Owen Taylor
parent bdd655c7ab
commit a5d1bc41ec
9 changed files with 66 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/x11/gdkevents-x11.c
View File

@ -1487,8 +1487,16 @@ gdk_wm_protocols_filter (GdkXEvent *xev,
GdkWindow *win = event->any.window;
Window focus_win = GDK_WINDOW_IMPL_X11(((GdkWindowObject *)win)->impl)->focus_window;
XSetInputFocus (GDK_WINDOW_XDISPLAY (win), focus_win,
RevertToParent, xevent->xclient.data.l[1]);
/* There is no way of knowing reliably whether we are viewable so we need
* to trap errors so we don't cause a BadMatch.
*/
gdk_error_trap_push ();
XSetInputFocus (GDK_WINDOW_XDISPLAY (win),
focus_win,
RevertToParent,
xevent->xclient.data.l[1]);
XSync (GDK_WINDOW_XDISPLAY (win), False);
gdk_error_trap_pop ();
}
else if ((Atom) xevent->xclient.data.l[0] == gdk_atom_intern ("_NET_WM_PING", FALSE))
{

7
gdk/x11/gdkwindow-x11.c
View File

@ -1120,10 +1120,17 @@ gdk_window_focus (GdkWindow *window,
else
{
XRaiseWindow (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XID (window));
/* There is no way of knowing reliably whether we are viewable so we need
* to trap errors so we don't cause a BadMatch.
*/
gdk_error_trap_push ();
XSetInputFocus (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XWINDOW (window),
RevertToNone,
timestamp);
XSync (GDK_WINDOW_XDISPLAY (window), False);
gdk_error_trap_pop ();
}
}