/* Configuration */
static int border = 2;
static int no_capture = 0;
+static int stack = 25;
/* Internal structures */
struct win_sys {
} color_t;
/* Global data */
+static win_t *root;
static int running;
static void *cache;
static Atom atoms[NATOMS];
if (XGetWindowAttributes(dpy, xid, &attr))
if (attr.override_redirect)
return NULL;
+
win_t *win = new0(win_t);
win->x = attr.x;
win->y = attr.y;
win->sys = new0(win_sys_t);
win->sys->dpy = dpy;
win->sys->xid = xid;
- if (win_prop(win, NET_TYPE) == atoms[NET_DIALOG])
- win->type = TYPE_DIALOG;
- if (XGetTransientForHint(dpy, xid, &trans))
- win->parent = win_find(dpy, trans, 0);
- printf("win_new: %p = %p, %d (%d,%d %dx%d) - %s\n",
- win, dpy, (int)xid,
+
+ if (root) {
+ if (strut_add(root, win))
+ win->type = TYPE_TOOLBAR;
+
+ if (win_prop(win, NET_TYPE) == atoms[NET_DIALOG])
+ win->type = TYPE_DIALOG;
+
+ if (win_prop(win, NET_STATE) == atoms[NET_FULL])
+ win->state = ST_FULL;
+
+ if (XGetTransientForHint(dpy, xid, &trans))
+ win->parent = win_find(dpy, trans, 0);
+
+ XSelectInput(dpy, xid, PropertyChangeMask);
+ }
+
+ printf("win_new: win=%p x11=(%p,%d) state=%x pos=(%d,%d %dx%d) type=%s\n",
+ win, dpy, (int)xid, win->state,
win->x, win->y, win->w, win->h,
- win->type ? "dialog" : "normal");
+ win->type == TYPE_NORMAL ? "normal" :
+ win->type == TYPE_DIALOG ? "dialog" :
+ win->type == TYPE_TOOLBAR ? "toolbar" : "unknown");
+
+ if (root)
+ wm_insert(win);
+
return win;
}
static void win_remove(win_t *win)
{
+ if (win != root) {
+ strut_del(root, win);
+ wm_remove(win);
+ }
tdelete(win, &cache, win_cmp);
win_free(win);
}
-static int win_viewable(win_t *win)
+static int win_viewable(Display *dpy, Window xid)
{
XWindowAttributes attr;
- if (XGetWindowAttributes(win->sys->dpy, win->sys->xid, &attr))
+ if (XGetWindowAttributes(dpy, xid, &attr))
return attr.map_state == IsViewable;
else
return True;
if (type == KeyPress) {
while (XCheckTypedEvent(dpy, KeyPress, xe));
KeySym sym = XLookupKeysym(&xe->xkey, 0);
- printf("got xe %c %hhx\n", xk2ev(sym), mod2int(mod));
+ //printf("got xe %c %hhx\n", xk2ev(sym), mod2int(mod));
wm_handle_event(win, xk2ev(sym), mod, ptr);
}
else if (type == KeyRelease) {
}
else if (type == FocusIn || type == FocusOut) {
//printf("focus: %lx\n", xe->xfocus.window);
- event_t ev = FocusIn ? EV_FOCUS : EV_UNFOCUS;
+ event_t ev = type == FocusIn ? EV_FOCUS : EV_UNFOCUS;
if ((win = win_find(dpy,xe->xfocus.window,0)))
wm_handle_event(win, ev, MOD(), PTR());
}
else if (type == ConfigureNotify) {
- printf("configure: %lx\n", xe->xconfigure.window);
+ //printf("configure: %lx\n", xe->xconfigure.window);
}
else if (type == MapNotify) {
printf("map: %lx\n", xe->xmap.window);
else if (type == UnmapNotify) {
if ((win = win_find(dpy,xe->xunmap.window,0)) &&
win->state != ST_HIDE) {
- if (!strut_del(root, win))
- wm_remove(win);
- else
- wm_update();
+ printf("unmap: %lx\n", xe->xunmap.window);
+ wm_handle_state(win, win->state, ST_HIDE);
win->state = ST_HIDE;
}
}
else if (type == DestroyNotify) {
- //printf("destroy: %lx\n", xe->xdestroywindow.window);
+ printf("destroy: %lx\n", xe->xdestroywindow.window);
if ((win = win_find(dpy,xe->xdestroywindow.window,0)))
win_remove(win);
}
}
else if (type == MapRequest) {
printf("map_req: %lx\n", xe->xmaprequest.window);
- if ((win = win_find(dpy,xe->xmaprequest.window,1)) &&
- win->state == ST_HIDE) {
+ win = win_find(dpy,xe->xmaprequest.window,1);
+ // fixme, for hide -> max, etc
+ if (win->state == ST_HIDE)
win->state = ST_SHOW;
- if (win_prop(win, NET_STATE) == atoms[NET_FULL])
- win->state = ST_FULL;
- XSelectInput(win->sys->dpy, win->sys->xid, PropertyChangeMask);
- if (!strut_add(root, win))
- wm_insert(win);
- else
- wm_update();
- }
sys_show(win, win->state);
}
else if (type == ClientMessage) {
state_t next = (cme->data.l[0] == 1 || /* _NET_WM_STATE_ADD */
(cme->data.l[0] == 2 && /* _NET_WM_STATE_TOGGLE */
win->state != ST_FULL)) ? ST_FULL : ST_SHOW;
+ printf("client_msg: fullscreen %x -> %x", win->state, next);
wm_handle_state(win, win->state, next);
sys_show(win, next);
}
}
else if (type == PropertyNotify) {
- printf("prop: %d\n", xe->xproperty.state);
+ printf("prop: %lx - %d\n", xe->xproperty.window, xe->xproperty.state);
}
else {
printf("unknown event: %d\n", type);
void sys_focus(win_t *win)
{
- printf("sys_focus: %p\n", win);
+ //printf("sys_focus: %p\n", win);
/* Set actual focus */
XSetInputFocus(win->sys->dpy, win->sys->xid,
break;
case ST_SHADE:
printf("sys_show: shade %p\n", win);
+ XConfigureWindow(win->sys->dpy, win->sys->xid, CWHeight,
+ &(XWindowChanges){ .height = stack });
XMapWindow(win->sys->dpy, win->sys->xid);
break;
case ST_ICON:
Window xid;
/* Load configuration */
+ stack = conf_get_int("main.stack", stack);
border = conf_get_int("main.border", border);
no_capture = conf_get_int("main.no-capture", no_capture);
XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask);
xerrorxlib = XSetErrorHandler(xerror);
- return win_find(dpy, xid, 1);
+ return root = win_find(dpy, xid, 1);
}
void sys_run(win_t *root)
Window par, xid, *kids = NULL;
if (XQueryTree(root->sys->dpy, root->sys->xid,
&par, &xid, &kids, &nkids)) {
- for(int i = 0; i < nkids; i++) {
- win_t *win = win_find(root->sys->dpy, kids[i], 1);
- if (win && win_viewable(win) && !strut_add(root,win))
- wm_insert(win);
- }
+ for(int i = 0; i < nkids; i++)
+ if (win_viewable(root->sys->dpy, kids[i]))
+ win_find(root->sys->dpy, kids[i], 1);
XFree(kids);
}
- wm_update(); // For struts
}
/* Main loop */
projects / wmpus / blobdiff