static gboolean unfocus_delay_func(gpointer data);
static void focus_delay_client_dest(ObClient *client, gpointer data);
-Time event_curtime = CurrentTime;
-Time event_last_user_time = CurrentTime;
-/*! The serial of the current X event */
+Time event_last_user_time;
+
+/*! The time of the current X event (if it had a timestamp) */
+static Time event_curtime;
+/*! The source time that started the current X event (user-provided, so not
+ to be trusted) */
+static Time event_sourcetime;
+/*! The serial of the current X event */
static gulong event_curserial;
static gboolean focus_left_screen = FALSE;
/*! A list of ObSerialRanges which are to be ignored for mouse enter events */
#endif
client_add_destroy_notify(focus_delay_client_dest, NULL);
+
+ event_curtime = CurrentTime;
+ event_sourcetime = CurrentTime;
+ event_last_user_time = CurrentTime;
}
void event_shutdown(gboolean reconfig)
return window;
}
-static void event_set_curtime(XEvent *e)
+static inline Time event_get_timestamp(const XEvent *e)
{
Time t = CurrentTime;
if (obt_display_extension_sync &&
e->type == obt_display_extension_sync_basep + XSyncAlarmNotify)
{
- t = ((XSyncAlarmNotifyEvent*)e)->time;
+ t = ((const XSyncAlarmNotifyEvent*)e)->time;
}
#endif
/* if more event types are anticipated, get their timestamp
break;
}
+ return t;
+}
+
+static void event_set_curtime(XEvent *e)
+{
+ Time t = event_get_timestamp(e);
+
/* watch that if we get an event earlier than the last specified user_time,
which can happen if the clock goes backwards, we erase the last
specified user_time */
if (t && event_last_user_time && event_time_after(event_last_user_time, t))
event_last_user_time = CurrentTime;
+ event_sourcetime = CurrentTime;
event_curtime = t;
}
/* if something happens and it's not from an XEvent, then we don't know
the time */
- event_curtime = CurrentTime;
+ event_curtime = event_sourcetime = CurrentTime;
event_curserial = 0;
}
if (msgtype == OBT_PROP_ATOM(NET_CURRENT_DESKTOP)) {
guint d = e->xclient.data.l[0];
if (d < screen_num_desktops) {
- event_curtime = e->xclient.data.l[1];
- if (event_curtime == 0)
+ if (e->xclient.data.l[1] == 0)
ob_debug_type(OB_DEBUG_APP_BUGS,
"_NET_CURRENT_DESKTOP message is missing "
"a timestamp");
+ else
+ event_sourcetime = e->xclient.data.l[1];
screen_set_desktop(d, TRUE);
}
} else if (msgtype == OBT_PROP_ATOM(NET_NUMBER_OF_DESKTOPS)) {
data = g_slice_new(ObFocusDelayData);
data->client = client;
- data->time = event_curtime;
+ data->time = event_time();
data->serial = event_curserial;
obt_main_loop_timeout_add(ob_main_loop,
} else {
ObFocusDelayData data;
data.client = client;
- data.time = event_curtime;
+ data.time = event_time();
data.serial = event_curserial;
focus_delay_func(&data);
}
data = g_slice_new(ObFocusDelayData);
data->client = client;
- data->time = event_curtime;
+ data->time = event_time();
data->serial = event_curserial;
obt_main_loop_timeout_add(ob_main_loop,
} else {
ObFocusDelayData data;
data.client = client;
- data.time = event_curtime;
+ data.time = event_time();
data.serial = event_curserial;
unfocus_delay_func(&data);
}
XXX remove this some day...that would be nice. but really unexpected
from Sun Microsystems.
*/
- g_print("x %d y %d grav %d %d\n", x, y, client->gravity, NorthWestGravity);
- if (x == 0 && y == 0 && client->gravity == NorthWestGravity) {
+ if (x == 0 && y == 0 && client->gravity == NorthWestGravity &&
+ client_normal(client))
+ {
const Rect to = { x, y, w, h };
/* oldschool fullscreen windows are allowed */
to an already unmapped window.
*/
- /* we don't want the reparent event, put it back on the stack for the
- X server to deal with after we unmanage the window */
- XPutBackEvent(obt_display, e);
-
ob_debug("ReparentNotify for window 0x%x", client->window);
client_unmanage(client);
break;
so do not use this timestamp in event_curtime, as this would
be used in XSetInputFocus.
*/
- /*event_curtime = e->xclient.data.l[1];*/
+ event_sourcetime = e->xclient.data.l[1];
if (e->xclient.data.l[1] == 0)
ob_debug_type(OB_DEBUG_APP_BUGS,
"_NET_ACTIVE_WINDOW message for window %s is"
" missing a timestamp", client->title);
-
- event_curtime = event_get_server_time();
} else
ob_debug_type(OB_DEBUG_APP_BUGS,
"_NET_ACTIVE_WINDOW message for window %s is "
} else if (msgtype == XA_WM_HINTS) {
client_update_wmhints(client);
} else if (msgtype == XA_WM_TRANSIENT_FOR) {
- client_update_transient_for(client);
+ /* get the transient-ness first, as this affects if the client
+ decides to be transient for the group or not in
+ client_update_transient_for() */
client_get_type_and_transientness(client);
+ client_update_transient_for(client);
/* type may have changed, so update the layer */
client_calc_layer(client);
client_setup_decor_and_functions(client, TRUE);
ret = TRUE;
}
- else if (sym == XK_Return) {
+ else if (sym == XK_Return || sym == XK_KP_Enter) {
frame->press_doexec = TRUE;
ret = TRUE;
}
static gboolean focus_delay_func(gpointer data)
{
ObFocusDelayData *d = data;
- Time old = event_curtime;
+ Time old = event_curtime; /* save the curtime */
event_curtime = d->time;
event_curserial = d->serial;
static gboolean unfocus_delay_func(gpointer data)
{
ObFocusDelayData *d = data;
- Time old = event_curtime;
+ Time old = event_curtime; /* save the curtime */
event_curtime = d->time;
event_curserial = d->serial;
return t1 >= t2 && t1 < (t2 + TIME_HALF);
}
-Time event_get_server_time(void)
+Bool find_timestamp(Display *d, XEvent *e, XPointer a)
+{
+ const Time t = event_get_timestamp(e);
+ return t != CurrentTime;
+}
+
+Time event_time(void)
{
- /* Generate a timestamp */
XEvent event;
+ if (event_curtime) return event_curtime;
+
+ /* Some events don't come with timestamps :(
+ ...but we can get one anyways >:) */
+
+ /* Generate a timestamp so there is guaranteed at least one in the queue
+ eventually */
XChangeProperty(obt_display, screen_support_win,
OBT_PROP_ATOM(WM_CLASS), OBT_PROP_ATOM(STRING),
8, PropModeAppend, NULL, 0);
- XWindowEvent(obt_display, screen_support_win, PropertyChangeMask, &event);
- return event.xproperty.time;
+
+ /* Grab the first timestamp available */
+ XPeekIfEvent(obt_display, &event, find_timestamp, NULL);
+
+ /* Save the time so we don't have to do this again for this event */
+ return event_curtime = event.xproperty.time;
+}
+
+Time event_source_time(void)
+{
+ return event_sourcetime;
}
projects / chaz / openbox / blobdiff