提交: 42dc87f2ad6843a0998485bd2141984baee7f387 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• 修订版: 42dc87f2ad6843a0998485bd2141984baee7f387 (tree)
• 时间: 2010-07-07 05:16:59
• 作者: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

add --misclick <nr of pixels> as runtime option

更改概述

• modified: src/main_common.hpp

差异

--- a/src/main_common.hpp
+++ b/src/main_common.hpp
@@ -220,14 +220,16 @@ int find_device(const char* pre_device, bool verbose, bool list_devices,
     return found;
 }
 
-static void usage(char* cmd)
+static void usage(char* cmd, unsigned thr_misclick)
 {
-    fprintf(stderr, "Usage: %s [-h|--help] [-v|--verbose] [--list] [--device <device name or id>] [--precalib <minx> <maxx> <miny> <maxy>] [--fake]\n", cmd);
+    fprintf(stderr, "Usage: %s [-h|--help] [-v|--verbose] [--list] [--device <device name or id>] [--precalib <minx> <maxx> <miny> <maxy>] [--misclick <nr of pixels>] [--fake]\n", cmd);
     fprintf(stderr, "\t-h, --help: print this help message\n");
     fprintf(stderr, "\t-v, --verbose: print debug messages during the process\n");
     fprintf(stderr, "\t--list: list calibratable input devices and quit\n");
     fprintf(stderr, "\t--device <device name or id>: select a specific device to calibrate\n");
-    fprintf(stderr, "\t--precalib: manually provide the current calibration setting (eg the values in xorg.conf)\n");
+    fprintf(stderr, "\t--precalib: manually provide the current calibration setting (eg. the values in xorg.conf)\n");
+    fprintf(stderr, "\t--misclick: set the misclick threshold (0=off, default: %i pixels)\n",
+        thr_misclick);
     fprintf(stderr, "\t--fake: emulate a fake device (for testing purposes)\n");
 }
 
@@ -250,7 +252,7 @@ Calibrator* main_common(int argc, char** argv)
             if (strcmp("-h", argv[i]) == 0 ||
                 strcmp("--help", argv[i]) == 0) {
                 fprintf(stderr, "xinput_calibratior, v%s\n\n", VERSION);
-                usage(argv[0]);
+                usage(argv[0], thr_misclick);
                 exit(0);
             } else
 
@@ -271,7 +273,7 @@ Calibrator* main_common(int argc, char** argv)
                     pre_device = argv[++i];
                 else {
                     fprintf(stderr, "Error: --device needs a device name or id as argument; use --list to list the calibratable input devices.\n\n");
-                    usage(argv[0]);
+                    usage(argv[0], thr_misclick);
                     exit(1);
                 }
             } else
@@ -289,6 +291,17 @@ Calibrator* main_common(int argc, char** argv)
                     pre_axys.y_max = atoi(argv[++i]);
             } else
 
+            // Get mis-click threshold ?
+            if (strcmp("--misclick", argv[i]) == 0) {
+                if (argc > i+1)
+                    thr_misclick = atoi(argv[++i]);
+                else {
+                    fprintf(stderr, "Error: --misclick needs a number (the pixel threshold) as argument. Set to 0 to disable mis-click detection.\n\n");
+                    usage(argv[0], thr_misclick);
+                    exit(1);
+                }
+            } else
+
             // Fake calibratable device ?
             if (strcmp("--fake", argv[i]) == 0) {
                 fake = true;
@@ -297,7 +310,7 @@ Calibrator* main_common(int argc, char** argv)
             // unknown option
             else {
                 fprintf(stderr, "Unknown option: %s\n\n", argv[i]);
-                usage(argv[0]);
+                usage(argv[0], thr_misclick);
                 exit(0);
             }
         }