brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move request_take_focus to window-x11

Browse Source 
This will let us kill off send_icccm_message
This commit is contained in:
Jasper St. Pierre 2014-03-20 16:06:24 -04:00
parent ab2224686a
commit 46b4d6c0f0
4 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/display-private.h
View File

@ -498,5 +498,7 @@ void meta_display_update_focus_window (MetaDisplay *display,
void meta_display_sanity_check_timestamps (MetaDisplay *display, void meta_display_sanity_check_timestamps (MetaDisplay *display,
guint32 timestamp); guint32 timestamp);
gboolean meta_display_timestamp_too_old (MetaDisplay *display,
guint32 *timestamp);
#endif #endif

22
src/core/display.c
View File

@ -1700,8 +1700,8 @@ meta_display_update_focus_window (MetaDisplay *display,
meta_display_update_active_window_hint (display); meta_display_update_active_window_hint (display);
} }
static gboolean gboolean
timestamp_too_old (MetaDisplay *display, meta_display_timestamp_too_old (MetaDisplay *display,
guint32 *timestamp) guint32 *timestamp)
{ {
/* FIXME: If Soeren's suggestion in bug 151984 is implemented, it will allow /* FIXME: If Soeren's suggestion in bug 151984 is implemented, it will allow
@ -1738,7 +1738,7 @@ request_xserver_input_focus_change (MetaDisplay *display,
{ {
gulong serial; gulong serial;
if (timestamp_too_old (display, &timestamp)) if (meta_display_timestamp_too_old (display, &timestamp))
return; return;
meta_error_trap_push (display); meta_error_trap_push (display);
@ -3404,22 +3404,6 @@ meta_display_set_input_focus_window (MetaDisplay *display,
timestamp); timestamp);
} }
void
meta_display_request_take_focus (MetaDisplay *display,
MetaWindow *window,
guint32 timestamp)
{
if (timestamp_too_old (display, &timestamp))
return;
meta_topic (META_DEBUG_FOCUS, "WM_TAKE_FOCUS(%s, %u)\n",
window->desc, timestamp);
meta_window_send_icccm_message (window,
display->atom_WM_TAKE_FOCUS,
timestamp);
}
void void
meta_display_set_input_focus_xwindow (MetaDisplay *display, meta_display_set_input_focus_xwindow (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,

4
src/meta/display.h
View File

@ -163,10 +163,6 @@ void meta_display_set_input_focus_window (MetaDisplay *display,
gboolean focus_frame, gboolean focus_frame,
guint32 timestamp); guint32 timestamp);
void meta_display_request_take_focus (MetaDisplay *display,
MetaWindow *window,
guint32 timestamp);
/* meta_display_focus_the_no_focus_window is called when the /* meta_display_focus_the_no_focus_window is called when the
* designated no_focus_window should be focused, but is otherwise the * designated no_focus_window should be focused, but is otherwise the
* same as meta_display_set_input_focus_window * same as meta_display_set_input_focus_window

16
src/x11/window-x11.c
View File

@ -386,6 +386,18 @@ meta_window_x11_kill (MetaWindow *window)
meta_error_trap_pop (window->display); meta_error_trap_pop (window->display);
} }
static void
request_take_focus (MetaWindow *window,
guint32 timestamp)
{
MetaDisplay *display = window->display;
meta_topic (META_DEBUG_FOCUS, "WM_TAKE_FOCUS(%s, %u)\n",
window->desc, timestamp);
meta_window_send_icccm_message (window, display->atom_WM_TAKE_FOCUS, timestamp);
}
static void static void
meta_window_x11_focus (MetaWindow *window, meta_window_x11_focus (MetaWindow *window,
guint32 timestamp) guint32 timestamp)
@ -448,9 +460,7 @@ meta_window_x11_focus (MetaWindow *window,
timestamp); timestamp);
} }
meta_display_request_take_focus (window->display, request_take_focus (window, timestamp);
window,
timestamp);
} }
} }
} }