Commit: 496d4401731c6e5ed550e446cc2fc4b12d999ad8 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revisión: 496d4401731c6e5ed550e446cc2fc4b12d999ad8 (tree)
• Tiempo: 2010-03-01 07:14:10
• Autor: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

rudimentary mis-click GUI for x11

Cambiar Resumen

• modified: src/calibrator.cpp
• modified: src/gui/gui_x11.cpp

Diferencia incremental

--- a/src/calibrator.cpp
+++ b/src/calibrator.cpp
@@ -46,6 +46,7 @@ int Calibrator::get_numclicks()
 bool Calibrator::add_click(int x, int y)
 {
     // Double-click detection
+    // actually, it is still possible to click on a previous point
     if (num_clicks > 0 && threshold_doubleclick > 0
      && abs (x - clicked_x[num_clicks-1]) < threshold_doubleclick
      && abs (y - clicked_y[num_clicks-1]) < threshold_doubleclick) {
@@ -57,6 +58,8 @@ bool Calibrator::add_click(int x, int y)
     }
 
     // Mis-click detection, check second and third point with first point
+    // actually, check that different axes...
+    // and check that threshold_misclick > 0
     if ((num_clicks == 1 || num_clicks == 2) &&
         (abs (x - clicked_x[0]) > threshold_misclick
          && abs (x - clicked_y[0]) > threshold_misclick

--- a/src/gui/gui_x11.cpp
+++ b/src/gui/gui_x11.cpp
@@ -95,6 +95,7 @@ protected:
 
     // Helper functions
     void redraw();
+    void draw_message(const char* msg);
 
 private:
     static GuiCalibratorX11* instance;
@@ -261,14 +262,22 @@ bool GuiCalibratorX11::on_timer_signal()
 
 bool GuiCalibratorX11::on_button_press_event(XEvent event)
 {
+    // Clear window, maybe a bit overdone, but easiest for me atm.
+    // (goal is to clear possible message and other clicks)
+    XClearWindow(display, win);
+
     // Handle click
     time_elapsed = 0;
-    calibrator->add_click(event.xbutton.x, event.xbutton.y);
+    bool success = calibrator->add_click(event.xbutton.x, event.xbutton.y);
+
+    if (!success && calibrator->get_numclicks() == 0) {
+        draw_message("Mis-click detected, restarting...");
+    }
 
     // Are we done yet?
     if (calibrator->get_numclicks() >= 4) {
         // Recalibrate
-        bool success = calibrator->finish(display_width, display_height);
+        success = calibrator->finish(display_width, display_height);
 
         if (success) {
             exit(0);
@@ -285,6 +294,21 @@ bool GuiCalibratorX11::on_button_press_event(XEvent event)
     return true;
 }
 
+void GuiCalibratorX11::draw_message(const char* msg)
+{
+    int text_height = font_info->ascent + font_info->descent;
+    int text_width = XTextWidth(font_info, msg, strlen(msg));
+
+    int x = (display_width - text_width) / 2;
+    int y = (display_height - text_height) / 2 + clock_radius + 60;
+    XSetForeground(display, gc, pixel[BLACK]);
+    XSetLineAttributes(display, gc, 2, LineSolid, CapRound, JoinRound);
+    XDrawRectangle(display, win, gc, x - 10, y - text_height - 10,
+                text_width + 20, text_height + 25);
+
+    XDrawString(display, win, gc, x, y, msg, strlen(msg));
+}
+
 void GuiCalibratorX11::give_timer_signal()
 {
     if (instance != NULL) {