autolinux

commit c81d3f98a08507bdbdbb758791d1108d613632f5

Author: Connor Etherington <[email protected]>

Date:   Wed Mar 22 21:31:51 2023 +0200

    Auto-Commit Update 22.03.2023 - 21:31:51

---

 AutoLinux                   | Bin 109536 -> 110128 bytes

 AutoLinux.c                 |   6 ++----

 AutoLinux.o                 | Bin 107296 -> 0 bytes

 config.h                    |  27 +++++++++++++++++++++------

 drw.o                       | Bin 10320 -> 0 bytes

 package.json                |  20 ++++++++++++++++++++

 patch/bar_tags.c            |   6 ++++--

 patch/cust/bar_date.c       |  39 +++++++++++++++++++++++++++++++++++++++

 patch/cust/bar_date.h       |   2 ++

 patch/cust/bar_datetime.c   |  34 ++++++++++++++++++++++++++++++++++

 patch/cust/bar_datetime.h   |   2 ++

 patch/{ => cust}/bar_time.c |  28 ++++++++++++++--------------

 patch/{ => cust}/bar_time.h |   0

 patch/include.c             |   3 ++-

 patch/include.h             |   3 ++-

 util.o                      | Bin 2224 -> 0 bytes

 16 files changed, 142 insertions(+), 28 deletions(-)

diff --git a/AutoLinux b/AutoLinux

index a9a76d1..087f349 100755

Binary files a/AutoLinux and b/AutoLinux differ

diff --git a/AutoLinux.c b/AutoLinux.c

index 8b9f814..9a1ddf2 100644

--- a/AutoLinux.c

+++ b/AutoLinux.c

@@ -69,11 +69,10 @@

 #define SPTAGMASK		(((1 << LENGTH(scratchpads))-1) << LENGTH(tags))

 #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)

 #define TRUNC(X,A,B)            (MAX((A), MIN((X), (B))))

-#define currentTime() { .v = (const char*[]){ "/bin/sh", "-c", "date '+%H:%M:%S'", NULL } }

 /* enums */

 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */

-enum { SchemeNorm, SchemeSel }; /* color schemes */

+enum { SchemeNorm, SchemeSel, SchemeTime, SchemeActive, SchemeInactive }; /* color schemes */

 enum { NetSupported, NetWMName, NetWMState, NetWMCheck,

        NetWMFullscreen, NetActiveWindow, NetWMWindowType,

        NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */

@@ -136,9 +135,8 @@ typedef struct {

 	int alignment; // see bar alignment enum

 	int (*widthfunc)(Bar *bar, BarWidthArg *a);

 	int (*drawfunc)(Bar *bar, BarDrawArg *a);

-	int (*timefunc)(Bar *bar, BarDrawArg *a);

 	int (*clickfunc)(Bar *bar, Arg *arg, BarClickArg *a);

-	char *name; // for debugging             //

+	char *name; // for debugging

 	int x, w; // position, width for internal use

 } BarRule;

diff --git a/AutoLinux.o b/AutoLinux.o

deleted file mode 100644

index 7c77353..0000000

Binary files a/AutoLinux.o and /dev/null differ

diff --git a/config.h b/config.h

index 799af40..d772b0a 100644

--- a/config.h

+++ b/config.h

@@ -54,12 +54,25 @@ static char normfgcolor[]           = "#41fdfe";

 static char selfgcolor[]            = "#00ff00";

 static char selbordercolor[]        = "#c9c9c9";

 static char selbgcolor[]            = "#1A2026";

+static char timefgcolor[]           = "#1A2026";

+static char timebordercolor[]       = "#ff5782";

+static char timebgcolor[]           = "#ff5782";

+static char activefgcolor[]         = "#EFEFEF";

+static char activebordercolor[]     = "#ff5782";

+static char activebgcolor[]         = "#1A2026";

+static char inactivefgcolor[]       = "#ff5782";

+static char inactivebordercolor[]   = "#ff5782";

+static char inactivebgcolor[]       = "#1A2026";

 static char *colors[][3] = {

            /*               fg           bg           border   */

        [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },

        [SchemeSel]  = { selfgcolor,  selbgcolor,  selbordercolor  },

+       [SchemeTime]  = { timefgcolor, timebgcolor, timebordercolor },

+       [SchemeActive]  = { activefgcolor, activebgcolor, activebordercolor },

+       [SchemeInactive]  = { inactivefgcolor, inactivebgcolor, inactivebordercolor },

+

 };

 typedef struct {

@@ -78,6 +91,7 @@ static Sp scratchpads[] = {

 //----------------------------------------------------------- Tagging ----------------------------------------------------------//

 static const char *tags[] =   { " 1 ", " 2 ", " 3 ", " 4 ", "  ", " 6 ", " 7 ", " 8 ", " 9 " };

+//static const char *tags[] =   { "  ", "  ", "  ", "  ", "  ", "  ", "  ", "  ", "  " };

 //static const char *tags[] =   { " 1 ", " 2 ", " 3 ", " 4 ", "  ", " 6 ", " 7 ", " 8 ", " 9 " };

 //static const char *tags[] =   { "  ", "  ", "  ", "  ", "  ", "  ", "  ", "  " };

 // static const char *tags[] =  {  " ", " ", " ", " ", " ", " ", " ", " ", " "  };

@@ -100,12 +114,13 @@ static const Rule rules[] = {

 //-------------------------------------------------------- Bar Allignment -------------------------------------------------------//

 static const BarRule barrules[] = {

-   	/* monitor  bar    alignment             widthfunc              drawfunc              clickfunc           name */

- /* { -1,       0,     BAR_ALIGN_LEFT,       width_tags,            draw_tags,            click_tags,         "tags"     }, */

-    { -1,       0,     BAR_ALIGN_LEFT,       width_ltsymbol,        draw_ltsymbol,        click_ltsymbol,     "layout"   },

-    { -1,       0,     BAR_ALIGN_RIGHT,      width_time,            draw_time,            click_time,         "time"     },

-  	{ -1,       0,     BAR_ALIGN_CENTER,     width_tags,            draw_tags,            click_tags,         "tags"     },

-    { 0,        0,     BAR_ALIGN_NONE,       width_wintitle,        draw_wintitle,        click_wintitle,     "wintitle" },

+   	/* monitor  bar    alignment               widthfunc              drawfunc              clickfunc           name */

+ /* { -1,       0,     BAR_ALIGN_LEFT,         width_tags,            draw_tags,            click_tags,         "tags"     }, */

+  	{ -1,       0,     BAR_ALIGN_CENTER,       width_tags,            draw_tags,            click_tags,         "tags"     },

+    { -1,       0,     BAR_ALIGN_LEFT_LEFT,    width_ltsymbol,        draw_ltsymbol,        click_ltsymbol,     "layout"   },

+    { 0,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_time,            draw_time,            click_status,       "time"     },

+    { 1,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_datetime,        draw_datetime,        click_status,       "datetime" },

+    { 0,        0,     BAR_ALIGN_LEFT,         width_wintitle,        draw_wintitle,        click_wintitle,     "wintitle" },

 };

diff --git a/drw.o b/drw.o

deleted file mode 100644

index 8c310c9..0000000

Binary files a/drw.o and /dev/null differ

diff --git a/package.json b/package.json

new file mode 100644

index 0000000..65a87dd

--- /dev/null

+++ b/package.json

@@ -0,0 +1,20 @@

+{

+  "name": "autolinux",

+  "version": "1.0.0",

+  "description": "",

+  "main": "index.js",

+  "scripts": {

+    "test": "echo \"Error: no test specified\" && exit 1"

+  },

+  "repository": {

+    "type": "git",

+    "url": "git+ssh://[email protected]/a4to/AutoLinux.git"

+  },

+  "keywords": [],

+  "author": "",

+  "license": "ISC",

+  "bugs": {

+    "url": "https://gitlab.com/a4to/AutoLinux/issues"

+  },

+  "homepage": "https://gitlab.com/a4to/AutoLinux#readme"

+}

diff --git a/patch/bar_tags.c b/patch/bar_tags.c

index 680e1fe..2185973 100644

--- a/patch/bar_tags.c

+++ b/patch/bar_tags.c

@@ -14,7 +14,7 @@ draw_tags(Bar *bar, BarDrawArg *a)

 {

 	int invert;

 	int w, x = a->x;

-	int boxs = drw->fonts->h / 9;

+  int boxs = drw->fonts->h / 9;

 	int boxw = drw->fonts->h / 6 + 2;

 	unsigned int i, occ = 0, urg = 0;

 	Client *c;

@@ -37,9 +37,11 @@ draw_tags(Bar *bar, BarDrawArg *a)

 		x += w;

 	}

-	return x;

+ /* move off center by 5 chars: */

+  return x;

 }

+

 int

 click_tags(Bar *bar, Arg *arg, BarClickArg *a)

 {

diff --git a/patch/cust/bar_date.c b/patch/cust/bar_date.c

new file mode 100644

index 0000000..00f1128

--- /dev/null

+++ b/patch/cust/bar_date.c

@@ -0,0 +1,39 @@

+

+#define SH(cmd) (const char*[]){ "/bin/sh", "-c", cmd, NULL }

+

+// get current time once a second

+void get_date(char *time) {

+    FILE *fp;

+    char buf[100];

+    fp = popen("date '+%a, %d %b    '", "r");

+    fgets(buf, 100, fp);

+    pclose(fp);

+    strcpy(time, buf);

+}

+

+int

+width_time(Bar *bar, BarWidthArg *a)

+{

+  return TEXTW("DDD, DD MMM   ") + lrpad;

+}

+

+int

+draw_time(Bar *bar, BarDrawArg *a)

+{

+	int boxs = drw->fonts->h / 9;

+	int boxw = drw->fonts->h / 6 + 2;

+	int x = a->x, w = a->w;

+	Monitor *m = bar->mon;

+

+	drw_setscheme(drw, scheme[m == selmon ? SchemeActive : SchemeInactive]);

+

+  char date[100];

+  get_date(date);

+  date[strlen(date) - 1] = '\0';

+

+  drw_text(drw, a->x, 0, a->w, bh, lrpad / 2, date, 0);

+  drw_map(drw, bar->win, 0, 0, w, bh);

+

+  return x + w;

+}

+

diff --git a/patch/cust/bar_date.h b/patch/cust/bar_date.h

new file mode 100644

index 0000000..29416b2

--- /dev/null

+++ b/patch/cust/bar_date.h

@@ -0,0 +1,2 @@

+static int width_date(Bar *bar, BarWidthArg *a);

+static int draw_date(Bar *bar, BarDrawArg *a);

diff --git a/patch/cust/bar_datetime.c b/patch/cust/bar_datetime.c

new file mode 100644

index 0000000..6b4ca61

--- /dev/null

+++ b/patch/cust/bar_datetime.c

@@ -0,0 +1,34 @@

+int

+width_datetime(Bar *bar, BarWidthArg *a)

+{

+  return TEXTW("DDD, DD MMM   00:00  ") + lrpad;

+}

+

+int

+draw_datetime(Bar *bar, BarDrawArg *a)

+{

+	int boxs = drw->fonts->h / 9;

+	int boxw = drw->fonts->h / 6 + 2;

+	int x = a->x, w = a->w;

+	Monitor *m = bar->mon;

+

+	drw_setscheme(drw, scheme[m == selmon ? SchemeActive : SchemeInactive]);

+

+  char date[100];

+  get_date(date);

+  date[strlen(date) - 1] = '\0';

+

+  char time[100];

+  get_time(time);

+  time[strlen(time) - 1] = '\0';

+

+  char date_time[100];

+  strcpy(date_time, date);

+  strcat(date_time, time);

+

+  drw_text(drw, a->x, 0, a->w, bh, lrpad / 2, date_time, 0);

+  drw_map(drw, bar->win, 0, 0, w, bh);

+

+  return x + w;

+}

+

diff --git a/patch/cust/bar_datetime.h b/patch/cust/bar_datetime.h

new file mode 100644

index 0000000..2ca6e2d

--- /dev/null

+++ b/patch/cust/bar_datetime.h

@@ -0,0 +1,2 @@

+static int width_datetime(Bar *bar, BarWidthArg *a);

+static int draw_datetime(Bar *bar, BarDrawArg *a);

diff --git a/patch/bar_time.c b/patch/cust/bar_time.c

similarity index 53%

rename from patch/bar_time.c

rename to patch/cust/bar_time.c

index 6e86da4..ec7c771 100644

--- a/patch/bar_time.c

+++ b/patch/cust/bar_time.c

@@ -2,20 +2,28 @@

 #define SH(cmd) (const char*[]){ "/bin/sh", "-c", cmd, NULL }

 // get current time once a second

-void get_time(char *time) {

+void get_date(char *time) {

     FILE *fp;

     char buf[100];

-    fp = popen("date +%H:%M", "r");

+    fp = popen("date '+%a, %d %b    '", "r");

     fgets(buf, 100, fp);

     pclose(fp);

     strcpy(time, buf);

 }

+void get_time(char *time) {

+    FILE *fp;

+    char buf[100];

+    fp = popen("date '+%H:%M'", "r");

+    fgets(buf, 100, fp);

+    pclose(fp);

+    strcpy(time, buf);

+}

 int

 width_time(Bar *bar, BarWidthArg *a)

 {

-  return TEXTW("00:00:00") + lrpad;

+  return TEXTW("00:00  ") + lrpad;

 }

 int

@@ -26,19 +34,11 @@ draw_time(Bar *bar, BarDrawArg *a)

 	int x = a->x, w = a->w;

 	Monitor *m = bar->mon;

-	drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);

+	drw_setscheme(drw, scheme[m == selmon ? SchemeActive : SchemeInactive]);

   char time[100];

   get_time(time);

-  char *time2 = time;

-  time2[5] = '\0';

-

-  return drw_text(drw, a->x, 0, a->w, bh, lrpad / 2, time2, 0);

-}

-

-int

-click_time(Bar *bar, Arg *arg, BarClickArg *a)

-{

-  return ClkStatusText;

+  time[strlen(time) - 1] = '\0';

+  return drw_text(drw, x, 0, w, bh, lrpad / 2, time, 0);

 }

diff --git a/patch/bar_time.h b/patch/cust/bar_time.h

similarity index 100%

rename from patch/bar_time.h

rename to patch/cust/bar_time.h

diff --git a/patch/include.c b/patch/include.c

index b17bd3e..f2fa000 100644

--- a/patch/include.c

+++ b/patch/include.c

@@ -1,6 +1,7 @@

 /* Bar functionality */

 #include "bar_ltsymbol.c"

-#include "bar_time.c"

 #include "bar_status.c"

 #include "bar_tags.c"

 #include "bar_wintitle.c"

+#include "cust/bar_time.c"

+#include "cust/bar_datetime.c"

diff --git a/patch/include.h b/patch/include.h

index 0fed3fd..4c8b723 100644

--- a/patch/include.h

+++ b/patch/include.h

@@ -1,6 +1,7 @@

 /* Bar functionality */

 #include "bar_ltsymbol.h"

-#include "bar_time.h"

 #include "bar_status.h"

 #include "bar_tags.h"

 #include "bar_wintitle.h"

+#include "cust/bar_time.h"

+#include "cust/bar_datetime.h"

diff --git a/util.o b/util.o

deleted file mode 100644

index a36344b..0000000

Binary files a/util.o and /dev/null differ