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>
63 lines
2.2 KiB
C
63 lines
2.2 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_GUI_H__
|
|
#define __CALIBRATOR_GUI_H__
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
/* struct to hold min/max info of the X and Y axis */
|
|
typedef struct
|
|
{
|
|
gdouble x_min;
|
|
gdouble x_max;
|
|
gdouble y_min;
|
|
gdouble y_max;
|
|
} XYinfo;
|
|
|
|
typedef struct CalibArea CalibArea;
|
|
typedef void (*FinishCallback) (CalibArea *area, gpointer user_data);
|
|
|
|
CalibArea * calib_area_new (GdkScreen *screen,
|
|
int monitor,
|
|
GdkDevice *device,
|
|
FinishCallback callback,
|
|
gpointer user_data,
|
|
int threshold_doubleclick,
|
|
int threshold_misclick);
|
|
|
|
gboolean calib_area_finish (CalibArea *area);
|
|
|
|
void calib_area_free (CalibArea *area);
|
|
|
|
void calib_area_get_display_size (CalibArea *area,
|
|
gint *width,
|
|
gint *height);
|
|
|
|
void calib_area_get_axis (CalibArea *area,
|
|
XYinfo *new_axis,
|
|
gboolean *swap_xy);
|
|
|
|
void calib_area_get_padding (CalibArea *area,
|
|
XYinfo *padding);
|
|
#endif /* __CALIBRATOR_GUI_H__ */
|