NapoleonDynamite/dwmblocks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "no longer (unused) icon slot" for bugfix

Browse source 
This reverts commit 29485b43b0.
This commit is contained in:
Luke Smith 2020-04-22 20:09:51 -04:00
parent 93b951f715
commit 01e9f1a568
No known key found for this signature in database
GPG key ID: 4C50B54A911F6252
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
config.h
View file

@ -1,22 +1,22 @@
//Modify this file to change what commands output to your statusbar, and recompile using the make command. //Modify this file to change what commands output to your statusbar, and recompile using the make command.
static const Block blocks[] = { static const Block blocks[] = {
/*Command*/ /*Update Interval*/ /*Update Signal*/ /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/
{"cat /tmp/recordingicon 2>/dev/null", 0, 9}, {"", "cat /tmp/recordingicon 2>/dev/null", 0, 9},
{"music", 0, 11}, {"", "music", 0, 11},
{"pacpackages", 0, 8}, {"", "pacpackages", 0, 8},
/* {"crypto", 0, 13}, */ /* {"", "crypto", 0, 13}, */
/* {"torrent", 20, 7}, */ {"", "torrent", 20, 7},
{"news", 0, 6}, {"", "news", 0, 6},
/* {"memory", 10, 14}, */ /* {"", "memory", 10, 14}, */
/* {"cpu", 10, 13}, */ /* {"", "cpu", 10, 13}, */
/* {"moonphase", 18000, 5}, */ /* {"", "moonphase", 18000, 5}, */
{"weather", 18000, 5}, {"", "weather", 18000, 5},
{"mailbox", 180, 12}, {"", "mailbox", 180, 12},
{"volume", 0, 10}, {"", "volume", 1, 10},
{"battery", 5, 3}, {"", "battery | tr \'\n\' \' \'", 5, 3},
{"clock", 60, 1}, {"", "clock", 60, 1},
{"internet", 5, 4}, {"", "internet", 5, 4},
{"help-icon", 0, 15}, {"", "help", 0, 15},
}; };
//sets delimeter between status commands. NULL character ('\0') means no delimeter. //sets delimeter between status commands. NULL character ('\0') means no delimeter.

8
dwmblocks.c
View file

@ -8,6 +8,7 @@
#define CMDLENGTH 50 #define CMDLENGTH 50
typedef struct { typedef struct {
char* icon;
char* command; char* command;
unsigned int interval; unsigned int interval;
unsigned int signal; unsigned int signal;
@ -55,6 +56,7 @@ void getcmd(const Block *block, char *output)
output[0] = block->signal; output[0] = block->signal;
output++; output++;
} }
strcpy(output, block->icon);
char* cmd; char* cmd;
FILE *cmdf; FILE *cmdf;
if (button) if (button)
@ -72,8 +74,10 @@ void getcmd(const Block *block, char *output)
} }
if (!cmdf) if (!cmdf)
return; return;
fgets(output, CMDLENGTH, cmdf); char c;
int i = strlen(output); 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++] = delim;
output[i++] = '\0'; output[i++] = '\0';