fixed crash on zoom if only 1 client exists

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 5ff6b91..b027a3e 100644 (file)
--- a/event.c
+++ b/event.c
@@ -4,12 +4,13 @@
  */
 
 #include <fcntl.h>
  */
 
 #include <fcntl.h>

+#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 

-#include "wm.h"
+#include "dwm.h"

 
 /* local functions */
 static void buttonpress(XEvent *e);
 
 /* local functions */
 static void buttonpress(XEvent *e);


@@ -37,20 +38,15 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 
        [UnmapNotify] = unmapnotify
 };
 

-void
-discard_events(long even_mask)
-{
-       XEvent ev;
-       while(XCheckMaskEvent(dpy, even_mask, &ev));
-}
-

 static void
 buttonpress(XEvent *e)
 {
        XButtonPressedEvent *ev = &e->xbutton;
        Client *c;
 
 static void
 buttonpress(XEvent *e)
 {
        XButtonPressedEvent *ev = &e->xbutton;
        Client *c;
 

-       if((c = getclient(ev->window))) {
+       if(barwin == ev->window)
+               barclick(ev);
+       else if((c = getclient(ev->window))) {

                craise(c);
                switch(ev->button) {
                default:
                craise(c);
                switch(ev->button) {
                default:


@@ -87,8 +83,9 @@ configurerequest(XEvent *e)
                if(ev->value_mask & CWHeight)
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                if(ev->value_mask & CWHeight)
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)

-                       c->border = ev->border_width;
+                       c->border = 1;

                gravitate(c, False);
                gravitate(c, False);

+               resize(c, True);

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


@@ -179,6 +176,7 @@ static void
 propertynotify(XEvent *e)
 {
        XPropertyEvent *ev = &e->xproperty;
 propertynotify(XEvent *e)
 {
        XPropertyEvent *ev = &e->xproperty;

+       Window trans;

        Client *c;
 
        if(ev->state == PropertyDelete)
        Client *c;
 
        if(ev->state == PropertyDelete)


@@ -192,9 +190,10 @@ propertynotify(XEvent *e)
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:

-                               XGetTransientForHint(dpy, c->win, &c->trans);
+                               XGetTransientForHint(dpy, c->win, &trans);
+                               if(!c->floating && (c->floating = (trans != 0)))
+                                       arrange(NULL);

                                break;
                                break;

-                               update_size(c);

                        case XA_WM_NORMAL_HINTS:
                                update_size(c);
                                break;
                        case XA_WM_NORMAL_HINTS:
                                update_size(c);
                                break;