提交: 3bdd75af73f773ec1275118c2024c455fde8b858 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• 修订版: 3bdd75af73f773ec1275118c2024c455fde8b858 (tree)
• 时间: 2013-01-04 07:13:17
• 作者: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

--no-timeout for X11 gui

更改概述

• modified: src/gui/x11.cpp

差异

--- a/src/gui/x11.cpp
+++ b/src/gui/x11.cpp
@@ -276,10 +276,12 @@ void GuiCalibratorX11::redraw()
     }
 
     // Draw the clock background
-    XSetForeground(display, gc, pixel[DIMGRAY]);
-    XSetLineAttributes(display, gc, 0, LineSolid, CapRound, JoinRound);
-    XFillArc(display, win, gc, (display_width-clock_radius)/2, (display_height - clock_radius)/2,
-                clock_radius, clock_radius, 0, 360 * 64);
+    if(calibrator->get_use_timeout()){
+        XSetForeground(display, gc, pixel[DIMGRAY]);
+        XSetLineAttributes(display, gc, 0, LineSolid, CapRound, JoinRound);
+        XFillArc(display, win, gc, (display_width-clock_radius)/2, (display_height - clock_radius)/2,
+                    clock_radius, clock_radius, 0, 360 * 64);
+    }
 }
 
 bool GuiCalibratorX11::on_expose_event()
@@ -297,13 +299,15 @@ bool GuiCalibratorX11::on_timer_signal()
     }
 
     // Update clock
-    XSetForeground(display, gc, pixel[BLACK]);
-    XSetLineAttributes(display, gc, clock_line_width,
-                LineSolid, CapButt, JoinMiter);
-    XDrawArc(display, win, gc, (display_width-clock_radius+clock_line_width)/2,
-                (display_height-clock_radius+clock_line_width)/2,
-                clock_radius-clock_line_width, clock_radius-clock_line_width,
-                90*64, ((double)time_elapsed/(double)max_time) * -360 * 64);
+    if(calibrator->get_use_timeout()){
+        XSetForeground(display, gc, pixel[BLACK]);
+        XSetLineAttributes(display, gc, clock_line_width,
+                    LineSolid, CapButt, JoinMiter);
+        XDrawArc(display, win, gc, (display_width-clock_radius+clock_line_width)/2,
+                    (display_height-clock_radius+clock_line_width)/2,
+                    clock_radius-clock_line_width, clock_radius-clock_line_width,
+                    90*64, ((double)time_elapsed/(double)max_time) * -360 * 64);
+    }
 
     return true;
 }