Add alt-b for toggling tool bar. One little bug leftover when switching

[spectrwm.git] / scrotwm.c

diff --git a/scrotwm.c b/scrotwm.c
index 3cb675e..0d4fc1e 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -56,6 +56,7 @@
 #include <locale.h>
 #include <unistd.h>
 #include <time.h>
+#include <signal.h>
 #include <string.h>
 
 #include <sys/types.h>
@@ -129,9 +130,10 @@ TAILQ_HEAD(ws_win_list, ws_win);
 #define SWM_WS_MAX             (10)
 struct workspace {
        int                     visible;        /* workspace visible */
+       int                     restack;        /* restack on switch */
        struct ws_win           *focus;         /* which win has focus */
        int                     winno;          /* total nr of windows */
-       struct ws_win_list      winlist;
+       struct ws_win_list      winlist;        /* list of windows in ws */
 } ws[SWM_WS_MAX];
 int                    current_ws = 0;
 
@@ -144,12 +146,18 @@ union arg {
        char                    **argv;
 };
 
+
+void   stack(void);
+
 void
 bar_print(void)
 {
        time_t                  tmt;
        struct tm               tm;
 
+       if (bar_enabled == 0)
+               return;
+
        /* clear old text */
        XSetForeground(display, bar_gc, 0x000000);
        XDrawString(display, bar_window, bar_gc, 4, bar_fs->ascent, bar_text,
@@ -163,7 +171,37 @@ bar_print(void)
        XDrawString(display, bar_window, bar_gc, 4, bar_fs->ascent, bar_text,
            strlen(bar_text));
        XSync(display, False);
+
+       alarm(60);
 }
+
+void
+bar_signal(int sig)
+{
+       /* XXX yeah yeah byte me */
+       bar_print();
+}
+
+void
+bar_toggle(union arg *args)
+{
+       DNPRINTF(SWM_D_MISC, "bar_toggle\n");
+
+       if (bar_enabled) {
+               bar_enabled = 0;
+               height += bar_height; /* correct screen height */
+               XUnmapWindow(display, bar_window);
+       } else {
+               bar_enabled = 1;
+               height -= bar_height; /* correct screen height */
+               XMapWindow(display, bar_window);
+       }
+       XSync(display, False);
+
+       stack();
+       bar_print(); /* must be after stack */
+}
+
 void
 quit(union arg *args)
 {
@@ -234,9 +272,13 @@ switchws(union arg *args)
        current_ws = wsid;
 
        ignore_enter = 1;
-       if (ws[wsid].focus != NULL)
-               focus_win(ws[wsid].focus);
-       XSync(display, False);
+       if (ws[wsid].restack) {
+               stack();
+       } else {
+               if (ws[wsid].focus != NULL)
+                       focus_win(ws[wsid].focus);
+               XSync(display, False);
+       }
 }
 
 void
@@ -252,27 +294,22 @@ focus(union arg *args)
 
        switch (args->id) {
        case SWM_ARG_ID_FOCUSPREV:
-               if (ws[current_ws].focus ==
-                   TAILQ_FIRST(&ws[current_ws].winlist))
+               ws[current_ws].focus =
+                   TAILQ_PREV(ws[current_ws].focus, ws_win_list, entry);
+               if (ws[current_ws].focus == NULL)
                        ws[current_ws].focus =
                            TAILQ_LAST(&ws[current_ws].winlist, ws_win_list);
-               else
-                       ws[current_ws].focus =TAILQ_PREV(ws[current_ws].focus,
-                           ws_win_list, entry);
                break;
 
        case SWM_ARG_ID_FOCUSNEXT:
-               if (ws[current_ws].focus == TAILQ_LAST(&ws[current_ws].winlist,
-                   ws_win_list))
+               ws[current_ws].focus = TAILQ_NEXT(ws[current_ws].focus, entry);
+               if (ws[current_ws].focus == NULL)
                        ws[current_ws].focus =
                            TAILQ_FIRST(&ws[current_ws].winlist);
-               else
-                       ws[current_ws].focus =
-                           TAILQ_NEXT(ws[current_ws].focus, entry);
                break;
 
        case SWM_ARG_ID_FOCUSMAIN:
-               ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);;
+               ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);
                break;
 
        default:
@@ -311,7 +348,7 @@ stack(void)
                hrh = 0;
 
        x = 0;
-       y = bar_height;
+       y = bar_enabled ? bar_height : 0;
        h = height;
        i = 0;
        TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
@@ -363,7 +400,10 @@ swap_to_main(union arg *args)
        struct ws_win           *tmpwin = TAILQ_FIRST(&ws[current_ws].winlist);
 
        DNPRINTF(SWM_D_MISC, "swap_to_main: win: %lu\n",
-           ws[current_ws].focus->id);
+           ws[current_ws].focus ? ws[current_ws].focus->id : 0);
+
+       if (ws[current_ws].focus == NULL || ws[current_ws].focus == tmpwin)
+               return;
 
        TAILQ_REMOVE(&ws[current_ws].winlist, tmpwin, entry);
        TAILQ_INSERT_AFTER(&ws[current_ws].winlist, ws[current_ws].focus,
@@ -375,6 +415,33 @@ swap_to_main(union arg *args)
        stack();
 }
 
+void
+send_to_ws(union arg *args)
+{
+       int                     wsid = args->id;
+       struct ws_win           *win = ws[current_ws].focus;
+
+       DNPRINTF(SWM_D_WS, "send_to_ws: win: %lu\n", win->id);
+
+       XUnmapWindow(display, win->id);
+
+       /* find a window to focus */
+       ws[current_ws].focus = TAILQ_PREV(win, ws_win_list,entry);
+       if (ws[current_ws].focus == NULL)
+               ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);
+
+       TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
+       ws[current_ws].winno--;
+
+       TAILQ_INSERT_TAIL(&ws[wsid].winlist, win, entry);
+       if (ws[wsid].winno == 0)
+               ws[wsid].focus = win;
+       ws[wsid].winno++;
+       ws[wsid].restack = 1;
+
+       stack();
+}
+
 /* terminal + args */
 char                           *term[] = { "xterm", NULL };
 
@@ -400,6 +467,17 @@ struct key {
        { MODKEY,               XK_8,           switchws,       {.id = 7} },
        { MODKEY,               XK_9,           switchws,       {.id = 8} },
        { MODKEY,               XK_0,           switchws,       {.id = 9} },
+       { MODKEY | ShiftMask,   XK_1,           send_to_ws,     {.id = 0} },
+       { MODKEY | ShiftMask,   XK_2,           send_to_ws,     {.id = 1} },
+       { MODKEY | ShiftMask,   XK_3,           send_to_ws,     {.id = 2} },
+       { MODKEY | ShiftMask,   XK_4,           send_to_ws,     {.id = 3} },
+       { MODKEY | ShiftMask,   XK_5,           send_to_ws,     {.id = 4} },
+       { MODKEY | ShiftMask,   XK_6,           send_to_ws,     {.id = 5} },
+       { MODKEY | ShiftMask,   XK_7,           send_to_ws,     {.id = 6} },
+       { MODKEY | ShiftMask,   XK_8,           send_to_ws,     {.id = 7} },
+       { MODKEY | ShiftMask,   XK_9,           send_to_ws,     {.id = 8} },
+       { MODKEY | ShiftMask,   XK_0,           send_to_ws,     {.id = 9} },
+       { MODKEY,               XK_b,           bar_toggle,     {0} },
        { MODKEY,               XK_Tab,         focus,          {.id = SWM_ARG_ID_FOCUSNEXT} },
        { MODKEY | ShiftMask,   XK_Tab,         focus,          {.id = SWM_ARG_ID_FOCUSPREV} },
 };
@@ -699,11 +777,13 @@ main(int argc, char *argv[])
 
        /* make work space 1 active */
        ws[0].visible = 1;
+       ws[0].restack = 0;
        ws[0].focus = NULL;
        ws[0].winno = 0;
        TAILQ_INIT(&ws[0].winlist);
        for (i = 1; i < SWM_WS_MAX; i++) {
                ws[i].visible = 0;
+               ws[i].restack = 0;
                ws[i].focus = NULL;
                ws[i].winno = 0;
                TAILQ_INIT(&ws[i].winlist);
@@ -736,6 +816,9 @@ main(int argc, char *argv[])
                height -= bar_height; /* correct screen height */
                XMapWindow(display, bar_window);
        }
+
+       if (signal(SIGALRM, bar_signal) == SIG_ERR)
+               err(1, "could not install bar_signal");
        bar_print();
 
        while (running) {