50b39dc570
The calibration utility was modified in cf408c27b0 to return unitless
padding measurements instead of axis values for storage in gsettings.
Unfortunately, the code still assumes in some places that it is working
with axes rather than paddings. This causes subtle math errors that
result in undesired cursor offsets after the calibration is applied.
Fortunately, this can be simplified, since tablet area is always reset
to the default state before starting calibration, we are sure that the
value will remain constant. Since both axes are in the same 0..1 scale,
calibration code doesn't need to swap X/Y back and forth to calculate
each axis scale.
Additionally, the code to get the calibrated axis values has been moved
into its own function along with a new function that returns padding
values suitable for consumption by g-c-c. All calculations are performed
internally in the 0..1 range.
https://bugzilla.gnome.org/show_bug.cgi?id=784009
Co-Authored-By: Carlos Garnacho <carlosg@gnome.org>
98 lines
3.1 KiB
C
98 lines
3.1 KiB
C
/*
|
|
* Copyright (c) 2009 Tias Guns
|
|
* Copyright (c) 2009 Soren Hauberg
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef _calibrator_h
|
|
#define _calibrator_h
|
|
|
|
#include <glib.h>
|
|
#include "calibrator-gui.h"
|
|
|
|
/*
|
|
* Number of blocks. We partition the screen into 'num_blocks' x 'num_blocks'
|
|
* rectangles of equal size. We then ask the user to press points that are
|
|
* located at the corner closes to the center of the four blocks in the corners
|
|
* of the screen. The following ascii art illustrates the situation. We partition
|
|
* the screen into 8 blocks in each direction. We then let the user press the
|
|
* points marked with 'O'.
|
|
*
|
|
* +--+--+--+--+--+--+--+--+
|
|
* | | | | | | | | |
|
|
* +--O--+--+--+--+--+--O--+
|
|
* | | | | | | | | |
|
|
* +--+--+--+--+--+--+--+--+
|
|
* | | | | | | | | |
|
|
* +--+--+--+--+--+--+--+--+
|
|
* | | | | | | | | |
|
|
* +--+--+--+--+--+--+--+--+
|
|
* | | | | | | | | |
|
|
* +--+--+--+--+--+--+--+--+
|
|
* | | | | | | | | |
|
|
* +--+--+--+--+--+--+--+--+
|
|
* | | | | | | | | |
|
|
* +--O--+--+--+--+--+--O--+
|
|
* | | | | | | | | |
|
|
* +--+--+--+--+--+--+--+--+
|
|
*/
|
|
#define NUM_BLOCKS 8
|
|
|
|
/* Names of the points */
|
|
enum
|
|
{
|
|
UL = 0, /* Upper-left */
|
|
UR = 1, /* Upper-right */
|
|
LL = 2, /* Lower-left */
|
|
LR = 3 /* Lower-right */
|
|
};
|
|
|
|
struct Calib
|
|
{
|
|
/* Geometry of the calibration window */
|
|
GdkRectangle geometry;
|
|
|
|
/* nr of clicks registered */
|
|
int num_clicks;
|
|
|
|
/* click coordinates */
|
|
int clicked_x[4], clicked_y[4];
|
|
|
|
/* Threshold to keep the same point from being clicked twice.
|
|
* Set to zero if you don't want this check
|
|
*/
|
|
int threshold_doubleclick;
|
|
|
|
/* Threshold to detect mis-clicks (clicks not along axes)
|
|
* A lower value forces more precise calibration
|
|
* Set to zero if you don't want this check
|
|
*/
|
|
int threshold_misclick;
|
|
};
|
|
|
|
void reset (struct Calib *c);
|
|
gboolean add_click (struct Calib *c,
|
|
int x,
|
|
int y);
|
|
gboolean finish (struct Calib *c,
|
|
XYinfo *new_axis,
|
|
gboolean *swap);
|
|
|
|
#endif /* _calibrator_h */
|