From ff6633db972624b8ed7c073ba61b3c9afb3525ac Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 2 Oct 2020 12:45:25 +1000 Subject: [PATCH] libei: Improve function namespacing Signed-off-by: Peter Hutterer --- src/libei-device.c | 22 ++++++++++++---------- src/libei-private.h | 28 ++++++++++++++-------------- src/libei.c | 30 +++++++++++++----------------- 3 files changed, 39 insertions(+), 41 deletions(-) diff --git a/src/libei-device.c b/src/libei-device.c index 4b01579..830c11c 100644 --- a/src/libei-device.c +++ b/src/libei-device.c @@ -316,8 +316,10 @@ ei_device_add(struct ei_device *device) "%s: device %s is missing an abs pointer range\n", __func__, device->name); - ei_add_device(device); - ei_device_set_state(device, EI_DEVICE_STATE_CONNECTING); + if (ei_send_add_device(device) == 0) { + ei_device_set_state(device, EI_DEVICE_STATE_CONNECTING); + ei_seat_add_device(device); + } } _public_ void @@ -332,7 +334,7 @@ ei_device_remove(struct ei_device *device) } ei_device_set_state(device, EI_DEVICE_STATE_REMOVED); - ei_remove_device(device); + ei_send_remove_device(device); } void @@ -418,7 +420,7 @@ ei_device_pointer_motion(struct ei_device *device, if (device->state != EI_DEVICE_STATE_RESUMED) return; - ei_pointer_rel(device, x, y); + ei_send_pointer_rel(device, x, y); } _public_ void @@ -438,7 +440,7 @@ ei_device_pointer_motion_absolute(struct ei_device *device, y < 0 || y >= device->abs.dim.height) return; - ei_pointer_abs(device, x, y); + ei_send_pointer_abs(device, x, y); } _public_ void @@ -454,7 +456,7 @@ ei_device_pointer_button(struct ei_device *device, if (device->state != EI_DEVICE_STATE_RESUMED) return; - ei_pointer_button(device, button, is_press); + ei_send_pointer_button(device, button, is_press); } _public_ void @@ -470,7 +472,7 @@ ei_device_keyboard_key(struct ei_device *device, if (device->state != EI_DEVICE_STATE_RESUMED) return; - ei_keyboard_key(device, key, is_press); + ei_send_keyboard_key(device, key, is_press); } @@ -532,7 +534,7 @@ ei_touch_down(struct ei_touch *touch, double x, double y) touch->state = TOUCH_IS_DOWN; - ei_touch_touch_down(touch->device, touch->tracking_id, x, y); + ei_send_touch_down(touch->device, touch->tracking_id, x, y); } _public_ void @@ -550,7 +552,7 @@ ei_touch_motion(struct ei_touch *touch, double x, double y) return; } - ei_touch_touch_motion(touch->device, touch->tracking_id, x, y); + ei_send_touch_motion(touch->device, touch->tracking_id, x, y); } _public_ void @@ -564,7 +566,7 @@ ei_touch_up(struct ei_touch *touch) } touch->state = TOUCH_IS_UP; - ei_touch_touch_up(touch->device, touch->tracking_id); + ei_send_touch_up(touch->device, touch->tracking_id); } diff --git a/src/libei-private.h b/src/libei-private.h index 2c4cb75..6594a8e 100644 --- a/src/libei-private.h +++ b/src/libei-private.h @@ -160,38 +160,38 @@ void ei_seat_remove_device(struct ei_device *device); int -ei_add_device(struct ei_device *device); +ei_send_add_device(struct ei_device *device); int -ei_remove_device(struct ei_device *device); +ei_send_remove_device(struct ei_device *device); void ei_drop_device(struct ei_device *device); int -ei_pointer_rel(struct ei_device *device, - double x, double y); +ei_send_pointer_rel(struct ei_device *device, + double x, double y); int -ei_pointer_abs(struct ei_device *device, - double x, double y); +ei_send_pointer_abs(struct ei_device *device, + double x, double y); int -ei_pointer_button(struct ei_device *device, - uint32_t button, bool is_press); +ei_send_pointer_button(struct ei_device *device, + uint32_t button, bool is_press); int -ei_keyboard_key(struct ei_device *device, - uint32_t key, bool is_press); +ei_send_keyboard_key(struct ei_device *device, + uint32_t key, bool is_press); int -ei_touch_touch_down(struct ei_device *device, uint32_t tid, +ei_send_touch_down(struct ei_device *device, uint32_t tid, double x, double y); int -ei_touch_touch_motion(struct ei_device *device, uint32_t tid, - double x, double y); +ei_send_touch_motion(struct ei_device *device, uint32_t tid, + double x, double y); int -ei_touch_touch_up(struct ei_device *device, uint32_t tid); +ei_send_touch_up(struct ei_device *device, uint32_t tid); void ei_device_added(struct ei_device *device); diff --git a/src/libei.c b/src/libei.c index df5e407..6f31311 100644 --- a/src/libei.c +++ b/src/libei.c @@ -460,22 +460,18 @@ ei_disconnect(struct ei *ei) } int -ei_add_device(struct ei_device *device) +ei_send_add_device(struct ei_device *device) { struct ei *ei = ei_device_get_context(device); int rc = connection_send_add(ei, device); - if (rc) { + if (rc) ei_disconnect(ei); - return rc; - } - ei_seat_add_device(device); - - return 0; + return rc; } int -ei_remove_device(struct ei_device *device) +ei_send_remove_device(struct ei_device *device) { struct ei *ei = ei_device_get_context(device); int rc = connection_send_remove(ei, device); @@ -601,7 +597,7 @@ handle_msg_suspended(struct ei *ei, uint32_t deviceid) } int -ei_pointer_rel(struct ei_device *device, double x, double y) +ei_send_pointer_rel(struct ei_device *device, double x, double y) { struct ei *ei = ei_device_get_context(device); int rc = connection_send_rel(ei, device, x, y); @@ -611,7 +607,7 @@ ei_pointer_rel(struct ei_device *device, double x, double y) } int -ei_pointer_abs(struct ei_device *device, double x, double y) +ei_send_pointer_abs(struct ei_device *device, double x, double y) { struct ei *ei = ei_device_get_context(device); int rc = connection_send_abs(ei, device, x, y); @@ -621,7 +617,7 @@ ei_pointer_abs(struct ei_device *device, double x, double y) } int -ei_pointer_button(struct ei_device *device, uint32_t button, bool is_press) +ei_send_pointer_button(struct ei_device *device, uint32_t button, bool is_press) { struct ei *ei = ei_device_get_context(device); int rc = connection_send_button(ei, device, button, is_press); @@ -631,7 +627,7 @@ ei_pointer_button(struct ei_device *device, uint32_t button, bool is_press) } int -ei_keyboard_key(struct ei_device *device, uint32_t key, bool is_press) +ei_send_keyboard_key(struct ei_device *device, uint32_t key, bool is_press) { struct ei *ei = ei_device_get_context(device); int rc = connection_send_key(ei, device, key, is_press); @@ -641,8 +637,8 @@ ei_keyboard_key(struct ei_device *device, uint32_t key, bool is_press) } int -ei_touch_touch_down(struct ei_device *device, uint32_t tid, - double x, double y) +ei_send_touch_down(struct ei_device *device, uint32_t tid, + double x, double y) { struct ei *ei = ei_device_get_context(device); int rc = connection_send_touch_down(ei, device, tid, x, y); @@ -652,8 +648,8 @@ ei_touch_touch_down(struct ei_device *device, uint32_t tid, } int -ei_touch_touch_motion(struct ei_device *device, uint32_t tid, - double x, double y) +ei_send_touch_motion(struct ei_device *device, uint32_t tid, + double x, double y) { struct ei *ei = ei_device_get_context(device); int rc = connection_send_touch_motion(ei, device, tid, x, y); @@ -663,7 +659,7 @@ ei_touch_touch_motion(struct ei_device *device, uint32_t tid, } int -ei_touch_touch_up(struct ei_device *device, uint32_t tid) +ei_send_touch_up(struct ei_device *device, uint32_t tid) { struct ei *ei = ei_device_get_context(device); int rc = connection_send_touch_up(ei, device, tid);