clutter: Sanitize ClutterInputDevice header

Move some exposed setters to private headers. It makes some sense to
provide those for backends, not as much to the upper layers.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403
This commit is contained in:
Carlos Garnacho 2020-05-06 18:56:06 +02:00
parent edc399e5cf
commit 88f03d3a26
3 changed files with 16 additions and 15 deletions

View File

@ -214,6 +214,12 @@ CLUTTER_EXPORT
void _clutter_input_device_set_n_keys (ClutterInputDevice *device, void _clutter_input_device_set_n_keys (ClutterInputDevice *device,
guint n_keys); guint n_keys);
CLUTTER_EXPORT CLUTTER_EXPORT
void clutter_input_device_set_key (ClutterInputDevice *device,
guint index_,
guint keyval,
ClutterModifierType modifiers);
CLUTTER_EXPORT
gboolean _clutter_input_device_translate_axis (ClutterInputDevice *device, gboolean _clutter_input_device_translate_axis (ClutterInputDevice *device,
guint index_, guint index_,
gdouble value, gdouble value,
@ -252,4 +258,13 @@ ClutterInputDeviceTool *
guint64 serial, guint64 serial,
ClutterInputDeviceToolType type); ClutterInputDeviceToolType type);
CLUTTER_EXPORT
void clutter_input_device_update_from_event (ClutterInputDevice *device,
ClutterEvent *event,
gboolean update_stage);
CLUTTER_EXPORT
gboolean clutter_input_device_keycode_to_evdev (ClutterInputDevice *device,
guint hardware_keycode,
guint *evdev_keycode);
#endif /* CLUTTER_INPUT_DEVICE_PRIVATE_H */ #endif /* CLUTTER_INPUT_DEVICE_PRIVATE_H */

View File

@ -122,11 +122,6 @@ gboolean clutter_input_device_get_axis_value (ClutterInputDev
CLUTTER_EXPORT CLUTTER_EXPORT
guint clutter_input_device_get_n_keys (ClutterInputDevice *device); guint clutter_input_device_get_n_keys (ClutterInputDevice *device);
CLUTTER_EXPORT CLUTTER_EXPORT
void clutter_input_device_set_key (ClutterInputDevice *device,
guint index_,
guint keyval,
ClutterModifierType modifiers);
CLUTTER_EXPORT
gboolean clutter_input_device_get_key (ClutterInputDevice *device, gboolean clutter_input_device_get_key (ClutterInputDevice *device,
guint index_, guint index_,
guint *keyval, guint *keyval,
@ -137,11 +132,6 @@ ClutterInputDevice * clutter_input_device_get_associated_device (ClutterInput
CLUTTER_EXPORT CLUTTER_EXPORT
GList * clutter_input_device_get_slave_devices (ClutterInputDevice *device); GList * clutter_input_device_get_slave_devices (ClutterInputDevice *device);
CLUTTER_EXPORT
void clutter_input_device_update_from_event (ClutterInputDevice *device,
ClutterEvent *event,
gboolean update_stage);
CLUTTER_EXPORT CLUTTER_EXPORT
void clutter_input_device_grab (ClutterInputDevice *device, void clutter_input_device_grab (ClutterInputDevice *device,
ClutterActor *actor); ClutterActor *actor);
@ -161,11 +151,6 @@ CLUTTER_EXPORT
ClutterActor * clutter_input_device_sequence_get_grabbed_actor (ClutterInputDevice *device, ClutterActor * clutter_input_device_sequence_get_grabbed_actor (ClutterInputDevice *device,
ClutterEventSequence *sequence); ClutterEventSequence *sequence);
CLUTTER_EXPORT
gboolean clutter_input_device_keycode_to_evdev (ClutterInputDevice *device,
guint hardware_keycode,
guint *evdev_keycode);
CLUTTER_EXPORT CLUTTER_EXPORT
const gchar * clutter_input_device_get_vendor_id (ClutterInputDevice *device); const gchar * clutter_input_device_get_vendor_id (ClutterInputDevice *device);
CLUTTER_EXPORT CLUTTER_EXPORT

View File

@ -1,6 +1,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <glib.h> #include <glib.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <clutter/clutter-mutter.h>
#include "tests/clutter-test-utils.h" #include "tests/clutter-test-utils.h"