提交: c4d1e1159635603fe7b512a95599071914e52afa - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• 修订版: c4d1e1159635603fe7b512a95599071914e52afa (tree)
• 时间: 2013-02-15 00:31:32
• 作者: Jeff Lasslett <jeff.lasslett@gmai...>
• Commiter: Andreas Müller

Log Message

Prevent timeout exit when --no-timeout is used

Submitted https://github.com/tias/xinput_calibrator/pull/45

Signed-off-by: Jeff Lasslett <[e-mail]>

更改概述

• modified: src/gui/gtkmm.cpp
• modified: src/gui/x11.cpp

差异

--- a/src/gui/gtkmm.cpp
+++ b/src/gui/gtkmm.cpp
@@ -204,21 +204,23 @@ void CalibrationArea::redraw()
 
 bool CalibrationArea::on_timer_signal()
 {
-    time_elapsed += time_step;
-    if (time_elapsed > max_time) {
-        exit(0);
-    }
-
-    // Update clock
-    Glib::RefPtr<Gdk::Window> win = get_window();
-    if (win) {
-        const Gdk::Rectangle rect(display_width/2 - clock_radius - clock_line_width,
-                                 display_height/2 - clock_radius - clock_line_width,
-                                 2 * clock_radius + 1 + 2 * clock_line_width,
-                                 2 * clock_radius + 1 + 2 * clock_line_width);
-        win->invalidate_rect(rect, false);
+    if (calibrator->get_use_timeout()) {
+        time_elapsed += time_step;
+        if (time_elapsed > max_time) {
+            exit(0);
+        }
+    
+        // Update clock
+        Glib::RefPtr<Gdk::Window> win = get_window();
+        if (win) {
+            const Gdk::Rectangle rect(display_width/2 - clock_radius - clock_line_width,
+                                     display_height/2 - clock_radius - clock_line_width,
+                                     2 * clock_radius + 1 + 2 * clock_line_width,
+                                     2 * clock_radius + 1 + 2 * clock_line_width);
+            win->invalidate_rect(rect, false);
+        }
     }
-
+    
     return true;
 }
 

--- a/src/gui/x11.cpp
+++ b/src/gui/x11.cpp
@@ -293,13 +293,14 @@ bool GuiCalibratorX11::on_expose_event()
 
 bool GuiCalibratorX11::on_timer_signal()
 {
-    time_elapsed += time_step;
-    if (time_elapsed > max_time) {
-        exit(0);
-    }
-
     // Update clock
-    if(calibrator->get_use_timeout()){
+    if(calibrator->get_use_timeout()) {
+
+        time_elapsed += time_step;
+        if (time_elapsed > max_time) {
+            exit(0);
+        }
+
         XSetForeground(display, gc, pixel[BLACK]);
         XSetLineAttributes(display, gc, clock_line_width,
                     LineSolid, CapButt, JoinMiter);