removed unnecessary include, prepared dwm-4.4

[dwm.git] / client.c

diff --git a/client.c b/client.c
index d4dfe6e..a105514 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,8 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <stdlib.h>
-#include <string.h>
-#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 /* static */
@@ -100,10 +98,8 @@ void
 ban(Client *c) {
        if(c->isbanned)
                return;
-       XUnmapWindow(dpy, c->win);
-       setclientstate(c, IconicState);
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        c->isbanned = True;
-       c->unmapped++;
 }
 
 void
@@ -181,6 +177,7 @@ killclient(const char *arg) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
+       unsigned int i;
        Client *c, *t = NULL;
        Window trans;
        Status rettrans;
@@ -221,31 +218,31 @@ manage(Window w, XWindowAttributes *wa) {
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
-       settags(c, t);
+       if(t)
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = t->tags[i];
+       applyrules(c);
        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;
        attach(c);
        attachstack(c);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
-       setclientstate(c, IconicState);
-       c->isbanned = True;
-       focus(c);
-       lt->arrange();
+       ban(c);
+       XMapWindow(dpy, c->win);
+       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) {
@@ -298,22 +295,11 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        }
 }
 
-void
-togglefloating(const char *arg) {
-       if(!sel || lt->arrange == floating)
-               return;
-       sel->isfloating = !sel->isfloating;
-       if(sel->isfloating)
-               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
-       lt->arrange();
-}
-
 void
 unban(Client *c) {
        if(!c->isbanned)
                return;
-       XMapWindow(dpy, c->win);
-       setclientstate(c, NormalState);
+       XMoveWindow(dpy, c->win, c->x, c->y);
        c->isbanned = False;
 }
 
@@ -337,7 +323,7 @@ unmanage(Client *c) {
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
-       lt->arrange();
+       arrange();
 }
 
 void
@@ -394,27 +380,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 - 1);
-       else {
-               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-               && n > 0 && *list)
-               {
-                       strncpy(c->name, *list, sizeof c->name - 1);
-                       XFreeStringList(list);
-               }
-       }
-       c->name[sizeof c->name - 1] = '\0';
-       XFree(name.value);
+       if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
+               gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 }