7296099388
This was happening on Wayland in my tests, and apparently on Windows too, according to the report. I widely simplified the code. Now we don't list of axis anymore, and therefore we don't allow to change these (which was not working anyway, for as long as I remember, at least on Linux, both X11 and Wayland). As for the pressure curve, we just show it unconditionally for any device of type "Pen". It may mean that it might show on some rare stylus devices with no pressure support, but in such case, it will just be a bogus curve (it won't break the device). And then we'll avoid all the flimsy heuristic trying to guess if a device is supposed to have pressure sensitivity, which especially became bad in Wayland as we have this information only on proximity. It means that if you don't approach the stylus and were trying to set up your pen's pressure curve with a mouse, no curve would appear! Add to this that gdk_device_list_axes() seems very broken on Wayland and was always returning GDK_NONE for all axis (even when only using it on various device signal handlers, per advices by Carlos on IRC), at least anyhow I tried to make it work, our heuristic to detect when an axis should be ignored was completely broken on Wayland as well. A simpler logic should work better and makes the code simpler to read too. It's also one less usage of GtkListStore, which is good for future GTK versions where it got deprecated!
123 lines
5.9 KiB
C
123 lines
5.9 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "core/gimptoolpreset.h"
|
|
|
|
|
|
typedef struct _GimpDeviceKey GimpDeviceKey;
|
|
|
|
struct _GimpDeviceKey
|
|
{
|
|
guint keyval;
|
|
GdkModifierType modifiers;
|
|
};
|
|
|
|
|
|
#define GIMP_TYPE_DEVICE_INFO (gimp_device_info_get_type ())
|
|
#define GIMP_DEVICE_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DEVICE_INFO, GimpDeviceInfo))
|
|
#define GIMP_DEVICE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DEVICE_INFO, GimpDeviceInfoClass))
|
|
#define GIMP_IS_DEVICE_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DEVICE_INFO))
|
|
#define GIMP_IS_DEVICE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DEVICE_INFO))
|
|
#define GIMP_DEVICE_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DEVICE_INFO, GimpDeviceInfoClass))
|
|
|
|
|
|
typedef struct _GimpDeviceInfoPrivate GimpDeviceInfoPrivate;
|
|
typedef struct _GimpDeviceInfoClass GimpDeviceInfoClass;
|
|
|
|
struct _GimpDeviceInfo
|
|
{
|
|
GimpToolPreset parent_instance;
|
|
|
|
GimpDeviceInfoPrivate *priv;
|
|
};
|
|
|
|
struct _GimpDeviceInfoClass
|
|
{
|
|
GimpToolPresetClass parent_class;
|
|
};
|
|
|
|
|
|
GType gimp_device_info_get_type (void) G_GNUC_CONST;
|
|
|
|
GimpDeviceInfo * gimp_device_info_new (Gimp *gimp,
|
|
GdkDevice *device,
|
|
GdkDisplay *display);
|
|
|
|
GdkDevice * gimp_device_info_get_device (GimpDeviceInfo *info,
|
|
GdkDisplay **display);
|
|
gboolean gimp_device_info_set_device (GimpDeviceInfo *info,
|
|
GdkDevice *device,
|
|
GdkDisplay *display);
|
|
|
|
void gimp_device_info_set_default_tool (GimpDeviceInfo *info);
|
|
|
|
void gimp_device_info_save_tool (GimpDeviceInfo *info);
|
|
void gimp_device_info_restore_tool (GimpDeviceInfo *info);
|
|
|
|
GdkInputMode gimp_device_info_get_mode (GimpDeviceInfo *info);
|
|
void gimp_device_info_set_mode (GimpDeviceInfo *info,
|
|
GdkInputMode mode);
|
|
|
|
gboolean gimp_device_info_has_cursor (GimpDeviceInfo *info);
|
|
|
|
GdkInputSource gimp_device_info_get_source (GimpDeviceInfo *info);
|
|
|
|
const gchar * gimp_device_info_get_vendor_id (GimpDeviceInfo *info);
|
|
const gchar * gimp_device_info_get_product_id (GimpDeviceInfo *info);
|
|
|
|
GdkDeviceToolType gimp_device_info_get_tool_type (GimpDeviceInfo *info);
|
|
guint64 gimp_device_info_get_tool_serial (GimpDeviceInfo *info);
|
|
guint64 gimp_device_info_get_tool_hardware_id (GimpDeviceInfo *info);
|
|
|
|
gint gimp_device_info_get_n_axes (GimpDeviceInfo *info);
|
|
const gchar * gimp_device_info_get_axis_name (GimpDeviceInfo *info,
|
|
gint axis);
|
|
GdkAxisUse gimp_device_info_get_axis_use (GimpDeviceInfo *info,
|
|
gint axis);
|
|
void gimp_device_info_set_axis_use (GimpDeviceInfo *info,
|
|
gint axis,
|
|
GdkAxisUse use);
|
|
|
|
gint gimp_device_info_get_n_keys (GimpDeviceInfo *info);
|
|
void gimp_device_info_get_key (GimpDeviceInfo *info,
|
|
gint key,
|
|
guint *keyval,
|
|
GdkModifierType *modifiers);
|
|
void gimp_device_info_set_key (GimpDeviceInfo *info,
|
|
gint key,
|
|
guint keyval,
|
|
GdkModifierType modifiers);
|
|
|
|
GimpCurve * gimp_device_info_get_curve (GimpDeviceInfo *info,
|
|
GdkAxisUse use);
|
|
gdouble gimp_device_info_map_axis (GimpDeviceInfo *info,
|
|
GdkAxisUse use,
|
|
gdouble value);
|
|
|
|
void gimp_device_info_changed (GimpDeviceInfo *info);
|
|
|
|
GimpDeviceInfo * gimp_device_info_get_by_device (GdkDevice *device);
|
|
|
|
gint gimp_device_info_compare (GimpDeviceInfo *a,
|
|
GimpDeviceInfo *b);
|
|
|
|
GimpPadActions * gimp_device_info_get_pad_actions (GimpDeviceInfo *info);
|
|
|
|
GtkPadController * gimp_device_info_create_pad_controller (GimpDeviceInfo *info,
|
|
GimpWindow *window);
|