2eee9aa445
When device open or close messages are sent to seatd, libseat must read
messages from the socket until it sees the associated response message.
This means that it may drain enable/disable seat events from the socket,
queueing them internally for deferred processing.
As the socket is drained, the caller will not wake from a poll and have
no reason to dispatch libseat. To ensure that these messages would not
be left in the queue, 6fa82930d0 made it
so that open/close calls would execute all queued events just before
returning.
Unfortunately, this had the side-effect of having events fire from the
stack of libseat_open_device or libseat_close_device, which we now see
cause problems in compositors. Specifically, an issue has been observed
where libinput end up calling libseat_close_device, which in turn
dispatch a disable seat event that calls libinput_suspend. libinput does
not like this.
Instead, remove the execution from libseat_open_device and
libseat_close_device, and instead make a "ping" request to seatd if
events have been queued. The response to this will wake us up and ensure
that dispatch is called.
63 lines
1.5 KiB
C
63 lines
1.5 KiB
C
#ifndef _SEATD_CONSTANTS_H
|
|
#define _SEATD_CONSTANTS_H
|
|
|
|
#define MAX_PATH_LEN 256
|
|
#define MAX_SEAT_LEN 64
|
|
#define MAX_SEAT_DEVICES 128
|
|
#define MAX_SESSION_LEN 64
|
|
|
|
#define CLIENT_EVENT(opcode) (opcode)
|
|
#define SERVER_EVENT(opcode) ((opcode) + (1 << 15))
|
|
|
|
#define CLIENT_OPEN_SEAT CLIENT_EVENT(1)
|
|
#define CLIENT_CLOSE_SEAT CLIENT_EVENT(2)
|
|
#define CLIENT_OPEN_DEVICE CLIENT_EVENT(3)
|
|
#define CLIENT_CLOSE_DEVICE CLIENT_EVENT(4)
|
|
#define CLIENT_DISABLE_SEAT CLIENT_EVENT(5)
|
|
#define CLIENT_SWITCH_SESSION CLIENT_EVENT(6)
|
|
#define CLIENT_PING CLIENT_EVENT(7)
|
|
|
|
#define SERVER_SEAT_OPENED SERVER_EVENT(1)
|
|
#define SERVER_SEAT_CLOSED SERVER_EVENT(2)
|
|
#define SERVER_DEVICE_OPENED SERVER_EVENT(3)
|
|
#define SERVER_DEVICE_CLOSED SERVER_EVENT(4)
|
|
#define SERVER_DISABLE_SEAT SERVER_EVENT(5)
|
|
#define SERVER_ENABLE_SEAT SERVER_EVENT(6)
|
|
#define SERVER_PONG SERVER_EVENT(7)
|
|
#define SERVER_ERROR SERVER_EVENT(0x7FFF)
|
|
|
|
#include <stdint.h>
|
|
|
|
struct proto_header {
|
|
uint16_t opcode;
|
|
uint16_t size;
|
|
};
|
|
|
|
struct proto_client_open_device {
|
|
uint16_t path_len;
|
|
// NULL-terminated byte-sequence path_len long follows
|
|
};
|
|
|
|
struct proto_client_close_device {
|
|
int device_id;
|
|
};
|
|
|
|
struct proto_client_switch_session {
|
|
int session;
|
|
};
|
|
|
|
struct proto_server_seat_opened {
|
|
uint16_t seat_name_len;
|
|
// NULL-terminated byte-sequence seat_name_len long follows
|
|
};
|
|
|
|
struct proto_server_device_opened {
|
|
int device_id;
|
|
// One fd in auxillary data
|
|
};
|
|
|
|
struct proto_server_error {
|
|
int error_code;
|
|
};
|
|
|
|
#endif
|