提交: 41e0d3ab1f0c91f1297c817c63c400bbf6b8f365 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• 修订版: 41e0d3ab1f0c91f1297c817c63c400bbf6b8f365 (tree)
• 时间: 2012-06-27 06:19:26
• 作者: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

remove invertX/Y from evdev config outputting

invertX/Y is automatically handled by xf86ScaleAxis
avoid outputting it so users don't manually change it
(it is still set/unset in dynamic calibration when needed though)

更改概述

• modified: src/calibrator/Evdev.cpp

差异

--- a/src/calibrator/Evdev.cpp
+++ b/src/calibrator/Evdev.cpp
@@ -574,8 +574,6 @@ bool CalibratorEvdev::output_xorgconfd(const XYinfo new_axys)
     printf("	Option	\"Calibration\"	\"%d %d %d %d\"\n",
                 new_axys.x.min, new_axys.x.max, new_axys.y.min, new_axys.y.max);
     printf("	Option	\"SwapAxes\"	\"%d\"\n", new_axys.swap_xy);
-    printf("	Option	\"InvertX\"	\"%d\"\n", new_axys.x.invert);
-    printf("	Option	\"InvertY\"	\"%d\"\n", new_axys.y.invert);
     printf("EndSection\n");
 
     if (not_sysfs_name)
@@ -597,8 +595,6 @@ bool CalibratorEvdev::output_hal(const XYinfo new_axys)
   <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);
     printf("  <merge key=\"input.x11_options.swapaxes\" type=\"string\">%d</merge>\n", new_axys.swap_xy);
-    printf("  <merge key=\"input.x11_options.invertx\" type=\"string\">%d</merge>\n", new_axys.x.invert);
-    printf("  <merge key=\"input.x11_options.inverty\" type=\"string\">%d</merge>\n", new_axys.y.invert);
     printf("</match>\n");
 
     if (not_sysfs_name)
@@ -613,7 +609,6 @@ bool CalibratorEvdev::output_xinput(const XYinfo new_axys)
     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);
     printf("    xinput set-int-prop \"%s\" \"Evdev Axes Swap\" 8 %d\n", device_name, new_axys.swap_xy);
-    printf("    xinput set-int-prop \"%s\" \"Evdev Axis Inversion\" %d %d\n", device_name, new_axys.x.invert, new_axys.y.invert);
 
     return true;
 }