Commit: d7bc8bbd0f5a825f0e8993f31df812e8640316ed - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revision: d7bc8bbd0f5a825f0e8993f31df812e8640316ed (tree)
• Time: 2012-03-09 08:51:58
• Author: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

new_axys now contains the axys value to write

previously, new_axys.swap_xy meant that the old swap_xy value needed to
be swapped.
Now, new_axys is initialised to old_axys,
such that setting new_axys.do_swap_xy() swaps the axys and hence
new_axys contains the axys values to write.
Similar for invert_x, invert_y

Changes to Usbtouchscreen were not needed as it resets swap/inversion
values to 'false' before doing calibration.

Change Summary

• modified: src/calibrator.cpp
• modified: src/calibrator/Evdev.cpp
• modified: src/calibrator/Evdev.hpp
• modified: src/calibrator/XorgPrint.cpp
• modified: src/calibrator/XorgPrint.hpp

Incremental Difference

--- a/src/calibrator.cpp
+++ b/src/calibrator.cpp
@@ -137,12 +137,18 @@ bool Calibrator::finish(int width, int height)
         return false;
     }
 
-    XYinfo new_axys; // new axys origin and scaling
+    // new axys origin and scaling
+    // based on old_axys: inversion/swapping is relative to the old axys
+    XYinfo new_axys(old_axys);
 
     // Should x and y be swapped?
-    new_axys.swap_xy = (abs (clicked.x[UL] - clicked.x[UR]) < abs (clicked.y[UL] - clicked.y[UR]));
+    bool do_swap_xy = false;
+    if (abs(clicked.x[UL] - clicked.x[UR]) < abs(clicked.y[UL] - clicked.y[UR])) {
+        do_swap_xy = true;
+        new_axys.do_swap_xy();
+    }
 
-    if (new_axys.swap_xy) {
+    if (do_swap_xy) {
         std::swap(clicked.x[LL], clicked.x[UR]);
         std::swap(clicked.y[LL], clicked.y[UR]);
     }
@@ -167,7 +173,7 @@ bool Calibrator::finish(int width, int height)
 
 
     // If x and y has to be swapped we also have to swap the parameters
-    if (new_axys.swap_xy) {
+    if (do_swap_xy) {
         std::swap(new_axys.x.min, new_axys.y.max);
         std::swap(new_axys.y.min, new_axys.x.max);
     }

--- a/src/calibrator/Evdev.cpp
+++ b/src/calibrator/Evdev.cpp
@@ -154,14 +154,10 @@ bool CalibratorEvdev::finish_data(const XYinfo new_axys)
 {
     bool success = true;
 
-    // swap x and y axis, indicated by swap_xy
-    // new value is old value (could have been 0 or 1) swapped:
-    int new_swap_xy = 1 - old_axys.swap_xy;
-
     printf("\nDoing dynamic recalibration:\n");
     // Evdev Axes Swap
-    if (new_axys.swap_xy) {
-        success &= set_swapxy(new_swap_xy);
+    if (old_axys.swap_xy != new_axys.swap_xy) {
+        success &= set_swapxy(new_axys.swap_xy);
     }
 
     // Evdev Axis Calibration
@@ -177,19 +173,19 @@ bool CalibratorEvdev::finish_data(const XYinfo new_axys)
         case OUTYPE_AUTO:
             // xorg.conf.d or alternatively xinput commands
             if (has_xorgconfd_support()) {
-                success &= output_xorgconfd(new_axys, new_swap_xy);
+                success &= output_xorgconfd(new_axys);
             } else {
-                success &= output_xinput(new_axys, new_swap_xy);
+                success &= output_xinput(new_axys);
             }
             break;
         case OUTYPE_XORGCONFD:
-            success &= output_xorgconfd(new_axys, new_swap_xy);
+            success &= output_xorgconfd(new_axys);
             break;
         case OUTYPE_HAL:
-            success &= output_hal(new_axys, new_swap_xy);
+            success &= output_hal(new_axys);
             break;
         case OUTYPE_XINPUT:
-            success &= output_xinput(new_axys, new_swap_xy);
+            success &= output_xinput(new_axys);
             break;
         default:
             fprintf(stderr, "ERROR: Evdev Calibrator does not support the supplied --output-type\n");
@@ -430,7 +426,7 @@ int CalibratorEvdev::xinput_do_set_prop(Display *display, Atom type, int format,
 
 }
 
-bool CalibratorEvdev::output_xorgconfd(const XYinfo new_axys, int new_swap_xy)
+bool CalibratorEvdev::output_xorgconfd(const XYinfo new_axys)
 {
     const char* sysfs_name = get_sysfs_name();
     bool not_sysfs_name = (sysfs_name == NULL);
@@ -444,8 +440,7 @@ bool CalibratorEvdev::output_xorgconfd(const XYinfo new_axys, int new_swap_xy)
     printf("	MatchProduct	\"%s\"\n", sysfs_name);
     printf("	Option	\"Calibration\"	\"%d %d %d %d\"\n",
                 new_axys.x.min, new_axys.x.max, new_axys.y.min, new_axys.y.max);
-    if (new_axys.swap_xy != 0)
-        printf("	Option	\"SwapAxes\"	\"%d\"\n", new_swap_xy);
+    printf("	Option	\"SwapAxes\"	\"%d\"\n", new_axys.swap_xy);
     printf("EndSection\n");
 
     if (not_sysfs_name)
@@ -454,7 +449,7 @@ bool CalibratorEvdev::output_xorgconfd(const XYinfo new_axys, int new_swap_xy)
     return true;
 }
 
-bool CalibratorEvdev::output_hal(const XYinfo new_axys, int new_swap_xy)
+bool CalibratorEvdev::output_hal(const XYinfo new_axys)
 {
     const char* sysfs_name = get_sysfs_name();
     bool not_sysfs_name = (sysfs_name == NULL);
@@ -466,8 +461,7 @@ bool CalibratorEvdev::output_hal(const XYinfo new_axys, int new_swap_xy)
 <match key=\"info.product\" contains=\"%s\">\n\
   <merge key=\"input.x11_options.calibration\" type=\"string\">%d %d %d %d</merge>\n"
      , sysfs_name, new_axys.x.min, new_axys.x.max, new_axys.y.min, new_axys.y.max);
-    if (new_axys.swap_xy != 0)
-        printf("  <merge key=\"input.x11_options.swapaxes\" type=\"string\">%d</merge>\n", new_swap_xy);
+    printf("  <merge key=\"input.x11_options.swapaxes\" type=\"string\">%d</merge>\n", new_axys.swap_xy);
     printf("</match>\n");
 
     if (not_sysfs_name)
@@ -476,13 +470,12 @@ bool CalibratorEvdev::output_hal(const XYinfo new_axys, int new_swap_xy)
     return true;
 }
 
-bool CalibratorEvdev::output_xinput(const XYinfo new_axys, int new_swap_xy)
+bool CalibratorEvdev::output_xinput(const XYinfo new_axys)
 {
     // create startup script
     printf("  Install the 'xinput' tool and copy the command(s) below in a script that starts with your X session\n");
     printf("    xinput set-int-prop \"%s\" \"Evdev Axis Calibration\" 32 %d %d %d %d\n", device_name, new_axys.x.min, new_axys.x.max, new_axys.y.min, new_axys.y.max);
-    if (new_axys.swap_xy)
-        printf("    xinput set-int-prop \"%s\" \"Evdev Axes Swap\" 8 %d\n", device_name, new_swap_xy);
+    printf("    xinput set-int-prop \"%s\" \"Evdev Axes Swap\" 8 %d\n", device_name, new_axys.swap_xy);
 
     return true;
 }

--- a/src/calibrator/Evdev.hpp
+++ b/src/calibrator/Evdev.hpp
@@ -54,9 +54,9 @@ public:
     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, const char** argv);
 protected:
-    bool output_xorgconfd(const XYinfo new_axys, int new_swap_xy);
-    bool output_hal(const XYinfo new_axys, int new_swap_xy);
-    bool output_xinput(const XYinfo new_axys, int new_swap_xy);
+    bool output_xorgconfd(const XYinfo new_axys);
+    bool output_hal(const XYinfo new_axys);
+    bool output_xinput(const XYinfo new_axys);
 };
 
 #endif

--- a/src/calibrator/XorgPrint.cpp
+++ b/src/calibrator/XorgPrint.cpp
@@ -37,25 +37,21 @@ bool CalibratorXorgPrint::finish_data(const XYinfo new_axys)
 {
     bool success = true;
 
-    // we suppose the previous 'swap_xy' value was 0
-    // (unfortunately there is no way to verify this (yet))
-    int new_swap_xy = new_axys.swap_xy;
-
     printf("\n\n--> Making the calibration permanent <--\n");
     switch (output_type) {
         case OUTYPE_AUTO:
             // xorg.conf.d or alternatively hal config
             if (has_xorgconfd_support()) {
-                success &= output_xorgconfd(new_axys, new_swap_xy);
+                success &= output_xorgconfd(new_axys);
             } else {
-                success &= output_hal(new_axys, new_swap_xy);
+                success &= output_hal(new_axys);
             }
             break;
         case OUTYPE_XORGCONFD:
-            success &= output_xorgconfd(new_axys, new_swap_xy);
+            success &= output_xorgconfd(new_axys);
             break;
         case OUTYPE_HAL:
-            success &= output_hal(new_axys, new_swap_xy);
+            success &= output_hal(new_axys);
             break;
         default:
             fprintf(stderr, "ERROR: XorgPrint Calibrator does not support the supplied --output-type\n");
@@ -65,7 +61,7 @@ bool CalibratorXorgPrint::finish_data(const XYinfo new_axys)
     return success;
 }
 
-bool CalibratorXorgPrint::output_xorgconfd(const XYinfo new_axys, int new_swap_xy)
+bool CalibratorXorgPrint::output_xorgconfd(const XYinfo new_axys)
 {
     const char* sysfs_name = get_sysfs_name();
     bool not_sysfs_name = (sysfs_name == NULL);
@@ -81,8 +77,7 @@ bool CalibratorXorgPrint::output_xorgconfd(const XYinfo new_axys, int new_swap_x
     printf("	Option	\"MaxX\"	\"%d\"\n", new_axys.x.max);
     printf("	Option	\"MinY\"	\"%d\"\n", new_axys.y.min);
     printf("	Option	\"MaxY\"	\"%d\"\n", new_axys.y.max);
-    if (new_axys.swap_xy != 0)
-        printf("	Option	\"SwapXY\"	\"%d\" # unless it was already set to 1\n", new_swap_xy);
+    printf("	Option	\"SwapXY\"	\"%d\" # unless it was already set to 1\n", new_axys.swap_xy);
     printf("EndSection\n");
 
     if (not_sysfs_name)
@@ -91,7 +86,7 @@ bool CalibratorXorgPrint::output_xorgconfd(const XYinfo new_axys, int new_swap_x
     return true;
 }
 
-bool CalibratorXorgPrint::output_hal(const XYinfo new_axys, int new_swap_xy)
+bool CalibratorXorgPrint::output_hal(const XYinfo new_axys)
 {
     const char* sysfs_name = get_sysfs_name();
     bool not_sysfs_name = (sysfs_name == NULL);
@@ -106,8 +101,7 @@ bool CalibratorXorgPrint::output_hal(const XYinfo new_axys, int new_swap_xy)
   <merge key=\"input.x11_options.miny\" type=\"string\">%d</merge>\n\
   <merge key=\"input.x11_options.maxy\" type=\"string\">%d</merge>\n"
      , sysfs_name, new_axys.x.min, new_axys.x.max, new_axys.y.min, new_axys.y.max);
-    if (new_axys.swap_xy != 0)
-        printf("  <merge key=\"input.x11_options.swapxy\" type=\"string\">%d</merge>\n", new_swap_xy);
+    printf("  <merge key=\"input.x11_options.swapxy\" type=\"string\">%d</merge>\n", new_axys.swap_xy);
     printf("</match>\n");
 
     if (not_sysfs_name)

--- a/src/calibrator/XorgPrint.hpp
+++ b/src/calibrator/XorgPrint.hpp
@@ -37,9 +37,10 @@ public:
         const OutputType output_type=OUTYPE_AUTO, const char* geometry=0);
 
     virtual bool finish_data(const XYinfo new_axys);
+
 protected:
-    bool output_xorgconfd(const XYinfo new_axys, int new_swap_xy);
-    bool output_hal(const XYinfo new_axys, int new_swap_xy);
+    bool output_xorgconfd(const XYinfo new_axys);
+    bool output_hal(const XYinfo new_axys);
 };
 
 #endif