simplified several portions of code through replacing rect structs with x,y,h,w count...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 870ed4a..1db3d96 100644 (file)
--- a/event.c
+++ b/event.c
@@ -7,10 +7,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <X11/keysym.h>
 #include <stdlib.h>
 #include <string.h>
 #include <X11/keysym.h>

+#include <X11/Xatom.h>

 
 #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);


@@ -22,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,


@@ -34,13 +37,35 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 
        [UnmapNotify] = unmapnotify
 };
 

-unsigned int
-flush_masked_events(long even_mask)
+void
+discard_events(long even_mask)

 {
        XEvent ev;
 {
        XEvent ev;

-       unsigned int n = 0;
-       while(XCheckMaskEvent(dpy, even_mask, &ev)) n++;
-       return n;
+       while(XCheckMaskEvent(dpy, even_mask, &ev));
+}
+
+static void
+buttonpress(XEvent *e)
+{
+       XButtonPressedEvent *ev = &e->xbutton;
+       Client *c;
+
+       if((c = getclient(ev->window))) {
+               raise(c);
+               switch(ev->button) {
+               default:
+                       break;
+               case Button1:
+                       mmove(c);
+                       break;
+               case Button2:
+                       lower(c);
+                       break;
+               case Button3:
+                       mresize(c);
+                       break;
+               }
+       }

 }
 
 static void
 }
 
 static void


@@ -50,26 +75,23 @@ 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.y = ev->y;
        wc.width = ev->width;
        wc.height = ev->height;
        }
 
        wc.x = ev->x;
        wc.y = ev->y;
        wc.width = ev->width;
        wc.height = ev->height;

-       wc.border_width = 0;
+       wc.border_width = 1;

        wc.sibling = None;
        wc.stack_mode = Above;
        ev->value_mask &= ~CWStackMode;
        wc.sibling = None;
        wc.stack_mode = Above;
        ev->value_mask &= ~CWStackMode;


@@ -81,37 +103,26 @@ configurerequest(XEvent *e)
 static void
 destroynotify(XEvent *e)
 {
 static void
 destroynotify(XEvent *e)
 {

-#if 0

        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 

-       if((c = client_of_win(ev->window)))
-               destroy_client(c);
-#endif
+       if((c = getclient(ev->window)))
+               unmanage(c);

 }
 
 static void
 enternotify(XEvent *e)
 {
 }
 
 static void
 enternotify(XEvent *e)
 {

-#if 0

        XCrossingEvent *ev = &e->xcrossing;
        Client *c;
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
 
        XCrossingEvent *ev = &e->xcrossing;
        Client *c;
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
 

-       if((c = client_of_win(ev->window))) {
-               Frame *f = c->sel;
-               Area *a = f->area;
-               if(a->mode == Colmax)
-                       c = a->sel->client;
-               focus(c, False);
-       }
-       else if(ev->window == root) {
+       if((c = getclient(ev->window)))
+               focus(c);
+       else if(ev->window == root)

                sel_screen = True;
                sel_screen = True;

-               draw_frames();
-       }
-#endif

 }
 
 static void
 }
 
 static void


@@ -119,19 +130,20 @@ leavenotify(XEvent *e)
 {
        XCrossingEvent *ev = &e->xcrossing;
 
 {
        XCrossingEvent *ev = &e->xcrossing;
 

-       if((ev->window == root) && !ev->same_screen) {
+       if((ev->window == root) && !ev->same_screen)

                sel_screen = True;
                sel_screen = True;

-               /*draw_frames();*/
-       }

 }
 
 static void
 expose(XEvent *e)
 {
        XExposeEvent *ev = &e->xexpose;
 }
 
 static void
 expose(XEvent *e)
 {
        XExposeEvent *ev = &e->xexpose;

+       Client *c;

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

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

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


@@ -139,9 +151,7 @@ expose(XEvent *e)
 static void
 keymapnotify(XEvent *e)
 {
 static void
 keymapnotify(XEvent *e)
 {

-#if 0

        update_keys();
        update_keys();

-#endif

 }
 
 static void
 }
 
 static void


@@ -166,16 +176,35 @@ maprequest(XEvent *e)
 static void
 propertynotify(XEvent *e)
 {
 static void
 propertynotify(XEvent *e)
 {

-#if 0

        XPropertyEvent *ev = &e->xproperty;
        Client *c;
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
 
        XPropertyEvent *ev = &e->xproperty;
        Client *c;
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
 

-       if((c = client_of_win(ev->window)))
-               prop_client(c, ev);
-#endif
+       if(ev->atom == wm_atom[WMProtocols]) {
+               c->proto = win_proto(c->win);
+               return;
+       }
+       if((c = getclient(ev->window))) {
+               switch (ev->atom) {
+                       default: break;
+                       case XA_WM_TRANSIENT_FOR:
+                               XGetTransientForHint(dpy, c->win, &c->trans);
+                               break;
+                               update_size(c);
+                       case XA_WM_NORMAL_HINTS:
+                               update_size(c);
+                               break;
+               }
+               if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
+                       update_name(c);
+                       if(c == stack)
+                               draw_bar();
+                       else
+                               draw_client(c);
+               }
+       }

 }
 
 static void
 }
 
 static void