new stuff (some warning elimination)

[dwm.git] / wm.c

diff --git a/wm.c b/wm.c
index 843aaac..6d67bfc 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;
 Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];
 /* X structs */
 Display *dpy;
 Window root, barwin;
 Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];

-XRectangle rect, barrect;

 Bool running = True;
 Bool running = True;

+Bool issel;

 
 

-char *bartext;
-int screen, sel_screen;
-unsigned int lock_mask, numlock_mask;
+char stext[1024];
+int tsel = Tdev; /* default tag */
+int screen, sx, sy, sw, sh, th;

 
 

-/* draw structs */

 Brush brush = {0};
 Brush brush = {0};

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

 
 static Bool other_wm_running;
 
 static Bool other_wm_running;

+static const char version[] =
+       "gridwm - " 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: gridwm [-v]\n"); }

 
 static void
 scan_wins()
 
 static void
 scan_wins()


@@ -56,7 +64,7 @@ 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)
                }
        }
        if(wins)


@@ -86,13 +94,12 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 int
 win_proto(Window w)
 {
 int
 win_proto(Window w)
 {

-       Atom *protocols;
+       unsigned char *protocols;

        long res;
        int protos = 0;
        int i;
 
        long res;
        int protos = 0;
        int i;
 

-       res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L,
-                       ((unsigned char **) &protocols));
+       res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L, &protocols);

        if(res <= 0) {
                return protos;
        }
        if(res <= 0) {
                return protos;
        }


@@ -104,13 +111,28 @@ win_proto(Window w)
        return protos;
 }
 
        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


@@ -144,40 +166,17 @@ startup_error_handler(Display *dpy, XErrorEvent *error)
 }
 
 static void
 }
 
 static void

-init_lock_keys()
+cleanup()

 {
 {

-       XModifierKeymap *modmap;
-       KeyCode numlock;
-       int i;
-       static int masks[] = {
-               ShiftMask, LockMask, ControlMask, Mod1Mask,
-               Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
-       };
-
-       numlock_mask = 0;
-       modmap = XGetModifierMapping(dpy);
-       numlock = XKeysymToKeycode(dpy, XStringToKeysym("Num_Lock"));
-
-       if(modmap && modmap->max_keypermod > 0) {
-               int max = (sizeof(masks) / sizeof(int)) * modmap->max_keypermod;
-               for(i = 0; i < max; i++)
-                       if(numlock && (modmap->modifiermap[i] == numlock))
-                               numlock_mask = masks[i / modmap->max_keypermod];
-       }
-       XFreeModifiermap(modmap);
-
-       lock_mask = 255 & ~(numlock_mask | LockMask);
+       while(clients)
+               unmanage(clients);
+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);

 }
 
 }
 

-static void
-cleanup()
+void
+quit(void *aux)

 {
 {

-       /*
-       Client *c;
-       for(c=client; c; c=c->next)
-               reparent_client(c, root, c->sel->rect.x, c->sel->rect.y);
-       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-       */
+       running = False;

 }
 
 int
 }
 
 int


@@ -219,16 +218,15 @@ main(int argc, char *argv[])
        if(other_wm_running)
                error("gridwm: another window manager is already running\n");
 
        if(other_wm_running)
                error("gridwm: 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[WMState] = XInternAtom(dpy, "WM_STATE", False);

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


@@ -243,42 +241,29 @@ main(int argc, char *argv[])
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 

-       init_lock_keys();
+       update_keys();
+
+       /* style */
+       loadcolors(screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR);
+       loadfont(&brush.font, FONT);
+
+       th = texth(&brush.font);

 
 

-       brush.drawable = XCreatePixmap(dpy, root, rect.width, rect.height,
-                       DefaultDepth(dpy, screen));
+       brush.drawable = XCreatePixmap(dpy, root, sw, th, DefaultDepth(dpy, screen));

        brush.gc = XCreateGC(dpy, root, 0, 0);
 
        brush.gc = XCreateGC(dpy, root, 0, 0);
 

-       /* 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 = 0;
-       XDefineCursor(dpy, barwin, cursor[CurNormal]);
-       XMapRaised(dpy, barwin);
-       draw_bar();
-
-       wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
+       wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
+                                       | LeaveWindowMask;

        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 

+       arrange = grid;

        scan_wins();
 
        while(running) {
                XNextEvent(dpy, &ev);
                if(handler[ev.type])
        scan_wins();
 
        while(running) {
                XNextEvent(dpy, &ev);
                if(handler[ev.type])

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

        }
 
        cleanup();
        }
 
        cleanup();