fixed several things, nearly feature complete

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 909012d..937bee2 100644 (file)
--- a/event.c
+++ b/event.c
@@ -7,10 +7,12 @@
 #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);
 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 *) = {
+       [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
@@ -34,13 +37,35 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 
-unsigned int
-flush_masked_events(long even_mask)
+void
+discard_events(long even_mask)
 {
        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))) {
+               craise(c);
+               switch(ev->button) {
+               default:
+                       break;
+               case Button1:
+                       mmove(c);
+                       break;
+               case Button2:
+                       lower(c);
+                       break;
+               case Button3:
+                       mresize(c);
+                       break;
+               }
+       }
 }
 
 static void
@@ -50,26 +75,27 @@ configurerequest(XEvent *e)
        XWindowChanges wc;
        Client *c;
 
-       c = getclient(ev->window);
        ev->value_mask &= ~CWSibling;
-       if(c) {
+       if((c = getclient(ev->window))) {
+               gravitate(c, True);
                if(ev->value_mask & CWX)
-                       c->r[RFloat].x = ev->x;
+                       c->x = ev->x;
                if(ev->value_mask & CWY)
-                       c->r[RFloat].y = ev->y;
+                       c->y = ev->y;
                if(ev->value_mask & CWWidth)
-                       c->r[RFloat].width = ev->width;
+                       c->w = ev->width;
                if(ev->value_mask & CWHeight)
-                       c->r[RFloat].height = ev->height;
+                       c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
+               gravitate(c, False);
        }
 
        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;
@@ -81,37 +107,26 @@ configurerequest(XEvent *e)
 static void
 destroynotify(XEvent *e)
 {
-#if 0
        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)
 {
-#if 0
        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) {
-               sel_screen = True;
-               draw_frames();
-       }
-#endif
+       if((c = getclient(ev->window)))
+               focus(c);
+       else if(ev->window == root)
+               issel = True;
 }
 
 static void
@@ -119,29 +134,26 @@ leavenotify(XEvent *e)
 {
        XCrossingEvent *ev = &e->xcrossing;
 
-       if((ev->window == root) && !ev->same_screen) {
-               sel_screen = True;
-               /*draw_frames();*/
-       }
+       if((ev->window == root) && !ev->same_screen)
+               issel = True;
 }
 
 static void
 expose(XEvent *e)
 {
        XExposeEvent *ev = &e->xexpose;
+       Client *c;
 
        if(ev->count == 0) {
-               if(ev->window == barwin)
-                       draw_bar();
+               if((c = gettitle(ev->window)))
+                       draw_client(c);
        }
 }
 
 static void
 keymapnotify(XEvent *e)
 {
-#if 0
        update_keys();
-#endif
 }
 
 static void
@@ -159,37 +171,47 @@ maprequest(XEvent *e)
                return;
        }
 
-       /*if(!client_of_win(ev->window))*/
-               /*manage(create_client(ev->window, &wa));*/
-       XMapRaised(dpy, ev->window);
-       XMoveResizeWindow(dpy, ev->window, rect.x, rect.y, rect.width, rect.height - barrect.height);
-       XSetInputFocus(dpy, ev->window, RevertToPointerRoot, CurrentTime);
-       XFlush(dpy);
+       if(!getclient(ev->window))
+               manage(ev->window, &wa);
 }
 
 static void
 propertynotify(XEvent *e)
 {
-#if 0
        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((c = getclient(ev->window))) {
+               if(ev->atom == wm_atom[WMProtocols]) {
+                       c->proto = win_proto(c->win);
+                       return;
+               }
+               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);
+                       draw_client(c);
+               }
+       }
 }
 
 static void
 unmapnotify(XEvent *e)
 {
-#if 0
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
-       if((c = client_of_win(ev->window)))
-               destroy_client(c);
-#endif
+       if((c = getclient(ev->window)))
+               unmanage(c);
 }