implemented draw_client stuff

[dwm.git] / event.c

diff --git a/event.c b/event.c
index ccab9d1..f29038a 100644 (file)
--- a/event.c
+++ b/event.c
@@ -12,6 +12,7 @@
 #include "wm.h"
 
 /* local functions */
 #include "wm.h"
 
 /* local functions */

+static void buttonpress(XEvent *e);

 static void configurerequest(XEvent *e);
 static void destroynotify(XEvent *e);
 static void enternotify(XEvent *e);
 static void configurerequest(XEvent *e);
 static void destroynotify(XEvent *e);
 static void enternotify(XEvent *e);


@@ -23,6 +24,7 @@ static void propertynotify(XEvent *e);
 static void unmapnotify(XEvent *e);
 
 void (*handler[LASTEvent]) (XEvent *) = {
 static void unmapnotify(XEvent *e);
 
 void (*handler[LASTEvent]) (XEvent *) = {

+       [ButtonPress] = buttonpress,

        [ConfigureRequest] = configurerequest,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [ConfigureRequest] = configurerequest,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,


@@ -36,7 +38,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 };
 
 unsigned int
 };
 
 unsigned int

-flush_events(long even_mask)
+discard_events(long even_mask)

 {
        XEvent ev;
        unsigned int n = 0;
 {
        XEvent ev;
        unsigned int n = 0;


@@ -44,6 +46,29 @@ flush_events(long even_mask)
        return n;
 }
 
        return n;
 }
 

+static void
+buttonpress(XEvent *e)
+{
+       XButtonPressedEvent *ev = &e->xbutton;
+       Client *c;
+
+       if((c = getclient(ev->window))) {
+               switch(ev->button) {
+               default:
+                       break;
+               case Button1:
+                       mmove(c);
+                       break;
+               case Button2:
+                       XLowerWindow(dpy, c->win);
+                       break;
+               case Button3:
+                       mresize(c);
+                       break;
+               }
+       }
+}
+

 static void
 configurerequest(XEvent *e)
 {
 static void
 configurerequest(XEvent *e)
 {


@@ -51,19 +76,16 @@ configurerequest(XEvent *e)
        XWindowChanges wc;
        Client *c;
 
        XWindowChanges wc;
        Client *c;
 

-       c = getclient(ev->window);

        ev->value_mask &= ~CWSibling;
        ev->value_mask &= ~CWSibling;

-       if(c) {
+       if((c = getclient(ev->window))) {

                if(ev->value_mask & CWX)
                if(ev->value_mask & CWX)

-                       c->r[RFloat].x = ev->x;
+                       c->x = ev->x;

                if(ev->value_mask & CWY)
                if(ev->value_mask & CWY)

-                       c->r[RFloat].y = ev->y;
+                       c->y = ev->y;

                if(ev->value_mask & CWWidth)
                if(ev->value_mask & CWWidth)

-                       c->r[RFloat].width = ev->width;
+                       c->w = ev->width;

                if(ev->value_mask & CWHeight)
                if(ev->value_mask & CWHeight)

-                       c->r[RFloat].height = ev->height;
-               if(ev->value_mask & CWBorderWidth)
-                       c->border = ev->border_width;
+                       c->h = ev->height;

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


@@ -121,9 +143,12 @@ static void
 expose(XEvent *e)
 {
        XExposeEvent *ev = &e->xexpose;
 expose(XEvent *e)
 {
        XExposeEvent *ev = &e->xexpose;

+       Client *c;

 
        if(ev->count == 0) {
 
        if(ev->count == 0) {

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

                        draw_bar();
        }
 }
                        draw_bar();
        }
 }


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

-       long msize;

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


@@ -173,21 +197,13 @@ propertynotify(XEvent *e)
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &c->trans);
                                break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &c->trans);
                                break;

+                               update_size(c);

                        case XA_WM_NORMAL_HINTS:
                        case XA_WM_NORMAL_HINTS:

-                               if(!XGetWMNormalHints(dpy, c->win, &c->size, &msize)
-                                               || !c->size.flags)
-                                       c->size.flags = PSize;
-                               if(c->size.flags & PMinSize && c->size.flags & PMaxSize
-                                               && c->size.min_width == c->size.max_width
-                                               && c->size.min_height == c->size.max_height)
-                                       c->fixedsize = True;
-                               else
-                                       c->fixedsize = False;
+                               update_size(c);

                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
                        update_name(c);
                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
                        update_name(c);

-                       /*draw_frame(c->sel);*/

                }
        }
 }
                }
        }
 }