From 86044a6507dcef81564dc1a08b0d2d74034a8490 Mon Sep 17 00:00:00 2001
From: Jakub Trzeciak <jptrzy@gmail.com>
Date: Tue, 12 Sep 2023 08:46:18 +0200
Subject: Jptrzy's patches

---
 patches/dwmblocks-statuscmd-fork.diff   | 77 ---------------------------
 patches/dwmblocks-statuscmd-signal.diff | 93 ---------------------------------
 2 files changed, 170 deletions(-)
 delete mode 100644 patches/dwmblocks-statuscmd-fork.diff
 delete mode 100644 patches/dwmblocks-statuscmd-signal.diff

(limited to 'patches')

diff --git a/patches/dwmblocks-statuscmd-fork.diff b/patches/dwmblocks-statuscmd-fork.diff
deleted file mode 100644
index 1ae7d7a..0000000
--- a/patches/dwmblocks-statuscmd-fork.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/dwmblocks.c b/dwmblocks.c
-index 7d7a564..e2c5dd0 100644
---- a/dwmblocks.c
-+++ b/dwmblocks.c
-@@ -34,8 +34,6 @@ static int screen;
- static Window root;
- static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
- static char statusstr[2][256];
--static char exportstring[CMDLENGTH + 22] = "export BLOCK_BUTTON=-;";
--static int button = 0;
- static int statusContinue = 1;
- static void (*writestatus) () = setroot;
- 
-@@ -55,21 +53,8 @@ void getcmd(const Block *block, char *output)
- 		output[0] = block->signal;
- 		output++;
- 	}
--	char* cmd;
--	FILE *cmdf;
--	if (button)
--	{
--		cmd = strcat(exportstring, block->command);
--		cmd[20] = '0' + button;
--		button = 0;
--		cmdf = popen(cmd,"r");
--		cmd[22] = '\0';
--	}
--	else
--	{
--		cmd = block->command;
--		cmdf = popen(cmd,"r");
--	}
-+	char *cmd = block->command;
-+	FILE *cmdf = popen(cmd,"r");
- 	if (!cmdf)
- 		return;
- 	fgets(output, CMDLENGTH, cmdf);
-@@ -117,6 +102,7 @@ void setupsignals()
- 	sa.sa_sigaction = buttonhandler;
- 	sa.sa_flags = SA_SIGINFO;
- 	sigaction(SIGUSR1, &sa, NULL);
-+	signal(SIGCHLD, SIG_IGN);
- 
- }
- #endif
-@@ -179,9 +165,29 @@ void sighandler(int signum)
- 
- void buttonhandler(int sig, siginfo_t *si, void *ucontext)
- {
--	button = si->si_value.sival_int & 0xff;
--	getsigcmds(si->si_value.sival_int >> 8);
-+	int button = si->si_value.sival_int & 0xff;
-+	sig = si->si_value.sival_int >> 8;
-+	getsigcmds(sig);
- 	writestatus();
-+	if (fork() == 0)
-+	{
-+		static char exportstring[CMDLENGTH + 22] = "export BLOCK_BUTTON=-;";
-+		const Block *current;
-+		int i;
-+		for (i = 0; i < LENGTH(blocks); i++)
-+		{
-+			current = blocks + i;
-+			if (current->signal == sig)
-+				break;
-+		}
-+		char *cmd = strcat(exportstring, blocks[i].command);
-+		cmd[20] = '0' + button;
-+		char *command[] = { "/bin/sh", "-c", cmd, NULL };
-+		setsid();
-+		execvp(command[0], command);
-+		exit(EXIT_SUCCESS);
-+		cmd[22] = '\0';
-+	}
- }
- 
- #endif
diff --git a/patches/dwmblocks-statuscmd-signal.diff b/patches/dwmblocks-statuscmd-signal.diff
deleted file mode 100644
index c2092e7..0000000
--- a/patches/dwmblocks-statuscmd-signal.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/dwmblocks.c b/dwmblocks.c
-index 88bdfb0..7bd14df 100644
---- a/dwmblocks.c
-+++ b/dwmblocks.c
-@@ -14,6 +14,7 @@ typedef struct {
- 	unsigned int signal;
- } Block;
- void sighandler(int num);
-+void buttonhandler(int sig, siginfo_t *si, void *ucontext);
- void replace(char *str, char old, char new);
- void getcmds(int time);
- #ifndef __OpenBSD__
-@@ -34,6 +35,8 @@ static int screen;
- static Window root;
- static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
- static char statusstr[2][256];
-+static char exportstring[CMDLENGTH + 16] = "export BUTTON=-;";
-+static int button = 0;
- static int statusContinue = 1;
- static void (*writestatus) () = setroot;
-
-@@ -48,16 +51,34 @@ void replace(char *str, char old, char new)
- //opens process *cmd and stores output in *output
- void getcmd(const Block *block, char *output)
- {
-+	if (block->signal)
-+	{
-+		output[0] = block->signal;
-+		output++;
-+	}
- 	strcpy(output, block->icon);
--	char *cmd = block->command;
--	FILE *cmdf = popen(cmd,"r");
-+	char* cmd;
-+	FILE *cmdf;
-+	if (button)
-+	{
-+		cmd = strcat(exportstring, block->command);
-+		cmd[14] = '0' + button;
-+		button = 0;
-+		cmdf = popen(cmd,"r");
-+		cmd[16] = '\0';
-+	}
-+	else
-+	{
-+		cmd = block->command;
-+		cmdf = popen(cmd,"r");
-+	}
- 	if (!cmdf)
- 		return;
- 	char c;
- 	int i = strlen(block->icon);
- 	fgets(output+i, CMDLENGTH-i, cmdf);
- 	i = strlen(output);
--	if (delim != '\0' && --i)
-+	if (delim != '\0' && i)
- 		output[i++] = delim;
- 	output[i++] = '\0';
- 	pclose(cmdf);
-@@ -88,11 +106,18 @@ void getsigcmds(int signal)
-
- void setupsignals()
- {
-+	struct sigaction sa;
- 	for(int i = 0; i < LENGTH(blocks); i++)
- 	{
- 		if (blocks[i].signal > 0)
-+		{
- 			signal(SIGRTMIN+blocks[i].signal, sighandler);
-+			sigaddset(&sa.sa_mask, SIGRTMIN+blocks[i].signal);
-+		}
- 	}
-+	sa.sa_sigaction = buttonhandler;
-+	sa.sa_flags = SA_SIGINFO;
-+	sigaction(SIGUSR1, &sa, NULL);
-
- }
- #endif
-@@ -152,6 +177,14 @@ void sighandler(int signum)
- 	getsigcmds(signum-SIGRTMIN);
- 	writestatus();
- }
-+
-+void buttonhandler(int sig, siginfo_t *si, void *ucontext)
-+{
-+	button = si->si_value.sival_int & 0xff;
-+	getsigcmds(si->si_value.sival_int >> 8);
-+	writestatus();
-+}
-+
- #endif
-
- void termhandler(int signum)
-- 
cgit v1.2.3