removed unnecessary include, prepared dwm-4.4

[dwm.git] / client.c

diff --git a/client.c b/client.c
index d94c0ed..a105514 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,14 +1,10 @@
 /* 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 */
 

-static char prop[128];
-

 static void
 attachstack(Client *c) {
        c->snext = stack;
 static void
 attachstack(Client *c) {
        c->snext = stack;


@@ -102,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,21 +175,6 @@ killclient(const char *arg) {
                XKillClient(dpy, sel->win);
 }
 
                XKillClient(dpy, sel->win);
 }
 

-Bool
-loadprops(Client *c) {
-       unsigned int i;
-       Bool result = False;
-
-       if(gettextprop(c->win, dwmprops, prop, sizeof prop)) {
-               for(i = 0; i < ntags && i < sizeof prop - 1 && prop[i] != '\0'; i++)
-                       if((c->tags[i] = prop[i] == '1'))
-                               result = True;
-               if(i < sizeof prop - 1 && prop[i] != '\0')
-                       c->isfloating = prop[i] == '1';
-       }
-       return result;
-}
-

 void
 manage(Window w, XWindowAttributes *wa) {
        unsigned int i;
 void
 manage(Window w, XWindowAttributes *wa) {
        unsigned int i;


@@ -242,15 +221,14 @@ manage(Window w, XWindowAttributes *wa) {
        if(t)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = t->tags[i];
        if(t)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = t->tags[i];

-       if(!loadprops(c))
-               applyrules(c);
+       applyrules(c);

        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;
        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;

-       saveprops(c);

        attach(c);
        attachstack(c);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
        ban(c);
        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();
 }
 


@@ -317,30 +295,16 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        }
 }
 
        }
 }
 

-void
-saveprops(Client *c) {
-       unsigned int i;
-
-       for(i = 0; i < ntags && i < sizeof prop - 1; i++)
-               prop[i] = c->tags[i] ? '1' : '0';
-       if(i < sizeof prop - 1)
-               prop[i++] = c->isfloating ? '1' : '0';
-       prop[i] = '\0';
-       XChangeProperty(dpy, c->win, dwmprops, XA_STRING, 8,
-                       PropModeReplace, (unsigned char *)prop, i);
-}
-

 void
 unban(Client *c) {
        if(!c->isbanned)
                return;
 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;
 }
 
 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;


@@ -353,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