autolinux

commit c185d7eab42399aa3d684b7a6282c866dc613e72

Author: Connor Etherington <[email protected]>

Date:   Sat Mar 25 04:38:06 2023 +0200

    Auto-Commit Update 25.03.2023 - 04:38:06

---

 AutoLinux             | Bin 114224 -> 114256 bytes

 config.h              |   6 +++---

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

 patch/cust/bar_date.h |   1 +

 patch/cust/bar_time.c |  15 ---------------

 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/AutoLinux b/AutoLinux

index d7533d1..845b694 100755

Binary files a/AutoLinux and b/AutoLinux differ

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

index a33d71a..2490e6d 100644

--- a/config.h

+++ b/config.h

@@ -119,7 +119,7 @@ static const BarRule barrules[] = {

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

     { -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_time,       "date"     },

+    { -1,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_date,            draw_date,            click_date,       "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" },

 };

@@ -299,8 +299,8 @@ static Key keys[] = {

 	{ MODKEY|ShiftMask,     XK_a,		defaultgaps,	{0} },

 //	{ MODKEY,         			XK_s,		togglesticky,	{0} },

   { MODKEY|ShiftMask,		XK_s,		spawn,     SHCMD("gnome-screenshot -i") },

-	{ MODKEY,         			XK_d,		spawn,          SHCMD("rofi -show run") },

-	{ MODKEY|ALTKEY,         			XK_d,		spawn,  SHCMD("rofi -show run") },

+	{ MODKEY,         			XK_d,		spawn,          SHCMD("rfi 33") },

+	{ MODKEY|ALTKEY,         			XK_d,		spawn,  SHCMD("rfi 40") },

 	{ MODKEY|ALTKEY,         		  XK_b,		spawn,		SHCMD("passmenu") },

 	{ MODKEY,               XK_f,		togglefullscr,	{0} },

 	{ MODKEY|ShiftMask,     XK_f,		setlayout,	{.v = &layouts[8]} },

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

index b680420..bcec6a2 100644

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

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

@@ -1,5 +1,22 @@

 #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));

+}

 // get current time once a second

 void get_date(char *time) {

@@ -37,3 +54,9 @@ draw_date(Bar *bar, BarDrawArg *a)

   return x + w;

 }

+int

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

+{

+  runsh("rfi 40");

+  return EXIT_SUCCESS;

+}

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

index 29416b2..68f3cd7 100644

--- a/patch/cust/bar_date.h

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

@@ -1,2 +1,3 @@

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

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

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

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

index 7443010..7b9fa73 100644

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

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

@@ -4,21 +4,6 @@

 #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];