brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends: Drop the filter for libinput events

Browse Source 
This is now unused, and it's arguably any useful to stay.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403
This commit is contained in:
Carlos Garnacho 2020-05-06 13:54:23 +02:00
parent 3083e98254
commit 908a331fa8
2 changed files with 0 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/backends/native/meta-seat-native.c
View File

@ -65,15 +65,6 @@
#define BTN_STYLUS3 0x149 /* Linux 4.15 */ #define BTN_STYLUS3 0x149 /* Linux 4.15 */
#endif #endif
typedef struct _MetaEventFilter MetaEventFilter;
struct _MetaEventFilter
{
MetaEvdevFilterFunc func;
gpointer data;
GDestroyNotify destroy_notify;
};
struct _MetaEventSource struct _MetaEventSource
{ {
GSource source; GSource source;
@ -2350,40 +2341,10 @@ process_device_event (MetaSeatNative *seat,
return handled; return handled;
} }
static gboolean
filter_event (MetaSeatNative *seat,
struct libinput_event *event)
{
gboolean retval = CLUTTER_EVENT_PROPAGATE;
MetaEventFilter *filter;
GSList *tmp_list;
tmp_list = seat->event_filters;
while (tmp_list)
{
filter = tmp_list->data;
retval = filter->func (event, filter->data);
tmp_list = tmp_list->next;
if (retval != CLUTTER_EVENT_PROPAGATE)
break;
}
return retval;
}
static void static void
process_event (MetaSeatNative *seat, process_event (MetaSeatNative *seat,
struct libinput_event *event) struct libinput_event *event)
{ {
gboolean retval;
retval = filter_event (seat, event);
if (retval != CLUTTER_EVENT_PROPAGATE)
return;
if (process_base_event (seat, event)) if (process_base_event (seat, event))
return; return;
if (process_device_event (seat, event)) if (process_device_event (seat, event))
@ -2968,69 +2929,6 @@ meta_seat_native_set_relative_motion_filter (MetaSeatNative *seat,
seat->relative_motion_filter_user_data = user_data; seat->relative_motion_filter_user_data = user_data;
} }
/**
* meta_seat_native_add_filter: (skip)
* @func: (closure data): a filter function
* @data: (allow-none): user data to be passed to the filter function, or %NULL
* @destroy_notify: (allow-none): function to call on @data when the filter is removed, or %NULL
*
* Adds an event filter function.
*/
void
meta_seat_native_add_filter (MetaSeatNative *seat,
MetaEvdevFilterFunc func,
gpointer data,
GDestroyNotify destroy_notify)
{
MetaEventFilter *filter;
g_return_if_fail (func != NULL);
filter = g_new0 (MetaEventFilter, 1);
filter->func = func;
filter->data = data;
filter->destroy_notify = destroy_notify;
seat->event_filters = g_slist_append (seat->event_filters, filter);
}
/**
* meta_seat_native_remove_filter: (skip)
* @func: a filter function
* @data: (allow-none): user data to be passed to the filter function, or %NULL
*
* Removes the given filter function.
*/
void
meta_seat_native_remove_filter (MetaSeatNative *seat,
MetaEvdevFilterFunc func,
gpointer data)
{
MetaEventFilter *filter;
GSList *tmp_list;
g_return_if_fail (func != NULL);
tmp_list = seat->event_filters;
while (tmp_list)
{
filter = tmp_list->data;
if (filter->func == func && filter->data == data)
{
if (filter->destroy_notify)
filter->destroy_notify (filter->data);
g_free (filter);
seat->event_filters =
g_slist_delete_link (seat->event_filters, tmp_list);
return;
}
tmp_list = tmp_list->next;
}
}
void void
meta_seat_native_update_xkb_state (MetaSeatNative *seat) meta_seat_native_update_xkb_state (MetaSeatNative *seat)
{ {

13
src/backends/native/meta-seat-native.h
View File

@ -114,8 +114,6 @@ struct _MetaSeatNative
MetaRelativeMotionFilter relative_motion_filter; MetaRelativeMotionFilter relative_motion_filter;
gpointer relative_motion_filter_user_data; gpointer relative_motion_filter_user_data;
GSList *event_filters;
MetaKeymapNative *keymap; MetaKeymapNative *keymap;
GUdevClient *udev_client; GUdevClient *udev_client;
@ -273,17 +271,6 @@ void meta_seat_native_set_relative_motion_filter (MetaSeatNative *seat
MetaRelativeMotionFilter filter, MetaRelativeMotionFilter filter,
gpointer user_data); gpointer user_data);
typedef gboolean (* MetaEvdevFilterFunc) (struct libinput_event *event,
gpointer data);
void meta_seat_native_add_filter (MetaSeatNative *seat,
MetaEvdevFilterFunc func,
gpointer data,
GDestroyNotify destroy_notify);
void meta_seat_native_remove_filter (MetaSeatNative *seat,
MetaEvdevFilterFunc func,
gpointer data);
struct xkb_state * meta_seat_native_get_xkb_state (MetaSeatNative *seat); struct xkb_state * meta_seat_native_get_xkb_state (MetaSeatNative *seat);
void meta_seat_native_set_keyboard_map (MetaSeatNative *seat, void meta_seat_native_set_keyboard_map (MetaSeatNative *seat,