/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
mouse.c for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2006 Mikael Magnusson
+ Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "frame.h"
#include "translate.h"
#include "mouse.h"
+#include "gettext.h"
+
#include <glib.h>
typedef struct {
static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
ObClient *c, guint state,
- guint button, gint x, gint y)
+ guint button, gint x, gint y, Time time)
{
GSList *it;
ObMouseBinding *b;
/* if not bound, then nothing to do! */
if (it == NULL) return FALSE;
- action_run_mouse(b->actions[a], c, context, state, button, x, y);
+ action_run_mouse(b->actions[a], c, context, state, button, x, y, time);
return TRUE;
}
fire_binding(OB_MOUSE_ACTION_PRESS, context,
client, e->xbutton.state,
e->xbutton.button,
- e->xbutton.x_root, e->xbutton.y_root);
+ e->xbutton.x_root, e->xbutton.y_root,
+ e->xbutton.time);
if (CLIENT_CONTEXT(context, client)) {
/* Replay the event, so it goes to the client*/
- XAllowEvents(ob_display, ReplayPointer, event_lasttime);
+ XAllowEvents(ob_display, ReplayPointer, event_curtime);
/* Fall through to the release case! */
} else
break;
fire_binding(OB_MOUSE_ACTION_RELEASE, context,
client, e->xbutton.state,
e->xbutton.button,
- e->xbutton.x_root, e->xbutton.y_root);
+ e->xbutton.x_root, e->xbutton.y_root,
+ e->xbutton.time);
if (click)
fire_binding(OB_MOUSE_ACTION_CLICK, context,
client, e->xbutton.state,
e->xbutton.button,
e->xbutton.x_root,
- e->xbutton.y_root);
+ e->xbutton.y_root,
+ e->xbutton.time);
if (dclick)
fire_binding(OB_MOUSE_ACTION_DOUBLE_CLICK, context,
client, e->xbutton.state,
e->xbutton.button,
e->xbutton.x_root,
- e->xbutton.y_root);
+ e->xbutton.y_root,
+ e->xbutton.time);
break;
case MotionNotify:
break;
fire_binding(OB_MOUSE_ACTION_MOTION, context,
- client, state, button, px, py);
+ client, state, button, px, py, e->xmotion.time);
button = 0;
state = 0;
}
GSList *it;
if (!translate_button(buttonstr, &state, &button)) {
- g_warning("invalid button '%s'", buttonstr);
+ g_message(_("Invalid button '%s' in pointer binding"), buttonstr);
return FALSE;
}
context = frame_context_from_string(contextstr);
if (!context) {
- g_warning("invalid context '%s'", contextstr);
+ g_message(_("Invalid context '%s' in pointer binding"), contextstr);
return FALSE;
}