pinosaur
/
dwmblocks.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
09a00ab
)
Switched to fgets instead of using fgetc
author
Aidan
<torrinfail@gmail.com>
Sat, 30 Nov 2019 21:43:33 +0000
(14:43 -0700)
committer
Aidan
<torrinfail@gmail.com>
Sat, 30 Nov 2019 21:43:33 +0000
(14:43 -0700)
dwmblocks.c
patch
|
blob
|
history
diff --git
a/dwmblocks.c
b/dwmblocks.c
index
f7f23cc
..
ad8e91c
100644
(file)
--- a/
dwmblocks.c
+++ b/
dwmblocks.c
@@
-5,6
+5,7
@@
#include<signal.h>
#include<X11/Xlib.h>
#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
#include<signal.h>
#include<X11/Xlib.h>
#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
+#define CMDLENGTH 50
typedef struct {
char* icon;
typedef struct {
char* icon;
@@
-20,7
+21,6
@@
void setupsignals();
int getstatus(char *str, char *last);
void setroot();
void statusloop();
int getstatus(char *str, char *last);
void setroot();
void statusloop();
-void statusinit();
void sighandler(int signum);
void termhandler(int signum);
void sighandler(int signum);
void termhandler(int signum);
@@
-30,7
+30,7
@@
void termhandler(int signum);
static Display *dpy;
static int screen;
static Window root;
static Display *dpy;
static int screen;
static Window root;
-static char statusbar[LENGTH(blocks)][
50
] = {0};
+static char statusbar[LENGTH(blocks)][
CMDLENGTH
] = {0};
static char statusstr[2][256];
static int statusContinue = 1;
static void (*writestatus) () = setroot;
static char statusstr[2][256];
static int statusContinue = 1;
static void (*writestatus) () = setroot;
@@
-53,12
+53,8
@@
void getcmd(const Block *block, char *output)
return;
char c;
int i = strlen(block->icon);
return;
char c;
int i = strlen(block->icon);
- while((c = fgetc(cmdf)) != EOF)
- {
- output[i++] = c;
- if(c == '\n')
- break;
- }
+ fgets(output+i, CMDLENGTH-i, cmdf);
+ i = strlen(output);
if (delim != '\0' && --i)
output[i++] = delim;
output[i++] = '\0';
if (delim != '\0' && --i)
output[i++] = delim;
output[i++] = '\0';
@@
-102,9
+98,7
@@
int getstatus(char *str, char *last)
strcpy(last, str);
str[0] = '\0';
for(int i = 0; i < LENGTH(blocks); i++)
strcpy(last, str);
str[0] = '\0';
for(int i = 0; i < LENGTH(blocks); i++)
- {
strcat(str, statusbar[i]);
strcat(str, statusbar[i]);
- }
str[strlen(str)-1] = '\0';
return strcmp(str, last);//0 if they are the same
}
str[strlen(str)-1] = '\0';
return strcmp(str, last);//0 if they are the same
}
@@
-146,11
+140,6
@@
void statusloop()
}
}
}
}
-void statusinit()
-{
- statusloop();
-}
-
void sighandler(int signum)
{
void sighandler(int signum)
{
@@
-175,5
+164,5
@@
int main(int argc, char** argv)
}
signal(SIGTERM, termhandler);
signal(SIGINT, termhandler);
}
signal(SIGTERM, termhandler);
signal(SIGINT, termhandler);
- status
init
();
+ status
loop
();
}
}