From 40b3de27aa1633a213c1fb277020dd28b717a3ec Mon Sep 17 00:00:00 2001 From: flifloo Date: Thu, 19 Dec 2019 11:56:37 +0100 Subject: [PATCH] Add buffer to header file, print new brightness on command and add install target to makefile --- Makefile | 4 ++++ xbrightness.c | 18 ++++++++++-------- xbrightness.h | 2 ++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 2d7a052..4fda7a2 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,10 @@ OBJ=$(SRC:.c=.o) HEADER=xbrightness.h +install: all + cp $(NAME) /usr/local/bin/ + @make clean + all: $(NAME) $(NAME): $(OBJ) $(HEADER) diff --git a/xbrightness.c b/xbrightness.c index 5dc857d..36ae223 100644 --- a/xbrightness.c +++ b/xbrightness.c @@ -13,23 +13,23 @@ void cmd(char *command, char *output) { } float current() { - char out[1028]; - cmd("xrandr --verbose | grep Brightness: | cut -f2 -d\" \"", out); - return strtof(out, NULL); + char out[BUFFER]; + cmd("xrandr --verbose | grep Brightness: | cut -f2 -d\" \"", out); //TODO: Check when 0 screen connected and two or more connected and catch output error + return strtof(out, NULL); //TODO: Return NULL when convert fail } void set(float brightness) { - char screen[1028]; - char command[1028] = "xrandr --output "; + char screen[BUFFER]; //TODO: Better buffer + char command[BUFFER] = "xrandr --output "; char command2[] = " --brightness "; char b[3]; - cmd("xrandr | grep \" connected\" | cut -f1 -d\" \"", screen); + cmd("xrandr | grep \" connected\" | cut -f1 -d\" \"", screen); //TODO: Check when 0 screen connected and two or more connected and catch output error screen[strlen(screen)-1] = 0; strcat(command, screen); strcat(command, command2); gcvt(brightness, 3, b); strcat(command, b); - cmd(command, NULL); + cmd(command, NULL); //TODO: Catch output error } int main(int argc, char **argv) { @@ -48,10 +48,12 @@ int main(int argc, char **argv) { return 1; } else { if (argv[1][0] == '+' ||argv[1][0] == '-') { - set(current()+b); + b = current()+b; + set(b); } else { set(b); } + printf("Brightness set to %.2f\n", b); } return 0; } diff --git a/xbrightness.h b/xbrightness.h index c1238a3..bd0fc60 100644 --- a/xbrightness.h +++ b/xbrightness.h @@ -1,6 +1,8 @@ #ifndef XBRIGHTNESS_H #define XBRIGHTNESS_H +#define BUFFER 1028 + #include #include #include