summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/display.c2
-rw-r--r--src/window.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/display.c b/src/display.c
index f72bd599..3d8e3d2c 100644
--- a/src/display.c
+++ b/src/display.c
@@ -4660,6 +4660,7 @@ meta_display_set_input_focus_window (MetaDisplay *display,
"timestamp of 0 for window %s. This shouldn't happen!\n",
window->desc);
meta_print_backtrace ();
+ timestamp = meta_display_get_current_time_roundtrip (display);
}
else if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
return;
@@ -4684,6 +4685,7 @@ meta_display_focus_the_no_focus_window (MetaDisplay *display,
meta_warning ("meta_display_focus_the_no_focus_window called with a "
"timestamp of 0. This shouldn't happen!\n");
meta_print_backtrace ();
+ timestamp = meta_display_get_current_time_roundtrip (display);
}
else if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
{
diff --git a/src/window.c b/src/window.c
index 947acff3..67ff35c2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2109,7 +2109,7 @@ meta_window_shade (MetaWindow *window)
"Re-focusing window %s after shading it\n",
window->desc);
meta_window_focus (window,
- meta_display_get_current_time (window->display));
+ meta_display_get_current_time_roundtrip (window->display));
set_net_wm_state (window);
}
@@ -2130,7 +2130,8 @@ meta_window_unshade (MetaWindow *window)
meta_topic (META_DEBUG_FOCUS,
"Focusing window %s after unshading it\n",
window->desc);
- meta_window_focus (window, meta_display_get_current_time (window->display));
+ meta_window_focus (window,
+ meta_display_get_current_time_roundtrip (window->display));
set_net_wm_state (window);
}