mirror of
https://github.com/brl/mutter.git
synced 2024-12-24 20:12:06 +00:00
wayland: discard non-seat events sent to the seat
The wayland seat event handlers get sent events that aren't strictly interesting to them (such as events for hardware devices the seat doesn't support and events for virtual devices that the seat needs to ignore). This commit makes sure all uninteresting events get ignored.
This commit is contained in:
parent
56ca7eeb65
commit
673ddfde04
@ -242,10 +242,55 @@ meta_wayland_seat_free (MetaWaylandSeat *seat)
|
|||||||
g_slice_free (MetaWaylandSeat, seat);
|
g_slice_free (MetaWaylandSeat, seat);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
event_from_supported_hardware_device (MetaWaylandSeat *seat,
|
||||||
|
const ClutterEvent *event)
|
||||||
|
{
|
||||||
|
ClutterInputDevice *input_device;
|
||||||
|
ClutterInputMode input_mode;
|
||||||
|
ClutterInputDeviceType device_type;
|
||||||
|
gboolean hardware_device = FALSE;
|
||||||
|
gboolean supported_device = FALSE;
|
||||||
|
|
||||||
|
input_device = clutter_event_get_source_device (event);
|
||||||
|
|
||||||
|
if (input_device == NULL)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
input_mode = clutter_input_device_get_device_mode (input_device);
|
||||||
|
|
||||||
|
if (input_mode != CLUTTER_INPUT_MODE_SLAVE)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
hardware_device = TRUE;
|
||||||
|
|
||||||
|
device_type = clutter_input_device_get_device_type (input_device);
|
||||||
|
|
||||||
|
switch (device_type)
|
||||||
|
{
|
||||||
|
case CLUTTER_TOUCHPAD_DEVICE:
|
||||||
|
case CLUTTER_POINTER_DEVICE:
|
||||||
|
case CLUTTER_KEYBOARD_DEVICE:
|
||||||
|
case CLUTTER_TOUCHSCREEN_DEVICE:
|
||||||
|
supported_device = TRUE;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
supported_device = FALSE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
|
return hardware_device && supported_device;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
meta_wayland_seat_update (MetaWaylandSeat *seat,
|
meta_wayland_seat_update (MetaWaylandSeat *seat,
|
||||||
const ClutterEvent *event)
|
const ClutterEvent *event)
|
||||||
{
|
{
|
||||||
|
if (!event_from_supported_hardware_device (seat, event))
|
||||||
|
return;
|
||||||
|
|
||||||
switch (event->type)
|
switch (event->type)
|
||||||
{
|
{
|
||||||
case CLUTTER_MOTION:
|
case CLUTTER_MOTION:
|
||||||
@ -275,6 +320,9 @@ gboolean
|
|||||||
meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
|
meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
|
||||||
const ClutterEvent *event)
|
const ClutterEvent *event)
|
||||||
{
|
{
|
||||||
|
if (!event_from_supported_hardware_device (seat, event))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
switch (event->type)
|
switch (event->type)
|
||||||
{
|
{
|
||||||
case CLUTTER_MOTION:
|
case CLUTTER_MOTION:
|
||||||
|
Loading…
Reference in New Issue
Block a user