bump to 6.6 and added systray

1 files changed, 59 insertions, 57 deletions

diff --git a/config.h b/config.h
index 9e959c2..4c20a6e 100644
--- a/config.h
+++ b/config.h
@@ -3,13 +3,18 @@
 /* appearance */
 static const unsigned int borderpx  = 4;        /* border pixel of windows */
 static const unsigned int snap      = 32;       /* snap pixel */
-static const int swallowfloating    = 0;        /* 1 means swallow floating windows by default */
+static const unsigned int systraypinning = 0;   /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
+static const unsigned int systrayonleft = 0;    /* 0: systray in the right corner, >0: systray on left of status text */
+static const unsigned int systrayspacing = 2;   /* systray spacing */
+static const int systraypinningfailfirst = 1;   /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
+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 user_bh            = 2;        /* 2 is the default spacing around the bar's font */
-
-static const char *fonts[] = { "monospace:size=11",
-    "Noto Color Emoji:pixelsize=11:antialias=true:autohint=true"};
+static const char *fonts[] = { 
+	"monospace:size=11",
+    "Noto Color Emoji:pixelsize=11:antialias=true:autohint=true"
+};
 static const char dmenufont[]             = "monospace:size=12";
 static const char normbgcolor[]           = "#222222";
 static const char normbordercolor[]       = "#444444";
@@ -23,15 +28,14 @@ static const char *colors[][3]      = {
 	[SchemeSel]  = { selfgcolor , selbgcolor ,  selbordercolor  },
 };
 
-#include "movestack.c"
 #include <X11/XF86keysym.h>
+
 /* volume control */
 static const char *inc_vol[] = {"/home/mouad/.local/bin/volume/inc_vol", NULL};
 static const char *dec_vol[] = {"/home/mouad/.local/bin/volume/dec_vol", NULL};
 static const char *toggle_vol[] = {"/home/mouad/.local/bin/volume/toggle_vol", NULL};
 
 static const char *wallpaper[] = {"/home/mouad/.local/bin/background", NULL};
-
 static const char *turnoff[] = {"/home/mouad/.local/bin/turnoff", NULL};
 
 /* brightness control */
@@ -46,20 +50,20 @@ static const Rule rules[] = {
 	 *	WM_CLASS(STRING) = instance, class
 	 *	WM_NAME(STRING) = title
 	 */
-	/* class	instance  title       tags mask     isfloating	isterminal  noswallow   monitor */
-	{ "zoom",       NULL,     NULL,       1 << 0,       0,		0,	    0,		-1 },
-	{ "discord",	NULL,     NULL,       1 << 3,       0,		0,	    0,		-1 },
-	{ NULL,		NULL,     "Steam",    1 << 4,       0,		0,	    0,		-1 },
-	{ "qgis",	NULL,     NULL,       1 << 7,       0,		0,	    0,		-1 },
-	{ "Slack",	NULL,     NULL,       1 << 8,       0,		0,	    0,		-1 },
-	{ NULL,		NULL,     "st",       0,	    0,		1,	    0,		-1 },
-	{ NULL,		NULL,     "Event Tester", 0,        0,		0,	    1,		-1 }, /* xev */
+	/* class      instance    title       tags mask     isfloating   monitor */
+	{ "discord",  NULL,       NULL,       1 << 3,       0,           -1 },
+	{ NULL,	      NULL,       "Steam",    1 << 4,       0,           -1 },
+	{ "Gimp",	  NULL,       NULL,       1 << 5,       0,           -1 },
+	{ "qgis",	  NULL,       NULL,       1 << 7,       0,           -1 },
+	{ "Slack",	  NULL,       NULL,       1 << 8,       0,           -1 },
 };
 
+/* layout(s) */
 static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
 static const int nmaster     = 1;    /* number of clients in master area */
 static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
-static const int lockfullscreen = 0; /* 1 will force focus on the fullscreen window */
+static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
+static const int refreshrate = 120;  /* refresh rate (per second) for client move/resize */
 
 static const Layout layouts[] = {
 	/* symbol     arrange function */
@@ -87,11 +91,12 @@ static const char *termcmd[]  = { "st", NULL };
 static const char scratchpadname[]  = { "scratchpad" };
 static const char *scratchpadcmd[] = { "/home/mouad/.local/bin/scratch.sh", NULL };
 
+#include "movestack.c"
 static const Key keys[] = {
 	/* modifier                     key        function        argument */
 	{ MODKEY,                       XK_d,      spawn,          {.v = dmenucmd } },
-	{ MODKEY,			XK_Return, spawn,          {.v = termcmd } },
-	{ MODKEY,                       XK_a,	   togglescratch,  {.v = scratchpadcmd } },
+	{ MODKEY,						XK_a,	   togglescratch,  {.v = scratchpadcmd } },
+	{ MODKEY,						XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },
 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
@@ -99,70 +104,69 @@ static const Key keys[] = {
 	{ MODKEY,                       XK_p,      incnmaster,     {.i = -1 } },
 	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.02} },
 	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.02} },
-	{ MODKEY|ShiftMask,             XK_j,      movestack,      {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_k,      movestack,      {.i = -1 } },
+    { MODKEY|ShiftMask,             XK_j,      movestack,      {.i = +1 } },
+    { MODKEY|ShiftMask,             XK_k,      movestack,      {.i = -1 } },
 	{ MODKEY|ShiftMask,             XK_f,	   zoom,           {0} },
 	{ MODKEY,                       XK_Tab,    view,           {0} },
 	{ MODKEY|ShiftMask,             XK_q,      killclient,     {0} },
+	{ MODKEY,                       XK_s,      togglesticky,   {0} },
 	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
 	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[1]} },
 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
-	{ MODKEY,			XK_f,      togglefullscr,  {0} },
+	{ MODKEY,						XK_f,      togglefullscr,  {0} },
 	{ MODKEY|ShiftMask,             XK_t,      togglefakefullscreen, {0} },
+	{ Mod1Mask|ControlMask,         XK_j,      moveresize,     {.v = "0x 25y 0w 0h" } },
+	{ Mod1Mask|ControlMask,         XK_k,	   moveresize,     {.v = "0x -25y 0w 0h" } },
+	{ Mod1Mask|ControlMask,         XK_l,	   moveresize,     {.v = "25x 0y 0w 0h" } },
+	{ Mod1Mask|ControlMask,         XK_h,      moveresize,     {.v = "-25x 0y 0w 0h" } },
+	{ Mod1Mask|ShiftMask,           XK_j,      moveresize,     {.v = "0x 0y 0w 25h" } },
+	{ Mod1Mask|ShiftMask,           XK_k,      moveresize,     {.v = "0x 0y 0w -25h" } },
+	{ Mod1Mask|ShiftMask,           XK_l,      moveresize,     {.v = "0x 0y 25w 0h" } },
+	{ Mod1Mask|ShiftMask,           XK_h,      moveresize,     {.v = "0x 0y -25w 0h" } },
+	{ MODKEY|ControlMask,           XK_Up,     moveresizeedge, {.v = "t"} },
+	{ MODKEY|ControlMask,           XK_Down,   moveresizeedge, {.v = "b"} },
+	{ MODKEY|ControlMask,           XK_Left,   moveresizeedge, {.v = "l"} },
+	{ MODKEY|ControlMask,           XK_Right,  moveresizeedge, {.v = "r"} },
+	{ MODKEY|ControlMask|ShiftMask, XK_Up,     moveresizeedge, {.v = "T"} },
+	{ MODKEY|ControlMask|ShiftMask, XK_Down,   moveresizeedge, {.v = "B"} },
+	{ MODKEY|ControlMask|ShiftMask, XK_Left,   moveresizeedge, {.v = "L"} },
+	{ MODKEY|ControlMask|ShiftMask, XK_Right,  moveresizeedge, {.v = "R"} },
 	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
 	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
 	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
 	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
 	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } }, 
-	{MODKEY,			XK_s,	   togglesticky,   {0}},
-	TAGKEYS(XK_1                    , 0)
-	TAGKEYS(XK_2                    , 1)
-	TAGKEYS(XK_3                    , 2)
-        TAGKEYS(XK_4                    , 3)
-	TAGKEYS(XK_5                    , 4)
-	TAGKEYS(XK_6                    , 5)
-	TAGKEYS(XK_7                    , 6)
-	TAGKEYS(XK_8                    , 7)
-	TAGKEYS(XK_9                    , 8)
-	/* Custom commands */
+	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
+	TAGKEYS(                        XK_1,                      0)
+	TAGKEYS(                        XK_2,                      1)
+	TAGKEYS(                        XK_3,                      2)
+	TAGKEYS(                        XK_4,                      3)
+	TAGKEYS(                        XK_5,                      4)
+	TAGKEYS(                        XK_6,                      5)
+	TAGKEYS(                        XK_7,                      6)
+	TAGKEYS(                        XK_8,                      7)
+	TAGKEYS(                        XK_9,                      8)
 
 	{MODKEY | ShiftMask, XK_o, spawn, {.v = turnoff}},
 	{MODKEY | ShiftMask, XK_l, spawn, SHCMD("slock")},
 
-
 	/* keyboard layout */
 	{Mod1Mask | ShiftMask, XK_e, spawn, SHCMD("setxkbmap -option caps:escape && setxkbmap -layout us && kill -45 $(pidof dwmblocks) && xmodmap /home/mouad/.Xmodmap")},
 	{Mod1Mask | ShiftMask, XK_f, spawn, SHCMD("setxkbmap -option caps:escape && setxkbmap -layout fr && kill -45 $(pidof dwmblocks) && xmodmap /home/mouad/.Xmodmap")},
 
-
 	/* dunst control */
-	{ControlMask, XK_7, spawn, SHCMD("dunstctl history-pop")},
-	{ControlMask, XK_space, spawn, SHCMD("dunstctl close")},
+	{ControlMask,			  XK_7,		spawn, SHCMD("dunstctl history-pop")},
+	{ControlMask,			  XK_space, spawn, SHCMD("dunstctl close")},
 	{ControlMask | ShiftMask, XK_space, spawn, SHCMD("dunstctl close-all")},
 
-	{ Mod1Mask|ControlMask,           XK_j,      moveresize,     {.v = "0x 25y 0w 0h" } },
-	{ Mod1Mask|ControlMask,           XK_k,		moveresize,     {.v = "0x -25y 0w 0h" } },
-	{ Mod1Mask|ControlMask,           XK_l,		moveresize,     {.v = "25x 0y 0w 0h" } },
-	{ Mod1Mask|ControlMask,           XK_h,      moveresize,     {.v = "-25x 0y 0w 0h" } },
-	{ Mod1Mask|ShiftMask,             XK_j,         moveresize,     {.v = "0x 0y 0w 25h" } },
-	{ Mod1Mask|ShiftMask,             XK_k,         moveresize,     {.v = "0x 0y 0w -25h" } },
-	{ Mod1Mask|ShiftMask,             XK_l,         moveresize,     {.v = "0x 0y 25w 0h" } },
-	{ Mod1Mask|ShiftMask,             XK_h,         moveresize,     {.v = "0x 0y -25w 0h" } },
-
-	{0, XF86XK_MonBrightnessUp, spawn, {.v = inc_bright}},
-	{0, XF86XK_MonBrightnessDown, spawn, {.v = dec_bright}},
-
-	{0, XF86XK_AudioRaiseVolume, spawn, {.v = inc_vol}},
-	{0, XF86XK_AudioLowerVolume, spawn, {.v = dec_vol}},
-	{0, XF86XK_AudioMute, spawn, {.v = toggle_vol}},
+	{0, XF86XK_MonBrightnessUp,		spawn, {.v = inc_bright}},
+	{0, XF86XK_MonBrightnessDown,	spawn, {.v = dec_bright}},
+	{0, XF86XK_AudioRaiseVolume,	spawn, {.v = inc_vol}},
+	{0, XF86XK_AudioLowerVolume,	spawn, {.v = dec_vol}},
+	{0, XF86XK_AudioMute,			spawn, {.v = toggle_vol}},
 
 	{MODKEY, XK_r, spawn, {.v = wallpaper}},
 
-	{MODKEY, XK_F1, spawn, {.v = dec_vol}},
-	{MODKEY, XK_F2, spawn, {.v = inc_vol}},
-	{MODKEY, XK_F3, spawn, {.v = toggle_vol}},
-
 	{Mod1Mask, XK_F1, spawn, SHCMD("mpc prev")},
 	{Mod1Mask, XK_F2, spawn, SHCMD("mpc toggle")},
 	{Mod1Mask, XK_F3, spawn, SHCMD("mpc next")},
@@ -188,8 +192,6 @@ static const Button buttons[] = {
 	{ ClkStatusText,        0,              Button1,        sigstatusbar,   {.i = 1} },
 	{ ClkStatusText,        0,              Button2,        sigstatusbar,   {.i = 2} },
 	{ ClkStatusText,        0,              Button3,        sigstatusbar,   {.i = 3} },
-	{ ClkStatusText,        0,              Button4,        sigstatusbar,   {.i = 4} },
-	{ ClkStatusText,        0,              Button5,        sigstatusbar,   {.i = 5} },
 	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
 	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
 	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },