enter_notify(evt);
break;
case XCB_MOTION_NOTIFY:
- motion_notify(evt);
+ motion_notify();
break;
default:
break;
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);
- }
- }
- }
+ 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)
PRINTF("enter notify %X %d %d\n", win, e->mode, e->detail);
if (e->mode != XCB_NOTIFY_MODE_NORMAL
- || (last_pointer_position.x = e->root_x && last_pointer_position.y == e->root_y))
+ || (mon->desk->focus != NULL && mon->desk->focus->client->window == win))
return;
- window_focus(win);
+ enable_motion_recorder();
}
-void motion_notify(xcb_generic_event_t *evt)
+void motion_notify(void)
{
- xcb_motion_notify_event_t *e = (xcb_motion_notify_event_t *) evt;
- xcb_window_t win = e->event;
+ PUTS("motion notify");
- PRINTF("motion notify %X\n", win);
+ disable_motion_recorder();
- window_focus(win);
+ xcb_window_t win = XCB_NONE;
+ query_pointer(&win, NULL);
+ if (win != XCB_NONE)
+ window_focus(win);
}
void handle_state(monitor_t *m, desktop_t *d, node_t *n, xcb_atom_t state, unsigned int action)
toggle_fullscreen(m, n->client);
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);
}
}
{
PRINTF("grab pointer %u\n", pac);
- xcb_window_t win;
+ xcb_window_t win = XCB_NONE;
xcb_point_t pos;
- xcb_query_pointer_reply_t *qpr = xcb_query_pointer_reply(dpy, xcb_query_pointer(dpy, root), NULL);
- if (qpr != NULL) {
- pos = (xcb_point_t) {qpr->root_x, qpr->root_y};
- win = qpr->child;
- free(qpr);
- } else {
+ query_pointer(&win, &pos);
+
+ if (win == XCB_NONE)
return;
- }
window_location_t loc;
if (locate_window(win, &loc)) {
- client_t *c = loc.node->client;
+ client_t *c = NULL;
+ frozen_pointer->position = pos;
+ frozen_pointer->action = pac;
+ c = loc.node->client;
+ frozen_pointer->monitor = loc.monitor;
+ frozen_pointer->desktop = loc.desktop;
+ frozen_pointer->node = loc.node;
+ frozen_pointer->client = c;
+ frozen_pointer->window = c->window;
+ frozen_pointer->horizontal_fence = NULL;
+ frozen_pointer->vertical_fence = NULL;
+
switch (pac) {
- case POINTER_FOCUS:
+ case ACTION_FOCUS:
focus_node(loc.monitor, loc.desktop, loc.node, true);
break;
- case POINTER_MOVE:
- case POINTER_RESIZE:
- if (is_tiled(loc.node->client)) {
- loc.node->client->floating_rectangle = loc.node->client->tiled_rectangle;
- toggle_floating(loc.node);
- arrange(loc.monitor, loc.desktop);
- } else if (loc.node->client->fullscreen) {
+ case ACTION_MOVE:
+ case ACTION_RESIZE_SIDE:
+ case ACTION_RESIZE_CORNER:
+ if (is_tiled(c)) {
+ frozen_pointer->rectangle = c->tiled_rectangle;
+ frozen_pointer->is_tiled = true;
+ } else if (is_floating(c)) {
+ frozen_pointer->rectangle = c->floating_rectangle;
+ frozen_pointer->is_tiled = false;
+ } else {
+ frozen_pointer->action = ACTION_NONE;
return;
}
- frozen_pointer->monitor = loc.monitor;
- frozen_pointer->desktop = loc.desktop;
- frozen_pointer->node = loc.node;
- frozen_pointer->rectangle = c->floating_rectangle;
- frozen_pointer->position = pos;
- frozen_pointer->action = pac;
- if (pac == POINTER_RESIZE) {
- int16_t mid_x, mid_y;
- mid_x = c->floating_rectangle.x + (c->floating_rectangle.width / 2);
- mid_y = c->floating_rectangle.y + (c->floating_rectangle.height / 2);
+ if (pac == ACTION_RESIZE_SIDE) {
+ float W = frozen_pointer->rectangle.width;
+ float H = frozen_pointer->rectangle.height;
+ float ratio = W / H;
+ float x = pos.x - frozen_pointer->rectangle.x;
+ float y = pos.y - frozen_pointer->rectangle.y;
+ float diag_a = ratio * y;
+ float diag_b = W - diag_a;
+ if (x < diag_a) {
+ if (x < diag_b)
+ frozen_pointer->side = SIDE_LEFT;
+ else
+ frozen_pointer->side = SIDE_BOTTOM;
+ } else {
+ if (x < diag_b)
+ frozen_pointer->side = SIDE_TOP;
+ else
+ frozen_pointer->side = SIDE_RIGHT;
+ }
+ } else if (pac == ACTION_RESIZE_CORNER) {
+ int16_t mid_x = frozen_pointer->rectangle.x + (frozen_pointer->rectangle.width / 2);
+ int16_t mid_y = frozen_pointer->rectangle.y + (frozen_pointer->rectangle.height / 2);
if (pos.x > mid_x) {
- if (pos.y > mid_y) {
- frozen_pointer->corner = BOTTOM_RIGHT;
- window_set_cursor(loc.node->client->window, CURSOR_RESIZE_BR);
- } else {
- frozen_pointer->corner = TOP_RIGHT;
- window_set_cursor(loc.node->client->window, CURSOR_RESIZE_TR);
- }
+ if (pos.y > mid_y)
+ frozen_pointer->corner = CORNER_BOTTOM_RIGHT;
+ else
+ frozen_pointer->corner = CORNER_TOP_RIGHT;
} else {
- if (pos.y > mid_y) {
- frozen_pointer->corner = BOTTOM_LEFT;
- window_set_cursor(loc.node->client->window, CURSOR_RESIZE_BL);
- } else {
- frozen_pointer->corner = TOP_LEFT;
- window_set_cursor(loc.node->client->window, CURSOR_RESIZE_TL);
+ if (pos.y > mid_y)
+ frozen_pointer->corner = CORNER_BOTTOM_LEFT;
+ else
+ frozen_pointer->corner = CORNER_TOP_LEFT;
+ }
+ }
+ if (frozen_pointer->is_tiled) {
+ if (pac == ACTION_RESIZE_SIDE) {
+ switch (frozen_pointer->side) {
+ case SIDE_TOP:
+ frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_UP);
+ break;
+ case SIDE_RIGHT:
+ frozen_pointer->vertical_fence = find_fence(loc.node, DIR_RIGHT);
+ break;
+ case SIDE_BOTTOM:
+ frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_DOWN);
+ break;
+ case SIDE_LEFT:
+ frozen_pointer->vertical_fence = find_fence(loc.node, DIR_LEFT);
+ break;
+ }
+ } else if (pac == ACTION_RESIZE_CORNER) {
+ switch (frozen_pointer->corner) {
+ case CORNER_TOP_LEFT:
+ frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_UP);
+ frozen_pointer->vertical_fence = find_fence(loc.node, DIR_LEFT);
+ break;
+ case CORNER_TOP_RIGHT:
+ frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_UP);
+ frozen_pointer->vertical_fence = find_fence(loc.node, DIR_RIGHT);
+ break;
+ case CORNER_BOTTOM_RIGHT:
+ frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_DOWN);
+ frozen_pointer->vertical_fence = find_fence(loc.node, DIR_RIGHT);
+ break;
+ case CORNER_BOTTOM_LEFT:
+ frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_DOWN);
+ frozen_pointer->vertical_fence = find_fence(loc.node, DIR_LEFT);
+ break;
}
}
- } else {
- window_set_cursor(loc.node->client->window, CURSOR_MOVE);
+ if (frozen_pointer->horizontal_fence != NULL)
+ frozen_pointer->horizontal_ratio = frozen_pointer->horizontal_fence->split_ratio;
+ if (frozen_pointer->vertical_fence != NULL)
+ frozen_pointer->vertical_ratio = frozen_pointer->vertical_fence->split_ratio;
}
break;
+ case ACTION_NONE:
+ break;
}
+ } else {
+ frozen_pointer->action = ACTION_NONE;
}
}
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;
uint16_t width, height;
+ pointer_action_t pac = frozen_pointer->action;
monitor_t *m = frozen_pointer->monitor;
desktop_t *d = frozen_pointer->desktop;
node_t *n = frozen_pointer->node;
- client_t *c = n->client;
+ client_t *c = frozen_pointer->client;
+ xcb_window_t win = frozen_pointer->window;
xcb_rectangle_t rect = frozen_pointer->rectangle;
- xcb_window_t win = c->window;
+ 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;
- switch (frozen_pointer->action) {
- case POINTER_MOVE:
- x = rect.x + delta_x;
- y = rect.y + delta_y;
- window_move(win, x, y);
+ switch (pac) {
+ case ACTION_MOVE:
+ if (frozen_pointer->is_tiled) {
+ xcb_window_t pwin = XCB_NONE;
+ query_pointer(&pwin, NULL);
+ if (pwin == win)
+ return;
+ window_location_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);
+ arrange(m, d);
+ } else {
+ if (is_managed && loc.monitor == m) {
+ return;
+ } else if (!is_managed) {
+ xcb_point_t pt = (xcb_point_t) {root_x, root_y};
+ monitor_t *pmon = monitor_from_point(pt);
+ if (pmon == NULL || pmon == m) {
+ return;
+ } else {
+ loc.monitor = pmon;
+ loc.desktop = pmon->desk;
+ }
+ }
+ 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;
+ }
+ } else {
+ x = rect.x + delta_x;
+ y = rect.y + delta_y;
+ window_move(win, x, y);
+ }
break;
- case POINTER_RESIZE:
- switch (frozen_pointer->corner) {
- case TOP_LEFT:
- x = rect.x + delta_x;
- y = rect.y + delta_y;
- w = rect.width - delta_x;
- h = rect.height - delta_y;
- break;
- case TOP_RIGHT:
- x = rect.x;
- y = rect.y + delta_y;
- w = rect.width + delta_x;
- h = rect.height - delta_y;
- break;
- case BOTTOM_LEFT:
- x = rect.x + delta_x;
- y = rect.y;
- w = rect.width - delta_x;
- h = rect.height + delta_y;
- break;
- case BOTTOM_RIGHT:
- x = rect.x;
- y = rect.y;
- w = rect.width + delta_x;
- h = rect.height + delta_y;
- break;
+ case ACTION_RESIZE_SIDE:
+ case ACTION_RESIZE_CORNER:
+ if (frozen_pointer->is_tiled) {
+ if (vertical_fence != NULL) {
+ double sr = frozen_pointer->vertical_ratio + (double) delta_x / vertical_fence->rectangle.width;
+ sr = MAX(0, sr);
+ sr = MIN(1, sr);
+ vertical_fence->split_ratio = sr;
+ }
+ if (horizontal_fence != NULL) {
+ double sr = frozen_pointer->horizontal_ratio + (double) delta_y / horizontal_fence->rectangle.height;
+ sr = MAX(0, sr);
+ sr = MIN(1, sr);
+ horizontal_fence->split_ratio = sr;
+ }
+ arrange(mon, mon->desk);
+ } else {
+ if (pac == ACTION_RESIZE_SIDE) {
+ switch (frozen_pointer->side) {
+ case SIDE_TOP:
+ x = rect.x;
+ y = rect.y + delta_y;
+ w = rect.width;
+ h = rect.height - delta_y;
+ break;
+ case SIDE_RIGHT:
+ x = rect.x;
+ y = rect.y;
+ w = rect.width + delta_x;
+ h = rect.height;
+ break;
+ case SIDE_BOTTOM:
+ x = rect.x;
+ y = rect.y;
+ w = rect.width;
+ h = rect.height + delta_y;
+ break;
+ case SIDE_LEFT:
+ x = rect.x + delta_x;
+ y = rect.y;
+ w = rect.width - delta_x;
+ h = rect.height;
+ break;
+ }
+ width = MAX(1, w);
+ height = MAX(1, h);
+ window_move_resize(win, x, y, width, height);
+ c->floating_rectangle = (xcb_rectangle_t) {x, y, width, height};
+ window_draw_border(n, d->focus == n, mon == m);
+ } else if (pac == ACTION_RESIZE_CORNER) {
+ switch (frozen_pointer->corner) {
+ case CORNER_TOP_LEFT:
+ x = rect.x + delta_x;
+ y = rect.y + delta_y;
+ w = rect.width - delta_x;
+ h = rect.height - delta_y;
+ break;
+ case CORNER_TOP_RIGHT:
+ x = rect.x;
+ y = rect.y + delta_y;
+ w = rect.width + delta_x;
+ h = rect.height - delta_y;
+ break;
+ case CORNER_BOTTOM_LEFT:
+ x = rect.x + delta_x;
+ y = rect.y;
+ w = rect.width - delta_x;
+ h = rect.height + delta_y;
+ break;
+ case CORNER_BOTTOM_RIGHT:
+ x = rect.x;
+ y = rect.y;
+ w = rect.width + delta_x;
+ h = rect.height + delta_y;
+ break;
+ }
+ width = MAX(1, w);
+ height = MAX(1, h);
+ window_move_resize(win, x, y, width, height);
+ c->floating_rectangle = (xcb_rectangle_t) {x, y, width, height};
+ window_draw_border(n, d->focus == n, mon == m);
+ }
}
- width = MAX(1, w);
- height = MAX(1, h);
- window_move_resize(win, x, y, width, height);
- c->floating_rectangle = (xcb_rectangle_t) {x, y, width, height};
- window_draw_border(n, d->focus == n, mon == m);
break;
- case POINTER_FOCUS:
+ case ACTION_FOCUS:
+ case ACTION_NONE:
break;
}
}
{
PUTS("ungrab pointer");
- window_set_cursor(frozen_pointer->node->client->window, CURSOR_NORMAL);
- update_floating_rectangle(frozen_pointer->node->client);
- monitor_t *m = underlying_monitor(frozen_pointer->node->client);
+ 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);
projects / bspwm.git / blobdiff