isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Move evdev evcode data to Clutter button/key events

Browse Source 
We have this as platform-dependent data in the native backend, and
a bunch of fallback code done in place in the evcode users. Stop
making this platform-dependent data, and move it to the relevant
ClutterEvents.

The fallback code for the X11 backend case is about the same, but
now it is done directly by the X11 backend.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1623>
This commit is contained in:
Carlos Garnacho
2020-12-08 12:28:01 +01:00
committed by Marge Bot
parent 09b956997c
commit 9f5c453fc7
9 changed files with 58 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/backends/native/meta-event-native.c
View File

@ -28,8 +28,6 @@ typedef struct _MetaEventNative MetaEventNative;
struct _MetaEventNative
{
uint32_t evcode;
uint64_t time_usec;
gboolean has_relative_motion;
@ -75,16 +73,6 @@ meta_event_native_ensure_platform_data (ClutterEvent *event)
return event_evdev;
}
void
meta_event_native_set_event_code (ClutterEvent *event,
uint32_t evcode)
{
MetaEventNative *event_evdev;
event_evdev = meta_event_native_ensure_platform_data (event);
event_evdev->evcode = evcode;
}
void
meta_event_native_set_time_usec (ClutterEvent *event,
uint64_t time_usec)
@ -112,26 +100,6 @@ meta_event_native_set_relative_motion (ClutterEvent *event,
event_evdev->has_relative_motion = TRUE;
}
/**
* meta_event_native_get_event_code:
* @event: a #ClutterEvent
*
* Returns the event code of the original event. See linux/input.h for more
* information.
*
* Returns: The event code.
**/
uint32_t
meta_event_native_get_event_code (const ClutterEvent *event)
{
MetaEventNative *event_evdev = _clutter_event_get_platform_data (event);
if (event_evdev)
return event_evdev->evcode;
return 0;
}
/**
* meta_event_native_get_time_usec:
* @event: a #ClutterEvent

3
src/backends/native/meta-event-native.h
View File

@ -28,9 +28,6 @@ typedef struct _MetaEventNative MetaEventNative;
MetaEventNative * meta_event_native_copy (MetaEventNative *event_evdev);
void meta_event_native_free (MetaEventNative *event_evdev);
uint32_t meta_event_native_get_event_code (const ClutterEvent *event);
void meta_event_native_set_event_code (ClutterEvent *event,
uint32_t evcode);
uint64_t meta_event_native_get_time_usec (const ClutterEvent *event);
void meta_event_native_set_time_usec (ClutterEvent *event,
uint64_t time_usec);

4
src/backends/native/meta-seat-impl.c
View File

@ -397,7 +397,7 @@ meta_seat_impl_notify_key_in_impl (MetaSeatImpl *seat_impl,
seat_impl->xkb,
seat_impl->button_state,
us2ms (time_us), key, state);
meta_event_native_set_event_code (event, key);
event->key.evdev_code = key;
keycode = meta_xkb_evdev_to_keycode (key);
@ -712,7 +712,7 @@ meta_seat_impl_notify_button_in_impl (MetaSeatImpl *seat_impl,
button = mapped_button;
}
meta_event_native_set_event_code (event, button);
event->button.evdev_code = button;
if (clutter_input_device_get_device_type (input_device) == CLUTTER_TABLET_DEVICE)
{