changed font size, I'm not blind...

[dwm.git] / main.c

diff --git a/main.c b/main.c
index b96157c..db03958 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,43 +4,26 @@
  */
 
 #include "dwm.h"
  */
 
 #include "dwm.h"

-

 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

+#include <sys/select.h>

 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 

-Display *dpy;
-Window root, barwin;
-Atom wm_atom[WMLast], net_atom[NetLast];
-Cursor cursor[CurLast];
-Bool running = True;
-Bool issel;
-
-int tsel = Tdev; /* default tag */
-int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-char stext[1024];
+/* static */

 
 

-DC dc = {0};
-Client *clients = NULL;
-Client *sel = NULL;
-
-static Bool otherwm;
-static const char version[] =
-       "dwm-" VERSION ", (C)opyright MMVI Anselm R. Garbe\n";

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

-
-/* static functions */
+static Bool otherwm;

 
 static void
 cleanup()
 {
        while(sel) {
 
 static void
 cleanup()
 {
        while(sel) {

-               resize(sel, True);
+               resize(sel, True, TopLeft);

                unmanage(sel);
        }
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
                unmanage(sel);
        }
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);


@@ -50,9 +33,8 @@ static void
 scan()
 {
        unsigned int i, num;
 scan()
 {
        unsigned int i, num;

-       Window *wins;
+       Window *wins, d1, d2;

        XWindowAttributes wa;
        XWindowAttributes wa;

-       Window d1, d2;

 
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
 
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {


@@ -71,10 +53,9 @@ scan()
 static int
 win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {
 static int
 win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {

-       Atom real;
-       int format;
+       int status, format;

        unsigned long res, extra;
        unsigned long res, extra;

-       int status;
+       Atom real;

 
        status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
                        &res, &extra, prop);
 
        status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
                        &res, &extra, prop);


@@ -99,23 +80,38 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
        return -1;
 }
 
        return -1;
 }
 

-/* extern functions */
+/* extern */
+
+char stext[1024];
+int tsel = DEFTAG;
+int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+unsigned int ntags;
+Atom wmatom[WMLast], netatom[NetLast];
+Bool running = True;
+Bool issel = True;
+Client *clients = NULL;
+Client *sel = NULL;
+Cursor cursor[CurLast];
+Display *dpy;
+DC dc = {0};
+Window root, barwin;

 
 int
 getproto(Window w)
 {
 
 int
 getproto(Window w)
 {

-       unsigned char *protocols;
-       long res;

        int protos = 0;
        int i;
        int protos = 0;
        int i;

+       long res;
+       Atom *protocols;

 
 

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

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

-               if(protocols[i] == wm_atom[WMDelete])
-                       protos |= WM_PROTOCOL_DELWIN;
+               if(protocols[i] == wmatom[WMDelete])
+                       protos |= PROTODELWIN;

        }
        free((char *) protocols);
        return protos;
        }
        free((char *) protocols);
        return protos;


@@ -133,7 +129,7 @@ sendevent(Window w, Atom a, long value)
        e.xclient.data.l[0] = value;
        e.xclient.data.l[1] = CurrentTime;
        XSendEvent(dpy, w, False, NoEventMask, &e);
        e.xclient.data.l[0] = value;
        e.xclient.data.l[1] = CurrentTime;
        XSendEvent(dpy, w, False, NoEventMask, &e);

-       XFlush(dpy);
+       XSync(dpy, False);

 }
 
 void
 }
 
 void


@@ -143,83 +139,70 @@ quit(Arg *arg)
 }
 
 /*
 }
 
 /*

- * 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 Xlibs
+ * default error handler, which calls exit().

  */
 int
 xerror(Display *dpy, XErrorEvent *ee)
 {
        if(ee->error_code == BadWindow
  */
 int
 xerror(Display *dpy, XErrorEvent *ee)
 {
        if(ee->error_code == BadWindow

-                       || (ee->request_code == X_SetInputFocus
-                               && ee->error_code == BadMatch)
-                       || (ee->request_code == X_PolyText8
-                               && ee->error_code == BadDrawable)
-                       || (ee->request_code == X_PolyFillRectangle
-                               && ee->error_code == BadDrawable)
-                       || (ee->request_code == X_PolySegment
-                               && ee->error_code == BadDrawable)
-                       || (ee->request_code == X_ConfigureWindow
-                               && ee->error_code == BadMatch)
-                       || (ee->request_code == X_GrabKey
-                               && ee->error_code == BadAccess))
+       || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
+       || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
+       || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
+       || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
+       || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
+       || (ee->request_code == X_GrabKey && ee->error_code == BadAccess))

                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",

-                       ee->request_code, ee->error_code);
+               ee->request_code, ee->error_code);

        return xerrorxlib(dpy, ee); /* may call exit() */
 }
 
 int
 main(int argc, char *argv[])
 {
        return xerrorxlib(dpy, ee); /* may call exit() */
 }
 
 int
 main(int argc, char *argv[])
 {

-       int i, n;
-       fd_set rd;
-       XSetWindowAttributes wa;
+       int i;

        unsigned int mask;
        unsigned int mask;

-       Bool readstdin = True;
+       fd_set rd;
+       Bool readin = True;

        Window w;
        XEvent ev;
        Window w;
        XEvent ev;

+       XSetWindowAttributes wa;

 
 

-       for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
-               switch (argv[i][1]) {
-               case 'v':
-                       fprintf(stdout, "%s", version);
-                       exit(0);
-                       break;
-               default:
-                       eprint("usage: dwm [-v]\n");
-                       break;
-               }
+       if(argc == 2 && !strncmp("-v", argv[1], 3)) {
+               fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+               exit(EXIT_SUCCESS);

        }
        }

+       else if(argc != 1)
+               eprint("usage: dwm [-v]\n");

 
        dpy = XOpenDisplay(0);
        if(!dpy)
 
        dpy = XOpenDisplay(0);
        if(!dpy)

-               eprint("dwm: cannot connect X server\n");
+               eprint("dwm: cannot open display\n");

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

-       /* check if another WM is already running */

        otherwm = False;
        XSetErrorHandler(xerrorstart);
        otherwm = False;
        XSetErrorHandler(xerrorstart);

-       /* this causes an error if some other WM is running */
+       /* this causes an error if some other window manager is running */

        XSelectInput(dpy, root, SubstructureRedirectMask);
        XSelectInput(dpy, root, SubstructureRedirectMask);

-       XFlush(dpy);
+       XSync(dpy, False);

 
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
 
 
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
 

-       XSetErrorHandler(0);
+       XSetErrorHandler(NULL);

        xerrorxlib = XSetErrorHandler(xerror);
 
        /* init atoms */
        xerrorxlib = XSetErrorHandler(xerror);
 
        /* 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);
-       XChangeProperty(dpy, root, net_atom[NetSupported], XA_ATOM, 32,
-                       PropModeReplace, (unsigned char *) net_atom, NetLast);
+       wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
+       wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
+       netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
+       netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
+       XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+                       PropModeReplace, (unsigned char *) netatom, NetLast);

 
        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
 
        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);


@@ -227,6 +210,9 @@ main(int argc, char *argv[])
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        grabkeys();
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        grabkeys();

+       initrregs();
+
+       for(ntags = 0; tags[ntags]; ntags++);

 
        /* style */
        dc.bg = getcolor(BGCOLOR);
 
        /* style */
        dc.bg = getcolor(BGCOLOR);


@@ -258,20 +244,17 @@ main(int argc, char *argv[])
 
        issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 
 
        issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 

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

        wa.cursor = cursor[CurNormal];
        wa.cursor = cursor[CurNormal];

-

        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
        strcpy(stext, "dwm-"VERSION);
        scan();
 
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
        strcpy(stext, "dwm-"VERSION);
        scan();
 

-       /* main event loop, reads status text from stdin as well */
-Mainloop:
+       /* main event loop, also reads status text from stdin */

        while(running) {
                FD_ZERO(&rd);
        while(running) {
                FD_ZERO(&rd);

-               if(readstdin)
+               if(readin)

                        FD_SET(STDIN_FILENO, &rd);
                FD_SET(ConnectionNumber(dpy), &rd);
 
                        FD_SET(STDIN_FILENO, &rd);
                FD_SET(ConnectionNumber(dpy), &rd);
 


@@ -288,20 +271,12 @@ Mainloop:
                                                (handler[ev.type])(&ev); /* call handler */
                                }
                        }
                                                (handler[ev.type])(&ev); /* call handler */
                                }
                        }

-                       if(readstdin && FD_ISSET(STDIN_FILENO, &rd)) {
-                               i = n = 0;
-                               for(;;) {
-                                       if((i = getchar()) == EOF) {
-                                               /* broken pipe/end of producer */
-                                               readstdin = False;
-                                               strcpy(stext, "broken pipe");
-                                               goto Mainloop;
-                                       }
-                                       if(i == '\n' || n >= sizeof(stext) - 1)
-                                               break;
-                                       stext[n++] = i;
-                               }
-                               stext[n] = 0;
+                       if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
+                               readin = NULL != fgets(stext, sizeof(stext), stdin);
+                               if(readin)
+                                       stext[strlen(stext) - 1] = 0;
+                               else 
+                                       strcpy(stext, "broken pipe");

                                drawstatus();
                        }
                }
                                drawstatus();
                        }
                }