rearranged

[dwm.git] / event.c

diff --git a/event.c b/event.c
index b8b39a4..b369ede 100644 (file)
--- a/event.c
+++ b/event.c
@@ -4,12 +4,17 @@
  */
 
 #include <fcntl.h>
  */
 
 #include <fcntl.h>

+#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>

+#include <unistd.h>

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

-#include "wm.h"
+#include "dwm.h"
+
+#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
+#define MouseMask       (ButtonMask | PointerMotionMask)

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


@@ -18,7 +23,6 @@ static void destroynotify(XEvent *e);
 static void enternotify(XEvent *e);
 static void leavenotify(XEvent *e);
 static void expose(XEvent *e);
 static void enternotify(XEvent *e);
 static void leavenotify(XEvent *e);
 static void expose(XEvent *e);

-static void keymapnotify(XEvent *e);

 static void maprequest(XEvent *e);
 static void propertynotify(XEvent *e);
 static void unmapnotify(XEvent *e);
 static void maprequest(XEvent *e);
 static void propertynotify(XEvent *e);
 static void unmapnotify(XEvent *e);


@@ -31,28 +35,101 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [LeaveNotify] = leavenotify,
        [Expose] = expose,
        [KeyPress] = keypress,
        [LeaveNotify] = leavenotify,
        [Expose] = expose,
        [KeyPress] = keypress,

-       [KeymapNotify] = keymapnotify,

        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
 
        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
 

-unsigned int
-discard_events(long even_mask)
+static void
+mresize(Client *c)

 {
        XEvent ev;
 {
        XEvent ev;

-       unsigned int n = 0;
-       while(XCheckMaskEvent(dpy, even_mask, &ev)) n++;
-       return n;
+       int ocx, ocy;
+
+       ocx = c->x;
+       ocy = c->y;
+       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+                               None, cursor[CurResize], CurrentTime) != GrabSuccess)
+               return;
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
+       for(;;) {
+               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               switch(ev.type) {
+               default: break;
+               case Expose:
+                       handler[Expose](&ev);
+                       break;
+               case MotionNotify:
+                       XFlush(dpy);
+                       c->w = abs(ocx - ev.xmotion.x);
+                       c->h = abs(ocy - ev.xmotion.y);
+                       c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
+                       c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
+                       resize(c, True);
+                       break;
+               case ButtonRelease:
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
+               }
+       }
+}
+
+static void
+mmove(Client *c)
+{
+       XEvent ev;
+       int x1, y1, ocx, ocy, di;
+       unsigned int dui;
+       Window dummy;
+
+       ocx = c->x;
+       ocy = c->y;
+       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+                               None, cursor[CurMove], CurrentTime) != GrabSuccess)
+               return;
+       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+       for(;;) {
+               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               switch (ev.type) {
+               default: break;
+               case Expose:
+                       handler[Expose](&ev);
+                       break;
+               case MotionNotify:
+                       XFlush(dpy);
+                       c->x = ocx + (ev.xmotion.x - x1);
+                       c->y = ocy + (ev.xmotion.y - y1);
+                       resize(c, False);
+                       break;
+               case ButtonRelease:
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
+               }
+       }

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

+       int x;
+       Arg a;

        XButtonPressedEvent *ev = &e->xbutton;
        Client *c;
 
        XButtonPressedEvent *ev = &e->xbutton;
        Client *c;
 

-       if((c = getclient(ev->window))) {
+       if(barwin == ev->window) {
+               x = (arrange == floating) ? textw("~") : 0;
+               for(a.i = 0; a.i < TLast; a.i++) {
+                       x += textw(tags[a.i]);
+                       if(ev->x < x) {
+                               view(&a);
+                               break;
+                       }
+               }
+       }
+       else if((c = getclient(ev->window))) {
+               if(arrange == tiling && !c->floating)
+                       return;
+               craise(c);

                switch(ev->button) {
                default:
                        break;
                switch(ev->button) {
                default:
                        break;


@@ -60,7 +137,7 @@ buttonpress(XEvent *e)
                        mmove(c);
                        break;
                case Button2:
                        mmove(c);
                        break;
                case Button2:

-                       XLowerWindow(dpy, c->win);
+                       lower(c);

                        break;
                case Button3:
                        mresize(c);
                        break;
                case Button3:
                        mresize(c);


@@ -78,21 +155,26 @@ configurerequest(XEvent *e)
 
        ev->value_mask &= ~CWSibling;
        if((c = getclient(ev->window))) {
 
        ev->value_mask &= ~CWSibling;
        if((c = getclient(ev->window))) {

+               gravitate(c, True);

                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;
+                       c->h = ev->height;
+               if(ev->value_mask & CWBorderWidth)
+                       c->border = 1;
+               gravitate(c, False);
+               resize(c, True);

        }
 
        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;


@@ -122,10 +204,8 @@ enternotify(XEvent *e)
 
        if((c = getclient(ev->window)))
                focus(c);
 
        if((c = getclient(ev->window)))
                focus(c);

-       else if(ev->window == root) {
-               sel_screen = True;
-               /*draw_frames();*/
-       }
+       else if(ev->window == root)
+               issel = True;

 }
 
 static void
 }
 
 static void


@@ -133,29 +213,24 @@ leavenotify(XEvent *e)
 {
        XCrossingEvent *ev = &e->xcrossing;
 
 {
        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;
 }
 
 static void
 expose(XEvent *e)
 {
        XExposeEvent *ev = &e->xexpose;

+       Client *c;

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

-               if(ev->window == barwin)
+               if(barwin == ev->window)

                        draw_bar();
                        draw_bar();

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

        }
 }
 
        }
 }
 

-static void
-keymapnotify(XEvent *e)
-{
-       update_keys();
-}
-

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


@@ -179,36 +254,31 @@ static void
 propertynotify(XEvent *e)
 {
        XPropertyEvent *ev = &e->xproperty;
 propertynotify(XEvent *e)
 {
        XPropertyEvent *ev = &e->xproperty;

-       long msize;
+       Window trans;

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

-       if(ev->atom == wm_atom[WMProtocols]) {
-               c->proto = win_proto(c->win);
-               return;
-       }

        if((c = getclient(ev->window))) {
        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:
                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;
                        case XA_WM_NORMAL_HINTS:
                                break;
                        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_client(c);

                }
        }
 }
                }
        }
 }