#include "screen.h"
#include "frame.h"
#include "menu.h"
+#include "keyboard.h"
+#include "mouse.h"
#include "framerender.h"
#include "focus.h"
#include "moveresize.h"
static void event_set_lasttime(XEvent *e)
{
+ Time t = 0;
+
/* grab the lasttime and hack up the state */
switch (e->type) {
case ButtonPress:
case ButtonRelease:
- event_lasttime = e->xbutton.time;
+ t = e->xbutton.time;
break;
case KeyPress:
- event_lasttime = e->xkey.time;
+ t = e->xkey.time;
break;
case KeyRelease:
- event_lasttime = e->xkey.time;
+ t = e->xkey.time;
break;
case MotionNotify:
- event_lasttime = e->xmotion.time;
+ t = e->xmotion.time;
break;
case PropertyNotify:
- event_lasttime = e->xproperty.time;
+ t = e->xproperty.time;
break;
case EnterNotify:
case LeaveNotify:
- event_lasttime = e->xcrossing.time;
+ t = e->xcrossing.time;
break;
default:
- event_lasttime = CurrentTime;
+ /* if more event types are anticipated, get their timestamp
+ explicitly */
break;
}
+
+ if (t > event_lasttime)
+ event_lasttime = t;
}
#define STRIP_MODS(s) \
}
/* user input (action-bound) events */
- /*
if (e->type == ButtonPress || e->type == ButtonRelease ||
- e->type == MotionNotify)
- mouse_event(e, client);
- else if (e->type == KeyPress || e->type == KeyRelease)
- ;
- */
+ e->type == MotionNotify || e->type == KeyPress ||
+ e->type == KeyRelease)
+ {
+ ObFrameContext context;
+
+ context = frame_context(client, e->xany.window);
+
+ if (!keyboard_process_interactive_grab(e, &client, &context)) {
+
+ if (e->type == ButtonPress || e->type == ButtonRelease ||
+ e->type == MotionNotify)
+ mouse_event(client, context, e);
+ else if (e->type == KeyPress)
+ keyboard_event(client, e);
+ }
+ }
/* dispatch the event to registered handlers */
dispatch_x(e, client);
{
int newx = x;
int newy = y;
- client_find_onscreen(client, &newx, &newy, w, h, TRUE);
+ int fw = w +
+ client->frame->size.left + client->frame->size.right;
+ int fh = h +
+ client->frame->size.top + client->frame->size.bottom;
+ client_find_onscreen(client, &newx, &newy, fw, fh, TRUE);
if (e->xconfigurerequest.value_mask & CWX)
x = newx;
if (e->xconfigurerequest.value_mask & CWY)
client_close(client);
} else if (msgtype == prop_atoms.net_active_window) {
ob_debug("net_active_window for 0x%lx\n", client->window);
- client_activate(client);
+ client_activate(client, FALSE);
} else if (msgtype == prop_atoms.net_wm_moveresize) {
ob_debug("net_wm_moveresize for 0x%lx\n", client->window);
if ((Atom)e->xclient.data.l[2] ==
{
int newx = x;
int newy = y;
- client_find_onscreen(client, &newx, &newy, w, h, TRUE);
+ int fw = w +
+ client->frame->size.left + client->frame->size.right;
+ int fh = h +
+ client->frame->size.top + client->frame->size.bottom;
+ client_find_onscreen(client, &newx, &newy, fw, fh, TRUE);
if (e->xclient.data.l[0] & 1 << 8)
x = newx;
if (e->xclient.data.l[0] & 1 << 9)
(gpointer)&tmpmax);
max_fd = MAX(x_fd, tmpmax);
#ifdef USE_SM
- max_fd = MAX(ice_fd, tmpmax);
+ max_fd = MAX(ice_fd, max_fd);
#endif
}