Commit: f4a7fda8ed0f0760a8351a74c33517c0337cde8d - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Révision: f4a7fda8ed0f0760a8351a74c33517c0337cde8d (tree)
• l'heure: 2010-08-16 06:52:23
• Auteur: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Message de Log

remove xorg.conf mention (superseded by xorg.conf.d snippet, or HAL on
older systems)

The xorg.conf option is not as straightforward as I thought:
Since hotplugging with HAL, the Input Sections of xorg.conf are
automatically ignored. When adding an input section, one would have to
disable hotplugging with Option "AutoAddDevices" "false".
But it is a lot simpler to just write a HAL policy file in that case.

Change Summary

• modified: src/calibrator/calibratorEvdev.cpp
• modified: src/calibrator/calibratorXorgPrint.cpp

Modification

--- a/src/calibrator/calibratorEvdev.cpp
+++ b/src/calibrator/calibratorEvdev.cpp
@@ -234,13 +234,6 @@ bool CalibratorEvdev::finish_data(const XYinfo new_axys, int swap_xy)
     printf("EndSection\n");
     printf("\n");
 
-    // Xorg.conf output
-    printf("xorg.conf: edit /etc/X11/xorg.conf and add in the 'Section \"InputDevice\"' of your device:\n");
-    printf("    Option\t\"Calibration\"\t\t\"%d %d %d %d\"\n",
-                new_axys.x_min, new_axys.x_max, new_axys.y_min, new_axys.y_max);
-    if (swap_xy)
-        printf("    Option\t\"SwapAxes\"\t\"%d\" # unless it was already set to 1\n", new_swap_xy);
-
     return success;
 }
 

--- a/src/calibrator/calibratorXorgPrint.cpp
+++ b/src/calibrator/calibratorXorgPrint.cpp
@@ -50,20 +50,7 @@ bool CalibratorXorgPrint::finish_data(const XYinfo new_axys, int swap_xy)
 
     // TODO: detect which are applicable at runtime/in the makefile ?
     printf("\n\n== Applying the calibration ==\n");
-    printf("There are multiple ways to do this: the tranditional way (xorg.conf), the new way (xorg.conf.d snippet) and the soon deprecated way (HAL policy):\n");
-
-    // Xorg.conf output
-    printf("\nxorg.conf: edit /etc/X11/xorg.conf and add in the 'Section \"InputDevice\"' of your device:\n");
-    printf("\tOption\t\"MinX\"\t\t\"%d\"\n",
-                new_axys.x_min);
-    printf("\tOption\t\"MaxX\"\t\t\"%d\"\n",
-                new_axys.x_max);
-    printf("\tOption\t\"MinY\"\t\t\"%d\"\n",
-                new_axys.y_min);
-    printf("\tOption\t\"MaxY\"\t\t\"%d\"\n",
-                new_axys.y_max);
-    if (swap_xy != 0)
-        printf("\tOption\t\"SwapXY\"\t\"%d\" # unless it was already set to 1\n", new_swap_xy);
+    printf("There are multiple ways to do this: the new way (xorg.conf.d snippet) and the soon deprecated way (HAL policy):\n");
 
     // xorg.conf.d snippet
     printf("\nxorg.conf.d snippet (RECOMMENDED): copy the snippet below into /etc/X11/xorg.conf.d/99-calibration.conf\n");