Commit: 4cc7337a86c1de07475a3756c6268b9d2d642613 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revisão: 4cc7337a86c1de07475a3756c6268b9d2d642613 (tree)
• Hora: 2011-04-20 19:24:48
• Autor: Antoine Hue <antoine@peti...>
• Commiter: Tias Guns

Mensagem de Log

Completing file reorganization with correct headers

Mudança Sumário

• modified: src/Makefile.am
• modified: src/calibrator.cpp
• modified: src/calibrator.hh
• modified: src/calibrator/Evdev.cpp
• modified: src/calibrator/Makefile.am
• modified: src/calibrator/Usbtouchscreen.cpp
• modified: src/calibrator/XorgPrint.cpp
• modified: src/gui/Makefile.am
• modified: src/gui/gtkmm.cpp
• modified: src/gui/x11.cpp
• modified: src/gui/x11.hpp
• modified: src/main_common.cpp
• modified: src/main_gtkmm.cpp
• modified: src/main_x11.cpp

Diff

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,19 +28,21 @@ SUBDIRS = \
 	calibrator \
 	gui
 
-AM_CXXFLAGS = -Wall -ansi -pedantic -Wmissing-declarations
+AM_CXXFLAGS = -Wall -ansi -pedantic
 
 bin_PROGRAMS = xinput_calibrator
 
+COMMON_SRCS=calibrator.cpp calibrator/XorgPrint.cpp calibrator/Evdev.cpp calibrator/Usbtouchscreen.cpp main_common.cpp
+
 # only one of the BUILD_ flags should be set
 if BUILD_X11
-xinput_calibrator_SOURCES = main_x11.cpp
+xinput_calibrator_SOURCES = gui/x11.cpp main_x11.cpp $(COMMON_SRCS)
 xinput_calibrator_LDADD = $(XINPUT_LIBS) $(XRANDR_LIBS) $(X11_LIBS)
 xinput_calibrator_CXXFLAGS = $(XINPUT_CFLAGS) $(X11_CFLAGS) $(XRANDR_CFLAGS) $(AM_CXXFLAGS)
 endif
 
 if BUILD_GTKMM
-xinput_calibrator_SOURCES = main_gtkmm.cpp
+xinput_calibrator_SOURCES = gui/gtkmm.cpp main_gtkmm.cpp $(COMMON_SRCS)
 xinput_calibrator_LDADD = $(XINPUT_LIBS) $(GTKMM_LIBS)
 xinput_calibrator_CXXFLAGS = $(XINPUT_CFLAGS) $(GTKMM_CFLAGS) $(AM_CXXFLAGS)
 
@@ -52,4 +54,4 @@ endif
 EXTRA_DIST = \
 	calibrator.cpp \
 	calibrator.hh \
-	main_common.hpp
+	main_common.cpp

--- a/src/calibrator.cpp
+++ b/src/calibrator.cpp
@@ -25,7 +25,7 @@
 #include <dirent.h>
 #include <iostream>
 #include <fstream>
-#include <string>
+#include <cstring>
 
 #include "calibrator.hh"
 

--- a/src/calibrator.hh
+++ b/src/calibrator.hh
@@ -24,37 +24,115 @@
 #ifndef _calibrator_hh
 #define _calibrator_hh
 
-// Abstract base class for calculating new calibration parameters
+#include <stdexcept>
+#include <X11/Xlib.h>
+
+/*
+ * Number of blocks. We partition the screen into 'num_blocks' x 'num_blocks'
+ * rectangles of equal size. We then ask the user to press points that are
+ * located at the corner closes to the center of the four blocks in the corners
+ * of the screen. The following ascii art illustrates the situation. We partition
+ * the screen into 8 blocks in each direction. We then let the user press the
+ * points marked with 'O'.
+ *
+ *   +--+--+--+--+--+--+--+--+
+ *   |  |  |  |  |  |  |  |  |
+ *   +--O--+--+--+--+--+--O--+
+ *   |  |  |  |  |  |  |  |  |
+ *   +--+--+--+--+--+--+--+--+
+ *   |  |  |  |  |  |  |  |  |
+ *   +--+--+--+--+--+--+--+--+
+ *   |  |  |  |  |  |  |  |  |
+ *   +--+--+--+--+--+--+--+--+
+ *   |  |  |  |  |  |  |  |  |
+ *   +--+--+--+--+--+--+--+--+
+ *   |  |  |  |  |  |  |  |  |
+ *   +--+--+--+--+--+--+--+--+
+ *   |  |  |  |  |  |  |  |  |
+ *   +--O--+--+--+--+--+--O--+
+ *   |  |  |  |  |  |  |  |  |
+ *   +--+--+--+--+--+--+--+--+
+ */
+const int num_blocks = 8;
+
+/// struct to hold min/max info of the X and Y axis
+struct XYinfo {
+    int x_min;
+    int x_max;
+    int y_min;
+    int y_max;
+    XYinfo() : x_min(-1), x_max(-1), y_min(-1), y_max(-1) {}
+    XYinfo(int xmi, int xma, int ymi, int yma) :
+         x_min(xmi), x_max(xma), y_min(ymi), y_max(yma) {}
+};
+
+/// Names of the points
+enum {
+    UL = 0, // Upper-left
+    UR = 1, // Upper-right
+    LL = 2, // Lower-left
+    LR = 3,  // Lower-right
+    NUM_POINTS
+};
+
+/// Output types
+enum OutputType {
+    OUTYPE_AUTO,
+    OUTYPE_XORGCONFD,
+    OUTYPE_HAL,
+    OUTYPE_XINPUT
+};
+
+class WrongCalibratorException : public std::invalid_argument {
+    public:
+        WrongCalibratorException(const std::string& msg = "") :
+            std::invalid_argument(msg) {}
+};
+
+/// Base class for calculating new calibration parameters
 class Calibrator
 {
 public:
-    /* Constructor for a specific calibrator
-     *
-     * The constructor will throw an exception,
-     * if the touchscreen is not of the type it supports
-     */
-    Calibrator(const char* const device_name, const XYinfo& axys,
-        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0, const OutputType output_type=OUTYPE_AUTO, const char* geometry=0);
+    /// Parse arguments and create calibrator
+    static Calibrator* make_calibrator(int argc, char** argv);
+
+    /// Constructor
+    ///
+    /// The constructor will throw an exception,
+    /// if the touchscreen is not of the type it supports
+    Calibrator(const char* const device_name,
+               const XYinfo& axys,
+               const bool verbose,
+               const int thr_misclick=0,
+               const int thr_doubleclick=0,
+               const OutputType output_type=OUTYPE_AUTO,
+               const char* geometry=0);
+
     ~Calibrator() {}
 
-    // set the doubleclick treshold
+    /// set the doubleclick treshold
     void set_threshold_doubleclick(int t);
-    // set the misclick treshold
+
+    /// set the misclick treshold
     void set_threshold_misclick(int t);
-    // get the number of clicks already registered
+
+    /// get the number of clicks already registered
     int get_numclicks();
-    // return geometry string or NULL
+
+    /// return geometry string or NULL
     const char* get_geometry();
-    // reset clicks
+
+    /// reset clicks
     void reset() {
         num_clicks = 0;
     }
-    // add a click with the given coordinates
+
+    /// add a click with the given coordinates
     bool add_click(int x, int y);
-    // calculate and apply the calibration
+    /// calculate and apply the calibration
     bool finish(int width, int height);
-    // get the sysfs name of the device,
-    // returns NULL if it can not be found
+    /// get the sysfs name of the device,
+    /// returns NULL if it can not be found
     const char* get_sysfs_name();
 
 protected:
@@ -73,7 +151,7 @@ protected:
     // nr of clicks registered
     int num_clicks;
     // click coordinates
-    int clicked_x[4], clicked_y[4];
+    int clicked_x[NUM_POINTS], clicked_y[NUM_POINTS];
 
     // Threshold to keep the same point from being clicked twice.
     // Set to zero if you don't want this check

--- a/src/calibrator/Evdev.cpp
+++ b/src/calibrator/Evdev.cpp
@@ -20,12 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <ctype.h>
+
+#include "calibrator/Evdev.hpp"
 
 #include <X11/Xlib.h>
-#include <X11/extensions/XInput.h>
 #include <X11/Xatom.h>
 //#include <X11/Xutil.h>
+#include <ctype.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 
 #ifndef EXIT_SUCCESS
 #define EXIT_SUCCESS 1
@@ -34,39 +38,6 @@
 #define EXIT_FAILURE 0
 #endif
 
-/***************************************
- * Class for dynamic evdev calibration
- * uses xinput "Evdev Axis Calibration"
- ***************************************/
-class CalibratorEvdev: public Calibrator
-{
-private:
-    Display     *display;
-    XDeviceInfo *info;
-    XDevice     *dev;
-
-    int old_swap_xy;
-public:
-    CalibratorEvdev(const char* const device_name, const XYinfo& axys, const bool verbose,
-        XID device_id=(XID)-1, const int thr_misclick=0, const int thr_doubleclick=0,
-        const OutputType output_type=OUTYPE_AUTO, const char* geometry=0);
-    ~CalibratorEvdev();
-
-    virtual bool finish_data(const XYinfo new_axys, int swap_xy);
-
-    bool set_swapxy(const int swap_xy);
-    bool set_calibration(const XYinfo new_axys);
-
-    // xinput_ functions (from the xinput project)
-    Atom xinput_parse_atom(Display *display, const char* name);
-    XDeviceInfo* xinput_find_device_info(Display *display, const char* name, Bool only_extended);
-    int xinput_do_set_prop(Display *display, Atom type, int format, int argc, char* argv[]);
-protected:
-    bool output_xorgconfd(const XYinfo new_axys, int swap_xy, int new_swap_xy);
-    bool output_hal(const XYinfo new_axys, int swap_xy, int new_swap_xy);
-    bool output_xinput(const XYinfo new_axys, int swap_xy, int new_swap_xy);
-};
-
 CalibratorEvdev::CalibratorEvdev(const char* const device_name0, const XYinfo& axys0, const bool verbose0, XID device_id, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry)
   : Calibrator(device_name0, axys0, verbose0, thr_misclick, thr_doubleclick, output_type, geometry), old_swap_xy(0)
 {

--- a/src/calibrator/Makefile.am
+++ b/src/calibrator/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
-	calibratorEvdev.cpp \
-	calibratorUsbtouchscreen.cpp \
-	calibratorXorgPrint.cpp
+	Evdev.cpp \
+	Usbtouchscreen.cpp \
+	XorgPrint.cpp

--- a/src/calibrator/Usbtouchscreen.cpp
+++ b/src/calibrator/Usbtouchscreen.cpp
@@ -19,120 +19,34 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <string>
+
+#include "calibrator/Usbtouchscreen.hpp"
+
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 /*************************
  * Variables for usbtouchscreen specifically
  *************************/
 // The file to which the calibration parameters are saved.
 // (XXX: is this distribution dependend?)
-const char *modprobe_conf_local = "/etc/modprobe.conf.local";
+static const char *modprobe_conf_local = "/etc/modprobe.conf.local";
 
 // Prefix to the kernel path where we can set the parameters
-const char *module_prefix = "/sys/module/usbtouchscreen/parameters";
+static const char *module_prefix = "/sys/module/usbtouchscreen/parameters";
 
 // Names of kernel parameters
-const char *p_range_x = "range_x";
-const char *p_range_y = "range_y";
-const char *p_min_x = "min_x";
-const char *p_min_y = "min_y";
-const char *p_max_x = "max_x";
-const char *p_max_y = "max_y";
-const char *p_transform_xy = "transform_xy";
-const char *p_flip_x = "flip_x";
-const char *p_flip_y = "flip_y";
-const char *p_swap_xy = "swap_xy";
-
-
-/**********************************
- * Class for usbtouchscreen driver,
- * writes output parameters to running kernel and to modprobe.conf
- **********************************/
-class CalibratorUsbtouchscreen: public Calibrator
-{
-public:
-    CalibratorUsbtouchscreen(const char* const device_name, const XYinfo& axys,
-        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0,
-        const OutputType output_type=OUTYPE_AUTO, const char* geometry=0);
-    ~CalibratorUsbtouchscreen();
-
-    virtual bool finish_data(const XYinfo new_axys, int swap_xy);
-
-protected:
-    // Globals for kernel parameters from startup.
-    // We revert to these if the program aborts
-    bool val_transform_xy, val_flip_x, val_flip_y, val_swap_xy;
-
-    // Helper functions
-    char yesno(const bool value)
-    {
-        if (value)
-            return 'Y';
-        else
-            return 'N';
-    }
-
-    void read_int_parameter(const char *param, int &value)
-    {
-        int dummy;
-        char filename[100];
-        sprintf(filename, "%s/%s", module_prefix, param);
-        FILE *fid = fopen(filename, "r");
-        if (fid == NULL) {
-            fprintf(stderr, "Could not read parameter '%s'\n", param);
-            return;
-        }
-
-        dummy = fscanf(fid, "%d", &value);
-        fclose(fid);
-    }
-
-    void read_bool_parameter(const char *param, bool &value)
-    {
-        char *dummy;
-        char filename[100];
-        sprintf(filename, "%s/%s", module_prefix, param);
-        FILE *fid = fopen(filename, "r");
-        if (fid == NULL) {
-            fprintf(stderr, "Could not read parameter '%s'\n", param);
-            return;
-        }
-
-        char val[3];
-        dummy = fgets(val, 2, fid);
-        fclose(fid);
-
-        value = (val[0] == yesno(true));
-    }
-
-    void write_int_parameter(const char *param, const int value)
-    {
-        char filename[100];
-        sprintf(filename, "%s/%s", module_prefix, param);
-        FILE *fid = fopen(filename, "w");
-        if (fid == NULL) {
-            fprintf(stderr, "Could not save parameter '%s'\n", param);
-            return;
-        }
-
-        fprintf(fid, "%d", value);
-        fclose(fid);
-    }
-
-    void write_bool_parameter(const char *param, const bool value)
-    {
-        char filename[100];
-        sprintf(filename, "%s/%s", module_prefix, param);
-        FILE *fid = fopen(filename, "w");
-        if (fid == NULL) {
-            fprintf(stderr, "Could not save parameter '%s'\n", param);
-            return;
-        }
-
-        fprintf(fid, "%c", yesno (value));
-        fclose(fid);
-    }
-};
+static const char *p_range_x = "range_x";
+static const char *p_range_y = "range_y";
+static const char *p_min_x = "min_x";
+static const char *p_min_y = "min_y";
+static const char *p_max_x = "max_x";
+static const char *p_max_y = "max_y";
+static const char *p_transform_xy = "transform_xy";
+static const char *p_flip_x = "flip_x";
+static const char *p_flip_y = "flip_y";
+static const char *p_swap_xy = "swap_xy";
 
 CalibratorUsbtouchscreen::CalibratorUsbtouchscreen(const char* const device_name0, const XYinfo& axys0, const bool verbose0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry)
   : Calibrator(device_name0, axys0, verbose0, thr_misclick, thr_doubleclick, output_type, geometry)
@@ -232,3 +146,64 @@ bool CalibratorUsbtouchscreen::finish_data(const XYinfo new_axys, int swap_xy)
 
     return true;
 }
+
+void CalibratorUsbtouchscreen::read_int_parameter(const char *param, int &value)
+    {
+        int dummy;
+        char filename[100];
+        sprintf(filename, "%s/%s", module_prefix, param);
+        FILE *fid = fopen(filename, "r");
+        if (fid == NULL) {
+            fprintf(stderr, "Could not read parameter '%s'\n", param);
+            return;
+        }
+
+        dummy = fscanf(fid, "%d", &value);
+        fclose(fid);
+    }
+
+    void CalibratorUsbtouchscreen::read_bool_parameter(const char *param, bool &value)
+    {
+        char *dummy;
+        char filename[100];
+        sprintf(filename, "%s/%s", module_prefix, param);
+        FILE *fid = fopen(filename, "r");
+        if (fid == NULL) {
+            fprintf(stderr, "Could not read parameter '%s'\n", param);
+            return;
+        }
+
+        char val[3];
+        dummy = fgets(val, 2, fid);
+        fclose(fid);
+
+        value = (val[0] == yesno(true));
+    }
+
+    void CalibratorUsbtouchscreen::write_int_parameter(const char *param, const int value)
+    {
+        char filename[100];
+        sprintf(filename, "%s/%s", module_prefix, param);
+        FILE *fid = fopen(filename, "w");
+        if (fid == NULL) {
+            fprintf(stderr, "Could not save parameter '%s'\n", param);
+            return;
+        }
+
+        fprintf(fid, "%d", value);
+        fclose(fid);
+    }
+
+void CalibratorUsbtouchscreen::write_bool_parameter(const char *param, const bool value)
+    {
+        char filename[100];
+        sprintf(filename, "%s/%s", module_prefix, param);
+        FILE *fid = fopen(filename, "w");
+        if (fid == NULL) {
+            fprintf(stderr, "Could not save parameter '%s'\n", param);
+            return;
+        }
+
+        fprintf(fid, "%c", yesno (value));
+        fclose(fid);
+    }

--- a/src/calibrator/XorgPrint.cpp
+++ b/src/calibrator/XorgPrint.cpp
@@ -20,22 +20,9 @@
  * THE SOFTWARE.
  */
 
-/***************************************
- * Class for generic Xorg driver,
- * outputs new Xorg.conf and FDI policy, on stdout
- ***************************************/
-class CalibratorXorgPrint: public Calibrator
-{
-public:
-    CalibratorXorgPrint(const char* const device_name, const XYinfo& axys,
-        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0,
-        const OutputType output_type=OUTYPE_AUTO, const char* geometry=0);
+#include "calibrator/XorgPrint.hpp"
 
-    virtual bool finish_data(const XYinfo new_axys, int swap_xy);
-protected:
-    bool output_xorgconfd(const XYinfo new_axys, int swap_xy, int new_swap_xy);
-    bool output_hal(const XYinfo new_axys, int swap_xy, int new_swap_xy);
-};
+#include <cstdio>
 
 CalibratorXorgPrint::CalibratorXorgPrint(const char* const device_name0, const XYinfo& axys0, const bool verbose0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry)
   : Calibrator(device_name0, axys0, verbose0, thr_misclick, thr_doubleclick, output_type, geometry)

--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -1,3 +1,3 @@
 EXTRA_DIST = \
-	gui_gtkmm.cpp \
-	gui_x11.cpp
+	gtkmm.cpp \
+	x11.cpp

--- a/src/gui/gtkmm.cpp
+++ b/src/gui/gtkmm.cpp
@@ -20,13 +20,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <gtkmm/main.h>
-#include <gtkmm/window.h>
-#include <gtkmm/drawingarea.h>
-#include <cairomm/context.h>
-
-#include "calibrator.hh"
 
+#include "gui/gtkmm.hpp"
 
 // Timeout parameters
 const int time_step = 100;  // in milliseconds
@@ -48,36 +43,6 @@ const std::string help_text[help_lines] = {
     "(To abort, press any key or wait)"
 };
 
-
-/*******************************************
- * GTK-mm class for the the calibration GUI
- *******************************************/
-class CalibrationArea : public Gtk::DrawingArea
-{
-public:
-    CalibrationArea(Calibrator* w);
-
-protected:
-    // Data
-    Calibrator* calibrator;
-    double X[4], Y[4];
-    int display_width, display_height;
-    int time_elapsed;
-
-    const char* message;
-
-    // Signal handlers
-    bool on_timer_signal();
-    bool on_expose_event(GdkEventExpose *event);
-    bool on_button_press_event(GdkEventButton *event);
-    bool on_key_press_event(GdkEventKey *event);
-
-    // Helper functions
-    void set_display_size(int width, int height);
-    void redraw();
-    void draw_message(const char* msg);
-};
-
 CalibrationArea::CalibrationArea(Calibrator* calibrator0)
   : calibrator(calibrator0), time_elapsed(0), message(NULL)
 {

--- a/src/gui/x11.cpp
+++ b/src/gui/x11.cpp
@@ -19,6 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
+#include "gui/x11.hpp"
+
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -34,12 +37,10 @@
 #include <signal.h>
 #include <string.h>
 
-#include "calibrator.hh"
-
 
 // Timeout parameters
 const int time_step = 100;  // in milliseconds
-const int max_time = 15000; // 5000 = 5 sec
+const int max_time = 15000; // in milliseconds, 5000 = 5 sec
 
 // Clock appereance
 const int cross_lines = 25;
@@ -57,58 +58,18 @@ const std::string help_text[help_lines] = {
     "(To abort, press any key or wait)"
 };
 
-// color management
-enum { BLACK=0, WHITE=1, GRAY=2, DIMGRAY=3, RED=4 };
-const int nr_colors = 5;
-const char* colors[nr_colors] = {"BLACK", "WHITE", "GRAY", "DIMGRAY", "RED"};
-
+const char* GuiCalibratorX11::colors[GuiCalibratorX11::NUM_COLORS] = {"BLACK", "WHITE", "GRAY", "DIMGRAY", "RED"};
 
 void sigalarm_handler(int num);
 
-
-/*******************************************
- * X11 class for the the calibration GUI
- *******************************************/
-class GuiCalibratorX11
+/// Create singleton instance associated to calibrator w
+void GuiCalibratorX11::make_instance(Calibrator* w)
 {
-public:
-    GuiCalibratorX11(Calibrator* w);
-    ~GuiCalibratorX11();
-    static bool set_instance(GuiCalibratorX11* W);
-    static void give_timer_signal();
-
-protected:
-    // Data
-    Calibrator* calibrator;
-    double X[4], Y[4];
-    int display_width, display_height;
-    int time_elapsed;
-
-    // X11 vars
-    Display* display;
-    int screen_num;
-    Window win;
-    GC gc;
-    XFontStruct* font_info;
-    // color mngmt
-    unsigned long pixel[nr_colors];
-
-
-    // Signal handlers
-    bool on_timer_signal();
-    bool on_expose_event();
-    bool on_button_press_event(XEvent event);
-
-    // Helper functions
-    void set_display_size(int width, int height);
-    void redraw();
-    void draw_message(const char* msg);
-
-private:
-    static GuiCalibratorX11* instance;
-};
-GuiCalibratorX11* GuiCalibratorX11::instance = NULL;
+    instance = new GuiCalibratorX11(w);
+}
 
+// Singleton instance
+GuiCalibratorX11* GuiCalibratorX11::instance = NULL;
 
 GuiCalibratorX11::GuiCalibratorX11(Calibrator* calibrator0)
   : calibrator(calibrator0), time_elapsed(0)
@@ -181,7 +142,7 @@ GuiCalibratorX11::GuiCalibratorX11(Calibrator* calibrator0)
 
     Colormap colormap = DefaultColormap(display, screen_num);
     XColor color;
-    for (int i = 0; i != nr_colors; i++) {
+    for (int i = 0; i != NUM_COLORS; i++) {
         XParseColor(display, colormap, colors[i], &color);
         XAllocColor(display, colormap, &color);
         pixel[i] = color.pixel;
@@ -392,14 +353,6 @@ void GuiCalibratorX11::give_timer_signal()
     }
 }
 
-bool GuiCalibratorX11::set_instance(GuiCalibratorX11* W)
-{
-    bool wasSet = (instance != NULL);
-    instance = W;
-
-    return wasSet;
-}
-
 
 // handle SIGALRM signal, pass to singleton
 void sigalarm_handler(int num)

--- a/src/gui/x11.hpp
+++ b/src/gui/x11.hpp
@@ -31,17 +31,16 @@
 class GuiCalibratorX11
 {
 public:
-    GuiCalibratorX11(Calibrator* w);
-    ~GuiCalibratorX11();
-    static bool set_instance(GuiCalibratorX11* W);
+    static void make_instance(Calibrator* w);
     static void give_timer_signal();
 
 protected:
-	static const int nr_colors = 5;
-	static const char* colors[nr_colors];
+    GuiCalibratorX11(Calibrator* w);
+    ~GuiCalibratorX11();
+
     // Data
     Calibrator* calibrator;
-    double X[4], Y[4];
+    double X[NUM_POINTS], Y[NUM_POINTS];
     int display_width, display_height;
     int time_elapsed;
 
@@ -51,9 +50,11 @@ protected:
     Window win;
     GC gc;
     XFontStruct* font_info;
-    // color mngmt
-    unsigned long pixel[nr_colors];
 
+    // color management
+    enum { BLACK=0, WHITE=1, GRAY=2, DIMGRAY=3, RED=4, NUM_COLORS };
+    static const char* colors[NUM_COLORS];
+    unsigned long pixel[NUM_COLORS];
 
     // Signal handlers
     bool on_timer_signal();

--- a/src/main_common.cpp
+++ b/src/main_common.cpp
@@ -21,6 +21,13 @@
  * THE SOFTWARE.
  */
 
+#include "calibrator.hh"
+
+// Calibrator implementations
+#include "calibrator/Usbtouchscreen.hpp"
+#include "calibrator/Evdev.hpp"
+#include "calibrator/XorgPrint.hpp"
+
 #include <cstring>
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,13 +36,8 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput.h>
 
-#include "main_common.hpp"
-#include "calibrator/calibratorUsbtouchscreen.hpp"
-#include "calibrator/calibratorEvdev.hpp"
-#include "calibrator/calibratorXorgPrint.hpp"
-
 // strdup: non-ansi
-char* my_strdup(const char* s) {
+static char* my_strdup(const char* s) {
     size_t len = strlen(s) + 1;
     void* p = malloc(len);
 
@@ -52,7 +54,7 @@ char* my_strdup(const char* s) {
  * retuns number of devices found,
  * the data of the device is returned in the last 3 function parameters
  */
-int find_device(const char* pre_device, bool verbose, bool list_devices,
+static int find_device(const char* pre_device, bool verbose, bool list_devices,
         XID& device_id, const char*& device_name, XYinfo& device_axys)
 {
     bool pre_device_is_id = true;
@@ -179,7 +181,7 @@ static void usage(char* cmd, unsigned thr_misclick)
     fprintf(stderr, "\t--geometry: manually provide the geometry for the calibration window\n");
 }
 
-Calibrator* main_common(int argc, char** argv)
+Calibrator* Calibrator::make_calibrator(int argc, char** argv)
 {
     bool verbose = false;
     bool list_devices = false;
@@ -198,7 +200,7 @@ Calibrator* main_common(int argc, char** argv)
             // Display help ?
             if (strcmp("-h", argv[i]) == 0 ||
                 strcmp("--help", argv[i]) == 0) {
-                fprintf(stderr, "xinput_calibratior, v%s\n\n", VERSION);
+                fprintf(stderr, "xinput_calibrator, v%s\n\n", VERSION);
                 usage(argv[0], thr_misclick);
                 exit(0);
             } else
@@ -276,7 +278,6 @@ Calibrator* main_common(int argc, char** argv)
             // specify window geometry?
             if (strcmp("--geometry", argv[i]) == 0) {
                 geometry = argv[++i];
-                //sscanf(argv[++i],"%dx%d+%d+%d",&win_width,&win_height,&win_xoff,&win_yoff);
             } else
 
             // Fake calibratable device ?
@@ -294,7 +295,7 @@ Calibrator* main_common(int argc, char** argv)
     }
 
 
-    // Choose the device to calibrate
+    /// Choose the device to calibrate
     XID         device_id   = (XID) -1;
     const char* device_name = NULL;
     XYinfo      device_axys;

--- a/src/main_gtkmm.cpp
+++ b/src/main_gtkmm.cpp
@@ -24,15 +24,14 @@
 // Must be before Xlib stuff
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
-#include <gtkmm/drawingarea.h>
 #include <cairomm/context.h>
 
-#include "main_common.hpp"
-#include "gui/gui_gtkmm.cpp"
+#include "calibrator.hh"
+#include "gui/gtkmm.hpp"
 
 int main(int argc, char** argv)
 {
-    Calibrator* calibrator = main_common(argc, argv);
+    Calibrator* calibrator = Calibrator::make_calibrator(argc, argv);
 
     // GTK-mm setup
     Gtk::Main kit(argc, argv);

--- a/src/main_x11.cpp
+++ b/src/main_x11.cpp
@@ -20,15 +20,14 @@
  * THE SOFTWARE.
  */
 
-#include "main_common.hpp"
-#include "gui/gui_x11.cpp"
+#include "calibrator.hh"
+#include "gui/x11.hpp"
 
 int main(int argc, char** argv)
 {
-    Calibrator* calibrator = main_common(argc, argv);
+    Calibrator* calibrator = Calibrator::make_calibrator(argc, argv);
 
-    GuiCalibratorX11 gui(calibrator);
-    GuiCalibratorX11::set_instance(&gui);
+    GuiCalibratorX11::make_instance( calibrator );
 
     // wait for timer signal, processes events
     while(1)