#include <stdlib.h>
#include <string.h>
#include <xcb/xcb.h>
-#include <xcb/xcb_icccm.h>
#include <xcb/xcb_event.h>
-#include "helpers.h"
+#include <xcb/xcb_icccm.h>
#include "types.h"
#include "bspwm.h"
#include "settings.h"
-#include "misc.h"
+#include "helpers.h"
#include "window.h"
#include "events.h"
#include "tree.h"
case XCB_PROPERTY_NOTIFY:
property_notify(evt);
break;
+ case XCB_ENTER_NOTIFY:
+ enter_notify(evt);
+ break;
case XCB_BUTTON_PRESS:
button_press(evt);
break;
motion_notify(evt);
break;
case XCB_BUTTON_RELEASE:
- button_release(evt);
+ button_release();
break;
default:
break;
PRINTF("map request %X\n", e->window);
- xcb_get_window_attributes_reply_t *wa;
- xcb_window_t win = e->window;
- window_location_t loc;
- wa = xcb_get_window_attributes_reply(dpy, xcb_get_window_attributes(dpy, win), NULL);
-
- if ((wa != NULL && wa->override_redirect) || locate_window(win, &loc))
- return;
-
- free(wa);
-
- client_t *c = make_client(win);
- update_floating_rectangle(c);
-
- bool floating = false, transient = false, fullscreen = false, takes_focus = true;
-
- handle_rules(win, &floating, &transient, &fullscreen, &takes_focus);
-
- xcb_icccm_get_wm_class_reply_t reply;
- if (xcb_icccm_get_wm_class_reply(dpy, xcb_icccm_get_wm_class(dpy, win), &reply, NULL) == 1) {
- strcpy(c->class_name, reply.class_name);
- xcb_icccm_get_wm_class_reply_wipe(&reply);
- }
-
- if (c->transient)
- floating = true;
-
- node_t *birth = make_node();
- birth->client = c;
-
- if (floating)
- split_mode = MODE_MANUAL;
-
- insert_node(desk, birth);
-
- if (floating)
- toggle_floating(birth);
-
- if (desk->focus != NULL && desk->focus->client->fullscreen)
- toggle_fullscreen(desk->focus->client);
-
- if (fullscreen)
- toggle_fullscreen(birth->client);
-
- c->transient = transient;
-
- if (takes_focus)
- focus_node(desk, birth, false);
-
- apply_layout(desk, desk->root, root_rect);
-
- window_show(c->window);
-
- if (takes_focus)
- xcb_set_input_focus(dpy, XCB_INPUT_FOCUS_POINTER_ROOT, win, XCB_CURRENT_TIME);
-
- uint32_t values[] = {CLIENT_EVENT_MASK};
- xcb_change_window_attributes(dpy, c->window, XCB_CW_EVENT_MASK, values);
-
- num_clients++;
- ewmh_update_client_list();
+ manage_window(mon, mon->desk, e->window);
}
void configure_request(xcb_generic_event_t *evt)
xcb_configure_window(dpy, e->window, mask, values);
if (is_managed)
- window_draw_border(loc.node, (loc.node == loc.desktop->focus));
+ window_draw_border(loc.node, loc.node == loc.desktop->focus, loc.monitor == mon);
} else {
xcb_configure_notify_event_t evt;
xcb_rectangle_t rect;
rect = loc.node->client->tiled_rectangle;
bw = border_width;
} else {
- rect = (xcb_rectangle_t) {0, 0, screen_width, screen_height};
+ rect = loc.monitor->rectangle;
bw = 0;
}
window_location_t loc;
if (locate_window(e->window, &loc)) {
remove_node(loc.desktop, loc.node);
- apply_layout(loc.desktop, loc.desktop->root, root_rect);
+ arrange(loc.monitor, loc.desktop);
}
}
{
xcb_unmap_notify_event_t *e = (xcb_unmap_notify_event_t *) evt;
- PRINTF("unmap notify %X %u\n", e->window, XCB_EVENT_SENT(e));
-
- if (!XCB_EVENT_SENT(e))
- return;
+ PRINTF("unmap notify %X\n", e->window);
window_location_t loc;
if (locate_window(e->window, &loc)) {
- PRINTF("remove node in unmap notify %X\n", e->window);
remove_node(loc.desktop, loc.node);
- apply_layout(loc.desktop, loc.desktop->root, root_rect);
+ arrange(loc.monitor, loc.desktop);
}
}
return;
if (xcb_icccm_get_wm_hints_reply(dpy, xcb_icccm_get_wm_hints(dpy, e->window), &hints, NULL) == 1) {
loc.node->client->urgent = (hints.flags & XCB_ICCCM_WM_HINT_X_URGENCY);
- if (desk == loc.desktop)
- apply_layout(loc.desktop, loc.desktop->root, root_rect);
+ if (loc.monitor->desk == loc.desktop)
+ arrange(loc.monitor, loc.desktop);
}
}
}
+void enter_notify(xcb_generic_event_t *evt)
+{
+ xcb_enter_notify_event_t *e = (xcb_enter_notify_event_t *) evt;
+
+ PRINTF("enter notify %X %d %d\n", e->event, e->mode, e->detail);
+
+ if (!focus_follows_mouse
+ || (e->mode != XCB_NOTIFY_MODE_NORMAL && e->detail == XCB_NOTIFY_DETAIL_INFERIOR)
+ || (pointer_position.x == e->root_x && pointer_position.y == e->root_y))
+ return;
+
+ window_location_t loc;
+ if (locate_window(e->event, &loc)) {
+ select_monitor(loc.monitor);
+ focus_node(loc.monitor, loc.desktop, loc.node, true);
+ pointer_position = (xcb_point_t) {e->root_x, e->root_y};
+ }
+}
+
void client_message(xcb_generic_event_t *evt)
{
xcb_client_message_event_t *e = (xcb_client_message_event_t *) evt;
- PRINTF("client message %X\n", e->window);
+ PRINTF("client message %X %u\n", e->window, e->type);
- window_location_t loc;
+ 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);
+ }
+ return;
+ }
+ window_location_t loc;
if (!locate_window(e->window, &loc))
return;
if (e->type == ewmh->_NET_WM_STATE) {
- handle_state(loc.node, e->data.data32[1], e->data.data32[0]);
- handle_state(loc.node, e->data.data32[2], e->data.data32[0]);
+ 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 (desk->focus != NULL && desk->focus->client->fullscreen)
- return;
- apply_layout(loc.desktop, loc.desktop->root, root_rect);
- if (desk != loc.desktop)
- select_desktop(loc.desktop);
- focus_node(loc.desktop, loc.node, true);
+ 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);
}
}
xcb_button_press_event_t *e = (xcb_button_press_event_t *) evt;
xcb_window_t win = e->child;
- PRINTF("button press %X %u %u\n", win, e->detail, e->state);
+ PRINTF("button press %u %u %X\n", e->detail, e->state, win);
window_location_t loc;
if (locate_window(win, &loc)) {
client_t *c = loc.node->client;
switch (e->detail) {
case XCB_BUTTON_INDEX_2:
- focus_node(loc.desktop, loc.node, true);
+ focus_node(loc.monitor, loc.desktop, loc.node, true);
break;
case XCB_BUTTON_INDEX_1:
case XCB_BUTTON_INDEX_3:
- if (!is_floating(loc.node->client))
+ 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) {
return;
- PUTS("grab pointer from button press");
+ }
+ frozen_pointer->monitor = loc.monitor;
frozen_pointer->desktop = loc.desktop;
frozen_pointer->node = loc.node;
frozen_pointer->rectangle = c->floating_rectangle;
int16_t delta_x, delta_y, x, y, w, h;
uint16_t width, height;
+ monitor_t *m = frozen_pointer->monitor;
desktop_t *d = frozen_pointer->desktop;
node_t *n = frozen_pointer->node;
client_t *c = n->client;
xcb_rectangle_t rect = frozen_pointer->rectangle;
xcb_window_t win = c->window;
- PRINTF("motion notify %X %u\n", win, frozen_pointer->button);
+ x = y = 0;
+ w = h = 1;
+
+ /* PRINTF("motion notify %X\n", win); */
delta_x = e->root_x - frozen_pointer->position.x;
delta_y = e->root_y - frozen_pointer->position.y;
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));
+ window_draw_border(n, d->focus == n, mon == m);
+ break;
}
}
-void button_release(xcb_generic_event_t *evt)
+void button_release(void)
{
- xcb_button_press_event_t *e = (xcb_button_press_event_t *) evt;
- xcb_window_t win = e->child;
-
- PRINTF("button release %X %u %u\n", win, e->detail, e->state);
+ PUTS("button release");
xcb_ungrab_pointer(dpy, XCB_CURRENT_TIME);
-
- window_location_t loc;
- if (locate_window(win, &loc)) {
- update_floating_rectangle(loc.node->client);
+ update_floating_rectangle(frozen_pointer->node->client);
+ monitor_t *m = underlying_monitor(frozen_pointer->node->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);
}
}
-void handle_state(node_t *n, xcb_atom_t state, unsigned int action)
+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(n->client);
+ || (!fs && action == XCB_EWMH_WM_STATE_ADD)) {
+ toggle_fullscreen(m, n->client);
+ arrange(m, d);
+ }
}
}
projects / bspwm.git / blobdiff