Push a new build

Author: CreativeCodeCat

config.def.h

@@ -18,7 +18,8 @@ static const int systraypinningfailfirst 	    = 1;   		        /* 1: if pinning
 static const int showsystray        		    = 1;     	        /* 0 means no systray */
 static const int showbar            		    = 1;        	    /* 0 means no bar */
 static const int topbar             		    = 1;        	    /* 0 means bottom bar */
-static const int extrabar                       = 1;                /* 0 means no extra bar */
+static const int vertpad                        = 10;               /* vertical padding of bar */
+static const int sidepad                        = 10;               /* horizontal padding of bar */
 static const int viewontag         		        = 1;     	        /* 0 means don't view on tag switch */
 static const int useinstabar 			        = 1;  		        /* 0 means don't use instabar script */
 static const int user_bh            		    = 28;               /* 0 means that instawm will calculate bar height, >= 1 means instawm will user_bh as bar height */
@@ -139,8 +140,17 @@ static const Layout layouts[] = {
 };
 
 static const Taglayout taglayouts[] = {
-    /* tag		    layout */
-    { 1,		    {.v = &layouts[6]} },
+    /*  tag		layout */
+    {   1,		{.v = &layouts[6]} },
+    {   2,		{.v = &layouts[0]} },
+    {   3,		{.v = &layouts[0]} },
+    {   4,		{.v = &layouts[0]} },
+    {   5,		{.v = &layouts[0]} },
+    {   6,		{.v = &layouts[0]} },
+    {   7,		{.v = &layouts[0]} },
+    {   8,		{.v = &layouts[0]} },
+    {   9,		{.v = &layouts[0]} },
+    {   10,		{.v = &layouts[0]} },
 };
 
 /* key definitions */
@@ -237,7 +247,6 @@ static Key keys[] = {
     { MODKEY,				                -1,         		XK_Return, 			                    spawn,          		{.v = terminalcmd } },
     { ControlMask,                  	    -1,         		XK_Return,  		                    togglescratch,  		{.v = scratchpadcmd } },
     { MODKEY,                       	    -1,         		XK_b,      			                    togglebar,      		{0} },
-    { MODKEY,                               -1,                 XK_b,                                   toggleextrabar,         {0} },
     { MODKEY,                       	    -1,         		XK_j,      			                    focusstack,     		{.i = +1 } },
     { MODKEY,                       	    -1,         		XK_k,      			                    focusstack,     		{.i = -1 } },
     { MODKEY,                       	    -1,         		XK_i,      			                    incnmaster,     		{.i = +1 } },

instawm.c

@@ -326,6 +326,8 @@ static int screen;
 static int sw, sh;           /* X display screen geometry width, height */
 static int bh, blw = 0;      /* bar geometry */
 static int lrpad;            /* sum of left and right padding for text */
+static int vp;               /* vertical padding for bar */
+static int sp;               /* side padding for bar */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
@@ -2144,6 +2146,8 @@ setup(void)
     lrpad = drw->fonts->h;
     bh = user_bh ? user_bh : drw->fonts->h + 2;
     updategeom();
+    sp = sidepad;
+    vp = (topbar == 1) ? vertpad : - vertpad;
     /* init atoms */
     utf8string = XInternAtom(dpy, "UTF8_STRING", False);
     wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -2323,15 +2327,12 @@ togglebar(const Arg *arg)
         if (!selmon->showbar)
             wc.y = -bh;
         else if (selmon->showbar) {
-#if BARPADDING_PATCH
             wc.y = vp;
             if (!selmon->topbar)
                 wc.y = selmon->mh - bh + vp;
-#else
             wc.y = 0;
             if (!selmon->topbar)
                 wc.y = selmon->mh - bh;
-#endif // BARPADDING_PATCH
         }
         XConfigureWindow(dpy, systray->win, CWY, &wc);
     }