JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
gitweb / spectrwm.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Complie with warnings, and cleanup.
[spectrwm.git] / scrotwm.c
diff --git a/scrotwm.c b/scrotwm.c
index b86d93e..3cb675e 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -55,6 +55,8 @@
 #include <err.h>
 #include <locale.h>
 #include <unistd.h>
+#include <time.h>
+#include <string.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -103,6 +105,15 @@ unsigned long              col_unfocus = 0x888888;
 Display                        *display;
 Window                 root;
 
+/* status bar */
+int                    bar_enabled = 1;
+int                    bar_height = 12;
+Window                 bar_window;
+GC                     bar_gc;
+XGCValues              bar_gcv;
+XFontStruct            *bar_fs;
+char                   bar_text[128];
+
 struct ws_win {
        TAILQ_ENTRY(ws_win)     entry;
        Window                  id;
@@ -117,23 +128,43 @@ TAILQ_HEAD(ws_win_list, ws_win);
 /* define work spaces */
 #define SWM_WS_MAX             (10)
 struct workspace {
-       int                      visible;       /* workspace visible */
+       int                     visible;        /* workspace visible */
        struct ws_win           *focus;         /* which win has focus */
-       int                      winno;         /* total nr of windows */
-       struct ws_win_list       winlist;
+       int                     winno;          /* total nr of windows */
+       struct ws_win_list      winlist;
 } ws[SWM_WS_MAX];
 int                    current_ws = 0;
 
 /* args to functions */
 union arg {
-       int             id;
+       int                     id;
 #define SWM_ARG_ID_FOCUSNEXT   (0)
 #define SWM_ARG_ID_FOCUSPREV   (1)
 #define SWM_ARG_ID_FOCUSMAIN   (2)
-       char            **argv;
+       char                    **argv;
 };
 
 void
+bar_print(void)
+{
+       time_t                  tmt;
+       struct tm               tm;
+
+       /* clear old text */
+       XSetForeground(display, bar_gc, 0x000000);
+       XDrawString(display, bar_window, bar_gc, 4, bar_fs->ascent, bar_text,
+           strlen(bar_text));
+
+       /* draw new text */
+       time(&tmt);
+       localtime_r(&tmt, &tm);
+       strftime(bar_text, sizeof bar_text, "%a %b %d %R %Z %Y", &tm);
+       XSetForeground(display, bar_gc, 0xa0a0a0);
+       XDrawString(display, bar_window, bar_gc, 4, bar_fs->ascent, bar_text,
+           strlen(bar_text));
+       XSync(display, False);
+}
+void
 quit(union arg *args)
 {
        DNPRINTF(SWM_D_MISC, "quit\n");
@@ -165,7 +196,7 @@ spawn(union arg *args)
 void
 focus_win(struct ws_win *win)
 {
-       DNPRINTF(SWM_D_FOCUS, "focus_win: id: %d\n", win->id);
+       DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win->id);
        XSetWindowBorder(display, win->id, col_focus);
        XSetInputFocus(display, win->id, RevertToPointerRoot, CurrentTime);
        ws[current_ws].focus = win;
@@ -174,7 +205,7 @@ focus_win(struct ws_win *win)
 void
 unfocus_win(struct ws_win *win)
 {
-       DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %d\n", win->id);
+       DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", win->id);
        XSetWindowBorder(display, win->id, col_unfocus);
        if (ws[current_ws].focus == win)
                ws[current_ws].focus = NULL;
@@ -185,7 +216,6 @@ switchws(union arg *args)
 {
        int                     wsid = args->id;
        struct ws_win           *win;
-       Window                  winfocus;
 
        DNPRINTF(SWM_D_WS, "switchws: %d\n", wsid + 1);
 
@@ -261,7 +291,7 @@ stack(void)
 {
        XWindowChanges          wc;
        struct ws_win           wf, *win, *winfocus = &wf;
-       int                     i, h, w, x, y, winno, hrh;
+       int                     i, h, w, x, y, hrh;
 
        DNPRINTF(SWM_D_EVENT, "stack: workspace: %d\n", current_ws);
 
@@ -281,7 +311,7 @@ stack(void)
                hrh = 0;
 
        x = 0;
-       y = 0;
+       y = bar_height;
        h = height;
        i = 0;
        TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
@@ -332,7 +362,9 @@ swap_to_main(union arg *args)
 {
        struct ws_win           *tmpwin = TAILQ_FIRST(&ws[current_ws].winlist);
 
-       DNPRINTF(SWM_D_MISC, "swap_to_main: win: %d\n", ws[current_ws].focus->id);
+       DNPRINTF(SWM_D_MISC, "swap_to_main: win: %lu\n",
+           ws[current_ws].focus->id);
+
        TAILQ_REMOVE(&ws[current_ws].winlist, tmpwin, entry);
        TAILQ_INSERT_AFTER(&ws[current_ws].winlist, ws[current_ws].focus,
            tmpwin, entry);
@@ -413,9 +445,7 @@ grabkeys(void)
 void
 expose(XEvent *e)
 {
-       XExposeEvent            *ev = &e->xexpose;
-
-       DNPRINTF(SWM_D_EVENT, "expose: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "expose: window: %lu\n", e->xexpose.window);
 }
 
 void
@@ -425,7 +455,7 @@ keypress(XEvent *e)
        KeySym                  keysym;
        XKeyEvent               *ev = &e->xkey;
 
-       DNPRINTF(SWM_D_EVENT, "keypress: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "keypress: window: %lu\n", ev->window);
 
        keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
@@ -439,15 +469,18 @@ void
 buttonpress(XEvent *e)
 {
        XButtonPressedEvent     *ev = &e->xbutton;
+#ifdef SWM_CLICKTOFOCUS
        struct ws_win           *win;
+#endif
+
 
-       DNPRINTF(SWM_D_EVENT, "buttonpress: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window);
 
        if (ev->window == root)
                return;
        if (ev->window == ws[current_ws].focus->id)
                return;
-#if 0
+#ifdef SWM_CLICKTOFOCUS
        TAILQ_FOREACH(win, &ws[current_ws].winlist, entry)
                if (win->id == ev->window) {
                        /* focus in the clicked window */
@@ -469,7 +502,7 @@ configurerequest(XEvent *e)
        XConfigureRequestEvent  *ev = &e->xconfigurerequest;
        struct ws_win           *win;
 
-       DNPRINTF(SWM_D_EVENT, "configurerequest: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "configurerequest: window: %lu\n", ev->window);
 
        XSelectInput(display, ev->window, ButtonPressMask | EnterWindowMask |
            FocusChangeMask);
@@ -487,19 +520,17 @@ configurerequest(XEvent *e)
 void
 configurenotify(XEvent *e)
 {
-       XConfigureEvent         *ev = &e->xconfigure;
-
-       DNPRINTF(SWM_D_EVENT, "configurenotify: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "configurenotify: window: %lu\n",
+           e->xconfigure.window);
 }
 
 void
 destroynotify(XEvent *e)
 {
-       size_t                  sz;
        struct ws_win           *win;
        XDestroyWindowEvent     *ev = &e->xdestroywindow;
 
-       DNPRINTF(SWM_D_EVENT, "destroynotify: window %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
 
        TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
                if (ev->window == win->id) {
@@ -526,7 +557,7 @@ enternotify(XEvent *e)
        XCrossingEvent          *ev = &e->xcrossing;
        struct ws_win           *win;
 
-       DNPRINTF(SWM_D_EVENT, "enternotify: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window);
 
        if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) &&
            ev->window != root)
@@ -549,7 +580,7 @@ focusin(XEvent *e)
 {
        XFocusChangeEvent       *ev = &e->xfocus;
 
-       DNPRINTF(SWM_D_EVENT, "focusin: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", ev->window);
 
        if (ev->window == root)
                return;
@@ -559,7 +590,7 @@ focusin(XEvent *e)
         * click to focus
         */
        /*
-       DNPRINTF(SWM_D_EVENT, "focusin: window: %d grabbing\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "focusin: window: %lu grabbing\n", ev->window);
        XGrabButton(display, Button1, AnyModifier, ev->window, False,
            ButtonPress, GrabModeAsync, GrabModeSync, None, None);
        */
@@ -570,7 +601,7 @@ mappingnotify(XEvent *e)
 {
        XMappingEvent           *ev = &e->xmapping;
 
-       DNPRINTF(SWM_D_EVENT, "mappingnotify: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "mappingnotify: window: %lu\n", ev->window);
 
        XRefreshKeyboardMapping(ev);
        if(ev->request == MappingKeyboard)
@@ -580,25 +611,21 @@ mappingnotify(XEvent *e)
 void
 maprequest(XEvent *e)
 {
-       XMapRequestEvent        *ev = &e->xmaprequest;
-
-       DNPRINTF(SWM_D_EVENT, "maprequest: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n",
+           e->xmaprequest.window);
 }
 
 void
 propertynotify(XEvent *e)
 {
-       XPropertyEvent          *ev = &e->xproperty;
-
-       DNPRINTF(SWM_D_EVENT, "propertynotify: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "propertynotify: window: %lu\n",
+           e->xproperty.window);
 }
 
 void
 unmapnotify(XEvent *e)
 {
-       XUnmapEvent             *ev = &e->xunmap;
-
-       DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
 }
 
 void                   (*handler[LASTEvent])(XEvent *) = {
@@ -682,6 +709,18 @@ main(int argc, char *argv[])
                TAILQ_INIT(&ws[i].winlist);
        }
 
+       /* setup status bar */
+       bar_fs = XLoadQueryFont(display,
+           "-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*");
+       if (bar_fs == NULL) {
+               /* load a font that is default */
+               bar_fs = XLoadQueryFont(display,
+                   "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*");
+               if (bar_fs == NULL)
+                       errx(1, "couldn't load font");
+       }
+       bar_height = bar_fs->ascent + bar_fs->descent + 3;
+
        XSelectInput(display, root, SubstructureRedirectMask |
            SubstructureNotifyMask | ButtonPressMask | KeyPressMask |
            EnterWindowMask | LeaveWindowMask | StructureNotifyMask |
@@ -689,6 +728,16 @@ main(int argc, char *argv[])
 
        grabkeys();
 
+       bar_window = XCreateSimpleWindow(display, root, 0, 0, width,
+           bar_height - 2, 1, 0x008080, 0x000000);
+       bar_gc = XCreateGC(display, bar_window, 0, &bar_gcv);
+       XSetFont(display, bar_gc, bar_fs->fid);
+       if (bar_enabled) {
+               height -= bar_height; /* correct screen height */
+               XMapWindow(display, bar_window);
+       }
+       bar_print();
+
        while (running) {
                XNextEvent(display, &e);
                if (handler[e.type])
spectrwm; my tweaks