isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-05 16:14:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

backends: Add function to apply pressure sensitivity to tablet tools

Browse Source 
A bezier curve is created out of the 2 control points in settings, so
the pressure is made to follow the stablished curve between 0 and 1.
This commit is contained in:
Carlos Garnacho
2016-06-22 15:58:33 +02:00
parent e2b8b0bf67
commit ef113d708b
2 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/backends/meta-input-settings-private.h
View File

@@ -110,6 +110,11 @@ GDesktopStylusButtonAction meta_input_settings_get_stylus_button_action (MetaInp
ClutterInputDeviceTool *tool, ClutterInputDeviceTool *tool,
ClutterInputDevice *current_device, ClutterInputDevice *current_device,
guint button); guint button);
gdouble meta_input_settings_translate_tablet_tool_pressure (MetaInputSettings *input_settings,
ClutterInputDeviceTool *tool,
ClutterInputDevice *current_tablet,
gdouble pressure);
#ifdef HAVE_LIBWACOM #ifdef HAVE_LIBWACOM
WacomDevice * meta_input_settings_get_tablet_wacom_device (MetaInputSettings *settings, WacomDevice * meta_input_settings_get_tablet_wacom_device (MetaInputSettings *settings,
ClutterInputDevice *device); ClutterInputDevice *device);

59
src/backends/meta-input-settings.c
View File

@@ -1243,3 +1243,62 @@ meta_input_settings_get_tablet_wacom_device (MetaInputSettings *settings,
return info->wacom_device; return info->wacom_device;
} }
#endif /* HAVE_LIBWACOM */ #endif /* HAVE_LIBWACOM */
static gdouble
calculate_bezier_position (gdouble pos,
gdouble x1,
gdouble y1,
gdouble x2,
gdouble y2)
{
gdouble int1_y, int2_y;
pos = CLAMP (pos, 0, 1);
/* Intersection between 0,0 and x1,y1 */
int1_y = pos * y1;
/* Intersection between x2,y2 and 1,1 */
int2_y = (pos * (1 - y2)) + y2;
/* Find the new position in the line traced by the previous points */
return (pos * (int2_y - int1_y)) + int1_y;
}
gdouble
meta_input_settings_translate_tablet_tool_pressure (MetaInputSettings *input_settings,
ClutterInputDeviceTool *tool,
ClutterInputDevice *current_tablet,
gdouble pressure)
{
GSettings *settings;
GVariant *variant;
const gint32 *curve;
gsize n_elems;
pressure = CLAMP (pressure, 0, 1);
g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings), pressure);
g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE_TOOL (tool), pressure);
g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (current_tablet), pressure);
settings = lookup_tool_settings (tool, current_tablet);
if (clutter_input_device_tool_get_tool_type (tool) == CLUTTER_INPUT_DEVICE_TOOL_ERASER)
variant = g_settings_get_value (settings, "eraser-pressure-curve");
else
variant = g_settings_get_value (settings, "pressure-curve");
curve = g_variant_get_fixed_array (variant, &n_elems, sizeof (gint32));
if (n_elems != 4)
return pressure;
pressure = calculate_bezier_position (pressure,
(gdouble) curve[0] / 100,
(gdouble) curve[1] / 100,
(gdouble) curve[2] / 100,
(gdouble) curve[3] / 100);
g_variant_unref (variant);
return pressure;
}