#include "history.h"
#include "query.h"
#include "settings.h"
+#include "geometry.h"
#include "tree.h"
#include "subscribe.h"
#include "window.h"
#include "monitor.h"
-monitor_t *make_monitor(xcb_rectangle_t *rect)
+monitor_t *make_monitor(xcb_rectangle_t *rect, uint32_t id)
{
monitor_t *m = malloc(sizeof(monitor_t));
- snprintf(m->name, sizeof(m->name), "%s%02d", DEFAULT_MON_NAME, ++monitor_uid);
- m->id = XCB_NONE;
+ if (id == XCB_NONE) {
+ m->id = xcb_generate_id(dpy);
+ }
+ m->randr_id = XCB_NONE;
+ snprintf(m->name, sizeof(m->name), "%s", DEFAULT_MON_NAME);
+ m->padding = padding;
+ m->border_width = border_width;
+ m->window_gap = window_gap;
m->root = XCB_NONE;
m->prev = m->next = NULL;
m->desk = m->desk_head = m->desk_tail = NULL;
- m->top_padding = m->right_padding = m->bottom_padding = m->left_padding = 0;
m->wired = true;
m->sticky_count = 0;
if (rect != NULL) {
return m;
}
-void update_root(monitor_t *m, xcb_rectangle_t *r)
+void update_root(monitor_t *m, xcb_rectangle_t *rect)
{
- m->rectangle = *r;
+ xcb_rectangle_t last_rect = m->rectangle;
+ m->rectangle = *rect;
if (m->root == XCB_NONE) {
uint32_t values[] = {XCB_EVENT_MASK_ENTER_WINDOW};
m->root = xcb_generate_id(dpy);
- xcb_create_window(dpy, XCB_COPY_FROM_PARENT, m->root, root, r->x, r->y, r->width, r->height, 0, XCB_WINDOW_CLASS_INPUT_ONLY, XCB_COPY_FROM_PARENT, XCB_CW_EVENT_MASK, values);
+ xcb_create_window(dpy, XCB_COPY_FROM_PARENT, m->root, root,
+ rect->x, rect->y, rect->width, rect->height, 0,
+ XCB_WINDOW_CLASS_INPUT_ONLY, XCB_COPY_FROM_PARENT, XCB_CW_EVENT_MASK, values);
xcb_icccm_set_wm_class(dpy, m->root, sizeof(ROOT_WINDOW_IC), ROOT_WINDOW_IC);
window_lower(m->root);
if (focus_follows_pointer) {
window_show(m->root);
}
} else {
- window_move_resize(m->root, r->x, r->y, r->width, r->height);
- put_status(SBSC_MASK_MONITOR_GEOMETRY, "monitor_geometry %s %ux%u+%i+%i\n", m->name, r->width, r->height, r->x, r->y);
+ window_move_resize(m->root, rect->x, rect->y, rect->width, rect->height);
+ put_status(SBSC_MASK_MONITOR_GEOMETRY, "monitor_geometry 0x%08X %ux%u+%i+%i\n",
+ m->id, rect->width, rect->height, rect->x, rect->y);
+ }
+ for (desktop_t *d = m->desk_head; d != NULL; d = d->next) {
+ for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n, d->root)) {
+ if (n->client == NULL) {
+ continue;
+ }
+ adapt_geometry(&last_rect, rect, n);
+ }
+ arrange(m, d);
}
}
void rename_monitor(monitor_t *m, const char *name)
{
- put_status(SBSC_MASK_MONITOR_RENAME, "monitor_rename %s %s\n", m->name, name);
+ put_status(SBSC_MASK_MONITOR_RENAME, "monitor_rename 0x%08X %s %s\n", m->id, m->name, name);
snprintf(m->name, sizeof(m->name), "%s", name);
return NULL;
}
-monitor_t *get_monitor_by_id(xcb_randr_output_t id)
+monitor_t *get_monitor_by_randr_id(xcb_randr_output_t id)
{
for (monitor_t *m = mon_head; m != NULL; m = m->next) {
- if (m->id == id) {
+ if (m->randr_id == id) {
return m;
}
}
void adapt_geometry(xcb_rectangle_t *rs, xcb_rectangle_t *rd, node_t *n)
{
- if (frozen_pointer->action != ACTION_NONE) {
- return;
- }
-
for (node_t *f = first_extrema(n); f != NULL; f = next_leaf(f, n)) {
+ if (f->client == NULL) {
+ continue;
+ }
client_t *c = f->client;
/* Clip the rectangle to fit into the monitor. Without this, the fitting
* algorithm doesn't work as expected. This also conserves the
mon = m;
if (pointer_follows_monitor) {
- center_pointer(m->rectangle);
+ xcb_point_t pt;
+ query_pointer(NULL, &pt);
+ monitor_t *mp = monitor_from_point(pt);
+ if (mp != m) {
+ center_pointer(m->rectangle);
+ }
}
- put_status(SBSC_MASK_MONITOR_FOCUS, "monitor_focus %s\n", m->name);
+ put_status(SBSC_MASK_MONITOR_FOCUS, "monitor_focus 0x%08X\n", m->id);
}
void add_monitor(monitor_t *m)
mon_head = m;
mon_tail = m;
} else {
- mon_tail->next = m;
- m->prev = mon_tail;
- mon_tail = m;
+ monitor_t *a = mon_head;
+ while (a != NULL && rect_cmp(m->rectangle, a->rectangle) > 0) {
+ a = a->next;
+ }
+ if (a != NULL) {
+ monitor_t *b = a->prev;
+ if (b != NULL) {
+ b->next = m;
+ } else {
+ mon_head = m;
+ }
+ m->prev = b;
+ m->next = a;
+ a->prev = m;
+ } else {
+ mon_tail->next = m;
+ m->prev = mon_tail;
+ mon_tail = m;
+ }
}
- put_status(SBSC_MASK_MONITOR_ADD, "monitor_add %s 0x%X %ux%u+%i+%i\n", m->name, m->id, r.width, r.height, r.x, r.y);
+ put_status(SBSC_MASK_MONITOR_ADD, "monitor_add 0x%08X %s %ux%u+%i+%i\n", m->id, m->name, r.width, r.height, r.x, r.y);
put_status(SBSC_MASK_REPORT);
}
}
}
- put_status(SBSC_MASK_MONITOR_REMOVE, "monitor_remove %s\n", m->name);
+ put_status(SBSC_MASK_MONITOR_REMOVE, "monitor_remove 0x%08X\n", m->id);
xcb_destroy_window(dpy, m->root);
free(m);
}
}
-void swap_monitors(monitor_t *m1, monitor_t *m2)
+bool swap_monitors(monitor_t *m1, monitor_t *m2)
{
if (m1 == NULL || m2 == NULL || m1 == m2) {
- return;
+ return false;
}
+ put_status(SBSC_MASK_MONITOR_SWAP, "monitor_swap 0x%08X 0x%08X\n", m1->id, m2->id);
+
if (mon_head == m1) {
mon_head = m2;
} else if (mon_head == m2) {
ewmh_update_current_desktop();
put_status(SBSC_MASK_REPORT);
+ return true;
}
monitor_t *closest_monitor(monitor_t *m, cycle_dir_t dir, monitor_select_t sel)
bool is_inside_monitor(monitor_t *m, xcb_point_t pt)
{
- xcb_rectangle_t r = m->rectangle;
- return (r.x <= pt.x && pt.x < (r.x + r.width)
- && r.y <= pt.y && pt.y < (r.y + r.height));
+ return is_inside(pt, m->rectangle);
}
monitor_t *monitor_from_point(xcb_point_t pt)
monitor_t *monitor_from_client(client_t *c)
{
- xcb_point_t pt = {c->floating_rectangle.x, c->floating_rectangle.y};
+ int16_t xc = c->floating_rectangle.x + c->floating_rectangle.width/2;
+ int16_t yc = c->floating_rectangle.y + c->floating_rectangle.height/2;
+ xcb_point_t pt = {xc, yc};
monitor_t *nearest = monitor_from_point(pt);
if (nearest == NULL) {
- int x = (c->floating_rectangle.x + c->floating_rectangle.width) / 2;
- int y = (c->floating_rectangle.y + c->floating_rectangle.height) / 2;
int dmin = INT_MAX;
for (monitor_t *m = mon_head; m != NULL; m = m->next) {
xcb_rectangle_t r = m->rectangle;
- int d = abs((r.x + r.width / 2) - x) + abs((r.y + r.height / 2) - y);
+ int d = abs((r.x + r.width / 2) - xc) + abs((r.y + r.height / 2) - yc);
if (d < dmin) {
dmin = d;
nearest = m;
xcb_randr_get_crtc_info_reply_t *cir = xcb_randr_get_crtc_info_reply(dpy, xcb_randr_get_crtc_info(dpy, info->crtc, XCB_CURRENT_TIME), NULL);
if (cir != NULL) {
xcb_rectangle_t rect = (xcb_rectangle_t) {cir->x, cir->y, cir->width, cir->height};
- mm = get_monitor_by_id(outputs[i]);
+ mm = get_monitor_by_randr_id(outputs[i]);
if (mm != NULL) {
- xcb_rectangle_t last_rect = mm->rectangle;
update_root(mm, &rect);
- for (desktop_t *d = mm->desk_head; d != NULL; d = d->next) {
- for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n, d->root)) {
- adapt_geometry(&last_rect, &rect, n);
- }
- }
- arrange(mm, mm->desk);
mm->wired = true;
} else {
- mm = make_monitor(&rect);
+ mm = make_monitor(&rect, XCB_NONE);
char *name = (char *)xcb_randr_get_output_info_name(info);
- size_t name_len = MIN(sizeof(mm->name), (size_t)xcb_randr_get_output_info_name_length(info) + 1);
- snprintf(mm->name, name_len, "%s", name);
- mm->id = outputs[i];
+ int len = xcb_randr_get_output_info_name_length(info);
+ size_t name_size = MIN(sizeof(mm->name), (size_t) len + 1);
+ snprintf(mm->name, name_size, "%s", name);
+ mm->randr_id = outputs[i];
add_monitor(mm);
}
}
free(cir);
} else if (!remove_disabled_monitors && info->connection != XCB_RANDR_CONNECTION_DISCONNECTED) {
- m = get_monitor_by_id(outputs[i]);
+ m = get_monitor_by_randr_id(outputs[i]);
if (m != NULL) {
m->wired = true;
}
free(info);
}
- /* initially focus the primary monitor and add the first desktop to it */
xcb_randr_get_output_primary_reply_t *gpo = xcb_randr_get_output_primary_reply(dpy, xcb_randr_get_output_primary(dpy, root), NULL);
if (gpo != NULL) {
- pri_mon = get_monitor_by_id(gpo->output);
- if (!running && pri_mon != NULL) {
- if (mon != pri_mon) {
- mon = pri_mon;
- }
- add_desktop(pri_mon, make_desktop(NULL));
- ewmh_update_current_desktop();
- }
+ pri_mon = get_monitor_by_randr_id(gpo->output);
}
-
free(gpo);
/* handle overlapping monitors */
/* add one desktop to each new monitor */
for (m = mon_head; m != NULL; m = m->next) {
- if (m->desk == NULL && (running || pri_mon == NULL || m != pri_mon)) {
- add_desktop(m, make_desktop(NULL));
+ if (m->desk == NULL) {
+ add_desktop(m, make_desktop(NULL, XCB_NONE));
}
}
- if (!running && pri_mon != NULL && mon_head != pri_mon) {
- swap_monitors(mon_head, pri_mon);
+ if (!running && mon != NULL) {
+ if (pri_mon != NULL) {
+ mon = pri_mon;
+ }
+ center_pointer(mon->rectangle);
+ ewmh_update_current_desktop();
}
free(sres);
update_motion_recorder();
- return (mon_head != NULL);
+
+ return (mon != NULL);
}
projects / bspwm.git / blobdiff