diff options
author | Dominique Martinet <asmadeus@codewreck.org> | 2017-08-13 00:50:09 +0200 |
---|---|---|
committer | Dominique Martinet <asmadeus@codewreck.org> | 2017-08-13 08:18:05 +0200 |
commit | 5c82d2f5c361d9ad6ed3a120cb3f5e1005c4a9e7 (patch) | |
tree | 364b66924ebd51be68b6f6c63ee801b4a078dab1 /backend/libinput/pointer.c | |
parent | 08a2afdf6fdb5ed43395e392a261cc3464214e73 (diff) |
libinput backend: massive renaming
- 'libinput' (backend's) to libinput_context
- 'device' (libinput_device) to libinput_dev
- 'dev' (wlr_device) to wlr_dev
- 'devices' lists tangling of libinput devices to wlr_devices
- 'devices' list of wlr_devices in backend state to wlr_device_lists
Diffstat (limited to 'backend/libinput/pointer.c')
-rw-r--r-- | backend/libinput/pointer.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c index 08855167..c2c47592 100644 --- a/backend/libinput/pointer.c +++ b/backend/libinput/pointer.c @@ -8,16 +8,16 @@ #include "backend/libinput.h" struct wlr_pointer *wlr_libinput_pointer_create( - struct libinput_device *device) { - assert(device); + struct libinput_device *libinput_dev) { + assert(libinput_dev); return wlr_pointer_create(NULL, NULL); } void handle_pointer_motion(struct libinput_event *event, - struct libinput_device *device) { - struct wlr_input_device *dev = - get_appropriate_device(WLR_INPUT_DEVICE_POINTER, device); - if (!dev) { + struct libinput_device *libinput_dev) { + struct wlr_input_device *wlr_dev = + get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev); + if (!wlr_dev) { wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?"); return; } @@ -28,14 +28,14 @@ void handle_pointer_motion(struct libinput_event *event, wlr_event.time_usec = libinput_event_pointer_get_time_usec(pevent); wlr_event.delta_x = libinput_event_pointer_get_dx(pevent); wlr_event.delta_y = libinput_event_pointer_get_dy(pevent); - wl_signal_emit(&dev->pointer->events.motion, &wlr_event); + wl_signal_emit(&wlr_dev->pointer->events.motion, &wlr_event); } void handle_pointer_motion_abs(struct libinput_event *event, - struct libinput_device *device) { - struct wlr_input_device *dev = - get_appropriate_device(WLR_INPUT_DEVICE_POINTER, device); - if (!dev) { + struct libinput_device *libinput_dev) { + struct wlr_input_device *wlr_dev = + get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev); + if (!wlr_dev) { wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?"); return; } @@ -46,15 +46,15 @@ void handle_pointer_motion_abs(struct libinput_event *event, wlr_event.time_usec = libinput_event_pointer_get_time_usec(pevent); wlr_event.x_mm = libinput_event_pointer_get_absolute_x(pevent); wlr_event.y_mm = libinput_event_pointer_get_absolute_y(pevent); - libinput_device_get_size(device, &wlr_event.width_mm, &wlr_event.height_mm); - wl_signal_emit(&dev->pointer->events.motion_absolute, &wlr_event); + libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm); + wl_signal_emit(&wlr_dev->pointer->events.motion_absolute, &wlr_event); } void handle_pointer_button(struct libinput_event *event, - struct libinput_device *device) { - struct wlr_input_device *dev = - get_appropriate_device(WLR_INPUT_DEVICE_POINTER, device); - if (!dev) { + struct libinput_device *libinput_dev) { + struct wlr_input_device *wlr_dev = + get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev); + if (!wlr_dev) { wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?"); return; } @@ -72,14 +72,14 @@ void handle_pointer_button(struct libinput_event *event, wlr_event.state = WLR_BUTTON_RELEASED; break; } - wl_signal_emit(&dev->pointer->events.button, &wlr_event); + wl_signal_emit(&wlr_dev->pointer->events.button, &wlr_event); } void handle_pointer_axis(struct libinput_event *event, - struct libinput_device *device) { - struct wlr_input_device *dev = - get_appropriate_device(WLR_INPUT_DEVICE_POINTER, device); - if (!dev) { + struct libinput_device *libinput_dev) { + struct wlr_input_device *wlr_dev = + get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev); + if (!wlr_dev) { wlr_log(L_DEBUG, "Got a pointer event for a device with no pointers?"); return; } @@ -119,6 +119,6 @@ void handle_pointer_axis(struct libinput_event *event, wlr_event.delta = libinput_event_pointer_get_axis_value( pevent, axies[i]); } - wl_signal_emit(&dev->pointer->events.axis, &wlr_event); + wl_signal_emit(&wlr_dev->pointer->events.axis, &wlr_event); } } |