Commit: c8701d10faaa1389f7f56680b427981a7c12f73a - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revision: c8701d10faaa1389f7f56680b427981a7c12f73a (tree)
• Time: 2012-03-09 08:51:57
• Author: Antoine Hue <antoine@peti...>
• Commiter: Tias Guns

Log Message

Some refactoring of the Calibrator object

Make find_device a static function of Calibrator, and move some
functions around

This patch was originally part of Antoine Hue's commit with message
Managing correctly X/Y swap and X or Y inversion: - detect swap and
inversion modification - take into account for inversion in calibration
computation since Evdev is doing inversion after calibration. - Mainly
tested for Evdev based driver. To be tested for USB.

Signed-off-by: Tias Guns <[e-mail]>

Change Summary

• modified: src/calibrator.cpp
• modified: src/calibrator.hh
• modified: src/main_common.cpp

Incremental Difference

--- a/src/calibrator.cpp
+++ b/src/calibrator.cpp
@@ -41,26 +41,6 @@ Calibrator::Calibrator(const char* const device_name0, const XYinfo& axys0,
     //clicked.y(NUM_POINTS);
 }
 
-void Calibrator::set_threshold_doubleclick(int t)
-{
-    threshold_doubleclick = t;
-}
-
-void Calibrator::set_threshold_misclick(int t)
-{
-    threshold_misclick = t;
-}
-
-int Calibrator::get_numclicks()
-{
-    return clicked.num;
-}
-
-const char* Calibrator::get_geometry()
-{
-    return geometry;
-}
-
 bool Calibrator::add_click(int x, int y)
 {
     // Double-click detection

--- a/src/calibrator.hh
+++ b/src/calibrator.hh
@@ -122,16 +122,20 @@ public:
     ~Calibrator() {}
 
     /// set the doubleclick treshold
-    void set_threshold_doubleclick(int t);
+    void set_threshold_doubleclick(int t)
+    { threshold_doubleclick = t; }
 
     /// set the misclick treshold
-    void set_threshold_misclick(int t);
+    void set_threshold_misclick(int t)
+    { threshold_misclick = t; }
 
     /// get the number of clicks already registered
-    int get_numclicks();
+    int get_numclicks() const
+    { return clicked.num; }
 
     /// return geometry string or NULL
-    const char* get_geometry();
+    const char* get_geometry() const
+    { return geometry; }
 
     /// reset clicks
     void reset()
@@ -146,17 +150,32 @@ public:
     const char* get_sysfs_name();
 
 protected:
-    // check whether the coordinates are along the respective axis
+    /// check whether the coordinates are along the respective axis
     bool along_axis(int xy, int x0, int y0);
 
-    // overloaded function that applies the new calibration
+    /// Apply new calibration, implementation dependent
     virtual bool finish_data(const XYinfo new_axys) =0;
 
-    // name of the device (driver)
+    /// Compute calibration on 1 axis
+    void process_axys( int screen_dim, const AxisInfo &previous, std::vector<int> &clicked, AxisInfo &updated );
+
+    /// Check whether the given name is a sysfs device name
+    bool is_sysfs_name(const char* name);
+
+    /// Check whether the X server has xorg.conf.d support
+    bool has_xorgconfd_support(Display* display=NULL);
+
+    static int find_device(const char* pre_device, bool verbose, bool list_devices,
+            XID& device_id, const char*& device_name, XYinfo& device_axys);
+
+protected:
+    /// Name of the device (driver)
     const char* const device_name;
-    // original axys values
+
+    /// Original values
     XYinfo old_axys;
-    // be verbose or not
+
+    /// Be verbose or not
     bool verbose;
 
     /// Clicked values (screen coordinates)
@@ -181,12 +200,6 @@ protected:
 
     // manually specified geometry string
     const char* geometry;
-
-    // Check whether the given name is a sysfs device name
-    bool is_sysfs_name(const char* name);
-
-    // Check whether the X server has xorg.conf.d support
-    bool has_xorgconfd_support(Display* display=NULL);
 };
 
 #endif

--- a/src/main_common.cpp
+++ b/src/main_common.cpp
@@ -54,7 +54,7 @@ static char* my_strdup(const char* s) {
  * retuns number of devices found,
  * the data of the device is returned in the last 3 function parameters
  */
-static int find_device(const char* pre_device, bool verbose, bool list_devices,
+int Calibrator::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;