Re-fix duplicated code which broke compilation of dwm

7 files changed, 19 insertions, 54 deletions

diff --git a/dmenu/dmenu b/dmenu/dmenu
index 27d9aed..e796824 100755
--- a/dmenu/dmenu
+++ b/dmenu/dmenu
diff --git a/dmenu/dmenu.o b/dmenu/dmenu.o
index 025b008..e0d9407 100644
--- a/dmenu/dmenu.o
+++ b/dmenu/dmenu.o
diff --git a/dwm/config.h b/dwm/config.h
index 0424ce8..c94f430 100644
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -8,11 +8,14 @@ static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
 static const char *fonts[]          = { "monospace:size=10" };
 static const char dmenufont[]       = "monospace:size=10";
-static const char col_gray1[]       = "#222222";
-static const char col_gray2[]       = "#444444";
-static const char col_gray3[]       = "#bbbbbb";
-static const char col_gray4[]       = "#eeeeee";
-static const char col_cyan[]        = "#005577";
+static const char col_gray1[]       = "#000000";
+static const char col_gray2[]       = "#555555";
+static const char col_gray3[]       = "#dddddd";
+static const char col_gray4[]       = "#ffffff";
+static const char col_cyan[]        = "#66ccff";
+#ifndef BAROPACITY
+#define BAROPACITY 0.85
+#endif
 static const char *colors[][3]      = {
 	/*               fg         bg         border   */
 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
@@ -27,9 +30,9 @@ static const Rule rules[] = {
 	 *	WM_CLASS(STRING) = instance, class
 	 *	WM_NAME(STRING) = title
 	 */
-	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
+       /* class      instance    title               tags mask     isfloating   monitor */
+       { NULL,       NULL,       "Picture in picture", 0,            1,           -1 },
+       { "Firefox",  NULL,       NULL,               1 << 8,       0,           -1 },
 };
 
 /* layout(s) */
@@ -97,13 +100,13 @@ static const Key keys[] = {
 	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
 	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
 	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-  { MODKEY,                       XK_minus,  setgaps,        {.i = -1 } },
-  { MODKEY,                       XK_equal,  setgaps,        {.i = +1 } },
-  { MODKEY|ShiftMask,             XK_equal,  setgaps,        {.i = 0  } },
-  { MODKEY,                       XK_KP_End, spawn,          {.v = mediaprev } },
-  { MODKEY,                       XK_KP_Down, spawn,         {.v = mediaplaypause } },
-  { MODKEY,                       XK_KP_Page_Down, spawn,    {.v = medianext } },
-  TAGKEYS(                        XK_1,                      0)
+        { MODKEY,                       XK_minus,  setgaps,        {.i = -1 } },
+        { MODKEY,                       XK_equal,  setgaps,        {.i = +1 } },
+        { MODKEY|ShiftMask,             XK_equal,  setgaps,        {.i = 0  } },
+        { MODKEY,                       XK_KP_End, spawn,          {.v = mediaprev } },
+        { MODKEY,                       XK_KP_Down, spawn,         {.v = mediaplaypause } },
+        { MODKEY,                       XK_KP_Page_Down, spawn,    {.v = medianext } },
+        TAGKEYS(                        XK_1,                      0)
 	TAGKEYS(                        XK_2,                      1)
 	TAGKEYS(                        XK_3,                      2)
 	TAGKEYS(                        XK_4,                      3)
diff --git a/dwm/dwm b/dwm/dwm
index f98c0c2..0b42f7b 100755
--- a/dwm/dwm
+++ b/dwm/dwm
diff --git a/dwm/dwm.c b/dwm/dwm.c
index 8eccf8f..7a95f93 100644
--- a/dwm/dwm.c
+++ b/dwm/dwm.c
@@ -48,6 +48,7 @@
 
 #include "drw.h"
 #include "util.h"
+#include "../accent.h"
 
 /* macros */
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
@@ -287,45 +288,6 @@ static Window root, wmcheckwin;
 /* tag used for scratchpad clients */
 static const unsigned int scratchtag = 1 << LENGTH(tags);
 
-#define SHMNAME "/breathing_color_shm"
-typedef struct {
-    uint32_t magic;
-    uint32_t version;
-    volatile uint32_t seq;
-    char color[8];
-} ColorShm;
-
-/* state for the shared accent color */
-static ColorShm *accentshm;
-static char accentcol[8] = "#005577";
-
-#ifndef BAROPACITY
-#define BAROPACITY 1.0
-#endif
-
-/* tag used for scratchpad clients */
-static const unsigned int scratchtag = 1 << LENGTH(tags);
-
-#define SHMNAME "/breathing_color_shm"
-typedef struct {
-    uint32_t magic;
-    uint32_t version;
-    volatile uint32_t seq;
-    char color[8];
-} ColorShm;
-
-/* state for the shared accent color */
-static ColorShm *accentshm;
-static char accentcol[8] = "#005577";
-
-#ifndef BAROPACITY
-#define BAROPACITY 1.0
-#endif
-
-/* tag used for scratchpad clients */
-static const unsigned int scratchtag = 1 << LENGTH(tags);
-
-#include "../accent.h"
 
 /* state for the shared accent color */
 static ColorShm *accentshm;
diff --git a/dwm/dwm.o b/dwm/dwm.o
index 707e9d4..e39b2ce 100644
--- a/dwm/dwm.o
+++ b/dwm/dwm.o
diff --git a/tools/exofetch b/tools/exofetch
new file mode 100755
index 0000000..425ffa4
--- /dev/null
+++ b/tools/exofetch