removed unnecessary include, prepared dwm-4.4

[dwm.git] / client.c

diff --git a/client.c b/client.c
index c6cf770..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>
 /* 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 */
 #include <X11/Xutil.h>
 
 /* static */


@@ -100,10 +98,8 @@ void
 ban(Client *c) {
        if(c->isbanned)
                return;
 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->isbanned = True;

-       c->unmapped++;

 }
 
 void
 }
 
 void


@@ -181,6 +177,7 @@ killclient(const char *arg) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
 
 void
 manage(Window w, XWindowAttributes *wa) {

+       unsigned int i;

        Client *c, *t = NULL;
        Window trans;
        Status rettrans;
        Client *c, *t = NULL;
        Window trans;
        Status rettrans;


@@ -221,13 +218,17 @@ manage(Window w, XWindowAttributes *wa) {
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
        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 */
        ban(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 */
        ban(c);

+       XMapWindow(dpy, c->win);

        arrange();
 }
 
        arrange();
 }
 


@@ -298,13 +299,12 @@ void
 unban(Client *c) {
        if(!c->isbanned)
                return;
 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;
 }
 
 void
        c->isbanned = False;
 }
 
 void

-unmanage(Client *c, long state) {
+unmanage(Client *c) {

        XWindowChanges wc;
 
        wc.border_width = c->oldborder;
        XWindowChanges wc;
 
        wc.border_width = c->oldborder;


@@ -317,14 +317,13 @@ unmanage(Client *c, long state) {
        if(sel == c)
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        if(sel == c)
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);

-       setclientstate(c, state);
+       setclientstate(c, WithdrawnState);

        free(c->tags);
        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        free(c->tags);
        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

-       if(state != NormalState)
-               arrange();
+       arrange();

 }
 
 void
 }
 
 void


@@ -381,27 +380,6 @@ updatesizehints(Client *c) {
 
 void
 updatetitle(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);

 }
 }