Commit: eed08ae683258a321ef9f9480b7b2c3179b1bb09 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Révision: eed08ae683258a321ef9f9480b7b2c3179b1bb09 (tree)
• l'heure: 2011-04-20 19:24:48
• Auteur: Antoine Hue <antoine@peti...>
• Commiter: Tias Guns

Message de Log

Software engineering to avoid #include "XXX.cpp": + file headers + correct includes

Change Summary

• add: src/calibrator/Evdev.hpp
• add: src/calibrator/Usbtouchscreen.hpp
• add: src/calibrator/XorgPrint.hpp
• delete: src/calibrator/{calibratorEvdev.cpp => Evdev.cpp}
• delete: src/calibrator/{calibratorUsbtouchscreen.cpp => Usbtouchscreen.cpp}
• delete: src/calibrator/{calibratorXorgPrint.cpp => XorgPrint.cpp}
• add: src/gui/gtkmm.hpp
• add: src/gui/x11.hpp
• delete: src/gui/{gui_gtkmm.cpp => gtkmm.cpp}
• delete: src/gui/{gui_x11.cpp => x11.cpp}
• delete: src/{main_common.hpp => main_common.cpp}

Modification

--- /dev/null
+++ b/src/calibrator/Evdev.hpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2009 Tias Guns
+ * Copyright 2007 Peter Hutterer (xinput_ methods from xinput)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef CALIBRATOR_EVDEV_HPP
+#define CALIBRATOR_EVDEV_HPP
+
+#include "calibrator.hh"
+#include <X11/extensions/XInput.h>
+
+/***************************************
+ * 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);
+};
+
+#endif

--- a/src/calibrator/calibratorUsbtouchscreen.cpp
+++ b/src/calibrator/Usbtouchscreen.cpp
@@ -110,7 +110,7 @@ protected:
         char filename[100];
         sprintf(filename, "%s/%s", module_prefix, param);
         FILE *fid = fopen(filename, "w");
-        if (fid == NULL) { 
+        if (fid == NULL) {
             fprintf(stderr, "Could not save parameter '%s'\n", param);
             return;
         }

--- /dev/null
+++ b/src/calibrator/Usbtouchscreen.hpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2009 Soren Hauberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef CALIBRATOR_USBTOUCHSCREEN_HPP
+#define CALIBRATOR_USBTOUCHSCREEN_HPP
+
+#include "calibrator.hh"
+
+/**********************************
+ * 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);
+
+    void read_bool_parameter(const char *param, bool &value);
+
+    void write_int_parameter(const char *param, const int value);
+
+    void write_bool_parameter(const char *param, const bool value);
+};
+
+#endif

--- /dev/null
+++ b/src/calibrator/XorgPrint.hpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2009 Tias Guns
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef CALIBRATOR_XORGPRINT_HPP
+#define CALIBRATOR_XORGPRINT_HPP
+
+#include "calibrator.hh"
+
+/***************************************
+ * 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);
+
+    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);
+};
+
+#endif

--- /dev/null
+++ b/src/gui/gtkmm.hpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2009 Tias Guns
+ * Copyright (c) 2009 Soren Hauberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef GUI_GTKMM_HPP
+#define GUI_GTKMM_HPP
+
+#include <gtkmm/drawingarea.h>
+#include "calibrator.hh"
+
+/*******************************************
+ * 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);
+};
+
+#endif

--- /dev/null
+++ b/src/gui/x11.hpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2009 Tias Guns
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef GUI_CALIBRATOR_X11
+#define GUI_CALIBRATOR_X11
+
+#include "calibrator.hh"
+
+/*******************************************
+ * X11 class for the the calibration GUI
+ *******************************************/
+class GuiCalibratorX11
+{
+public:
+    GuiCalibratorX11(Calibrator* w);
+    ~GuiCalibratorX11();
+    static bool set_instance(GuiCalibratorX11* W);
+    static void give_timer_signal();
+
+protected:
+	static const int nr_colors = 5;
+	static const char* colors[nr_colors];
+    // 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;
+};
+
+#endif

--- a/src/main_common.hpp
+++ b/src/main_common.cpp
@@ -20,6 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include <cstring>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,69 +29,12 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput.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;
-
-// Names of the points
-enum {
-    UL = 0, // Upper-left
-    UR = 1, // Upper-right
-    LL = 2, // Lower-left
-    LR = 3  // Lower-right
-};
-
-// Output types
-enum OutputType {
-    OUTYPE_AUTO,
-    OUTYPE_XORGCONFD,
-    OUTYPE_HAL,
-    OUTYPE_XINPUT
-};
-
-// 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) {}
-};
-
-class WrongCalibratorException : public std::invalid_argument {
-    public:
-        WrongCalibratorException(const std::string& msg = "") :
-            std::invalid_argument(msg) {}
-};
+#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);
 char* my_strdup(const char* s) {
     size_t len = strlen(s) + 1;
     void* p = malloc(len);
@@ -101,13 +45,6 @@ char* my_strdup(const char* s) {
     return (char*) memcpy(p, s, len);
 }
 
-// all need struct XYinfo, and some the consts too
-#include "calibrator.cpp"
-#include "calibrator/calibratorXorgPrint.cpp"
-#include "calibrator/calibratorEvdev.cpp"
-#include "calibrator/calibratorUsbtouchscreen.cpp"
-
-
 /**
  * find a calibratable touchscreen device (using XInput)
  *
@@ -115,7 +52,6 @@ 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*, bool, bool, XID&, const char*&, XYinfo&);
 int find_device(const char* pre_device, bool verbose, bool list_devices,
         XID& device_id, const char*& device_name, XYinfo& device_axys)
 {
@@ -243,7 +179,6 @@ 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* main_common(int argc, char** argv)
 {
     bool verbose = false;
@@ -348,7 +283,7 @@ Calibrator* main_common(int argc, char** argv)
             if (strcmp("--fake", argv[i]) == 0) {
                 fake = true;
             }
-            
+
             // unknown option
             else {
                 fprintf(stderr, "Unknown option: %s\n\n", argv[i]);
@@ -357,7 +292,7 @@ Calibrator* main_common(int argc, char** argv)
             }
         }
     }
-    
+
 
     // Choose the device to calibrate
     XID         device_id   = (XID) -1;