X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=client.c;h=c716625533a1d83f003ca42ef60c9469155538c6;hp=282ad531d731d9957b59760d47aa504075f5f281;hb=2091200c957783deed032380d56c4199a23c6b81;hpb=06f9f346e650dfa2439836f3b01c8d1b242c2aee diff --git a/client.c b/client.c index 282ad53..c716625 100644 --- a/client.c +++ b/client.c @@ -1,10 +1,6 @@ -/* (C)opyright MMVI-MMVII Anselm R. Garbe - * See LICENSE file for license details. - */ +/* See LICENSE file for copyright and license details. */ #include "dwm.h" #include -#include -#include #include /* static */ @@ -99,6 +95,14 @@ attach(Client *c) { } void +ban(Client *c) { + if(c->isbanned) + return; + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); + c->isbanned = True; +} + +void configure(Client *c) { XConfigureEvent ce; @@ -129,8 +133,8 @@ detach(Client *c) { void focus(Client *c) { - if(c && !isvisible(c)) - return; + if((!c && selscreen) || (c && !isvisible(c))) + for(c = stack; c && !isvisible(c); c = c->snext); if(sel && sel != c) { grabbuttons(sel, False); XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]); @@ -141,7 +145,7 @@ focus(Client *c) { grabbuttons(c, True); } sel = c; - drawstatus(); + drawbar(); if(!selscreen) return; if(c) { @@ -173,8 +177,10 @@ killclient(const char *arg) { void manage(Window w, XWindowAttributes *wa) { - Client *c, *t; + unsigned int i; + Client *c, *t = NULL; Window trans; + Status rettrans; XWindowChanges wc; c = emallocz(sizeof(Client)); @@ -184,13 +190,13 @@ manage(Window w, XWindowAttributes *wa) { c->y = wa->y; c->w = wa->width; c->h = wa->height; + c->oldborder = wa->border_width; if(c->w == sw && c->h == sh) { - c->border = 0; c->x = sx; c->y = sy; + c->border = wa->border_width; } else { - c->border = BORDERPX; if(c->x + c->w + 2 * c->border > wax + waw) c->x = wax + waw - c->w - 2 * c->border; if(c->y + c->h + 2 * c->border > way + wah) @@ -199,45 +205,45 @@ manage(Window w, XWindowAttributes *wa) { c->x = wax; if(c->y < way) c->y = way; + c->border = BORDERPX; } - updatesizehints(c); - XSelectInput(dpy, w, - StructureNotifyMask | PropertyChangeMask | EnterWindowMask); - XGetTransientForHint(dpy, w, &trans); - grabbuttons(c, False); wc.border_width = c->border; XConfigureWindow(dpy, w, CWBorderWidth, &wc); XSetWindowBorder(dpy, w, dc.norm[ColBorder]); configure(c); /* propagates border_width, if size doesn't change */ + updatesizehints(c); + XSelectInput(dpy, w, + StructureNotifyMask | PropertyChangeMask | EnterWindowMask); + grabbuttons(c, False); updatetitle(c); - for(t = clients; t && t->win != trans; t = t->next); - settags(c, t); + if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success)) + for(t = clients; t && t->win != trans; t = t->next); + if(t) + for(i = 0; i < ntags; i++) + c->tags[i] = t->tags[i]; + applyrules(c); if(!c->isfloating) - c->isfloating = (t != NULL) || c->isfixed; + c->isfloating = (rettrans == Success) || c->isfixed; attach(c); attachstack(c); - c->isbanned = True; - XMoveWindow(dpy, w, c->x + 2 * sw, c->y); - XMapWindow(dpy, w); + XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */ + ban(c); + XMapWindow(dpy, c->win); setclientstate(c, NormalState); - if(isvisible(c)) - focus(c); - lt->arrange(); + arrange(); } void resize(Client *c, int x, int y, int w, int h, Bool sizehints) { - float dx, dy, max, min, ratio; - XWindowChanges wc; + double dx, dy, max, min, ratio; + XWindowChanges wc; - if(w <= 0 || h <= 0) - return; if(sizehints) { - if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0) { - dx = (float)(w - c->basew); - dy = (float)(h - c->baseh); - min = (float)(c->minax) / (float)(c->minay); - max = (float)(c->maxax) / (float)(c->maxay); + if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) { + dx = (double)(w - c->basew); + dy = (double)(h - c->baseh); + min = (double)(c->minax) / (double)(c->minay); + max = (double)(c->maxax) / (double)(c->maxay); ratio = dx / dy; if(max > 0 && min > 0 && ratio > 0) { if(ratio < min) { @@ -269,10 +275,6 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { } if(w <= 0 || h <= 0) return; - if(w == sw && h == sh) - c->border = 0; - else - c->border = BORDERPX; /* offscreen appearance fixes */ if(x > sw) x = sw - w - 2 * c->border; @@ -295,11 +297,34 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { } void -togglefloating(const char *arg) { - if(!sel || lt->arrange == floating) +unban(Client *c) { + if(!c->isbanned) return; - sel->isfloating = !sel->isfloating; - lt->arrange(); + XMoveWindow(dpy, c->win, c->x, c->y); + c->isbanned = False; +} + +void +unmanage(Client *c) { + XWindowChanges wc; + + wc.border_width = c->oldborder; + /* The server grab construct avoids race conditions. */ + XGrabServer(dpy); + XSetErrorHandler(xerrordummy); + XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */ + detach(c); + detachstack(c); + if(sel == c) + focus(NULL); + XUngrabButton(dpy, AnyButton, AnyModifier, c->win); + setclientstate(c, WithdrawnState); + free(c->tags); + free(c); + XSync(dpy, False); + XSetErrorHandler(xerror); + XUngrabServer(dpy); + arrange(); } void @@ -356,49 +381,6 @@ updatesizehints(Client *c) { void updatetitle(Client *c) { - char **list = NULL; - int n; - XTextProperty name; - - name.nitems = 0; - c->name[0] = 0; - XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]); - if(!name.nitems) - XGetWMName(dpy, c->win, &name); - if(!name.nitems) - return; - if(name.encoding == XA_STRING) - strncpy(c->name, (char *)name.value, sizeof c->name); - else { - if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success - && n > 0 && *list) - { - strncpy(c->name, *list, sizeof c->name); - XFreeStringList(list); - } - } - XFree(name.value); -} - -void -unmanage(Client *c) { - Client *nc; - - /* The server grab construct avoids race conditions. */ - XGrabServer(dpy); - XSetErrorHandler(xerrordummy); - detach(c); - detachstack(c); - if(sel == c) { - for(nc = stack; nc && !isvisible(nc); nc = nc->snext); - focus(nc); - } - XUngrabButton(dpy, AnyButton, AnyModifier, c->win); - setclientstate(c, WithdrawnState); - free(c->tags); - free(c); - XSync(dpy, False); - XSetErrorHandler(xerror); - XUngrabServer(dpy); - lt->arrange(); + if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name)) + gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name); }