Prefer udev clicker

clicker.c

@@ -5,7 +5,12 @@
 
 #include <stdlib.h>
 
-clicker_t* clicker_create(clicker_type_t type) {
+typedef enum clicker_type_e {
+    CLICKER_UDEV = 0,
+    CLICKER_X11
+} clicker_type_t;
+
+static clicker_t* clicker_create(clicker_type_t type) {
     clicker_t* clicker;
 
     clicker = calloc(1, sizeof(clicker_t));
@@ -26,6 +31,16 @@ clicker_t* clicker_create(clicker_type_t type) {
     return clicker;
 }
 
+clicker_t* clicker_init(void) {
+    clicker_t* clicker;
+
+    clicker = clicker_create(CLICKER_UDEV);
+    if (clicker)
+        return clicker;
+
+    return clicker_create(CLICKER_X11);
+}
+
 void clicker_close(clicker_t* clicker) {
     if (!clicker)
         return;

clicker.h

@@ -4,11 +4,6 @@
 typedef void (*clicker_click_t)(void* ctx);
 typedef void (*clicker_close_t)(void* ctx);
 
-typedef enum clicker_type_e {
-    CLICKER_UDEV = 0,
-    CLICKER_X11
-} clicker_type_t;
-
 typedef struct clicker_ctx {
     void* ctx;
 
@@ -16,7 +11,7 @@ typedef struct clicker_ctx {
     clicker_close_t close;
 } clicker_t;
 
-clicker_t* clicker_create(clicker_type_t type);
+clicker_t* clicker_init(void);
 
 static inline void clicker_click(clicker_t* clicker) {
     clicker->click(clicker->ctx);

guiascii.c

@@ -50,9 +50,9 @@ void set_button_sensitive(button_t button, bool state) {
 }
 
 int init_gui(int argc, char **argv) {
-    clicker = clicker_create(CLICKER_X11);
+    clicker = clicker_init();
     if (!clicker) {
-        fprintf(stderr, "Unable to create X11 clicker\n");
+        fprintf(stderr, "Unable to initialize clicker\n");
         return 0;
     }
 

guicommandline.c

@@ -58,9 +58,9 @@ static void printhelp(char *myname) {
 int init_gui(int argc, char **argv) {
     int c;
 
-    clicker = clicker_create(CLICKER_X11);
+    clicker = clicker_init();
     if (!clicker) {
-        fprintf(stderr, "Unable to create X11 clicker\n");
+        fprintf(stderr, "Unable to initialize clicker\n");
         return 0;
     }
 

guifltk.cpp

@@ -98,9 +98,9 @@ static Fl_Spinner* create_spin(const char* name) {
 }
 
 int init_gui(int argc, char **argv) {
-    clicker = clicker_create(CLICKER_X11);
+    clicker = clicker_init();
     if (!clicker) {
-        fprintf(stderr, "Unable to create X11 clicker\n");
+        fprintf(stderr, "Unable to initialize clicker\n");
         return 0;
     }
 

guigtk3.c

@@ -199,9 +199,9 @@ static GtkWidget *create_gAutoClick(void) {
 }
 
 int init_gui(int argc, char **argv) {
-    clicker = clicker_create(CLICKER_X11);
+    clicker = clicker_init();
     if (!clicker) {
-        fprintf(stderr, "Unable to create X11 clicker\n");
+        fprintf(stderr, "Unable to initialize clicker\n");
         return 0;
     }
 

guiqt.cpp

@@ -54,9 +54,9 @@ void set_button_sensitive(button_t button, bool state) {
 }
 
 int init_gui(int argc, char **argv) {
-    clicker = clicker_create(CLICKER_UDEV);
+    clicker = clicker_init();
     if (!clicker) {
-        std::cerr << "Unable to create udev clicker\n";
+        std::cerr << "Unable to initialize clicker\n";
         return 0;
     }