Bundle toggle extra bar with normal bar

* I rarely use them separately.
* Has the side effect of extra bar per tag.

Author: salastro

config.def.h

@@ -128,8 +128,6 @@ static Key keys[] = {
 	/* modifier                     key             function                argument */
 	{ MODKEY|ShiftMask,             XK_Return,      togglescratch,          {.v = scratchpadcmd } },
 	{ MODKEY,                       XK_b,           togglebar,              {0} },
-	{ MODKEY,                       XK_b,           toggleextrabar,         {0} },
-	{ MODKEY|ShiftMask,             XK_b,           toggleextrabar,         {0} },
 	{ MODKEY,                       XK_j,           focusstack,             {.i = +1 } },
 	{ MODKEY,                       XK_k,           focusstack,             {.i = -1 } },
 	{ MODKEY|Mod1Mask,              XK_j,           moveresize,             {.v = "0x 25y 0w 0h" } },

dwm.c

@@ -259,7 +259,6 @@ static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static void tagmon(const Arg *arg);
 static void togglebar(const Arg *arg);
-static void toggleextrabar(const Arg *arg);
 static void togglefloating(const Arg *arg);
 static void togglecanfocusfloating(const Arg *arg);
 static void togglescratch(const Arg *arg);
@@ -2710,16 +2709,9 @@ void
 togglebar(const Arg *arg)
 {
 	selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
-	updatebarpos(selmon);
-	XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
-	arrange(selmon);
-}
-
-void
-toggleextrabar(const Arg *arg)
-{
 	selmon->extrabar = !selmon->extrabar;
 	updatebarpos(selmon);
+	XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
 	XMoveResizeWindow(dpy, selmon->extrabarwin, selmon->wx, selmon->eby, selmon->ww, bh);
 	arrange(selmon);
 }