Commit: 5a0f5d1eda1a814d7690af3291b3323f41277ce8 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revision: 5a0f5d1eda1a814d7690af3291b3323f41277ce8 (tree)
• Time: 2010-01-24 07:17:38
• Author: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

use exceptions to detect if a calibrator is applicable or not

A constructor will throw a custom exception if it is not applicable,
this reduces code duplication in the evdev calibrator.
Also cleaned up the messages in the constructors.

Change Summary

• modified: calibrators/calibratorEvdev.cpp
• modified: calibrators/calibratorUsbtouchscreen.cpp
• modified: calibrators/calibratorXorgPrint.cpp
• modified: main_common.hpp

Incremental Difference

--- a/calibrators/calibratorEvdev.cpp
+++ b/calibrators/calibratorEvdev.cpp
@@ -49,8 +49,6 @@ public:
 
     virtual bool finish_data(const XYinfo new_axys, int swap_xy);
 
-    static Bool check_driver(const char* const name);
-
     // xinput functions (from the xinput source)
     static Atom parse_atom(Display *display, const char* name);
     static XDeviceInfo* find_device_info(Display *display, const char* name, Bool only_extended);
@@ -60,42 +58,48 @@ public:
 CalibratorEvdev::CalibratorEvdev(const char* const drivername0, const XYinfo& axys0)
   : Calibrator(drivername0, axys0)
 {
-    printf("Calibrating EVDEV driver for \"%s\"\n", drivername);
-
     // init
     display = XOpenDisplay(NULL);
     if (display == NULL) {
-        fprintf(stderr, "Unable to connect to X server\n");
-        return;
+        throw WrongCalibratorException("Evdev: Unable to connect to X server");
     }
 
     info = find_device_info(display, drivername, False);
     if (!info) {
-        fprintf(stderr, "unable to find device %s\n", drivername);
-        return;
+        XCloseDisplay(display);
+        throw WrongCalibratorException("Evdev: Unable to find device");
     }
 
     dev = XOpenDevice(display, info->id);
     if (!dev) {
-        fprintf(stderr, "unable to open device '%s'\n", info->name);
-        return;
+        XCloseDisplay(display);
+        throw WrongCalibratorException("Evdev: Unable to open device");
     }
 
-    // get "Evdev Axis Calibration" property
-    Atom            property = parse_atom(display, "Evdev Axis Calibration");
+    // XGetDeviceProperty vars
+    Atom            property;
     Atom            act_type;
     int             act_format;
     unsigned long   nitems, bytes_after;
     unsigned char   *data, *ptr;
+
+    // get "Evdev Axis Calibration" property
+    property = parse_atom(display, "Evdev Axis Calibration");
     if (XGetDeviceProperty(display, dev, property, 0, 1000, False,
                            AnyPropertyType, &act_type, &act_format,
-                           &nitems, &bytes_after, &data) == Success)
+                           &nitems, &bytes_after, &data) != Success)
     {
+        XCloseDevice(display, dev);
+        XCloseDisplay(display);
+        throw WrongCalibratorException("Evdev: \"Evdev Axis Calibration\" property missing, not a (valid) evdev device");
+
+    } else {
         if (act_format != 32 || act_type != XA_INTEGER) {
-            fprintf(stderr, "Error: unexpected format or type from \"Evdev Axis Calibration\" property.\n");
-        }
+            XCloseDevice(display, dev);
+            XCloseDisplay(display);
+            throw WrongCalibratorException("Evdev: invalid \"Evdev Axis Calibration\" property format");
 
-        if (nitems != 0) {
+        } else if (nitems != 0) {
             ptr = data;
 
             old_axys.x_min = *((long*)ptr);
@@ -106,14 +110,16 @@ CalibratorEvdev::CalibratorEvdev(const char* const drivername0, const XYinfo& ax
             ptr += sizeof(long);
             old_axys.y_max = *((long*)ptr);
             ptr += sizeof(long);
-
-            printf("Read current calibration data from XInput: min_x=%d, max_x=%d and min_y=%d, max_y=%d\n",
-                old_axys.x_min, old_axys.x_max, old_axys.y_min, old_axys.y_max);
         }
 
         XFree(data);
-    } else
-        printf("\tFetch failure for 'Evdev Axis Calibration', continuing nonetheless\n");
+    }
+
+    // TODO: swap_xy and flip_x/flip_y stuff
+
+    printf("Calibrating EVDEV driver for \"%s\"\n", drivername);
+    printf("\tcurrent calibration values (from XInput): min_x=%d, max_x=%d and min_y=%d, max_y=%d\n",
+                old_axys.x_min, old_axys.x_max, old_axys.y_min, old_axys.y_max);
 }
 
 CalibratorEvdev::~CalibratorEvdev () {
@@ -178,62 +184,6 @@ bool CalibratorEvdev::finish_data(const XYinfo new_axys, int swap_xy)
     return success;
 }
 
-Bool CalibratorEvdev::check_driver(const char *name) {
-    Display     *display;
-    XDeviceInfo *info;
-    XDevice     *dev;
-    int         nprops;
-    Atom        *props;
-    Bool        found = False;
-
-    display = XOpenDisplay(NULL);
-    if (display == NULL) {
-        //fprintf(stderr, "Unable to connect to X server");
-        return false;
-    }
-
-    info = find_device_info(display, name, False);
-    if (!info)
-    {
-        XCloseDisplay(display);
-        //fprintf(stderr, "unable to find device %s\n", name);
-        return false;
-    }
-
-    dev = XOpenDevice(display, info->id);
-    if (!dev)
-    {
-        XCloseDisplay(display);
-        //fprintf(stderr, "unable to open device '%s'\n", info->name);
-        return false;
-    }
-
-    props = XListDeviceProperties(display, dev, &nprops);
-    if (!nprops)
-    {
-        XCloseDevice(display, dev);
-        XCloseDisplay(display);
-        //printf("Device '%s' does not report any properties.\n", info->name);
-        return false;
-    }
-
-    // check if "Evdev Axis Calibration" exists, then its an evdev driver
-    while(nprops--)
-    {
-        if (strcmp(XGetAtomName(display, props[nprops]),
-                   "Evdev Axis Calibration") == 0) {
-            found = True;
-            break;
-        }
-    }
-
-    XFree(props);
-    XCloseDevice(display, dev);
-    XCloseDisplay(display);
-
-    return found;
-}
-
 Atom CalibratorEvdev::parse_atom(Display *display, const char *name) {
     Bool is_atom = True;
     int i;

--- a/calibrators/calibratorUsbtouchscreen.cpp
+++ b/calibrators/calibratorUsbtouchscreen.cpp
@@ -135,6 +135,9 @@ protected:
 CalibratorUsbtouchscreen::CalibratorUsbtouchscreen(const char* const drivername0, const XYinfo& axys0)
   : Calibrator(drivername0, axys0)
 {
+    if (strcmp(drivername, "Usbtouchscreen") != 0)
+        throw WrongCalibratorException("Not a usbtouchscreen device");
+
     // Reset the currently running kernel
     read_bool_parameter(p_transform_xy, val_transform_xy);
     read_bool_parameter(p_flip_x, val_flip_x);
@@ -145,6 +148,8 @@ CalibratorUsbtouchscreen::CalibratorUsbtouchscreen(const char* const drivername0
     write_bool_parameter(p_flip_x, false);
     write_bool_parameter(p_flip_y, false);
     write_bool_parameter(p_swap_xy, false);
+
+    printf("Calibrating Usbtouchscreen, through the kernel module\n");
 }
 
 CalibratorUsbtouchscreen::~CalibratorUsbtouchscreen()

--- a/calibrators/calibratorXorgPrint.cpp
+++ b/calibrators/calibratorXorgPrint.cpp
@@ -35,10 +35,10 @@ public:
 CalibratorXorgPrint::CalibratorXorgPrint(const char* const drivername0, const XYinfo& axys0)
   : Calibrator(drivername0, axys0)
 {
-    printf ("Calibrating Xorg driver \"%s\" (currently having min_x=%d, max_x=%d and min_y=%d, max_y=%d)\n",
-                drivername, old_axys.x_min, old_axys.x_max,
-                old_axys.y_min, old_axys.y_max);
-    printf("\tIf the current calibration data is estimated wrong then either supply it manually with --precalib <minx> <maxx> <miny> <maxy> or run the 'get_precalib.sh' script to automatically get it from your current Xorg configuration (through hal).\n");
+    printf("Calibrating standard Xorg driver \"%s\"\n", drivername);
+    printf("\tcurrent calibration values: min_x=%d, max_x=%d and min_y=%d, max_y=%d\n",
+                old_axys.x_min, old_axys.x_max, old_axys.y_min, old_axys.y_max);
+    printf("\tIf these values are estimated wrong, either supply it manually with the --precalib option, or run the 'get_precalib.sh' script to automatically get it (through HAL).\n");
 }
 
 bool CalibratorXorgPrint::finish_data(const XYinfo new_axys, int swap_xy)

--- a/main_common.hpp
+++ b/main_common.hpp
@@ -79,6 +79,12 @@ struct XYinfo {
          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) {}
+};
+
 // all need struct XYinfo, and some the consts too
 #include "calibrator.cpp"
 #include "calibrators/calibratorXorgPrint.cpp"
@@ -227,21 +233,26 @@ Calibrator* main_common(int argc, char** argv)
             axys.y_max = pre_axys.y_max;
     }
 
-    Calibrator* calibrator;
+
     // Different driver, different backend behaviour
-    if (strcmp(drivername, "Usbtouchscreen") == 0)
+    try {
         // Usbtouchscreen driver
-        calibrator = new CalibratorUsbtouchscreen(drivername, axys);
-    else {
-        // unable to know device driver from its name alone
-        // either its EVDEV or a normal Xorg touchscreen driver
-        if (CalibratorEvdev::check_driver(drivername)) {
-            // Evdev driver
-            calibrator = new CalibratorEvdev(drivername, axys);
-        } else {
-            // EVTouch is handled as a normal Xorg driver
-            calibrator = new CalibratorXorgPrint(drivername, axys);
-        }
+        return new CalibratorUsbtouchscreen(drivername, axys);
+
+    } catch(WrongCalibratorException& x) {
+        // TODO: verbose output
+        //printf("%s\n", x.what());
     }
-    return calibrator;
+
+    try {
+        // next, try Evdev driver
+        return new CalibratorEvdev(drivername, axys);
+
+    } catch(WrongCalibratorException& x) {
+        // TODO: verbose output
+        //printf("%s\n", x.what());
+    }
+
+    // lastly, presume a standard Xorg driver (evtouch, mutouch, ...)
+    return new CalibratorXorgPrint(drivername, axys);
 }