diff --git a/src/event.c b/src/event.c index b290007..3ae6b44 100644 --- a/src/event.c +++ b/src/event.c @@ -35,6 +35,7 @@ void mouse_event(event *event, mouse_button button) break; case M_MIDDLE: event->infos |= 0x3; break; + case M_NONE: break; } } diff --git a/src/main.cpp b/src/main.cpp index 35a165d..8ee6416 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,7 +23,7 @@ int main(void) GLFWwindow* window; ImGuiContext *ctx; - ImGuiIO *io; + /* ImGuiIO *io; */ const char *glsl_version; @@ -47,7 +47,7 @@ int main(void) glfwMakeContextCurrent(window); ctx = igCreateContext(NULL); - io = igGetIO(); + /* io = igGetIO(); */ glsl_version = "#version 330 core"; ImGui_ImplGlfw_InitForOpenGL(window, true); @@ -55,8 +55,7 @@ int main(void) igStyleColorsDark(NULL); - char is_recording = 0; - char *name = "fichier.macros"; + const char *name = "fichier.macros"; ui_infos *ui = init_ui(name); diff --git a/src/read_events.c b/src/read_events.c index 33164a1..fa619f6 100644 --- a/src/read_events.c +++ b/src/read_events.c @@ -54,7 +54,6 @@ int listen(FILE *file) int left = 0; int right = 0; int middle = 0; - signed char x, y; int fd = open(pDevice, O_RDWR); if (fd == -1) diff --git a/src/ui.c b/src/ui.c index 47f6c17..269724e 100644 --- a/src/ui.c +++ b/src/ui.c @@ -8,7 +8,9 @@ #include "read_file.h" #include "ui.h" -ui_infos * init_ui(char *name) +const struct ImVec2 zero_vec2 = {0, 0}; + +ui_infos * init_ui(const char *name) { ui_infos *ret = (ui_infos *) malloc(sizeof(ui_infos)); ret->name = (char *) malloc(strlen(name) + 1); @@ -31,8 +33,8 @@ int draw_ui(ui_infos *ptr) { /* en plein écran */ ImGuiViewport *vp = igGetMainViewport(); - igSetNextWindowPos(vp->Pos, NULL, (ImVec2) { 0, 0 }); - igSetNextWindowSize(vp->Size, NULL); + igSetNextWindowPos(vp->Pos, ImGuiCond_None, zero_vec2); + igSetNextWindowSize(vp->Size, ImGuiCond_None); /* * Choix du fichier @@ -49,7 +51,7 @@ int draw_ui(ui_infos *ptr) if (ptr->is_recording) { - if (igButton("Arrêter l'enregistrement.", (ImVec2) { 0, 0 })) + if (igButton("Arrêter l'enregistrement.", zero_vec2)) { if (pthread_cancel(ptr->pid)) { @@ -62,7 +64,7 @@ int draw_ui(ui_infos *ptr) } else { - if (igButton("Lancer l'enregistrement.", (ImVec2) { 0, 0 })) + if (igButton("Lancer l'enregistrement.", zero_vec2)) { ptr->is_recording = 1; @@ -77,7 +79,7 @@ int draw_ui(ui_infos *ptr) igInputInt("Temps de repos entre chaque clic (s)", &ptr->args_rf->time_sleep, 1, 10, 0); if (ptr->args_rf->time_sleep <= 0) ptr->args_rf->time_sleep = 1; - if (igButton("Replay", (ImVec2) {0, 0})) + if (igButton("Replay", zero_vec2)) { rewind(ptr->file); readfile(ptr->args_rf); diff --git a/src/ui.h b/src/ui.h index 80c38a3..c873b67 100644 --- a/src/ui.h +++ b/src/ui.h @@ -11,7 +11,7 @@ typedef struct { args_readfile *args_rf; } ui_infos; -ui_infos * init_ui(char *name); +ui_infos * init_ui(const char *name); void free_ui(ui_infos *ptr); int draw_ui(ui_infos *ptr);