提交: 6ca429f54c523268e87c76395bbd2a822d7d04d3 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• 修订版: 6ca429f54c523268e87c76395bbd2a822d7d04d3 (tree)
• 时间: 2013-02-08 05:32:56
• 作者: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

Merge pull request #47 from schnitzeltony/write-file-param

Add a new parameter --output-filename

更改概述

• modified: src/calibrator.cpp
• modified: src/calibrator.hh
• modified: src/calibrator/Evdev.cpp
• modified: src/calibrator/Evdev.hpp
• modified: src/calibrator/Usbtouchscreen.cpp
• modified: src/calibrator/Usbtouchscreen.hpp
• modified: src/calibrator/XorgPrint.cpp
• modified: src/calibrator/XorgPrint.hpp
• modified: src/main_common.cpp

差异

--- a/src/calibrator.cpp
+++ b/src/calibrator.cpp
@@ -37,10 +37,11 @@ bool Calibrator::verbose = false;
 Calibrator::Calibrator(const char* const device_name0, const XYinfo& axys0,
     const int thr_misclick, const int thr_doubleclick,
     const OutputType output_type0, const char* geometry0,
-    const bool use_timeout0)
+    const bool use_timeout0, const char* output_filename0)
 : device_name(device_name0),
     threshold_doubleclick(thr_doubleclick), threshold_misclick(thr_misclick),
-    output_type(output_type0), geometry(geometry0), use_timeout(use_timeout0)
+    output_type(output_type0), geometry(geometry0), use_timeout(use_timeout0),
+    output_filename(output_filename0)
 {
     old_axys = axys0;
 

--- a/src/calibrator.hh
+++ b/src/calibrator.hh
@@ -30,6 +30,9 @@
 #include <stdio.h>
 #include <vector>
 
+// XXX: we currently don't handle lines that are longer than this
+#define MAX_LINE_LEN 1024
+
 int xf86ScaleAxis(int Cx, int to_max, int to_min, int from_max, int from_min);
 float scaleAxis(float Cx, int to_max, int to_min, int from_max, int from_min);
 
@@ -145,9 +148,10 @@ public:
                const int thr_doubleclick=0,
                const OutputType output_type=OUTYPE_AUTO,
                const char* geometry=0,
-               const bool use_timeout=1);
+               const bool use_timeout=1,
+               const char* output_filename = 0);
 
-    ~Calibrator() {}
+    virtual ~Calibrator() {}
 
     /// set the doubleclick treshold
     void set_threshold_doubleclick(int t)
@@ -180,6 +184,10 @@ public:
     const bool get_use_timeout() const
     { return use_timeout; }
 
+    /// get output filename set at cmdline or NULL
+    const char* get_output_filename() const
+    { return output_filename; }
+
 protected:
     /// check whether the coordinates are along the respective axis
     bool along_axis(int xy, int x0, int y0);
@@ -230,6 +238,9 @@ protected:
     const char* geometry;
 
     const bool use_timeout;
+
+    // manually specified output filename
+    const char* output_filename;
 };
 
 // Interfance for a CalibratorTester

--- a/src/calibrator/Evdev.cpp
+++ b/src/calibrator/Evdev.cpp
@@ -47,8 +47,9 @@ CalibratorEvdev::CalibratorEvdev(const char* const device_name0,
                                  const int thr_doubleclick,
                                  const OutputType output_type,
                                  const char* geometry,
-                                 const bool use_timeout)
-  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry, use_timeout)
+                                 const bool use_timeout,
+                                 const char* output_filename)
+  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry, use_timeout, output_filename)
 {
     // init
     display = XOpenDisplay(NULL);
@@ -166,8 +167,9 @@ CalibratorEvdev::CalibratorEvdev(const char* const device_name0,
                                  const int thr_doubleclick,
                                  const OutputType output_type,
                                  const char* geometry,
-                                 const bool use_timeout)
-  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry) { }
+                                 const bool use_timeout,
+                                 const char* output_filename)
+  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry, output_filename) { }
 
 // Destructor
 CalibratorEvdev::~CalibratorEvdev () {
@@ -515,18 +517,41 @@ bool CalibratorEvdev::output_xorgconfd(const XYinfo new_axys)
     if (not_sysfs_name)
         sysfs_name = "!!Name_Of_TouchScreen!!";
 
+    if(output_filename == NULL || not_sysfs_name)
+        printf("  copy the snippet below into '/etc/X11/xorg.conf.d/99-calibration.conf' (/usr/share/X11/xorg.conf.d/ in some distro's)\n");
+    else
+        printf("  writing xorg.conf calibration data to '%s'\n", output_filename);
+
     // xorg.conf.d snippet
-    printf("  copy the snippet below into '/etc/X11/xorg.conf.d/99-calibration.conf' (/usr/share/X11/xorg.conf.d/ in some distro's)\n");
-    printf("Section \"InputClass\"\n");
-    printf("	Identifier	\"calibration\"\n");
-    printf("	MatchProduct	\"%s\"\n", sysfs_name);
-    printf("	Option	\"Calibration\"	\"%d %d %d %d\"\n",
+    char line[MAX_LINE_LEN];
+    std::string outstr;
+
+    outstr += "Section \"InputClass\"\n";
+    outstr += "	Identifier	\"calibration\"\n";
+    sprintf(line, "	MatchProduct	\"%s\"\n", sysfs_name);
+    outstr += line;
+    sprintf(line, "	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("EndSection\n");
+    outstr += line;
+    sprintf(line, "	Option	\"SwapAxes\"	\"%d\"\n", new_axys.swap_xy);
+    outstr += line;
+    outstr += "EndSection\n";
 
+    // console out
+    printf("%s", outstr.c_str());
     if (not_sysfs_name)
         printf("\nChange '%s' to your device's name in the snippet above.\n", sysfs_name);
+    // file out
+    else if(output_filename != NULL) {
+        FILE* fid = fopen(output_filename, "w");
+        if (fid == NULL) {
+            fprintf(stderr, "Error: Can't open '%s' for writing. Make sure you have the necessary rights\n", output_filename);
+            fprintf(stderr, "New calibration data NOT saved\n");
+            return false;
+        }
+        fprintf(fid, "%s", outstr.c_str());
+        fclose(fid);
+    }
 
     return true;
 }
@@ -538,26 +563,71 @@ bool CalibratorEvdev::output_hal(const XYinfo new_axys)
     if (not_sysfs_name)
         sysfs_name = "!!Name_Of_TouchScreen!!";
 
-    // HAL policy output
-    printf("  copy the policy below into '/etc/hal/fdi/policy/touchscreen.fdi'\n\
-<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);
-    printf("  <merge key=\"input.x11_options.swapaxes\" type=\"string\">%d</merge>\n", new_axys.swap_xy);
-    printf("</match>\n");
+    if(output_filename == NULL || not_sysfs_name)
+        printf("  copy the policy below into '/etc/hal/fdi/policy/touchscreen.fdi'\n");
+    else
+        printf("  writing HAL calibration data to '%s'\n", output_filename);
 
+    // HAL policy output
+    char line[MAX_LINE_LEN];
+    std::string outstr;
+
+    sprintf(line, "<match key=\"info.product\" contains=\"%s\">\n", sysfs_name);
+    outstr += line;
+    sprintf(line, "  <merge key=\"input.x11_options.calibration\" type=\"string\">%d %d %d %d</merge>\n",
+        new_axys.x.min, new_axys.x.max, new_axys.y.min, new_axys.y.max);
+    outstr += line;
+    sprintf(line, "  <merge key=\"input.x11_options.swapaxes\" type=\"string\">%d</merge>\n",
+        new_axys.swap_xy);
+    outstr += "</match>\n";
+    // console out
+    printf("%s", outstr.c_str());
     if (not_sysfs_name)
         printf("\nChange '%s' to your device's name in the config above.\n", sysfs_name);
+    // file out
+    else if(output_filename != NULL) {
+        FILE* fid = fopen(output_filename, "w");
+        if (fid == NULL) {
+            fprintf(stderr, "Error: Can't open '%s' for writing. Make sure you have the necessary rights\n", output_filename);
+            fprintf(stderr, "New calibration data NOT saved\n");
+            return false;
+        }
+        fprintf(fid, "%s", outstr.c_str());
+        fclose(fid);
+    }
 
     return true;
 }
 
 bool CalibratorEvdev::output_xinput(const XYinfo new_axys)
 {
+    if(output_filename == NULL)
+        printf("  Install the 'xinput' tool and copy the command(s) below in a script that starts with your X session\n");
+    else
+        printf("  writing calibration script to '%s'\n", output_filename);
+
     // 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);
-    printf("    xinput set-int-prop \"%s\" \"Evdev Axes Swap\" 8 %d\n", device_name, new_axys.swap_xy);
+    char line[MAX_LINE_LEN];
+    std::string outstr;
+
+    sprintf(line, "    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);
+    outstr += line;
+    sprintf(line, "    xinput set-int-prop \"%s\" \"Evdev Axes Swap\" 8 %d\n", device_name, new_axys.swap_xy);
+    outstr += line;
+
+    // console out
+    printf("%s", outstr.c_str());
+    // file out
+    if(output_filename != NULL) {
+		FILE* fid = fopen(output_filename, "w");
+		if (fid == NULL) {
+			fprintf(stderr, "Error: Can't open '%s' for writing. Make sure you have the necessary rights\n", output_filename);
+			fprintf(stderr, "New calibration data NOT saved\n");
+			return false;
+		}
+		fprintf(fid, "%s", outstr.c_str());
+		fclose(fid);
+    }
 
     return true;
 }

--- a/src/calibrator/Evdev.hpp
+++ b/src/calibrator/Evdev.hpp
@@ -47,7 +47,8 @@ protected:
                     const int thr_doubleclick=0,
                     const OutputType output_type=OUTYPE_AUTO,
                     const char* geometry=0,
-                    const bool use_timeout=false);
+                    const bool use_timeout=false,
+                    const char* output_filename = 0);
 
 public:
     CalibratorEvdev(const char* const device_name,
@@ -57,8 +58,9 @@ public:
                     const int thr_doubleclick=0,
                     const OutputType output_type=OUTYPE_AUTO,
                     const char* geometry=0,
-                    const bool use_timeout=false);
-    ~CalibratorEvdev();
+                    const bool use_timeout=false,
+                    const char* output_filename = 0);
+    virtual ~CalibratorEvdev();
 
     /// calculate and apply the calibration
     virtual bool finish(int width, int height);

--- a/src/calibrator/Usbtouchscreen.cpp
+++ b/src/calibrator/Usbtouchscreen.cpp
@@ -48,8 +48,8 @@ static const char *p_flip_x = "flip_x";
 static const char *p_flip_y = "flip_y";
 static const char *p_swap_xy = "swap_xy";
 
-CalibratorUsbtouchscreen::CalibratorUsbtouchscreen(const char* const device_name0, const XYinfo& axys0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry, const bool use_timeout)
-  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry, use_timeout)
+CalibratorUsbtouchscreen::CalibratorUsbtouchscreen(const char* const device_name0, const XYinfo& axys0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry, const bool use_timeout, const char* output_filename)
+  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry, use_timeout, output_filename)
 {
     if (strcmp(device_name, "Usbtouchscreen") != 0)
         throw WrongCalibratorException("Not a usbtouchscreen device");
@@ -104,16 +104,17 @@ bool CalibratorUsbtouchscreen::finish_data(const XYinfo new_axys)
     write_bool_parameter(p_swap_xy, new_axys.swap_xy);
 
     // Read, then write calibration parameters to modprobe_conf_local,
-    // to keep the for the next boot
-    FILE *fid = fopen(modprobe_conf_local, "r");
+    // or the file set by --output-filename to keep the for the next boot
+    const char* filename = output_filename == NULL ? modprobe_conf_local : output_filename;
+    FILE *fid = fopen(filename, "r");
     if (fid == NULL) {
-        fprintf(stderr, "Error: Can't open '%s' for reading. Make sure you have the necessary rights\n", modprobe_conf_local);
+        fprintf(stderr, "Error: Can't open '%s' for reading. Make sure you have the necessary rights\n", filename);
         fprintf(stderr, "New calibration data NOT saved\n");
         return false;
     }
 
     std::string new_contents;
-    const int len = 1024; // XXX: we currently don't handle lines that are longer than this
+    const int len = MAX_LINE_LEN;
     char line[len];
     const char *opt = "options usbtouchscreen";
     const int opt_len = strlen(opt);
@@ -135,9 +136,9 @@ bool CalibratorUsbtouchscreen::finish_data(const XYinfo new_axys)
          p_flip_y, yesno(flip_y), p_swap_xy, yesno(new_axys.swap_xy));
     new_contents += new_opt;
 
-    fid = fopen(modprobe_conf_local, "w");
+    fid = fopen(filename, "w");
     if (fid == NULL) {
-        fprintf(stderr, "Error: Can't open '%s' for writing. Make sure you have the necessary rights\n", modprobe_conf_local);
+        fprintf(stderr, "Error: Can't open '%s' for writing. Make sure you have the necessary rights\n", filename);
         fprintf(stderr, "New calibration data NOT saved\n");
         return false;
     }

--- a/src/calibrator/Usbtouchscreen.hpp
+++ b/src/calibrator/Usbtouchscreen.hpp
@@ -35,8 +35,8 @@ public:
     CalibratorUsbtouchscreen(const char* const device_name, const XYinfo& axys,
          const int thr_misclick=0, const int thr_doubleclick=0,
         const OutputType output_type=OUTYPE_AUTO, const char* geometry=0,
-        const bool use_timeout=false);
-    ~CalibratorUsbtouchscreen();
+        const bool use_timeout=false, const char* output_filename = 0);
+    virtual ~CalibratorUsbtouchscreen();
 
     virtual bool finish_data(const XYinfo new_axys);
 

--- a/src/calibrator/XorgPrint.cpp
+++ b/src/calibrator/XorgPrint.cpp
@@ -24,8 +24,8 @@
 
 #include <cstdio>
 
-CalibratorXorgPrint::CalibratorXorgPrint(const char* const device_name0, const XYinfo& axys0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry, const bool use_timeout)
-  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry, use_timeout)
+CalibratorXorgPrint::CalibratorXorgPrint(const char* const device_name0, const XYinfo& axys0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry, const bool use_timeout, const char* output_filename)
+  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry, use_timeout, output_filename)
 {
     printf("Calibrating standard Xorg driver \"%s\"\n", device_name);
     printf("\tcurrent calibration values: min_x=%d, max_x=%d and min_y=%d, max_y=%d\n",
@@ -69,22 +69,50 @@ bool CalibratorXorgPrint::output_xorgconfd(const XYinfo new_axys)
     if (not_sysfs_name)
         sysfs_name = "!!Name_Of_TouchScreen!!";
 
+    if(output_filename == NULL || not_sysfs_name)
+        printf("  copy the snippet below into '/etc/X11/xorg.conf.d/99-calibration.conf' (/usr/share/X11/xorg.conf.d/ in some distro's)\n");
+    else
+        printf("  writing calibration script to '%s'\n", output_filename);
+
     // xorg.conf.d snippet
-    printf("  copy the snippet below into '/etc/X11/xorg.conf.d/99-calibration.conf' (/usr/share/X11/xorg.conf.d/ in some distro's)\n");
-    printf("Section \"InputClass\"\n");
-    printf("	Identifier	\"calibration\"\n");
-    printf("	MatchProduct	\"%s\"\n", sysfs_name);
-    printf("	Option	\"MinX\"	\"%d\"\n", new_axys.x.min);
-    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);
-    printf("	Option	\"SwapXY\"	\"%d\" # unless it was already set to 1\n", new_axys.swap_xy);
-    printf("	Option	\"InvertX\"	\"%d\"  # unless it was already set\n", new_axys.x.invert);
-    printf("	Option	\"InvertY\"	\"%d\"  # unless it was already set\n", new_axys.y.invert);
-    printf("EndSection\n");
+    char line[MAX_LINE_LEN];
+    std::string outstr;
+
+    outstr += "Section \"InputClass\"\n";
+    outstr += "	Identifier	\"calibration\"\n";
+    sprintf(line, "	MatchProduct	\"%s\"\n", sysfs_name);
+    outstr += line;
+    sprintf(line, "	Option	\"MinX\"	\"%d\"\n", new_axys.x.min);
+    outstr += line;
+    sprintf(line, "	Option	\"MaxX\"	\"%d\"\n", new_axys.x.max);
+    outstr += line;
+    sprintf(line, "	Option	\"MinY\"	\"%d\"\n", new_axys.y.min);
+    outstr += line;
+    sprintf(line, "	Option	\"MaxY\"	\"%d\"\n", new_axys.y.max);
+    outstr += line;
+    sprintf(line, "	Option	\"SwapXY\"	\"%d\" # unless it was already set to 1\n", new_axys.swap_xy);
+    outstr += line;
+    sprintf(line, "	Option	\"InvertX\"	\"%d\"  # unless it was already set\n", new_axys.x.invert);
+    outstr += line;
+    sprintf(line, "	Option	\"InvertY\"	\"%d\"  # unless it was already set\n", new_axys.y.invert);
+    outstr += line;
+    outstr += "EndSection\n";
 
+    // console out
+    printf("%s", outstr.c_str());
     if (not_sysfs_name)
         printf("\nChange '%s' to your device's name in the config above.\n", sysfs_name);
+    // file out
+    else if(output_filename != NULL) {
+        FILE* fid = fopen(output_filename, "w");
+        if (fid == NULL) {
+            fprintf(stderr, "Error: Can't open '%s' for writing. Make sure you have the necessary rights\n", output_filename);
+            fprintf(stderr, "New calibration data NOT saved\n");
+            return false;
+        }
+        fprintf(fid, "%s", outstr.c_str());
+        fclose(fid);
+    }
 
     return true;
 }
@@ -96,21 +124,48 @@ bool CalibratorXorgPrint::output_hal(const XYinfo new_axys)
     if (not_sysfs_name)
         sysfs_name = "!!Name_Of_TouchScreen!!";
 
+    if(output_filename == NULL || not_sysfs_name)
+        printf("  copy the policy below into '/etc/hal/fdi/policy/touchscreen.fdi'\n");
+    else
+        printf("  writing HAL calibration data to '%s'\n", output_filename);
+
     // HAL policy output
-    printf("  copy the policy below into '/etc/hal/fdi/policy/touchscreen.fdi'\n\
-<match key=\"info.product\" contains=\"%s\">\n\
-  <merge key=\"input.x11_options.minx\" type=\"string\">%d</merge>\n\
-  <merge key=\"input.x11_options.maxx\" type=\"string\">%d</merge>\n\
-  <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);
-    printf("  <merge key=\"input.x11_options.swapxy\" 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");
+    char line[MAX_LINE_LEN];
+    std::string outstr;
+
+    sprintf(line, "<match key=\"info.product\" contains=\"%s\">\n", sysfs_name);
+    outstr += line;
+    sprintf(line, "  <merge key=\"input.x11_options.minx\" type=\"string\">%d</merge>\n", new_axys.x.min);
+    outstr += line;
+    sprintf(line, "  <merge key=\"input.x11_options.maxx\" type=\"string\">%d</merge>\n", new_axys.x.max);
+    outstr += line;
+    sprintf(line, "  <merge key=\"input.x11_options.miny\" type=\"string\">%d</merge>\n", new_axys.y.min);
+    outstr += line;
+    sprintf(line, "  <merge key=\"input.x11_options.maxy\" type=\"string\">%d</merge>\n", new_axys.y.max);
+    outstr += line;
+    sprintf(line, "  <merge key=\"input.x11_options.swapxy\" type=\"string\">%d</merge>\n", new_axys.swap_xy);
+    outstr += line;
+    sprintf(line, "  <merge key=\"input.x11_options.invertx\" type=\"string\">%d</merge>\n", new_axys.x.invert);
+    outstr += line;
+    sprintf(line, "  <merge key=\"input.x11_options.inverty\" type=\"string\">%d</merge>\n", new_axys.y.invert);
+    outstr += line;
+    outstr += "</match>\n";
 
+    // console out
+    printf("%s", outstr.c_str());
     if (not_sysfs_name)
         printf("\nChange '%s' to your device's name in the config above.\n", sysfs_name);
+    // file out
+    else if(output_filename != NULL) {
+        FILE* fid = fopen(output_filename, "w");
+        if (fid == NULL) {
+            fprintf(stderr, "Error: Can't open '%s' for writing. Make sure you have the necessary rights\n", output_filename);
+            fprintf(stderr, "New calibration data NOT saved\n");
+            return false;
+        }
+        fprintf(fid, "%s", outstr.c_str());
+        fclose(fid);
+    }
 
     return true;
 }

--- a/src/calibrator/XorgPrint.hpp
+++ b/src/calibrator/XorgPrint.hpp
@@ -35,7 +35,7 @@ public:
     CalibratorXorgPrint(const char* const device_name, const XYinfo& axys,
         const int thr_misclick=0, const int thr_doubleclick=0,
         const OutputType output_type=OUTYPE_AUTO, const char* geometry=0,
-        const bool use_timeout=false);
+        const bool use_timeout=false, const char* output_filename = 0);
 
     virtual bool finish_data(const XYinfo new_axys);
 

--- a/src/main_common.cpp
+++ b/src/main_common.cpp
@@ -180,6 +180,7 @@ static void usage(char* cmd, unsigned thr_misclick)
     fprintf(stderr, "\t--fake: emulate a fake device (for testing purposes)\n");
     fprintf(stderr, "\t--geometry: manually provide the geometry (width and height) for the calibration window\n");
     fprintf(stderr, "\t--no-timeout: turns off the timeout\n");
+    fprintf(stderr, "\t--output-filename: write calibration data to file (USB: override default /etc/modprobe.conf.local\n");
 }
 
 Calibrator* Calibrator::make_calibrator(int argc, char** argv)
@@ -191,6 +192,7 @@ Calibrator* Calibrator::make_calibrator(int argc, char** argv)
     XYinfo pre_axys;
     const char* pre_device = NULL;
     const char* geometry = NULL;
+    const char* output_filename = NULL;
     unsigned thr_misclick = 15;
     unsigned thr_doubleclick = 7;
     OutputType output_type = OUTYPE_AUTO;
@@ -289,6 +291,11 @@ Calibrator* Calibrator::make_calibrator(int argc, char** argv)
             // Disable timeout
 			if (strcmp("--no-timeout", argv[i]) == 0) {
 				use_timeout = false;
+			} else
+
+			// Output file
+			if (strcmp("--output-filename", argv[i]) == 0) {
+				output_filename = argv[++i];
 			}
 
             // unknown option
@@ -363,7 +370,8 @@ Calibrator* Calibrator::make_calibrator(int argc, char** argv)
     try {
         // try Usbtouchscreen driver
         return new CalibratorUsbtouchscreen(device_name, device_axys,
-            thr_misclick, thr_doubleclick, output_type, geometry, use_timeout);
+            thr_misclick, thr_doubleclick, output_type, geometry,
+            use_timeout, output_filename);
 
     } catch(WrongCalibratorException& x) {
         if (verbose)
@@ -373,7 +381,8 @@ Calibrator* Calibrator::make_calibrator(int argc, char** argv)
     try {
         // next, try Evdev driver (with XID)
         return new CalibratorEvdev(device_name, device_axys, device_id,
-            thr_misclick, thr_doubleclick, output_type, geometry, use_timeout);
+            thr_misclick, thr_doubleclick, output_type, geometry,
+            use_timeout, output_filename);
 
     } catch(WrongCalibratorException& x) {
         if (verbose)
@@ -382,5 +391,6 @@ Calibrator* Calibrator::make_calibrator(int argc, char** argv)
 
     // lastly, presume a standard Xorg driver (evtouch, mutouch, ...)
     return new CalibratorXorgPrint(device_name, device_axys,
-            thr_misclick, thr_doubleclick, output_type, geometry, use_timeout);
+            thr_misclick, thr_doubleclick, output_type, geometry,
+            use_timeout, output_filename);
 }