- context = frame_context(client, e->xany.window);
- context = mouse_button_frame_context(context, e->xbutton.button);
+ /* use where the press occured in the window */
+ context = frame_context(client, e->xbutton.window, pwx, pwy);
+ context = mouse_button_frame_context(context, e->xbutton.button,
+ e->xbutton.state);
+
+ if (e->xbutton.button == button)
+ pwx = pwy = -1;