mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2026-02-09 08:20:30 +01:00
Merge branch 'master' into tablet-support
Conflicts: src/libinput.sym
This commit is contained in:
Peter Hutterer
commit
b7e2853c82
4 changed files with 28 additions and 53 deletions
15
configure.ac
15
configure.ac
|
|
@ -1,7 +1,7 @@
|
|||
AC_PREREQ([2.64])
|
||||
|
||||
m4_define([libinput_major_version], [0])
|
||||
m4_define([libinput_minor_version], [11])
|
||||
m4_define([libinput_minor_version], [12])
|
||||
m4_define([libinput_micro_version], [0])
|
||||
m4_define([libinput_version],
|
||||
[libinput_major_version.libinput_minor_version.libinput_micro_version])
|
||||
|
|
@ -25,12 +25,13 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
|
|||
# Before making a release, the LIBINPUT_LT_VERSION string should be
|
||||
# modified.
|
||||
# The string is of the form C:R:A.
|
||||
# - If interfaces have been changed or added, but binary compatibility has
|
||||
# been preserved, change to C+1:0:A+1
|
||||
# - If binary compatibility has been broken (eg removed or changed interfaces)
|
||||
# change to C+1:0:0
|
||||
# - If the interface is the same as the previous version, change to C:R+1:A
|
||||
LIBINPUT_LT_VERSION=9:0:2
|
||||
# a) If binary compatibility has been broken (eg removed or changed interfaces)
|
||||
# change to C+1:0:0. DO NOT DO THIS! Use symbol versioning instead and
|
||||
# do b) instead.
|
||||
# b) If interfaces have been changed or added, but binary compatibility has
|
||||
# been preserved, change to C+1:0:A+1
|
||||
# c) If the interface is the same as the previous version, change to C:R+1:A
|
||||
LIBINPUT_LT_VERSION=10:0:0
|
||||
AC_SUBST(LIBINPUT_LT_VERSION)
|
||||
|
||||
AM_SILENT_RULES([yes])
|
||||
|
|
|
|||
|
|
@ -1763,12 +1763,6 @@ libinput_device_pointer_has_button(struct libinput_device *device, uint32_t code
|
|||
return evdev_device_has_button((struct evdev_device *)device, code);
|
||||
}
|
||||
|
||||
LIBINPUT_EXPORT int
|
||||
libinput_device_has_button(struct libinput_device *device, uint32_t code)
|
||||
{
|
||||
return libinput_device_pointer_has_button(device, code);
|
||||
}
|
||||
|
||||
LIBINPUT_EXPORT struct libinput_event *
|
||||
libinput_event_device_notify_get_base_event(struct libinput_event_device_notify *event)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2157,14 +2157,6 @@ libinput_device_get_size(struct libinput_device *device,
|
|||
int
|
||||
libinput_device_pointer_has_button(struct libinput_device *device, uint32_t code);
|
||||
|
||||
/**
|
||||
* @ingroup device
|
||||
*
|
||||
* @deprecated Use libinput_device_pointer_has_button() instead.
|
||||
*/
|
||||
int
|
||||
libinput_device_has_button(struct libinput_device *device, uint32_t code) LIBINPUT_ATTRIBUTE_DEPRECATED;
|
||||
|
||||
/**
|
||||
* @ingroup device
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,40 +1,45 @@
|
|||
/* in alphabetical order! */
|
||||
|
||||
LIBINPUT_0.8.0 {
|
||||
LIBINPUT_0.12.0 {
|
||||
global:
|
||||
libinput_config_status_to_str;
|
||||
libinput_device_config_accel_get_default_speed;
|
||||
libinput_device_config_accel_get_speed;
|
||||
libinput_device_config_accel_is_available;
|
||||
libinput_device_config_accel_set_speed;
|
||||
libinput_device_config_left_handed_get_default;
|
||||
libinput_device_config_left_handed_get;
|
||||
libinput_device_config_left_handed_is_available;
|
||||
libinput_device_config_left_handed_set;
|
||||
libinput_device_config_calibration_get_default_matrix;
|
||||
libinput_device_config_calibration_get_matrix;
|
||||
libinput_device_config_calibration_has_matrix;
|
||||
libinput_device_config_calibration_set_matrix;
|
||||
libinput_device_config_click_get_default_method;
|
||||
libinput_device_config_click_get_method;
|
||||
libinput_device_config_click_get_methods;
|
||||
libinput_device_config_click_set_method;
|
||||
libinput_device_config_left_handed_get;
|
||||
libinput_device_config_left_handed_get_default;
|
||||
libinput_device_config_left_handed_is_available;
|
||||
libinput_device_config_left_handed_set;
|
||||
libinput_device_config_scroll_get_button;
|
||||
libinput_device_config_scroll_get_default_button;
|
||||
libinput_device_config_scroll_get_default_method;
|
||||
libinput_device_config_scroll_get_default_natural_scroll_enabled;
|
||||
libinput_device_config_scroll_get_methods;
|
||||
libinput_device_config_scroll_get_method;
|
||||
libinput_device_config_scroll_get_methods;
|
||||
libinput_device_config_scroll_get_natural_scroll_enabled;
|
||||
libinput_device_config_scroll_has_natural_scroll;
|
||||
libinput_device_config_scroll_set_button;
|
||||
libinput_device_config_scroll_set_method;
|
||||
libinput_device_config_scroll_set_natural_scroll_enabled;
|
||||
libinput_device_config_send_events_get_default_mode;
|
||||
libinput_device_config_send_events_get_modes;
|
||||
libinput_device_config_send_events_get_mode;
|
||||
libinput_device_config_send_events_get_modes;
|
||||
libinput_device_config_send_events_set_mode;
|
||||
libinput_device_config_tap_get_default_enabled;
|
||||
libinput_device_config_tap_get_enabled;
|
||||
libinput_device_config_tap_get_finger_count;
|
||||
libinput_device_config_tap_set_enabled;
|
||||
libinput_device_get_context;
|
||||
libinput_device_get_device_group;
|
||||
libinput_device_get_id_product;
|
||||
libinput_device_get_id_vendor;
|
||||
libinput_device_get_name;
|
||||
|
|
@ -44,9 +49,13 @@ global:
|
|||
libinput_device_get_sysname;
|
||||
libinput_device_get_udev_device;
|
||||
libinput_device_get_user_data;
|
||||
libinput_device_has_button;
|
||||
libinput_device_group_get_user_data;
|
||||
libinput_device_group_ref;
|
||||
libinput_device_group_set_user_data;
|
||||
libinput_device_group_unref;
|
||||
libinput_device_has_capability;
|
||||
libinput_device_led_update;
|
||||
libinput_device_pointer_has_button;
|
||||
libinput_device_ref;
|
||||
libinput_device_set_seat_logical_name;
|
||||
libinput_device_set_user_data;
|
||||
|
|
@ -55,15 +64,15 @@ global:
|
|||
libinput_event_destroy;
|
||||
libinput_event_device_notify_get_base_event;
|
||||
libinput_event_get_context;
|
||||
libinput_event_get_device_notify_event;
|
||||
libinput_event_get_device;
|
||||
libinput_event_get_device_notify_event;
|
||||
libinput_event_get_keyboard_event;
|
||||
libinput_event_get_pointer_event;
|
||||
libinput_event_get_touch_event;
|
||||
libinput_event_get_type;
|
||||
libinput_event_keyboard_get_base_event;
|
||||
libinput_event_keyboard_get_key_state;
|
||||
libinput_event_keyboard_get_key;
|
||||
libinput_event_keyboard_get_key_state;
|
||||
libinput_event_keyboard_get_seat_key_count;
|
||||
libinput_event_keyboard_get_time;
|
||||
libinput_event_pointer_get_absolute_x;
|
||||
|
|
@ -74,8 +83,8 @@ global:
|
|||
libinput_event_pointer_get_axis_value;
|
||||
libinput_event_pointer_get_axis_value_discrete;
|
||||
libinput_event_pointer_get_base_event;
|
||||
libinput_event_pointer_get_button_state;
|
||||
libinput_event_pointer_get_button;
|
||||
libinput_event_pointer_get_button_state;
|
||||
libinput_event_pointer_get_dx;
|
||||
libinput_event_pointer_get_dx_unaccelerated;
|
||||
libinput_event_pointer_get_dy;
|
||||
|
|
@ -120,27 +129,6 @@ local:
|
|||
*;
|
||||
};
|
||||
|
||||
LIBINPUT_0.9.0 {
|
||||
global:
|
||||
libinput_device_config_click_get_default_method;
|
||||
libinput_device_config_click_get_method;
|
||||
libinput_device_config_click_get_methods;
|
||||
libinput_device_config_click_set_method;
|
||||
} LIBINPUT_0.8.0;
|
||||
|
||||
LIBINPUT_0.11.0 {
|
||||
libinput_device_get_device_group;
|
||||
libinput_device_group_get_user_data;
|
||||
libinput_device_group_ref;
|
||||
libinput_device_group_set_user_data;
|
||||
libinput_device_group_unref;
|
||||
|
||||
libinput_device_pointer_has_button;
|
||||
} LIBINPUT_0.9.0;
|
||||
|
||||
LIBINPUT_0.12.0 {
|
||||
} LIBINPUT_0.11.0;
|
||||
|
||||
/* tablet APIs, they are not part of any stable API promise yet.
|
||||
* keep them separate */
|
||||
LIBINPUT_TABLET_SUPPORT {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue