X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=b95b0805b00083cbb9a6ed57cea46cdf11b9f6c4;hb=8612fcfb99f4ed97f49c3617fd2ae291877c8c8e;hp=09b99bcc583c16193e4969934a1e6b44721153fe;hpb=1ffd89672fa62cdf2c9e707fdf53e6d8a0080b6f;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index 09b99bcc..b95b0805 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- keyboard.c for the Openbox window manager - Copyright (c) 2004 Mikael Magnusson + Copyright (c) 2006 Mikael Magnusson Copyright (c) 2003 Ben Jansens This program is free software; you can redistribute it and/or modify @@ -184,9 +184,9 @@ gboolean keyboard_interactive_grab(guint state, ObClient *client, } void keyboard_interactive_end(ObInteractiveState *s, - guint state, gboolean cancel) + guint state, gboolean cancel, Time time) { - action_run_interactive(s->actions, s->client, state, cancel, TRUE); + action_run_interactive(s->actions, s->client, state, time, cancel, TRUE); g_slist_free(s->actions); g_free(s); @@ -236,7 +236,7 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client) cancel = done = TRUE; } if (done) { - keyboard_interactive_end(s, e->xkey.state, cancel); + keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time); handled = TRUE; } else @@ -280,7 +280,8 @@ void keyboard_event(ObClient *client, const XEvent *e) keyboard_reset_chains(); action_run_key(p->actions, client, e->xkey.state, - e->xkey.x_root, e->xkey.y_root); + e->xkey.x_root, e->xkey.y_root, + e->xkey.time); } break; }