isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-01 04:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't require a push/pop trap around

Browse Source 
2006-10-01  Elijah Newren  <newren gmail com>

	* src/display.c (meta_display_set_input_focus_window):
	* src/window.c (meta_window_focus):
	Don't require a push/pop trap around
	meta_display_set_input_focus_window(), but rather move the
	push/pop into that function surrounding the XSetInputFocus() call
	directly.  Follow up to #358514.
This commit is contained in:
Elijah Newren 2006-10-02 04:08:33 +00:00 committed by Elijah Newren
parent ca3ed6a1eb
commit c4fa0d118c
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2006-10-01 Elijah Newren <newren gmail com>
* src/display.c (meta_display_set_input_focus_window):
* src/window.c (meta_window_focus):
Don't require a push/pop trap around
meta_display_set_input_focus_window(), but rather move the
push/pop into that function surrounding the XSetInputFocus() call
directly. Follow up to #358514.
2006-10-01 Elijah Newren <newren gmail com> 2006-10-01 Elijah Newren <newren gmail com>
* src/*.[ch]: Stick an emacs comment directive at the beginning of * src/*.[ch]: Stick an emacs comment directive at the beginning of

3
src/display.c
View File

@ -5002,10 +5002,13 @@ meta_display_set_input_focus_window (MetaDisplay *display,
if (timestamp_too_old (display, window, &timestamp)) if (timestamp_too_old (display, window, &timestamp))
return; return;
meta_error_trap_push (display);
XSetInputFocus (display->xdisplay, XSetInputFocus (display->xdisplay,
focus_frame ? window->frame->xwindow : window->xwindow, focus_frame ? window->frame->xwindow : window->xwindow,
RevertToPointerRoot, RevertToPointerRoot,
timestamp); timestamp);
meta_error_trap_pop (display, FALSE);
display->expected_focus_window = window; display->expected_focus_window = window;
display->last_focus_time = timestamp; display->last_focus_time = timestamp;
display->active_screen = window->screen; display->active_screen = window->screen;

4
src/window.c
View File

@ -3876,8 +3876,6 @@ meta_window_focus (MetaWindow *window,
} }
else else
{ {
meta_error_trap_push (window->display);
if (window->input) if (window->input)
{ {
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
@ -3899,8 +3897,6 @@ meta_window_focus (MetaWindow *window,
timestamp); timestamp);
window->display->expected_focus_window = window; window->display->expected_focus_window = window;
} }
meta_error_trap_pop (window->display, FALSE);
} }
if (window->wm_state_demands_attention) if (window->wm_state_demands_attention)