added dev.c instead of kb.c

[dwm.git] / wm.c

diff --git a/wm.c b/wm.c
index 8c5814f..ed002f7 100644 (file)
--- a/wm.c
+++ b/wm.c
@@ -13,33 +13,41 @@
 
 #include "wm.h"
 
 
 #include "wm.h"
 

+/********** CUSTOMIZE **********/
+
+char *tags[TLast] = {
+       [Tscratch] = "scratch",
+       [Tdev] = "dev",
+       [Tirc] = "irc",
+       [Twww] = "www",
+       [Twork] = "work",
+};
+
+/********** CUSTOMIZE **********/
+

 /* X structs */
 Display *dpy;
 Window root, barwin;
 /* X structs */
 Display *dpy;
 Window root, barwin;

-Atom net_atom[NetLast];
+Atom wm_atom[WMLast], net_atom[NetLast];

 Cursor cursor[CurLast];
 Cursor cursor[CurLast];

-XRectangle rect, barrect;

 Bool running = True;
 Bool running = True;

-Client *clients = NULL;
-
-char *bartext, tag[256];
-int screen, sel_screen;
+Bool issel;

 
 

-/* draw structs */
-Brush brush = {0};
+char stext[1024];
+int tsel = Tdev; /* default tag */
+int screen, sx, sy, sw, sh, th;

 
 

-enum { WM_PROTOCOL_DELWIN = 1 };
+DC dc = {0};
+Client *clients = NULL;
+Client *stack = NULL;

 
 static Bool other_wm_running;
 
 static Bool other_wm_running;

+static const char version[] =
+       "dwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";

 static int (*x_error_handler) (Display *, XErrorEvent *);
 static int (*x_error_handler) (Display *, XErrorEvent *);

-static char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";

 
 static void
 
 static void

-usage()
-{
-       fputs("usage: gridwm [-v]\n", stderr);
-       exit(1);
-}
+usage() {      error("usage: dwm [-v]\n"); }

 
 static void
 scan_wins()
 
 static void
 scan_wins()


@@ -56,20 +64,75 @@ scan_wins()
                        if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;
                        if(wa.map_state == IsViewable)
                        if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;
                        if(wa.map_state == IsViewable)

-                               manage(create_client(wins[i], &wa));
+                               manage(wins[i], &wa);

                }
        }
        if(wins)
                XFree(wins);
 }
 
                }
        }
        if(wins)
                XFree(wins);
 }
 

+static int
+win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
+{
+       Atom real;
+       int format;
+       unsigned long res, extra;
+       int status;
+
+       status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
+                       &res, &extra, prop);
+
+       if(status != Success || *prop == 0) {
+               return 0;
+       }
+       if(res == 0) {
+               free((void *) *prop);
+       }
+       return res;
+}
+
+int
+win_proto(Window w)
+{
+       unsigned char *protocols;
+       long res;
+       int protos = 0;
+       int i;
+
+       res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L, &protocols);
+       if(res <= 0) {
+               return protos;
+       }
+       for(i = 0; i < res; i++) {
+               if(protocols[i] == wm_atom[WMDelete])
+                       protos |= WM_PROTOCOL_DELWIN;
+       }
+       free((char *) protocols);
+       return protos;
+}
+
+void
+send_message(Window w, Atom a, long value)
+{
+       XEvent e;
+
+       e.type = ClientMessage;
+       e.xclient.window = w;
+       e.xclient.message_type = a;
+       e.xclient.format = 32;
+       e.xclient.data.l[0] = value;
+       e.xclient.data.l[1] = CurrentTime;
+       XSendEvent(dpy, w, False, NoEventMask, &e);
+       XFlush(dpy);
+}
+

 /*
  * There's no way to check accesses to destroyed windows, thus
  * those cases are ignored (especially on UnmapNotify's).
  * Other types of errors call Xlib's default error handler, which
  * calls exit().
  */
 /*
  * There's no way to check accesses to destroyed windows, thus
  * those cases are ignored (especially on UnmapNotify's).
  * Other types of errors call Xlib's default error handler, which
  * calls exit().
  */

-static int
+int

 error_handler(Display *dpy, XErrorEvent *error)
 {
        if(error->error_code == BadWindow
 error_handler(Display *dpy, XErrorEvent *error)
 {
        if(error->error_code == BadWindow


@@ -86,7 +149,7 @@ error_handler(Display *dpy, XErrorEvent *error)
                        || (error->request_code == X_GrabKey
                                && error->error_code == BadAccess))
                return 0;
                        || (error->request_code == X_GrabKey
                                && error->error_code == BadAccess))
                return 0;

-       fprintf(stderr, "gridwm: fatal error: request code=%d, error code=%d\n",
+       fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",

                        error->request_code, error->error_code);
        return x_error_handler(dpy, error); /* may call exit() */
 }
                        error->request_code, error->error_code);
        return x_error_handler(dpy, error); /* may call exit() */
 }


@@ -105,12 +168,15 @@ startup_error_handler(Display *dpy, XErrorEvent *error)
 static void
 cleanup()
 {
 static void
 cleanup()
 {

-       /*
-       Client *c;
-       for(c=client; c; c=c->next)
-               reparent_client(c, root, c->sel->rect.x, c->sel->rect.y);
+       while(clients)
+               unmanage(clients);

        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);

-       */
+}
+
+void
+quit(void *aux)
+{
+       running = False;

 }
 
 int
 }
 
 int


@@ -137,7 +203,7 @@ main(int argc, char *argv[])
 
        dpy = XOpenDisplay(0);
        if(!dpy)
 
        dpy = XOpenDisplay(0);
        if(!dpy)

-               error("gridwm: cannot connect X server\n");
+               error("dwm: cannot connect X server\n");

 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);


@@ -150,17 +216,19 @@ main(int argc, char *argv[])
        XFlush(dpy);
 
        if(other_wm_running)
        XFlush(dpy);
 
        if(other_wm_running)

-               error("gridwm: another window manager is already running\n");
+               error("dwm: another window manager is already running\n");

 
 

-       rect.x = rect.y = 0;
-       rect.width = DisplayWidth(dpy, screen);
-       rect.height = DisplayHeight(dpy, screen);
-       sel_screen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+       sx = sy = 0;
+       sw = DisplayWidth(dpy, screen);
+       sh = DisplayHeight(dpy, screen);
+       issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);

 
        XSetErrorHandler(0);
        x_error_handler = XSetErrorHandler(error_handler);
 
        /* init atoms */
 
        XSetErrorHandler(0);
        x_error_handler = XSetErrorHandler(error_handler);
 
        /* init atoms */

+       wm_atom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
+       wm_atom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);

        net_atom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        net_atom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
 
        net_atom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        net_atom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
 


@@ -175,29 +243,14 @@ main(int argc, char *argv[])
 
        update_keys();
 
 
        update_keys();
 

-       brush.drawable = XCreatePixmap(dpy, root, rect.width, rect.height,
-                       DefaultDepth(dpy, screen));
-       brush.gc = XCreateGC(dpy, root, 0, 0);
-

        /* style */
        /* style */

-       loadcolors(dpy, screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR);
-       loadfont(dpy, &brush.font, FONT);
-
-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask;
-
-       barrect = rect;
-       barrect.height = labelheight(&brush.font);
-       barrect.y = rect.height - barrect.height;
-       barwin = XCreateWindow(dpy, root, barrect.x, barrect.y,
-                       barrect.width, barrect.height, 0, DefaultDepth(dpy, screen),
-                       CopyFromParent, DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-       bartext = NULL;
-       XDefineCursor(dpy, barwin, cursor[CurNormal]);
-       XMapRaised(dpy, barwin);
-       draw_bar();
+       initcolors(BGCOLOR, FGCOLOR, BORDERCOLOR);
+       initfont(&dc.font, FONT);
+
+       th = texth(&dc.font);
+
+       dc.drawable = XCreatePixmap(dpy, root, sw, th, DefaultDepth(dpy, screen));
+       dc.gc = XCreateGC(dpy, root, 0, 0);

 
        wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
                                        | LeaveWindowMask;
 
        wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
                                        | LeaveWindowMask;


@@ -209,7 +262,7 @@ main(int argc, char *argv[])
        while(running) {
                XNextEvent(dpy, &ev);
                if(handler[ev.type])
        while(running) {
                XNextEvent(dpy, &ev);
                if(handler[ev.type])

-                       (handler[ev.type]) (&ev); /* call handler */
+                       (handler[ev.type])(&ev); /* call handler */

        }
 
        cleanup();
        }
 
        cleanup();