new colorscheme (16-bit compliant)

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 882b8ee..c716625 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>
-#include <string.h>
-#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 /* static */
 
-static char config[128];
-
 static void
 attachstack(Client *c) {
        c->snext = stack;
@@ -102,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
@@ -151,7 +145,7 @@ focus(Client *c) {
                grabbuttons(c, True);
        }
        sel = c;
-       drawstatus();
+       drawbar();
        if(!selscreen)
                return;
        if(c) {
@@ -181,28 +175,6 @@ killclient(const char *arg) {
                XKillClient(dpy, sel->win);
 }
 
-Bool
-loadconfig(Client *c) {
-       unsigned int i;
-       Bool result = False;
-       XTextProperty name;
-
-       /* check if window has set a property */
-       name.nitems = 0;
-       XGetTextProperty(dpy, c->win, &name, dwmconfig);
-       if(name.nitems && name.encoding == XA_STRING) {
-               strncpy(config, (char *)name.value, sizeof config - 1);
-               config[sizeof config - 1] = '\0';
-               XFree(name.value);
-               for(i = 0; i < ntags && i < sizeof config - 1 && config[i] != '\0'; i++)
-                       if((c->tags[i] = config[i] == '1'))
-                               result = True;
-               if(i < sizeof config - 1 && config[i] != '\0')
-                       c->isfloating = config[i] == '1';
-       }
-       return result;
-}
-
 void
 manage(Window w, XWindowAttributes *wa) {
        unsigned int i;
@@ -249,15 +221,15 @@ manage(Window w, XWindowAttributes *wa) {
        if(t)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = t->tags[i];
-       if(!loadconfig(c))
-               applyrules(c);
+       applyrules(c);
        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;
-       saveconfig(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);
+       setclientstate(c, NormalState);
        arrange();
 }
 
@@ -325,29 +297,15 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
-saveconfig(Client *c) {
-       unsigned int i;
-
-       for(i = 0; i < ntags && i < sizeof config - 1; i++)
-               config[i] = c->tags[i] ? '1' : '0';
-       if(i < sizeof config - 1)
-               config[i++] = c->isfloating ? '1' : '0';
-       config[i] = '\0';
-       XChangeProperty(dpy, c->win, dwmconfig, XA_STRING, 8,
-                       PropModeReplace, (unsigned char *)config, i);
-}
-
-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
-unmanage(Client *c, long state) {
+unmanage(Client *c) {
        XWindowChanges wc;
 
        wc.border_width = c->oldborder;
@@ -360,14 +318,13 @@ unmanage(Client *c, long state) {
        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);
-       if(state != NormalState)
-               arrange();
+       arrange();
 }
 
 void
@@ -424,27 +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 - 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);
 }