Commit: dd263d405a8ae109e1439c52dbabb55352d95bd0 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revision: dd263d405a8ae109e1439c52dbabb55352d95bd0 (tree)
• Time: 2013-01-23 02:34:11
• Author: Andreas Müller <schnitzeltony@goog...>
• Commiter: Andreas Müller

Log Message

Set up buffer size for max line length only once in calibrator.hh

Signed-off-by: Andreas Müller <[e-mail]>

Change Summary

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

Incremental Difference

--- 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);
 

--- a/src/calibrator/Evdev.cpp
+++ b/src/calibrator/Evdev.cpp
@@ -39,9 +39,6 @@
 #define EXIT_FAILURE 0
 #endif
 
-// XXX: we currently don't handle lines that are longer than this
-#define MAX_LINE_LEN 1024
-
 // Constructor
 CalibratorEvdev::CalibratorEvdev(const char* const device_name0,
                                  const XYinfo& axys0,

--- a/src/calibrator/Usbtouchscreen.cpp
+++ b/src/calibrator/Usbtouchscreen.cpp
@@ -114,7 +114,7 @@ bool CalibratorUsbtouchscreen::finish_data(const XYinfo new_axys)
     }
 
     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);

--- a/src/calibrator/XorgPrint.cpp
+++ b/src/calibrator/XorgPrint.cpp
@@ -24,9 +24,6 @@
 
 #include <cstdio>
 
-// XXX: we currently don't handle lines that are longer than this
-#define MAX_LINE_LEN 1024
-
 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)
 {