- /* window area geometry */
- if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
- if(n != nmons) {
- for(c = clients; c; c = c->next)
- if(c->mon >= n)
- c->mon = n - 1;
- if(!(mon = (Monitor *)realloc(mon, sizeof(Monitor) * n)))
- die("fatal: could not realloc() %u bytes\n", sizeof(Monitor) * nmons);
- selmon = NULL;
- }
- for(i = 0; i < n ; i++) {
- /* TODO: consider re-using XineramaScreenInfo */
- mon[i].symbol[0] = '[';
- mon[i].symbol[1] = '0' + info[i].screen_number;
- mon[i].symbol[2] = ']';
- mon[i].symbol[3] = 0;
- if(!selmon) { /* not initialised yet */
- mon[i].mfact = mfact;
- mon[i].showbar = showbar;
- mon[i].topbar = topbar;
- mon[i].tagset[0] = mon[i].tagset[1] = 1;
+#ifdef XINERAMA
+ XineramaScreenInfo *info = NULL;
+ Bool *flags = NULL;
+
+ if(XineramaIsActive(dpy))
+ info = XineramaQueryScreens(dpy, &n);
+ flags = (Bool *)malloc(sizeof(Bool) * n);
+ for(i = 0; i < n; i++)
+ flags[i] = False;
+ /* next double-loop seeks any combination of retrieved Xinerama info
+ * with existing monitors, this is used to avoid unnecessary
+ * re-allocations of monitor structs */
+ for(i = 0, nn = n; i < n; i++)
+ for(j = 0, m = mons; m; m = m->next, j++)
+ if(!flags[j]) {
+ if((flags[j] = (
+ info[i].x_org == m->mx
+ && info[i].y_org == m->my
+ && info[i].width == m->mw
+ && info[i].height == m->mh)
+ ))
+ --nn;
+ }
+ if(nn == 0) { /* no need to re-allocate monitors */
+ j = 0;
+ for(i = 0, m = mons; m; m = m->next, i++) {
+ m->num = info[i].screen_number;
+ if(info[i].x_org != m->mx
+ || info[i].y_org != m->my
+ || info[i].width != m->mw
+ || info[i].height != m->mh)
+ {
+ m->mx = m->wx = info[i].x_org;
+ m->my = m->wy = info[i].y_org;
+ m->mw = m->ww = info[i].width;
+ m->mh = m->wh = info[i].height;
+ updatebarpos(m);
+ j++;