openharmony/third_party_weston
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_weston.git synced 2026-07-01 22:04:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename func name for symbol conflict

Browse Source 
Change-Id: Iafa6c592545b73995d39b108780f9f5bdee36892
Signed-off-by: 黄磊 <huanglei0704@thundersoft.com>
This commit is contained in:
黄磊
2021-07-28 11:33:49 +08:00
parent a89d545d79
commit b8c49d805d
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/libinput-device.c
+9 -9
View File
@@ -46,7 +46,7 @@
#include "shared/timespec-util.h"
void
evdev_led_update(struct evdev_device *device, enum weston_led weston_leds)
evdev_led_update_l(struct evdev_device *device, enum weston_led weston_leds)
{
enum libinput_led leds = 0;
@@ -491,7 +491,7 @@ handle_touch_frame(struct libinput_device *libinput_device,
}
int
evdev_device_process_event(struct libinput_event *event)
evdev_device_process_event_l(struct libinput_event *event)
{
struct libinput_device *libinput_device =
libinput_event_get_device(event);
@@ -558,7 +558,7 @@ notify_output_destroy(struct wl_listener *listener, void *data)
container_of(listener,
struct evdev_device, output_destroy_listener);
evdev_device_set_output(device, NULL);
evdev_device_set_output_l(device, NULL);
}
/**
@@ -568,7 +568,7 @@ notify_output_destroy(struct wl_listener *listener, void *data)
* format libinput expects.
*/
void
evdev_device_set_calibration(struct evdev_device *device)
evdev_device_set_calibration_l(struct evdev_device *device)
{
struct udev *udev;
struct udev_device *udev_device = NULL;
@@ -657,7 +657,7 @@ out:
}
void
evdev_device_set_output(struct evdev_device *device,
evdev_device_set_output_l(struct evdev_device *device,
struct weston_output *output)
{
if (device->output == output)
@@ -686,11 +686,11 @@ evdev_device_set_output(struct evdev_device *device,
device->output_destroy_listener.notify = notify_output_destroy;
wl_signal_add(&output->destroy_signal,
&device->output_destroy_listener);
evdev_device_set_calibration(device);
evdev_device_set_calibration_l(device);
}
struct evdev_device *
evdev_device_create(struct libinput_device *libinput_device,
evdev_device_create_l(struct libinput_device *libinput_device,
struct weston_seat *seat)
{
struct evdev_device *device;
@@ -727,7 +727,7 @@ evdev_device_create(struct libinput_device *libinput_device,
}
void
evdev_device_destroy(struct evdev_device *device)
evdev_device_destroy_l(struct evdev_device *device)
{
if (device->seat_caps & EVDEV_SEAT_POINTER)
weston_seat_release_pointer(device->seat);
@@ -747,7 +747,7 @@ evdev_device_destroy(struct evdev_device *device)
}
void
evdev_notify_keyboard_focus(struct weston_seat *seat,
evdev_notify_keyboard_focus_l(struct weston_seat *seat,
struct wl_list *evdev_devices)
{
struct wl_array keys;
libweston/libinput-device.h
+7 -7
View File
@@ -55,26 +55,26 @@ struct evdev_device {
};
void
evdev_led_update(struct evdev_device *device, enum weston_led leds);
evdev_led_update_l(struct evdev_device *device, enum weston_led leds);
struct evdev_device *
evdev_device_create(struct libinput_device *libinput_device,
evdev_device_create_l(struct libinput_device *libinput_device,
struct weston_seat *seat);
int
evdev_device_process_event(struct libinput_event *event);
evdev_device_process_event_l(struct libinput_event *event);
void
evdev_device_set_output(struct evdev_device *device,
evdev_device_set_output_l(struct evdev_device *device,
struct weston_output *output);
void
evdev_device_destroy(struct evdev_device *device);
evdev_device_destroy_l(struct evdev_device *device);
void
evdev_notify_keyboard_focus(struct weston_seat *seat,
evdev_notify_keyboard_focus_l(struct weston_seat *seat,
struct wl_list *evdev_devices);
void
evdev_device_set_calibration(struct evdev_device *device);
evdev_device_set_calibration_l(struct evdev_device *device);
int
dispatch_libinput(struct libinput *libinput);
libweston/libinput-seat.c
+11 -11
View File
@@ -108,13 +108,13 @@ device_added(struct udev_input *input, struct libinput_device *libinput_device)
return;
seat = &udev_seat->base;
device = evdev_device_create(libinput_device, seat);
device = evdev_device_create_l(libinput_device, seat);
if (device == NULL)
return;
if (input->configure_device != NULL)
input->configure_device(c, device->device);
evdev_device_set_calibration(device);
evdev_device_set_calibration_l(device);
udev_seat = (struct udev_seat *) seat;
wl_list_insert(udev_seat->devices_list.prev, &device->link);
@@ -128,12 +128,12 @@ device_added(struct udev_input *input, struct libinput_device *libinput_device)
if (output_name) {
device->output_name = strdup(output_name);
output = output_find_by_head_name(c, output_name);
evdev_device_set_output(device, output);
evdev_device_set_output_l(device, output);
} else if (!wl_list_empty(&c->output_list)) {
/* default assignment to an arbitrary output */
output = container_of(c->output_list.next,
struct weston_output, link);
evdev_device_set_output(device, output);
evdev_device_set_output_l(device, output);
}
if (!input->suspended)
@@ -146,7 +146,7 @@ device_removed(struct udev_input *input, struct libinput_device *libinput_device
struct evdev_device *device;
device = libinput_device_get_user_data(libinput_device);
evdev_device_destroy(device);
evdev_device_destroy_l(device);
}
static void
@@ -155,7 +155,7 @@ udev_seat_remove_devices(struct udev_seat *seat)
struct evdev_device *device, *next;
wl_list_for_each_safe(device, next, &seat->devices_list, link) {
evdev_device_destroy(device);
evdev_device_destroy_l(device);
}
}
@@ -200,7 +200,7 @@ process_event(struct libinput_event *event)
{
if (udev_input_process_event(event))
return;
if (evdev_device_process_event(event))
if (evdev_device_process_event_l(event))
return;
}
@@ -286,7 +286,7 @@ udev_input_enable(struct udev_input *input)
}
wl_list_for_each(seat, &input->compositor->seat_list, base.link) {
evdev_notify_keyboard_focus(&seat->base, &seat->devices_list);
evdev_notify_keyboard_focus_l(&seat->base, &seat->devices_list);
if (!wl_list_empty(&seat->devices_list))
devices_found = 1;
@@ -384,7 +384,7 @@ udev_seat_led_update(struct weston_seat *seat_base, enum weston_led leds)
struct evdev_device *device;
wl_list_for_each(device, &seat->devices_list, link)
evdev_led_update(device, leds);
evdev_led_update_l(device, leds);
}
static void
@@ -400,7 +400,7 @@ udev_seat_output_changed(struct udev_seat *seat, struct weston_output *output)
*/
if (!device->output_name) {
if (!device->output)
evdev_device_set_output(device, output);
evdev_device_set_output_l(device, output);
continue;
}
@@ -410,7 +410,7 @@ udev_seat_output_changed(struct udev_seat *seat, struct weston_output *output)
*/
found = output_find_by_head_name(output->compositor,
device->output_name);
evdev_device_set_output(device, found);
evdev_device_set_output_l(device, found);
}
}