Revert "Changed delimeter to accept multiple characters."
Bug was found where certain modules caused dwm to lag horribly.
Reverting until a fix can be found.
This reverts commit 3da92ebccb.
			
			
This commit is contained in:
		
							
								
								
									
										4
									
								
								blocks.h
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								blocks.h
									
									
									
									
									
								
							@@ -16,5 +16,5 @@ static const Block blocks[] = {
 | 
			
		||||
	{"", "~/bin/statusbar/clock",						5,		0},
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
//sets delimeter between status commands. Empty string ("") means no delimeter.
 | 
			
		||||
static char* delim = "|";
 | 
			
		||||
//sets delimeter between status commands. NULL character ('\0') means no delimeter.
 | 
			
		||||
static char delim = '|';
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										18
									
								
								dwmblocks.c
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								dwmblocks.c
									
									
									
									
									
								
							@@ -56,20 +56,13 @@ void getcmd(const Block *block, char *output)
 | 
			
		||||
		return;
 | 
			
		||||
	//int N = strlen(output);
 | 
			
		||||
	char c;
 | 
			
		||||
	int sl;
 | 
			
		||||
	int i = sl = strlen(block->icon);
 | 
			
		||||
	int i = strlen(block->icon);
 | 
			
		||||
	while((c = fgetc(cmdf)) != EOF)
 | 
			
		||||
		output[i++] = c;
 | 
			
		||||
	if (delim != '\0' && --i)
 | 
			
		||||
		output[i++] = delim;
 | 
			
		||||
	output[i++] = '\0';
 | 
			
		||||
	pclose(cmdf);
 | 
			
		||||
	if (i == sl) { //return empty string if command has no output
 | 
			
		||||
		output[0] = '\0';
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
	if (delim[0] != '\0' && --i)
 | 
			
		||||
		for (int j = 0; delim[j]; j++)
 | 
			
		||||
			output[i++] = delim[j];
 | 
			
		||||
	else 
 | 
			
		||||
		output[--i] = '\0';
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void getcmds(int time)
 | 
			
		||||
@@ -111,7 +104,6 @@ void getstatus(char *str)
 | 
			
		||||
	{	
 | 
			
		||||
		strcpy(str + j, statusbar[i]);
 | 
			
		||||
	}
 | 
			
		||||
	for (int i = 0; delim[i]; i++)
 | 
			
		||||
	str[--j] = '\0';
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -167,7 +159,7 @@ int main(int argc, char** argv)
 | 
			
		||||
	for(int i = 0; i < argc; i++)
 | 
			
		||||
	{	
 | 
			
		||||
		if (!strcmp("-d",argv[i]))
 | 
			
		||||
			delim = argv[++i];
 | 
			
		||||
			delim = argv[++i][0];
 | 
			
		||||
	}
 | 
			
		||||
	signal(SIGTERM, termhandler);
 | 
			
		||||
	signal(SIGINT, termhandler);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user