brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

native: Use subclassing macros for InputDeviceToolNative

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3520>
This commit is contained in:
Bilal Elmoussaoui 2024-01-10 11:21:37 +01:00 committed by Marge Bot
parent a79834a1ff
commit b1bc03a314
2 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backends/native/meta-input-device-tool-native.c
View File

@ -21,7 +21,16 @@
#include "backends/native/meta-input-thread.h" #include "backends/native/meta-input-thread.h"
G_DEFINE_TYPE (MetaInputDeviceToolNative, meta_input_device_tool_native, struct _MetaInputDeviceToolNative
{
ClutterInputDeviceTool parent_instance;
struct libinput_tablet_tool *tool;
GHashTable *button_map;
graphene_point_t pressure_curve[2];
MetaBezier *bezier;
};
G_DEFINE_FINAL_TYPE (MetaInputDeviceToolNative, meta_input_device_tool_native,
CLUTTER_TYPE_INPUT_DEVICE_TOOL) CLUTTER_TYPE_INPUT_DEVICE_TOOL)
static void static void

41
src/backends/native/meta-input-device-tool-native.h
View File

@ -33,47 +33,16 @@ G_BEGIN_DECLS
#define META_TYPE_INPUT_DEVICE_TOOL_NATIVE (meta_input_device_tool_native_get_type ()) #define META_TYPE_INPUT_DEVICE_TOOL_NATIVE (meta_input_device_tool_native_get_type ())
#define META_INPUT_DEVICE_TOOL_NATIVE(o) \ G_DECLARE_FINAL_TYPE (MetaInputDeviceToolNative,
(G_TYPE_CHECK_INSTANCE_CAST ((o), \ meta_input_device_tool_native,
META_TYPE_INPUT_DEVICE_TOOL_NATIVE, MetaInputDeviceToolNative)) META,
INPUT_DEVICE_TOOL_NATIVE,
#define META_IS_INPUT_DEVICE_TOOL_NATIVE(o) \ ClutterInputDeviceTool)
(G_TYPE_CHECK_INSTANCE_TYPE ((o), \
META_TYPE_INPUT_DEVICE_TOOL_NATIVE))
#define META_INPUT_DEVICE_TOOL_NATIVE_CLASS(c) \
(G_TYPE_CHECK_CLASS_CAST ((c), \
META_TYPE_INPUT_DEVICE_TOOL_EVDEV, MetaInputDeviceToolNativeClass))
#define META_IS_INPUT_DEVICE_TOOL_NATIVE_CLASS(c) \
(G_TYPE_CHECK_CLASS_TYPE ((c), \
META_TYPE_INPUT_DEVICE_TOOL_NATIVE))
#define META_INPUT_DEVICE_TOOL_NATIVE_GET_CLASS(o) \
(G_TYPE_INSTANCE_GET_CLASS ((o), \
META_TYPE_INPUT_DEVICE_TOOL_NATIVE, MetaInputDeviceToolNativeClass))
typedef struct _MetaInputDeviceToolNative MetaInputDeviceToolNative; typedef struct _MetaInputDeviceToolNative MetaInputDeviceToolNative;
typedef struct _MetaInputDeviceToolNativeClass MetaInputDeviceToolNativeClass;
#define N_PRESSURECURVE_POINTS 256 #define N_PRESSURECURVE_POINTS 256
struct _MetaInputDeviceToolNative
{
ClutterInputDeviceTool parent_instance;
struct libinput_tablet_tool *tool;
GHashTable *button_map;
graphene_point_t pressure_curve[2];
MetaBezier *bezier;
};
struct _MetaInputDeviceToolNativeClass
{
ClutterInputDeviceToolClass parent_class;
};
GType meta_input_device_tool_native_get_type (void) G_GNUC_CONST;
ClutterInputDeviceTool * meta_input_device_tool_native_new (struct libinput_tablet_tool *tool, ClutterInputDeviceTool * meta_input_device_tool_native_new (struct libinput_tablet_tool *tool,
uint64_t serial, uint64_t serial,
ClutterInputDeviceToolType type); ClutterInputDeviceToolType type);