X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=window.c;h=2b005af801e7d62cd4c993196b6a3c60002092a8;hb=6c7d7d94444d93feaf9293e4c0c829e6958d20b7;hp=a7919507e99a0ea787066873b8e340b6fc240fa6;hpb=6bfebaaf6bf3078dd08f01e605801579a44d54f6;p=bspwm.git diff --git a/window.c b/window.c index a791950..2b005af 100644 --- a/window.c +++ b/window.c @@ -61,22 +61,27 @@ bool locate_desktop(char *name, desktop_location_t *loc) return false; } -bool is_inside(monitor_t *m, xcb_point_t p) +bool is_inside(monitor_t *m, xcb_point_t pt) { xcb_rectangle_t r = m->rectangle; - return (r.x <= p.x && p.x < (r.x + r.width) - && r.y <= p.y && p.y < (r.y + r.height)); + return (r.x <= pt.x && pt.x < (r.x + r.width) + && r.y <= pt.y && pt.y < (r.y + r.height)); } -monitor_t *underlying_monitor(client_t *c) +monitor_t *monitor_from_point(xcb_point_t pt) { - xcb_point_t p = (xcb_point_t) {c->floating_rectangle.x, c->floating_rectangle.y}; for (monitor_t *m = mon_head; m != NULL; m = m->next) - if (is_inside(m, p)) + if (is_inside(m, pt)) return m; return NULL; } +monitor_t *underlying_monitor(client_t *c) +{ + xcb_point_t pt = (xcb_point_t) {c->floating_rectangle.x, c->floating_rectangle.y}; + return monitor_from_point(pt); +} + void manage_window(monitor_t *m, desktop_t *d, xcb_window_t win) { window_location_t loc; @@ -91,9 +96,9 @@ void manage_window(monitor_t *m, desktop_t *d, xcb_window_t win) if (override_redirect || locate_window(win, &loc)) return; - bool floating = false, transient = false, fullscreen = false, takes_focus = true, manage = true; + bool floating = false, follow = false, transient = false, fullscreen = false, takes_focus = true, manage = true; - handle_rules(win, &m, &d, &floating, &transient, &fullscreen, &takes_focus, &manage); + handle_rules(win, &m, &d, &floating, &follow, &transient, &fullscreen, &takes_focus, &manage); if (!manage) { disable_shadow(win); @@ -157,6 +162,11 @@ void manage_window(monitor_t *m, desktop_t *d, xcb_window_t win) uint32_t values[] = {(focus_follows_pointer ? CLIENT_EVENT_MASK_FFP : CLIENT_EVENT_MASK)}; xcb_change_window_attributes(dpy, c->window, XCB_CW_EVENT_MASK, values); + if (follow) { + select_monitor(m); + select_desktop(d); + } + num_clients++; ewmh_set_wm_desktop(birth, d); ewmh_update_client_list(); @@ -211,8 +221,14 @@ void window_draw_border(node_t *n, bool focused_window, bool focused_monitor) xcb_rectangle_t *presel_rectangles; + uint8_t win_depth = root_depth; + xcb_get_geometry_reply_t *geo = xcb_get_geometry_reply(dpy, xcb_get_geometry(dpy, win), NULL); + if (geo != NULL) + win_depth = geo->depth; + free(geo); + xcb_pixmap_t pix = xcb_generate_id(dpy); - xcb_create_pixmap(dpy, root_depth, pix, win, full_width, full_height); + xcb_create_pixmap(dpy, win_depth, pix, win, full_width, full_height); xcb_gcontext_t gc = xcb_generate_id(dpy); xcb_create_gc(dpy, gc, pix, 0, NULL); @@ -343,11 +359,21 @@ void toggle_locked(client_t *c) c->locked = !c->locked; } +void set_urgency(monitor_t *m, desktop_t *d, node_t *n, bool value) +{ + if (value && mon->desk->focus == n) + return; + n->client->urgent = value; + put_status(); + if (m->desk == d) + arrange(m, d); +} + void set_shadow(xcb_window_t win, uint32_t value) { if (!apply_shadow_property) return; - xcb_change_property(dpy, XCB_PROP_MODE_REPLACE, win, compton_shadow, XCB_ATOM_CARDINAL, 32, sizeof(value), &value); + xcb_change_property(dpy, XCB_PROP_MODE_REPLACE, win, compton_shadow, XCB_ATOM_CARDINAL, 32, 1, &value); } void enable_shadow(xcb_window_t win) @@ -401,33 +427,29 @@ uint32_t get_border_color(client_t *c, bool focused_window, bool focused_monitor void update_floating_rectangle(client_t *c) { - xcb_get_geometry_reply_t *geom = xcb_get_geometry_reply(dpy, xcb_get_geometry(dpy, c->window), NULL); + xcb_get_geometry_reply_t *geo = xcb_get_geometry_reply(dpy, xcb_get_geometry(dpy, c->window), NULL); - if (geom) { - c->floating_rectangle = (xcb_rectangle_t) {geom->x, geom->y, geom->width, geom->height}; - free(geom); - } else { + if (geo != NULL) + c->floating_rectangle = (xcb_rectangle_t) {geo->x, geo->y, geo->width, geo->height}; + else c->floating_rectangle = (xcb_rectangle_t) {0, 0, 32, 24}; - } -} - -void save_pointer_position(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}; - free(qpr); - } + free(geo); } -void get_pointed_window(xcb_window_t *win) + +void query_pointer(xcb_window_t *win, xcb_point_t *pt) { + window_lower(motion_recorder); xcb_query_pointer_reply_t *qpr = xcb_query_pointer_reply(dpy, xcb_query_pointer(dpy, root), NULL); if (qpr != NULL) { - *win = qpr->child; + if (win != NULL) + *win = qpr->child; + if (pt != NULL) + *pt = (xcb_point_t) {qpr->root_x, qpr->root_y}; free(qpr); } + window_raise(motion_recorder); } void window_focus(xcb_window_t win) @@ -466,11 +488,11 @@ void window_raise(xcb_window_t win) xcb_configure_window(dpy, win, XCB_CONFIG_WINDOW_STACK_MODE, values); } -void window_pseudo_raise(desktop_t *d, xcb_window_t win) +void stack_tiled(desktop_t *d) { - for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n)) - if (is_tiled(n->client) && n->client->window != win) - window_lower(n->client->window); + for (node_list_t *x = d->history->tail; x != NULL; x = x->prev) + if (x->latest && is_tiled(x->node->client)) + window_lower(x->node->client->window); } void window_lower(xcb_window_t win) @@ -502,6 +524,8 @@ void window_show(xcb_window_t win) void toggle_visibility(void) { + if (visible) + clear_input_focus(); visible = !visible; for (monitor_t *m = mon_head; m != NULL; m = m->next) for (node_t *n = first_extrema(m->desk->root); n != NULL; n = next_leaf(n)) @@ -520,3 +544,8 @@ void disable_motion_recorder(void) { window_hide(motion_recorder); } + +void clear_input_focus(void) +{ + xcb_set_input_focus(dpy, XCB_INPUT_FOCUS_POINTER_ROOT, root, XCB_CURRENT_TIME); +}