Completing file reorganization with correct headers

Author: tonio73

src/.gitignore

@@ -1,2 +1,3 @@
 xinput_calibrator_x11
 xinput_calibrator_gtkmm
+xinput_calibrator

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,5 @@ endif
 EXTRA_DIST = \
 	calibrator.cpp \
 	calibrator.hh \
-	main_common.hpp
+	main_common.cpp
+	

src/calibrator.cpp

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

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

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)
 {