#include "window.h"
#include "events.h"
#include "tree.h"
+#include "query.h"
#include "rules.h"
#include "ewmh.h"
enter_notify(evt);
break;
case XCB_MOTION_NOTIFY:
- motion_notify();
+ motion_notify(evt);
+ break;
+ case XCB_FOCUS_IN:
+ focus_in(evt);
break;
default:
if (randr && resp_type == randr_base + XCB_RANDR_SCREEN_CHANGE_NOTIFY)
PRINTF("configure request %X\n", e->window);
- window_location_t loc;
+ coordinates_t loc;
bool is_managed = locate_window(e->window, &loc);
if (!is_managed || is_floating(loc.node->client)) {
PRINTF("destroy notify %X\n", e->window);
- window_location_t loc;
+ coordinates_t loc;
if (locate_window(e->window, &loc)) {
remove_node(loc.desktop, loc.node);
arrange(loc.monitor, loc.desktop);
PRINTF("unmap notify %X\n", e->window);
- window_location_t loc;
+ coordinates_t loc;
if (locate_window(e->window, &loc)) {
remove_node(loc.desktop, loc.node);
arrange(loc.monitor, loc.desktop);
if (e->atom != XCB_ATOM_WM_HINTS)
return;
- window_location_t loc;
+ coordinates_t loc;
if (locate_window(e->window, &loc)
&& xcb_icccm_get_wm_hints_reply(dpy, xcb_icccm_get_wm_hints(dpy, e->window), &hints, NULL) == 1)
set_urgency(loc.monitor, loc.desktop, loc.node, xcb_icccm_wm_hints_get_urgency(&hints));
PRINTF("client message %X %u\n", e->window, e->type);
if (e->type == ewmh->_NET_CURRENT_DESKTOP) {
- desktop_location_t loc;
+ coordinates_t loc;
if (ewmh_locate_desktop(e->data.data32[0], &loc))
focus_node(loc.monitor, loc.desktop, loc.desktop->focus);
return;
}
- window_location_t loc;
+ coordinates_t loc;
if (!locate_window(e->window, &loc))
return;
if (loc.node == mon->desk->focus)
return;
if (loc.desktop->focus->client->fullscreen && loc.desktop->focus != loc.node) {
- toggle_fullscreen(loc.desktop, loc.desktop->focus);
+ set_fullscreen(loc.desktop, loc.desktop->focus, false);
arrange(loc.monitor, loc.desktop);
}
focus_node(loc.monitor, loc.desktop, loc.node);
} else if (e->type == ewmh->_NET_WM_DESKTOP) {
- desktop_location_t dloc;
+ coordinates_t dloc;
if (ewmh_locate_desktop(e->data.data32[0], &dloc))
transfer_node(loc.monitor, loc.desktop, dloc.monitor, dloc.desktop, loc.node);
}
}
+void focus_in(xcb_generic_event_t *evt)
+{
+ xcb_focus_in_event_t *e = (xcb_focus_in_event_t *) evt;
+
+ /* PRINTF("focus in %X %d %d\n", e->event, e->mode, e->detail); */
+
+ if (e->mode == XCB_NOTIFY_MODE_GRAB
+ || e->mode == XCB_NOTIFY_MODE_UNGRAB)
+ return;
+ if ((e->detail == XCB_NOTIFY_DETAIL_ANCESTOR ||
+ e->detail == XCB_NOTIFY_DETAIL_INFERIOR ||
+ e->detail == XCB_NOTIFY_DETAIL_NONLINEAR_VIRTUAL ||
+ e->detail == XCB_NOTIFY_DETAIL_NONLINEAR) &&
+ (mon->desk->focus == NULL
+ || mon->desk->focus->client->window != e->event))
+ update_input_focus();
+}
+
void enter_notify(xcb_generic_event_t *evt)
{
xcb_enter_notify_event_t *e = (xcb_enter_notify_event_t *) evt;
enable_motion_recorder();
}
-void motion_notify(void)
+void motion_notify(xcb_generic_event_t *evt)
{
PUTS("motion notify");
+ xcb_motion_notify_event_t *e = (xcb_motion_notify_event_t *) evt;
+
+ int dtime = e->time - last_motion_time;
+ if (dtime > 1000) {
+ last_motion_time = e->time;
+ last_motion_x = e->event_x;
+ last_motion_y = e->event_y;
+ return;
+ }
+
+ int mdist = abs(e->event_x - last_motion_x) + abs(e->event_y - last_motion_y);
+ if (mdist < 10)
+ return;
+
disable_motion_recorder();
xcb_window_t win = XCB_NONE;
query_pointer(&win, NULL);
if (win != XCB_NONE) {
bool backup = pointer_follows_monitor;
+ auto_raise = false;
pointer_follows_monitor = false;
window_focus(win);
pointer_follows_monitor = backup;
+ auto_raise = true;
}
}
void handle_state(monitor_t *m, desktop_t *d, node_t *n, xcb_atom_t state, unsigned int action)
{
if (state == ewmh->_NET_WM_STATE_FULLSCREEN) {
- bool fs = n->client->fullscreen;
- if (action == XCB_EWMH_WM_STATE_TOGGLE
- || (fs && action == XCB_EWMH_WM_STATE_REMOVE)
- || (!fs && action == XCB_EWMH_WM_STATE_ADD)) {
- toggle_fullscreen(d, n);
- arrange(m, d);
- }
+ if (action == XCB_EWMH_WM_STATE_ADD)
+ set_fullscreen(d, n, true);
+ else if (action == XCB_EWMH_WM_STATE_REMOVE)
+ set_fullscreen(d, n, false);
+ else if (action == XCB_EWMH_WM_STATE_TOGGLE)
+ set_fullscreen(d, n, !n->client->fullscreen);
+ arrange(m, d);
} else if (state == ewmh->_NET_WM_STATE_DEMANDS_ATTENTION) {
if (action == XCB_EWMH_WM_STATE_ADD)
set_urgency(m, d, n, true);
query_pointer(&win, &pos);
- if (win == XCB_NONE)
- return;
-
- window_location_t loc;
+ coordinates_t loc;
if (locate_window(win, &loc)) {
client_t *c = NULL;
frozen_pointer->position = pos;
pointer_follows_monitor = false;
focus_node(loc.monitor, loc.desktop, loc.node);
pointer_follows_monitor = backup;
+ } else if (focus_follows_pointer && is_floating(loc.node->client)) {
+ stack(loc.desktop, loc.node);
}
break;
case ACTION_MOVE:
break;
}
} else {
+ if (pac == ACTION_FOCUS) {
+ monitor_t *m = monitor_from_point(pos);
+ if (m != NULL)
+ focus_node(m, m->desk, m->desk->focus);
+ }
frozen_pointer->action = ACTION_NONE;
}
}
if (frozen_pointer->action == ACTION_NONE)
return;
- int16_t delta_x, delta_y, x, y, w, h;
+ int16_t delta_x, delta_y, x = 0, y = 0, w = 1, h = 1;
uint16_t width, height;
pointer_action_t pac = frozen_pointer->action;
node_t *vertical_fence = frozen_pointer->vertical_fence;
node_t *horizontal_fence = frozen_pointer->horizontal_fence;
- x = y = 0;
- w = h = 1;
-
delta_x = root_x - frozen_pointer->position.x;
delta_y = root_y - frozen_pointer->position.y;
query_pointer(&pwin, NULL);
if (pwin == win)
return;
- window_location_t loc;
+ coordinates_t loc;
bool is_managed = (pwin == XCB_NONE ? false : locate_window(pwin, &loc));
if (is_managed && is_tiled(loc.node->client) && loc.monitor == m) {
- swap_nodes(n, loc.node, true);
+ swap_nodes(n, loc.node);
arrange(m, d);
} else {
if (is_managed && loc.monitor == m) {
projects / bspwm.git / blobdiff