From 1ddc714196a20a7d31722f7614c0a4597ac0a421 Mon Sep 17 00:00:00 2001
From: OldMan <tele-post@mail.ru>
Date: Tue, 13 Apr 2010 10:15:40 +0600
Subject: [PATCH] Conf: section 'selbar' in section 'bar'

---
 src/config.c  | 20 +++++++++++++++++++-
 src/event.c   |  9 +++++++++
 src/infobar.c |  2 +-
 src/structs.h |  7 +++++++
 src/wmfs.c    |  1 +
 wmfsrc.in     | 12 +++++++++++-
 6 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/config.c b/src/config.c
index 94cfab1..1edcfe7 100644
--- a/src/config.c
+++ b/src/config.c
@@ -176,13 +176,14 @@ conf_misc_section(char *src)
 void
 conf_bar_section(char *src)
 {
+     char *tmp;
+
      cfg_set_sauv(src);
 
      conf.border.bar  = get_opt(src, "false", "border").bool;
      conf.bars.height = get_opt(src, "-1", "height").num;
      conf.colors.bar  = getcolor(get_opt(src, "#000000", "bg").str);
      conf.colors.text = get_opt(src, "#ffffff", "fg").str;
-     conf.bars.selbar = get_opt(src, "false", "selbar").bool;
 
      if((conf.bars.nmouse = get_size_sec(src, "mouse")))
      {
@@ -190,6 +191,23 @@ conf_bar_section(char *src)
           mouse_section(conf.bars.mouse, src, conf.bars.nmouse);
      }
 
+     /* Selbar part {{ */
+     tmp = get_sec(src, "selbar");
+     cfg_set_sauv(tmp);
+
+     conf.bars.selbar = tmp ? True : False;
+
+     conf.selbar.bg = getcolor(get_opt(tmp, "#000000", "bg").str);
+     conf.selbar.fg = get_opt(tmp, "#ffffff", "fg").str;
+
+     /* Multi mouse section */
+     if((conf.selbar.nmouse = get_size_sec(tmp, "mouse")))
+     {
+          conf.selbar.mouse = emalloc(conf.selbar.nmouse, sizeof(MouseBinding));
+          mouse_section(conf.selbar.mouse, tmp, conf.selbar.nmouse);
+     }
+     /* }} */
+
      return;
 }
 
diff --git a/src/event.c b/src/event.c
index df48a42..076a7ac 100644
--- a/src/event.c
+++ b/src/event.c
@@ -96,6 +96,15 @@ buttonpress(XButtonEvent *ev)
                                    if(conf.bars.mouse[j].func)
                                         conf.bars.mouse[j].func(conf.bars.mouse[j].cmd);
 
+     /* Selbar */
+     if(ev->window == infobar[selscreen].selbar->win)
+          for(i = 0; i < conf.selbar.nmouse; ++i)
+               if(conf.selbar.mouse[i].tag == seltag[conf.selbar.mouse[i].screen]
+                  || conf.selbar.mouse[i].tag < 0)
+                    if(ev->button == conf.selbar.mouse[i].button)
+                         if(conf.selbar.mouse[i].func)
+                              conf.selbar.mouse[i].func(conf.selbar.mouse[i].cmd);
+
      /* Tags */
      for(i = 1; i < conf.ntag[selscreen] + 1; ++i)
           if(ev->window == infobar[selscreen].tags[i]->win)
diff --git a/src/infobar.c b/src/infobar.c
index e7af54f..2e7d187 100644
--- a/src/infobar.c
+++ b/src/infobar.c
@@ -108,7 +108,7 @@ infobar_init(void)
                           : infobar[sc].layout_button->geo.x + infobar[sc].layout_button->geo.width + PAD / 2), 1,
                          (sel) ? textw(sel->title) + PAD : 1,
                          infobar[sc].geo.height - 2,
-                         conf.colors.bar, conf.colors.text, False, False, False);
+                         conf.selbar.bg, conf.selbar.fg, False, False, False);
 
           /* Map/Refresh all */
           barwin_map(infobar[sc].bar);
diff --git a/src/structs.h b/src/structs.h
index 50ebdcc..8be90b2 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -373,6 +373,13 @@ typedef struct
           Bool selbar;
      } bars;
      struct
+     {
+          char *fg;
+          uint bg;
+          MouseBinding *mouse;
+          int nmouse;
+     } selbar;
+     struct
      {
           char *background_command;
           MouseBinding *mouse;
diff --git a/src/wmfs.c b/src/wmfs.c
index 7140a31..95016ba 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -125,6 +125,7 @@ quit(void)
      }
 
      IFREE(conf.bars.mouse);
+     IFREE(conf.selbar.mouse);
      IFREE(conf.titlebar.button);
      IFREE(conf.client.mouse);
      IFREE(conf.root.mouse);
diff --git a/wmfsrc.in b/wmfsrc.in
index aa9b454..446fbed 100644
--- a/wmfsrc.in
+++ b/wmfsrc.in
@@ -18,7 +18,17 @@
         bg     = "#191919"
         fg     = "#D4D4D4"
         border = true
-        selbar = false
+        # selbar = false   #not worked now, see section [selbar]
+
+        # Remove this section to disable the selbar.
+        [selbar]
+                bg = "#191919"
+                fg = "#D4D4ff"
+
+                [mouse] button = "4" func = "client_next" [/mouse]
+                [mouse] button = "5" func = "client_prev" [/mouse]
+        [/selbar]
+
 [/bar]
 
 [layouts]