X-Git-Url: http://pileus.org/git/?p=wmpus;a=blobdiff_plain;f=sys-x11.c;h=68baaee22cb16540683f1aedbc281e0d773ca140;hp=7dd9c7b35d814cb8981d59b8febef6385442571f;hb=f4ecdada45354c19e46d860a4563305780060635;hpb=b04686f8b7197c2869b6207c5162b2fb1521cbb4 diff --git a/sys-x11.c b/sys-x11.c index 7dd9c7b..68baaee 100644 --- a/sys-x11.c +++ b/sys-x11.c @@ -32,6 +32,7 @@ /* Configuration */ static int border = 2; static int no_capture = 0; +static int stack = 25; /* Internal structures */ struct win_sys { @@ -50,6 +51,7 @@ typedef struct { typedef enum { WM_PROTO, WM_FOCUS, WM_DELETE, NET_STATE, NET_FULL, NET_STRUT, + NET_TYPE, NET_DIALOG, NATOMS } atom_t; @@ -188,10 +190,10 @@ static int strut_add(win_t *root, win_t *win) if (status != Success || ret_size != 32 || ret_items != 4) return 0; - win->sys->strut.left = ((int*)xdata)[0]; - win->sys->strut.right = ((int*)xdata)[1]; - win->sys->strut.top = ((int*)xdata)[2]; - win->sys->strut.bottom = ((int*)xdata)[3]; + win->sys->strut.left = ((long*)xdata)[0]; + win->sys->strut.right = ((long*)xdata)[1]; + win->sys->strut.top = ((long*)xdata)[2]; + win->sys->strut.bottom = ((long*)xdata)[3]; struts = list_insert(struts, win); for (list_t *cur = screens; cur; cur = cur->next) strut_copy(cur->data, win, 1); @@ -209,8 +211,12 @@ static int strut_del(win_t *root, win_t *win) } /* Window functions */ +static Atom win_prop(win_t *win, atom_t prop); +static win_t *win_find(Display *dpy, Window xid, int create); + static win_t *win_new(Display *dpy, Window xid) { + Window trans; XWindowAttributes attr; if (XGetWindowAttributes(dpy, xid, &attr)) if (attr.override_redirect) @@ -223,9 +229,14 @@ static win_t *win_new(Display *dpy, Window xid) win->sys = new0(win_sys_t); win->sys->dpy = dpy; win->sys->xid = xid; - printf("win_new: %p = %p, %d (%d,%d %dx%d)\n", + 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, - win->x, win->y, win->w, win->h); + win->x, win->y, win->w, win->h, + win->type ? "dialog" : "normal"); return win; } @@ -346,12 +357,12 @@ static void process_event(int type, XEvent *xe, win_t *root) /* Split based on event */ if (type == KeyPress) { while (XCheckTypedEvent(dpy, KeyPress, xe)); - KeySym sym = XKeycodeToKeysym(dpy, xe->xkey.keycode, 0); + KeySym sym = XLookupKeysym(&xe->xkey, 0); printf("got xe %c %hhx\n", xk2ev(sym), mod2int(mod)); wm_handle_event(win, xk2ev(sym), mod, ptr); } else if (type == KeyRelease) { - //printf("release: %d\n", type); + //printf("release: %lx\n", xe->xkey.window); } else if (type == ButtonPress) { if (wm_handle_event(win, xb2ev(xe->xbutton.button), mod, ptr)) { @@ -372,22 +383,23 @@ static void process_event(int type, XEvent *xe, win_t *root) wm_handle_ptr(win, ptr); } else if (type == EnterNotify || type == LeaveNotify) { - printf("%s: %d\n", type==EnterNotify?"enter":"leave", type); + printf("%s: %lx\n", type==EnterNotify?"enter":"leave", + xe->xcrossing.window); event_t ev = type == EnterNotify ? EV_ENTER : EV_LEAVE; if ((win = win_find(dpy,xe->xcrossing.window,0))) wm_handle_event(win, ev, MOD(), PTR()); } else if (type == FocusIn || type == FocusOut) { - //printf("focus: %d\n", type); + //printf("focus: %lx\n", xe->xfocus.window); event_t ev = 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: %d\n", type); + printf("configure: %lx\n", xe->xconfigure.window); } else if (type == MapNotify) { - printf("map: %d\n", type); + printf("map: %lx\n", xe->xmap.window); } else if (type == UnmapNotify) { if ((win = win_find(dpy,xe->xunmap.window,0)) && @@ -400,14 +412,14 @@ static void process_event(int type, XEvent *xe, win_t *root) } } else if (type == DestroyNotify) { - //printf("destroy: %d\n", type); + //printf("destroy: %lx\n", xe->xdestroywindow.window); if ((win = win_find(dpy,xe->xdestroywindow.window,0))) win_remove(win); } else if (type == ConfigureRequest) { XConfigureRequestEvent *cre = &xe->xconfigurerequest; - printf("configure_req: %d - %x, (0x%lx) %dx%d @ %d,%d\n", - type, (int)cre->window, cre->value_mask, + 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))) { XSendEvent(dpy, cre->window, False, StructureNotifyMask, &(XEvent){ @@ -425,9 +437,10 @@ static void process_event(int type, XEvent *xe, win_t *root) } } else if (type == MapRequest) { - printf("map_req: %d\n", type); + printf("map_req: %lx\n", xe->xmaprequest.window); if ((win = win_find(dpy,xe->xmaprequest.window,1)) && 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); @@ -435,13 +448,13 @@ static void process_event(int type, XEvent *xe, win_t *root) wm_insert(win); else wm_update(); - } else - sys_show(win, ST_SHOW); + } + sys_show(win, win->state); } else if (type == ClientMessage) { XClientMessageEvent *cme = &xe->xclient; - printf("msg: %d - %ld %ld,%ld,%ld,%ld,%ld\n", - type, cme->message_type, + printf("client_msg: %lx - %ld %ld,%ld,%ld,%ld,%ld\n", + cme->window, cme->message_type, cme->data.l[0], cme->data.l[1], cme->data.l[2], cme->data.l[3], cme->data.l[4]); if ((win = win_find(dpy,cme->window,0)) && @@ -456,7 +469,7 @@ static void process_event(int type, XEvent *xe, win_t *root) } } else if (type == PropertyNotify) { - printf("prop: %d - %d\n", type, xe->xproperty.state); + printf("prop: %d\n", xe->xproperty.state); } else { printf("unknown event: %d\n", type); @@ -572,6 +585,8 @@ void sys_show(win_t *win, state_t state) 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: @@ -655,6 +670,7 @@ win_t *sys_init(void) 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); @@ -665,12 +681,14 @@ win_t *sys_init(void) error("Unable to get root window"); /* Setup X11 data */ - atoms[WM_PROTO] = XInternAtom(dpy, "WM_PROTOCOLS", False); - atoms[WM_FOCUS] = XInternAtom(dpy, "WM_TAKE_FOCUS", False); - atoms[WM_DELETE] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); - atoms[NET_STATE] = XInternAtom(dpy, "_NET_WM_STATE", False); - atoms[NET_FULL] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False); - atoms[NET_STRUT] = XInternAtom(dpy, "_NET_WM_STRUT", False); + atoms[WM_PROTO] = XInternAtom(dpy, "WM_PROTOCOLS", False); + atoms[WM_FOCUS] = XInternAtom(dpy, "WM_TAKE_FOCUS", False); + atoms[WM_DELETE] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); + atoms[NET_STATE] = XInternAtom(dpy, "_NET_WM_STATE", False); + atoms[NET_FULL] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False); + atoms[NET_STRUT] = XInternAtom(dpy, "_NET_WM_STRUT", False); + atoms[NET_TYPE] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False); + atoms[NET_DIALOG] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False); colors[CLR_FOCUS] = get_color(dpy, "#a0a0ff"); colors[CLR_UNFOCUS] = get_color(dpy, "#101066");