yet another fix of copyright compactisition

[dwm.git] / event.c

diff --git a/event.c b/event.c
index a442d2e..c41c975 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,6 +1,6 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */

 #include "dwm.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "dwm.h"
 #include <stdio.h>
 #include <stdlib.h>


@@ -151,14 +151,14 @@ buttonpress(XEvent *e) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;

-               if(ev->button == Button1 && (lt->arrange == untile || c->isuntiled)) {
+               if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) {

                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                else if(ev->button == Button3
                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                else if(ev->button == Button3

-               && (lt->arrange == untile || c->isuntiled) && !c->isfixed)
+               && (lt->arrange == floating || c->isfloating) && !c->isfixed)

                {
                        restack();
                        resizemouse(c);
                {
                        restack();
                        resizemouse(c);


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

-               if(ev->value_mask & CWBorderWidth)
-                       c->border = ev->border_width;
-               if(c->isfixed || c->isuntiled || (lt->arrange == untile)) {
+               if(c->isfixed || c->isfloating || (lt->arrange == floating)) {

                        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)


@@ -191,8 +189,12 @@ configurerequest(XEvent *e) {
                        if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                        if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }

-               else
+               else {
+                       if(ev->value_mask & CWBorderWidth)
+                               c->border = ev->border_width;

                        configure(c);
                        configure(c);

+                       c->border = BORDERPX;
+               }

        }
        else {
                wc.x = ev->x;
        }
        else {
                wc.x = ev->x;


@@ -304,7 +306,7 @@ propertynotify(XEvent *e) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);

-                               if(!c->isuntiled && (c->isuntiled = (getclient(trans) != NULL)))
+                               if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))

                                        lt->arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
                                        lt->arrange();
                                break;
                        case XA_WM_NORMAL_HINTS: