/* Global data */
static win_t *root;
+static win_t *last;
static int running;
static void *cache;
static Atom atoms[NATOMS];
static void win_free(win_t *win)
{
+ if (win == last)
+ last = NULL;
free(win->sys);
free(win);
}
printf("configure_req: %lx - (0x%lx) %dx%d @ %d,%d\n",
cre->window, cre->value_mask,
cre->height, cre->width, cre->x, cre->y);
- if ((win = win_find(dpy,xe->xconfigurerequest.window,1))) {
+ if ((win = win_find(dpy,cre->window,1))) {
+ int border_width = (win->type == TYPE_TOOLBAR ? 0 : border);
XSendEvent(dpy, cre->window, False, StructureNotifyMask, &(XEvent){
- .xconfigure.type = ConfigureNotify,
- .xconfigure.display = win->sys->dpy,
- .xconfigure.event = win->sys->xid,
- .xconfigure.window = win->sys->xid,
- .xconfigure.x = win->x,
- .xconfigure.y = win->y,
- .xconfigure.width = win->w,
- .xconfigure.height = win->h,
- .xconfigure.border_width = border,
+ .xconfigure.type = ConfigureNotify,
+ .xconfigure.display = win->sys->dpy,
+ .xconfigure.event = win->sys->xid,
+ .xconfigure.window = win->sys->xid,
+ .xconfigure.x = win->x,
+ .xconfigure.y = win->y,
+ .xconfigure.width = win->w,
+ .xconfigure.height = win->h,
+ .xconfigure.border_width = border_width,
});
XSync(win->sys->dpy, False);
}
//win_msg(win, WM_FOCUS);
/* Set border on focused window */
- static win_t *last = NULL;
if (last)
XSetWindowBorder(last->sys->dpy, last->sys->xid, colors[CLR_UNFOCUS]);
XSync(win->sys->dpy, False);
PropModeReplace, (unsigned char*)0, 0);
/* Update border */
- if (state == ST_SHOW || state == ST_MAX || state == ST_SHADE)
- XSetWindowBorderWidth(win->sys->dpy, win->sys->xid, border);
- else if (state == ST_FULL)
+ if (win->type == TYPE_TOOLBAR || state == ST_FULL)
XSetWindowBorderWidth(win->sys->dpy, win->sys->xid, 0);
+ else if (state == ST_SHOW || state == ST_MAX || state == ST_SHADE)
+ XSetWindowBorderWidth(win->sys->dpy, win->sys->xid, border);
/* Map/Unmap window */
if (state == ST_SHOW || state == ST_FULL || state == ST_MAX || state == ST_SHADE)
.width = screen->w + screen->sys->strut.left + screen->sys->strut.right,
.height = screen->h + screen->sys->strut.top + screen->sys->strut.bottom
};
+ win->x = wc.x; win->y = wc.y;
+ win->w = wc.width; win->h = wc.height;
XConfigureWindow(win->sys->dpy, win->sys->xid, CWX|CWY|CWWidth|CWHeight, &wc);
XMoveResizeWindow(win->sys->dpy, win->sys->xid, wc.x, wc.y, wc.width, wc.height);
} else if (state == ST_SHADE) {