#include "kernel/action.h"
#include "kernel/event.h"
#include "kernel/client.h"
-#include "kernel/frame.h"
#include "kernel/grab.h"
-#include "kernel/engine.h"
#include "kernel/parse.h"
#include "kernel/frame.h"
#include "translate.h"
break;
}
b->action[a]->data.resize.final = final;
- }
+ } else
+ g_assert_not_reached();
b->action[a]->func(&b->action[a]->data);
return TRUE;
}
{
static Time ltime;
static int px, py, cx, cy, cw, ch, dx, dy;
- static guint button = 0, lbutton = 0;
+ static guint button = 0, state = 0, lbutton = 0;
static gboolean drag = FALSE, drag_used = FALSE;
static Corner corner = Corner_TopLeft;
gboolean click = FALSE;
corner = pick_corner(px, py, cx, cy, cw, ch);
}
button = e->data.x.e->xbutton.button;
+ state = e->data.x.e->xbutton.state;
}
- context = engine_get_context(e->data.x.client,
- e->data.x.e->xbutton.window);
+ context = frame_context(e->data.x.client->frame,
+ e->data.x.e->xbutton.window);
fire_button(MouseAction_Press, context,
e->data.x.client, e->data.x.e->xbutton.state,
break;
case Event_X_ButtonRelease:
- context = engine_get_context(e->data.x.client,
- e->data.x.e->xbutton.window);
+ context = frame_context(e->data.x.client->frame,
+ e->data.x.e->xbutton.window);
if (e->data.x.e->xbutton.button == button) {
/* end drags */
if (drag_used) {
fire_motion(MouseAction_Motion, context,
- e->data.x.client, e->data.x.e->xbutton.state,
- e->data.x.e->xbutton.button,
+ e->data.x.client, state, button,
cx, cy, cw, ch, dx, dy, TRUE, corner);
drag = drag_used = FALSE;
}
button = 0;
+ state = 0;
ltime = e->data.x.e->xbutton.time;
}
fire_button(MouseAction_Release, context,
(ABS(dx) >= threshold || ABS(dy) >= threshold))
drag = TRUE;
if (drag) {
- context = engine_get_context(e->data.x.client,
- e->data.x.e->xbutton.window);
+ context = frame_context(e->data.x.client->frame,
+ e->data.x.e->xbutton.window);
drag_used = fire_motion(MouseAction_Motion, context,
e->data.x.client,
- e->data.x.e->xmotion.state,
- button, cx, cy, cw, ch, dx, dy,
+ state, button, cx, cy, cw, ch, dx, dy,
FALSE, corner);
}
}