From 197ee0ad4732c8668fe38a6b49e0a747866ef3ea Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 16 Apr 2010 22:23:37 -0400 Subject: event_curtime is replaced (publicly) by event_time() This function never returns CurrentTime, which is nice, cuz using CurrentTime for XSetFocus always sucks. If the current XEvent did not have a timestamp, then event_time() will find one. It finds the first timestamp available in the X event queue, meaning the earliest timestamp >= the current (nontimestamped) event. All future events should have a timestamp >= event_time(), so using this in XSetFocus() should not mess up any future calls we make to it. This change seems to work well, as it appears to fix bug #3648. --- openbox/event.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'openbox/event.h') diff --git a/openbox/event.h b/openbox/event.h index 4a8d7901..8a2a4cbc 100644 --- a/openbox/event.h +++ b/openbox/event.h @@ -28,8 +28,6 @@ struct _ObClient; to determine if the user is working in another window */ #define OB_EVENT_USER_TIME_DELAY (500) /* 0.5 seconds */ -/*! Time at which the last event with a timestamp occured. */ -extern Time event_curtime; /*! The last user-interaction time, as given by the clients */ extern Time event_last_user_time; @@ -66,6 +64,14 @@ void event_halt_focus_delay(void); comes at the same time or later than t2. */ gboolean event_time_after(guint32 t1, guint32 t2); -Time event_get_server_time(void); +/*! Time at which the current event occured. If this is not known, this + is a time at or after it, but at or before any other events we will process +*/ +Time event_time(void); +/*! A time at which an event happened that caused this current event to be + generated. This is a user-provided time and not to be trusted. + Returns CurrentTime if there was no source time provided. + */ +Time event_source_time(void); #endif -- cgit v1.2.3