fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-08 20:38:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop libinput_device_has_button

Browse source 
And merge all current API versions into the same block. This isn't technically
necessary since removing libinput_has_button from the code will remove it from
the exported list. That trips up test/symbols-leak-test though.

Since we break the API and bump the soname in this release anyway, move
to a single block so the initial stable API is all nicely grouped together.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2015-03-04 15:36:35 +10:00
parent 9b865ba212
commit 595beb93b4
4 changed files with 12 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -30,7 +30,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
# - If binary compatibility has been broken (eg removed or changed interfaces) # - If binary compatibility has been broken (eg removed or changed interfaces)
# change to C+1:0:0 # change to C+1:0:0
# - If the interface is the same as the previous version, change to C:R+1:A # - If the interface is the same as the previous version, change to C:R+1:A
LIBINPUT_LT_VERSION=9:0:2 LIBINPUT_LT_VERSION=10:0:0
AC_SUBST(LIBINPUT_LT_VERSION) AC_SUBST(LIBINPUT_LT_VERSION)
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])

6
src/libinput.c
View file

@ -1369,12 +1369,6 @@ libinput_device_pointer_has_button(struct libinput_device *device, uint32_t code
return evdev_device_has_button((struct evdev_device *)device, 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_EXPORT struct libinput_event *
libinput_event_device_notify_get_base_event(struct libinput_event_device_notify *event) libinput_event_device_notify_get_base_event(struct libinput_event_device_notify *event)
{ {

8
src/libinput.h
View file

@ -1682,14 +1682,6 @@ libinput_device_get_size(struct libinput_device *device,
int int
libinput_device_pointer_has_button(struct libinput_device *device, uint32_t code); 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 * @ingroup device
* *

31
src/libinput.sym
View file

@ -1,6 +1,6 @@
/* in alphabetical order! */ /* in alphabetical order! */
LIBINPUT_0.8.0 { LIBINPUT_0.12.0 {
global: global:
libinput_config_status_to_str; libinput_config_status_to_str;
libinput_device_config_accel_get_default_speed; libinput_device_config_accel_get_default_speed;
@ -15,6 +15,10 @@ global:
libinput_device_config_calibration_get_matrix; libinput_device_config_calibration_get_matrix;
libinput_device_config_calibration_has_matrix; libinput_device_config_calibration_has_matrix;
libinput_device_config_calibration_set_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_scroll_get_button; libinput_device_config_scroll_get_button;
libinput_device_config_scroll_get_default_button; libinput_device_config_scroll_get_default_button;
libinput_device_config_scroll_get_default_method; libinput_device_config_scroll_get_default_method;
@ -35,6 +39,7 @@ global:
libinput_device_config_tap_get_finger_count; libinput_device_config_tap_get_finger_count;
libinput_device_config_tap_set_enabled; libinput_device_config_tap_set_enabled;
libinput_device_get_context; libinput_device_get_context;
libinput_device_get_device_group;
libinput_device_get_id_product; libinput_device_get_id_product;
libinput_device_get_id_vendor; libinput_device_get_id_vendor;
libinput_device_get_name; libinput_device_get_name;
@ -44,9 +49,13 @@ global:
libinput_device_get_sysname; libinput_device_get_sysname;
libinput_device_get_udev_device; libinput_device_get_udev_device;
libinput_device_get_user_data; 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_has_capability;
libinput_device_led_update; libinput_device_led_update;
libinput_device_pointer_has_button;
libinput_device_ref; libinput_device_ref;
libinput_device_set_seat_logical_name; libinput_device_set_seat_logical_name;
libinput_device_set_user_data; libinput_device_set_user_data;
@ -118,21 +127,3 @@ global:
local: 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;