X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=events.c;h=307861c6a717a862fa9c8a57d5d09280f58d2542;hb=e7573238856369f933322a72bc323c4acbf22354;hp=58a2f39015a68f136f11bf3c4ac84bc0237dc7f0;hpb=d18b3917ee9694ddbea596c2cce0a63abe7225aa;p=bspwm.git diff --git a/events.c b/events.c index 58a2f39..307861c 100644 --- a/events.c +++ b/events.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include "types.h" @@ -11,12 +12,14 @@ #include "window.h" #include "events.h" #include "tree.h" +#include "query.h" #include "rules.h" #include "ewmh.h" void handle_event(xcb_generic_event_t *evt) { - switch (XCB_EVENT_RESPONSE_TYPE(evt)) { + uint8_t resp_type = XCB_EVENT_RESPONSE_TYPE(evt); + switch (resp_type) { case XCB_MAP_REQUEST: map_request(evt); break; @@ -39,9 +42,14 @@ void handle_event(xcb_generic_event_t *evt) 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) + import_monitors(); break; } } @@ -61,7 +69,7 @@ void configure_request(xcb_generic_event_t *evt) 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)) { @@ -150,7 +158,7 @@ void destroy_notify(xcb_generic_event_t *evt) 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); @@ -163,7 +171,7 @@ void unmap_notify(xcb_generic_event_t *evt) 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); @@ -180,18 +188,10 @@ void property_notify(xcb_generic_event_t *evt) if (e->atom != XCB_ATOM_WM_HINTS) return; - window_location_t loc; - if (locate_window(e->window, &loc)) { - if (xcb_icccm_get_wm_hints_reply(dpy, xcb_icccm_get_wm_hints(dpy, e->window), &hints, NULL) == 1) { - uint32_t urgent = xcb_icccm_wm_hints_get_urgency(&hints); - if (urgent != 0 && loc.node != mon->desk->focus) { - loc.node->client->urgent = urgent; - put_status(); - if (loc.monitor->desk == loc.desktop) - arrange(loc.monitor, loc.desktop); - } - } - } + 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)); } void client_message(xcb_generic_event_t *evt) @@ -201,15 +201,13 @@ void client_message(xcb_generic_event_t *evt) PRINTF("client message %X %u\n", e->window, e->type); if (e->type == ewmh->_NET_CURRENT_DESKTOP) { - desktop_location_t loc; - if (ewmh_locate_desktop(e->data.data32[0], &loc)) { - select_monitor(loc.monitor); - select_desktop(loc.desktop); - } + 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; @@ -217,15 +215,38 @@ void client_message(xcb_generic_event_t *evt) handle_state(loc.monitor, loc.desktop, loc.node, e->data.data32[1], e->data.data32[0]); handle_state(loc.monitor, loc.desktop, loc.node, e->data.data32[2], e->data.data32[0]); } else if (e->type == ewmh->_NET_ACTIVE_WINDOW) { - if (loc.desktop->focus->client->fullscreen && loc.desktop->focus != loc.node) - toggle_fullscreen(loc.monitor, loc.desktop->focus->client); - select_monitor(loc.monitor); - select_desktop(loc.desktop); - focus_node(loc.monitor, loc.desktop, loc.node, true); - arrange(loc.monitor, loc.desktop); + if (loc.node == mon->desk->focus) + return; + if (loc.desktop->focus->client->fullscreen && loc.desktop->focus != loc.node) { + 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) { + 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; @@ -240,28 +261,55 @@ void enter_notify(xcb_generic_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) + 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(m, n->client); - 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); + else if (action == XCB_EWMH_WM_STATE_REMOVE) + set_urgency(m, d, n, false); + else if (action == XCB_EWMH_WM_STATE_TOGGLE) + set_urgency(m, d, n, !n->client->urgent); } } @@ -274,10 +322,7 @@ void grab_pointer(pointer_action_t pac) 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; @@ -293,7 +338,14 @@ void grab_pointer(pointer_action_t pac) switch (pac) { case ACTION_FOCUS: - focus_node(loc.monitor, loc.desktop, loc.node, true); + if (loc.node != mon->desk->focus) { + bool backup = pointer_follows_monitor; + 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: case ACTION_RESIZE_SIDE: @@ -388,6 +440,11 @@ void grab_pointer(pointer_action_t pac) 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; } } @@ -397,7 +454,7 @@ void track_pointer(int root_x, int root_y) 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; @@ -410,9 +467,6 @@ void track_pointer(int root_x, int root_y) 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; @@ -423,10 +477,10 @@ void track_pointer(int root_x, int root_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(d, n, loc.desktop, loc.node); + swap_nodes(n, loc.node); arrange(m, d); } else { if (is_managed && loc.monitor == m) { @@ -442,8 +496,6 @@ void track_pointer(int root_x, int root_y) } } transfer_node(m, d, loc.monitor, loc.desktop, n); - arrange(m, d); - arrange(loc.monitor, loc.desktop); frozen_pointer->monitor = loc.monitor; frozen_pointer->desktop = loc.desktop; } @@ -451,6 +503,15 @@ void track_pointer(int root_x, int root_y) x = rect.x + delta_x; y = rect.y + delta_y; window_move(win, x, y); + c->floating_rectangle.x = x; + c->floating_rectangle.y = y; + xcb_point_t pt = (xcb_point_t) {root_x, root_y}; + monitor_t *pmon = monitor_from_point(pt); + if (pmon == NULL || pmon == m) + return; + transfer_node(m, d, pmon, pmon->desk, n); + frozen_pointer->monitor = pmon; + frozen_pointer->desktop = pmon->desk; } break; case ACTION_RESIZE_SIDE: @@ -542,18 +603,3 @@ void track_pointer(int root_x, int root_y) break; } } - -void ungrab_pointer(void) -{ - PUTS("ungrab pointer"); - - if (frozen_pointer->action == ACTION_NONE || frozen_pointer->is_tiled) - return; - - update_floating_rectangle(frozen_pointer->client); - monitor_t *m = underlying_monitor(frozen_pointer->client); - if (m != NULL && m != frozen_pointer->monitor) { - transfer_node(frozen_pointer->monitor, frozen_pointer->desktop, m, m->desk, frozen_pointer->node); - select_monitor(m); - } -}