From a9fdae695a515a8f0233fa73ad6b9817237121b9 Mon Sep 17 00:00:00 2001 From: rick Date: Mon, 5 Dec 2022 03:07:23 +0100 Subject: [PATCH] refactor: use ANSI C --- Makefile | 2 +- src/main.c | 3 ++- src/read_events.c | 20 +++++++++++--------- src/read_file.c | 4 ++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index fe68d88..c8363a3 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SRCS := main.c event.c read_events.c read_file.c OBJS := main.o event.o read_events.o read_file.o CC := gcc -CFLAGS := -Wall -g -I. +CFLAGS := -ansi -pedantic -Wall -Wextra -g -I. #CFLAGS := -Wall -ansi -g -I. LDLIBS := -lxdo -lX11 diff --git a/src/main.c b/src/main.c index b39c533..fc364b1 100644 --- a/src/main.c +++ b/src/main.c @@ -147,10 +147,11 @@ void readfile() { int main() { + int t; FILE *file = fopen("t", "w+"); if (file == NULL) return -1; - int t = listen(file); + t = listen(file); if (t) return t; printf("Fin\n"); diff --git a/src/read_events.c b/src/read_events.c index 3d8d59a..7113275 100644 --- a/src/read_events.c +++ b/src/read_events.c @@ -26,6 +26,11 @@ int listen(FILE *file) unsigned char data[3]; const char *pDevice = "/dev/input/mice"; + int left = 0; + int right = 0; + int middle = 0; + signed char x, y; + int fd = open(pDevice, O_RDWR); if (fd == -1) { @@ -33,14 +38,9 @@ int listen(FILE *file) return -1; } - int left = 0; - int right = 0; - int middle = 0; - signed char x, y; - while (!(left && right)) { - // Read Mouse + /* Read Mouse */ bytes = read(fd, data, sizeof(data)); if (bytes > 0) @@ -61,7 +61,7 @@ int listen(FILE *file) &event.xbutton.state ); - //printf("%d - %d\n", event.xmotion.x, event.xmotion.y); + /* printf("%d - %d\n", event.xmotion.x, event.xmotion.y); */ if ((left || right) && !(left && right)) { mouse_button type_button; @@ -83,6 +83,8 @@ int listen(FILE *file) close(fd); XCloseDisplay(display); return 0; - // TODO on ecoute la souris - // TODO on repete ce qu'on a entre + /* + TODO on ecoute la souris + TODO on repete ce qu'on a entre + */ } diff --git a/src/read_file.c b/src/read_file.c index 71ba6a0..1ba7e7a 100644 --- a/src/read_file.c +++ b/src/read_file.c @@ -1,4 +1,3 @@ -//#include #include #include #include @@ -6,7 +5,8 @@ #include "event.h" #include "read_file.h" -void readfile(FILE *file) { +void readfile(FILE *file) +{ xdo_t *x_t = xdo_new(NULL); event *current_event = new_event();