renamed drawtitle into drawclient

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 45a21a6..c9ad387 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"


@@ -11,7 +11,7 @@
 typedef struct {
        unsigned long mod;
        KeySym keysym;
 typedef struct {
        unsigned long mod;
        KeySym keysym;

-       void (*func[NFUNCS])(Arg *arg);
+       void (*func)(Arg *arg);

        Arg arg;
 } Key;
 
        Arg arg;
 } Key;
 


@@ -161,7 +161,6 @@ configurerequest(XEvent *e) {
 
        if((c = getclient(ev->window))) {
                c->ismax = False;
 
        if((c = getclient(ev->window))) {
                c->ismax = False;

-               gravitate(c, True);

                if(ev->value_mask & CWX)
                        c->x = ev->x;
                if(ev->value_mask & CWY)
                if(ev->value_mask & CWX)
                        c->x = ev->x;
                if(ev->value_mask & CWY)


@@ -172,7 +171,6 @@ configurerequest(XEvent *e) {
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;

-               gravitate(c, False);

                wc.x = c->x;
                wc.y = c->y;
                wc.width = c->w;
                wc.x = c->x;
                wc.y = c->y;
                wc.width = c->w;


@@ -238,14 +236,14 @@ expose(XEvent *e) {
                if(barwin == ev->window)
                        drawstatus();
                else if((c = getctitle(ev->window)))
                if(barwin == ev->window)
                        drawstatus();
                else if((c = getctitle(ev->window)))

-                       drawtitle(c);
+                       drawclient(c);

        }
 }
 
 static void
 keypress(XEvent *e) {
        static unsigned int len = sizeof key / sizeof key[0];
        }
 }
 
 static void
 keypress(XEvent *e) {
        static unsigned int len = sizeof key / sizeof key[0];

-       unsigned int i, j;
+       unsigned int i;

        KeySym keysym;
        XKeyEvent *ev = &e->xkey;
 
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;
 


@@ -254,10 +252,8 @@ keypress(XEvent *e) {
                if(keysym == key[i].keysym
                        && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
                {
                if(keysym == key[i].keysym
                        && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
                {

-                       for(j = 0; j < NFUNCS; j++)
-                               if(key[i].func[j])
-                                       key[i].func[j](&key[i].arg);
-                       return;
+                       if(key[i].func)
+                               key[i].func(&key[i].arg);

                }
        }
 }
                }
        }
 }


@@ -318,13 +314,13 @@ propertynotify(XEvent *e) {
                                        arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
                                        arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:

-                               updatesize(c);
+                               updatesizehints(c);

                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
                        resizetitle(c);
                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
                        resizetitle(c);

-                       drawtitle(c);
+                       drawclient(c);

                }
        }
 }
                }
        }
 }