fdo-mirrors/libei
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libei.git synced 2025-12-20 04:30:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ei: re-order a few arguments to match the order in the protocol

Browse source 
No functional changes
This commit is contained in:
Peter Hutterer 2023-02-01 10:39:14 +10:00
parent affc464caa
commit e515edafa5
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libei-proto.c
View file

@ -69,7 +69,7 @@ ei_proto_handle_message(struct ei *ei,
case SERVER_MESSAGE__MSG_SEAT_ADDED:
rc = call(seat_added, ei,
proto->seat_added->seatid,
proto->seat_added->name, proto->seat_added->capabilities);
proto->seat_added->capabilities, proto->seat_added->name);
break;
case SERVER_MESSAGE__MSG_SEAT_REMOVED:
rc = call(seat_removed, ei,
@ -78,9 +78,9 @@ ei_proto_handle_message(struct ei *ei,
case SERVER_MESSAGE__MSG_DEVICE_ADDED:
rc = call(device_added, ei,
proto->device_added->deviceid,
proto->device_added->seatid,
proto->device_added->name,
proto->device_added->capabilities,
proto->device_added->name,
proto->device_added->seatid,
proto->device_added->type,
proto->device_added->width,
proto->device_added->height);
@ -95,8 +95,7 @@ ei_proto_handle_message(struct ei *ei,
rc = call(device_keymap, ei,
proto->device_keymap->deviceid,
proto->device_keymap->keymap_type,
fd,
proto->device_keymap->keymap_size);
proto->device_keymap->keymap_size, fd);
xclose(fd);
}
break;
@ -113,8 +112,8 @@ ei_proto_handle_message(struct ei *ei,
rc = call(keyboard_modifiers, ei,
proto->keyboard_modifiers->deviceid,
proto->keyboard_modifiers->depressed,
proto->keyboard_modifiers->latched,
proto->keyboard_modifiers->locked,
proto->keyboard_modifiers->latched,
proto->keyboard_modifiers->group);
break;
case SERVER_MESSAGE__MSG_DEVICE_REMOVED:

5
src/libei-proto.h
View file

@ -37,7 +37,7 @@ struct ei_proto_interface {
int (*connected)(struct ei *ei);
int (*disconnected)(struct ei *ei);
int (*seat_added)(struct ei *ei, uint32_t seatid,
const char *name, uint32_t capabilities);
uint32_t capabilities, const char *name);
int (*seat_removed)(struct ei *ei, uint32_t seatid);
int (*device_added)(struct ei *ei, uint32_t deviceid, uint32_t seatid,
const char *name, uint32_t capabilities, uint32_t type,
@ -51,8 +51,7 @@ struct ei_proto_interface {
double scale);
int (*device_keymap)(struct ei *ei, uint32_t deviceid,
enum ei_keymap_type keymap_type,
int keymap_fd,
size_t keymap_size);
size_t keymap_size, int keymap_fd);
int (*keyboard_modifiers)(struct ei *ei, uint32_t deviceid,
uint32_t depressed, uint32_t latched,
uint32_t locked, uint32_t group);

12
src/libei.c
View file

@ -642,7 +642,7 @@ ei_disconnect(struct ei *ei)
static int
handle_msg_seat_added(struct ei *ei, uint32_t seatid,
const char *name, uint32_t capabilities)
uint32_t capabilities, const char *name)
{
log_debug(ei, "Added seat %#x '%s' with caps %#x",
seatid, name, capabilities);
@ -671,8 +671,8 @@ handle_msg_seat_removed(struct ei *ei, uint32_t seatid)
}
static int
handle_msg_device_added(struct ei *ei, uint32_t deviceid, uint32_t seatid,
const char *name, uint32_t capabilities, uint32_t type,
handle_msg_device_added(struct ei *ei, uint32_t deviceid, uint32_t capabilities,
const char *name, uint32_t seatid, uint32_t type,
uint32_t width, uint32_t height)
{
struct ei_seat *seat = ei_find_seat(ei, seatid);
@ -724,7 +724,7 @@ handle_msg_device_added(struct ei *ei, uint32_t deviceid, uint32_t seatid,
static int
handle_msg_device_keymap(struct ei *ei, uint32_t deviceid,
enum ei_keymap_type keymap_type,
int keymap_fd, size_t keymap_sz)
size_t keymap_sz, int keymap_fd)
{
log_debug(ei, "Adding keymap for %#x", deviceid);
@ -788,8 +788,8 @@ handle_msg_device_region(struct ei *ei, uint32_t deviceid,
static int
handle_msg_keyboard_modifiers(struct ei *ei, uint32_t deviceid,
uint32_t depressed, uint32_t latched,
uint32_t locked, uint32_t group)
uint32_t depressed, uint32_t locked,
uint32_t latched, uint32_t group)
{
log_debug(ei, "Setting modifiers for %#x", deviceid);