autolinux

commit eaf0c30f78df81fd77ea573812c25e5f54d120a0

Author: Connor Etherington <[email protected]>

Date:   Fri Mar 24 23:34:38 2023 +0200

    Auto-Commit Update 24.03.2023 - 23:34:38

---

 AutoLinux             | Bin 110072 -> 114224 bytes

 config.h              |  18 +++++++++---------

 patch/cust/bar_act.c  |  10 ++++++++++

 patch/cust/bar_act.h  |   1 +

 patch/cust/bar_date.c |   4 ++--

 patch/cust/bar_time.c |  30 +++++++++++++++++++++++++++---

 6 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/AutoLinux b/AutoLinux

index 0d9013c..d7533d1 100755

Binary files a/AutoLinux and b/AutoLinux differ

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

index b5787b7..a33d71a 100644

--- a/config.h

+++ b/config.h

@@ -55,13 +55,13 @@ 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 timebordercolor[]       = "#ff2782";

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

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

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

 static char activebgcolor[]         = "#0077aa";

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

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

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

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

 static char inactivebgcolor[]       = "#efeff0";

 static char *colors[][3] = {

@@ -117,10 +117,10 @@ 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_CENTER,       width_tags,            draw_tags,            click_tags,         "tags"     },

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

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

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

-    { -1,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_date,            draw_date,            click_status,       "date"     },

-    { -1,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_time,            draw_time,            click_status,       "time"     },

+    { -1,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_date,            draw_date,            click_time,       "date"     },

+    { -1,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_time,            draw_time,            click_time,       "time"     },

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

 };

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

new file mode 100644

index 0000000..03c47b2

--- /dev/null

+++ b/patch/cust/bar_act.c

@@ -0,0 +1,10 @@

+

+#define ROFI() (const char*[]){ "/bin/rofi", "-show", "run", NULL }

+

+int

+click_act (Bar *bar, Arg *arg, BarClickArg *a)

+{

+  spawn (ROFI());

+}

+

+int

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

new file mode 100644

index 0000000..434f567

--- /dev/null

+++ b/patch/cust/bar_act.h

@@ -0,0 +1 @@

+static int click_act(Bar *bar, Arg *arg, BarClickArg *a);

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

index c417129..b680420 100644

--- a/patch/cust/bar_date.c

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

@@ -5,7 +5,7 @@

 void get_date(char *time) {

     FILE *fp;

     char buf[100];

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

+    fp = popen("echo -en \"  `date '+%a, %d %b'`\"", "r");

     fgets(buf, 100, fp);

     pclose(fp);

     strcpy(time, buf);

@@ -29,7 +29,7 @@ draw_date(Bar *bar, BarDrawArg *a)

   char date[100];

   get_date(date);

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

+//  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);

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

index a555e1a..7443010 100644

--- a/patch/cust/bar_time.c

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

@@ -1,10 +1,28 @@

+

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

+#define ROFI() (const char*[]){ "/bin/rofi", "-show", "run", NULL }

+#define TERM_RUN(cmd) (const char*[]){ "/bin/alacritty", "-e", cmd, NULL }

+

+void runcmd(const char *cmd[]) {

+  if (fork() == 0) {

+    setsid();

+    execvp(cmd[0], (char**)cmd);

+  }

+}

+

+void runsh(const char *cmd) {

+  runcmd(SH(cmd));

+}

+

+void termrun(const char *cmd) {

+  runcmd(TERM_RUN(cmd));

+}

 void get_time(char *time) {

     FILE *fp;

     char buf[100];

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

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

     fgets(buf, 100, fp);

     pclose(fp);

     strcpy(time, buf);

@@ -13,7 +31,7 @@ void get_time(char *time) {

 int

 width_time(Bar *bar, BarWidthArg *a)

 {

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

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

 }

 int

@@ -28,7 +46,13 @@ draw_time(Bar *bar, BarDrawArg *a)

   char time[100];

   get_time(time);

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

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

 }

+int

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

+{

+  termrun("ttyclk");

+  return EXIT_SUCCESS;

+}

+