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

eis/client: Add user_data to add-device helper

Browse Source 
This will allow passing extra context to the configure function.
Currently all NULL, but preparing for the future.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3228>
This commit is contained in:
Jonas Ådahl 2023-08-28 22:14:53 +02:00 committed by Marge Bot
parent 63acc732ad
commit 12c7c1bffb
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/backends/meta-eis-client.c
View File

@ -57,7 +57,8 @@ struct _MetaEisClient
G_DEFINE_TYPE (MetaEisClient, meta_eis_client, G_TYPE_OBJECT) G_DEFINE_TYPE (MetaEisClient, meta_eis_client, G_TYPE_OBJECT)
typedef void (* MetaEisDeviceConfigFunc) (MetaEisClient *client, typedef void (* MetaEisDeviceConfigFunc) (MetaEisClient *client,
struct eis_device *device); struct eis_device *device,
gpointer user_data);
static bool static bool
bit_is_set (const guchar *array, bit_is_set (const guchar *array,
@ -167,7 +168,8 @@ meta_eis_device_free (MetaEisDevice *device)
static void static void
configure_rel (MetaEisClient *client, configure_rel (MetaEisClient *client,
struct eis_device *eis_device) struct eis_device *eis_device,
gpointer user_data)
{ {
eis_device_configure_capability (eis_device, EIS_DEVICE_CAP_POINTER); eis_device_configure_capability (eis_device, EIS_DEVICE_CAP_POINTER);
eis_device_configure_capability (eis_device, EIS_DEVICE_CAP_BUTTON); eis_device_configure_capability (eis_device, EIS_DEVICE_CAP_BUTTON);
@ -176,7 +178,8 @@ configure_rel (MetaEisClient *client,
static void static void
configure_keyboard (MetaEisClient *client, configure_keyboard (MetaEisClient *client,
struct eis_device *eis_device) struct eis_device *eis_device,
gpointer user_data)
{ {
size_t len; size_t len;
MetaAnonymousFile *f; MetaAnonymousFile *f;
@ -218,7 +221,8 @@ configure_keyboard (MetaEisClient *client,
static void static void
configure_abs (MetaEisClient *client, configure_abs (MetaEisClient *client,
struct eis_device *eis_device) struct eis_device *eis_device,
gpointer user_data)
{ {
int idx = 0; int idx = 0;
MtkRectangle rect; MtkRectangle rect;
@ -247,7 +251,8 @@ add_device (MetaEisClient *client,
struct eis_seat *eis_seat, struct eis_seat *eis_seat,
ClutterInputDeviceType type, ClutterInputDeviceType type,
const char *name_suffix, const char *name_suffix,
MetaEisDeviceConfigFunc extra_config_func) MetaEisDeviceConfigFunc extra_config_func,
gpointer extra_config_user_data)
{ {
MetaBackend *backend = meta_eis_get_backend (client->eis); MetaBackend *backend = meta_eis_get_backend (client->eis);
MetaEisDevice *device; MetaEisDevice *device;
@ -262,7 +267,7 @@ add_device (MetaEisClient *client,
name_suffix); name_suffix);
eis_device_configure_name (eis_device, name); eis_device_configure_name (eis_device, name);
if (extra_config_func) if (extra_config_func)
extra_config_func (client, eis_device); extra_config_func (client, eis_device, extra_config_user_data);
device = g_new0 (MetaEisDevice, 1); device = g_new0 (MetaEisDevice, 1);
device->eis_device = eis_device_ref (eis_device); device->eis_device = eis_device_ref (eis_device);
@ -521,7 +526,7 @@ on_keymap_changed (MetaBackend *backend,
client->eis_seat, client->eis_seat,
CLUTTER_KEYBOARD_DEVICE, CLUTTER_KEYBOARD_DEVICE,
"virtual keyboard", "virtual keyboard",
configure_keyboard); configure_keyboard, NULL);
} }
gboolean gboolean
@ -541,7 +546,7 @@ meta_eis_client_process_event (MetaEisClient *client,
eis_seat, eis_seat,
CLUTTER_POINTER_DEVICE, CLUTTER_POINTER_DEVICE,
"virtual pointer", "virtual pointer",
configure_rel); configure_rel, NULL);
} }
if (eis_event_seat_has_capability (event, EIS_DEVICE_CAP_KEYBOARD)) if (eis_event_seat_has_capability (event, EIS_DEVICE_CAP_KEYBOARD))
{ {
@ -549,7 +554,7 @@ meta_eis_client_process_event (MetaEisClient *client,
eis_seat, eis_seat,
CLUTTER_KEYBOARD_DEVICE, CLUTTER_KEYBOARD_DEVICE,
"virtual keyboard", "virtual keyboard",
configure_keyboard); configure_keyboard, NULL);
g_signal_connect (meta_eis_get_backend (client->eis), g_signal_connect (meta_eis_get_backend (client->eis),
"keymap-changed", "keymap-changed",
@ -562,7 +567,8 @@ meta_eis_client_process_event (MetaEisClient *client,
eis_seat, eis_seat,
CLUTTER_POINTER_DEVICE, CLUTTER_POINTER_DEVICE,
"virtual absolute pointer", "virtual absolute pointer",
configure_abs); configure_abs,
NULL);
} }
break; break;
@ -641,7 +647,8 @@ meta_eis_client_set_viewports (MetaEisClient *client,
client->eis_seat, client->eis_seat,
CLUTTER_POINTER_DEVICE, CLUTTER_POINTER_DEVICE,
"virtual absolute pointer", "virtual absolute pointer",
configure_abs); configure_abs,
NULL);
} }
static void static void