fixed some small things (update_interval) interferes with get_cpu_usage() and reordered)
This commit is contained in:
		
				
					committed by
					
						
						Aaron Marcher (drkhsh)
					
				
			
			
				
	
			
			
			
						parent
						
							e046ee18f9
						
					
				
				
					commit
					1b65dec306
				
			@@ -17,8 +17,8 @@ static const char batteryfullfile[] = "/sys/class/power_supply/BAT0/energy_full_
 | 
			
		||||
/* time */
 | 
			
		||||
static const char timeformat[] = "%y-%m-%d %H:%M:%S";
 | 
			
		||||
 | 
			
		||||
/* bar update interval in seconds */
 | 
			
		||||
static unsigned int update_interval = 10;
 | 
			
		||||
/* bar update interval in seconds (smallest value = 1) */
 | 
			
		||||
static unsigned int update_interval = 1;
 | 
			
		||||
 | 
			
		||||
/* statusbar
 | 
			
		||||
Possible arguments:
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										40
									
								
								slstatus.c
									
									
									
									
									
								
							
							
						
						
									
										40
									
								
								slstatus.c
									
									
									
									
									
								
							@@ -16,9 +16,15 @@
 | 
			
		||||
/* local libraries */
 | 
			
		||||
#include "config.h"
 | 
			
		||||
 | 
			
		||||
/* check file macro */
 | 
			
		||||
#define CHECK_FILE(X,Y) do { \
 | 
			
		||||
    if (stat(X,&Y) < 0) return -1; \
 | 
			
		||||
    if (!S_ISREG(Y.st_mode)) return -1; \
 | 
			
		||||
} while (0);
 | 
			
		||||
 | 
			
		||||
/* functions */
 | 
			
		||||
void setstatus(char *str);
 | 
			
		||||
int config_check();
 | 
			
		||||
void setstatus(char *str);
 | 
			
		||||
char *smprintf(char *fmt, ...);
 | 
			
		||||
char *get_battery();
 | 
			
		||||
char *get_cpu_temperature();
 | 
			
		||||
@@ -31,6 +37,17 @@ char *get_wifi_signal();
 | 
			
		||||
/* global variables */
 | 
			
		||||
static Display *dpy;
 | 
			
		||||
 | 
			
		||||
/* check configured paths */
 | 
			
		||||
int
 | 
			
		||||
config_check()
 | 
			
		||||
{
 | 
			
		||||
    struct stat fs;
 | 
			
		||||
    CHECK_FILE(batterynowfile, fs);
 | 
			
		||||
    CHECK_FILE(batteryfullfile, fs);
 | 
			
		||||
    CHECK_FILE(tempfile, fs);
 | 
			
		||||
    return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* set statusbar (WM_NAME) */
 | 
			
		||||
void
 | 
			
		||||
setstatus(char *str)
 | 
			
		||||
@@ -53,22 +70,6 @@ smprintf(char *fmt, ...)
 | 
			
		||||
    return ret;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define CHECK_FILE(X,Y) do { \
 | 
			
		||||
    if (stat(X,&Y) < 0) return -1; \
 | 
			
		||||
    if (!S_ISREG(Y.st_mode)) return -1; \
 | 
			
		||||
} while (0);
 | 
			
		||||
 | 
			
		||||
/* check configured paths */
 | 
			
		||||
int
 | 
			
		||||
config_check()
 | 
			
		||||
{
 | 
			
		||||
    struct stat fs;
 | 
			
		||||
    CHECK_FILE(batterynowfile, fs);
 | 
			
		||||
    CHECK_FILE(batteryfullfile, fs);
 | 
			
		||||
    CHECK_FILE(tempfile, fs);
 | 
			
		||||
    return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* battery percentage */
 | 
			
		||||
char *
 | 
			
		||||
get_battery()
 | 
			
		||||
@@ -339,6 +340,7 @@ main()
 | 
			
		||||
        fprintf(stderr, "Config error, please check paths and recompile\n");
 | 
			
		||||
        exit(1);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* open display */
 | 
			
		||||
    if (!(dpy = XOpenDisplay(0x0))) {
 | 
			
		||||
        fprintf(stderr, "Cannot open display!\n");
 | 
			
		||||
@@ -368,7 +370,9 @@ main()
 | 
			
		||||
        free(ram_usage);
 | 
			
		||||
        free(volume);
 | 
			
		||||
        free(wifi_signal);
 | 
			
		||||
        sleep(update_interval);
 | 
			
		||||
 | 
			
		||||
        /* wait, "update_interval - 1" because of get_cpu_usage() which uses 1 second */
 | 
			
		||||
        sleep(update_interval -1);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* close display */
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user