isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

window: Treat CurrentTime as legal timestamp in activation

Browse Source 
Effectively we have been accepting CurrentTime timestamps for years,
but still complained about "stupid pagers" when encountering them;
just accept that we will never limit treating 0 timestamps as current
time to pagers.

https://bugzilla.gnome.org/show_bug.cgi?id=728018
This commit is contained in:
Florian Müllner 2014-04-11 19:05:20 +02:00
parent 59541dfa14
commit 5defe574d7
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/window.c
View File

@ -3703,23 +3703,13 @@ meta_window_activate_full (MetaWindow *window,
MetaClientType source_indication, MetaClientType source_indication,
MetaWorkspace *workspace) MetaWorkspace *workspace)
{ {
gboolean can_ignore_outdated_timestamps;
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"_NET_ACTIVE_WINDOW message sent for %s at time %u " "_NET_ACTIVE_WINDOW message sent for %s at time %u "
"by client type %u.\n", "by client type %u.\n",
window->desc, timestamp, source_indication); window->desc, timestamp, source_indication);
/* Older EWMH spec didn't specify a timestamp; we decide to honor these only if (timestamp != 0 &&
* if the app specifies that it is a pager. XSERVER_TIME_IS_BEFORE (timestamp, window->display->last_user_time))
*
* Update: Unconditionally honor 0 timestamps for now; we'll fight
* that battle later. Just remove the "FALSE &&" in order to only
* honor 0 timestamps for pagers.
*/
can_ignore_outdated_timestamps =
(timestamp != 0 || (FALSE && source_indication != META_CLIENT_TYPE_PAGER));
if (XSERVER_TIME_IS_BEFORE (timestamp, window->display->last_user_time) &&
can_ignore_outdated_timestamps)
{ {
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"last_user_time (%u) is more recent; ignoring " "last_user_time (%u) is more recent; ignoring "
@ -3729,13 +3719,8 @@ meta_window_activate_full (MetaWindow *window,
return; return;
} }
/* For those stupid pagers, get a valid timestamp and show a warning */
if (timestamp == 0) if (timestamp == 0)
{ timestamp = meta_display_get_current_time_roundtrip (window->display);
meta_warning ("meta_window_activate called by a pager with a 0 timestamp; "
"the pager needs to be fixed.\n");
timestamp = meta_display_get_current_time_roundtrip (window->display);
}
meta_window_set_user_time (window, timestamp); meta_window_set_user_time (window, timestamp);