isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-02 14:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

seat/x11: Make clutter backend variable naming more consistent

Browse Source 
Name ClutterBackend pointers clutter_backend. That'll make things less
confusing when mixed with MetaBackend pointers.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2014>
This commit is contained in:
Jonas Ådahl 2021-09-17 16:48:43 +02:00
parent fc3b80fc60
commit eae1e532dd
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backends/x11/meta-seat-x11.c
View File

@ -476,7 +476,7 @@ guess_source_from_wacom_type (MetaSeatX11 *seat_x11,
static ClutterInputDevice * static ClutterInputDevice *
create_device (MetaSeatX11 *seat_x11, create_device (MetaSeatX11 *seat_x11,
ClutterBackend *backend, ClutterBackend *clutter_backend,
XIDeviceInfo *info) XIDeviceInfo *info)
{ {
Display *xdisplay = xdisplay_from_seat (seat_x11); Display *xdisplay = xdisplay_from_seat (seat_x11);
@ -557,7 +557,7 @@ create_device (MetaSeatX11 *seat_x11,
"has-cursor", (info->use == XIMasterPointer), "has-cursor", (info->use == XIMasterPointer),
"device-type", source, "device-type", source,
"device-mode", mode, "device-mode", mode,
"backend", backend, "backend", clutter_backend,
"vendor-id", vendor_id, "vendor-id", vendor_id,
"product-id", product_id, "product-id", product_id,
"device-node", node_path, "device-node", node_path,
@ -639,12 +639,12 @@ update_touch_mode (MetaSeatX11 *seat_x11)
static ClutterInputDevice * static ClutterInputDevice *
add_device (MetaSeatX11 *seat_x11, add_device (MetaSeatX11 *seat_x11,
ClutterBackend *backend, ClutterBackend *clutter_backend,
XIDeviceInfo *info) XIDeviceInfo *info)
{ {
ClutterInputDevice *device; ClutterInputDevice *device;
device = create_device (seat_x11, backend, info); device = create_device (seat_x11, clutter_backend, info);
g_hash_table_replace (seat_x11->devices_by_id, g_hash_table_replace (seat_x11->devices_by_id,
GINT_TO_POINTER (info->deviceid), GINT_TO_POINTER (info->deviceid),
@ -782,7 +782,7 @@ device_get_tool_serial (MetaSeatX11 *seat_x11,
} }
static gboolean static gboolean
translate_hierarchy_event (ClutterBackend *backend, translate_hierarchy_event (ClutterBackend *clutter_backend,
MetaSeatX11 *seat_x11, MetaSeatX11 *seat_x11,
XIHierarchyEvent *ev, XIHierarchyEvent *ev,
ClutterEvent *event) ClutterEvent *event)
@ -811,7 +811,7 @@ translate_hierarchy_event (ClutterBackend *backend,
{ {
ClutterInputDevice *device; ClutterInputDevice *device;
device = add_device (seat_x11, backend, &info[0]); device = add_device (seat_x11, clutter_backend, &info[0]);
event->any.type = CLUTTER_DEVICE_ADDED; event->any.type = CLUTTER_DEVICE_ADDED;
event->any.time = ev->time; event->any.time = ev->time;
@ -1394,7 +1394,7 @@ meta_seat_x11_constructed (GObject *object)
{ {
MetaSeatX11 *seat_x11 = META_SEAT_X11 (object); MetaSeatX11 *seat_x11 = META_SEAT_X11 (object);
Display *xdisplay = xdisplay_from_seat (seat_x11); Display *xdisplay = xdisplay_from_seat (seat_x11);
ClutterBackend *backend = ClutterBackend *clutter_backend =
meta_backend_get_clutter_backend (seat_x11->backend); meta_backend_get_clutter_backend (seat_x11->backend);
XIDeviceInfo *info; XIDeviceInfo *info;
XIEventMask event_mask; XIEventMask event_mask;
@ -1410,7 +1410,7 @@ meta_seat_x11_constructed (GObject *object)
if (!xi_device->enabled) if (!xi_device->enabled)
continue; continue;
add_device (seat_x11, backend, xi_device); add_device (seat_x11, clutter_backend, xi_device);
} }
XIFreeDeviceInfo (info); XIFreeDeviceInfo (info);
@ -1441,7 +1441,7 @@ meta_seat_x11_constructed (GObject *object)
XSync (xdisplay, False); XSync (xdisplay, False);
seat_x11->keymap = g_object_new (META_TYPE_KEYMAP_X11, seat_x11->keymap = g_object_new (META_TYPE_KEYMAP_X11,
"backend", backend, "backend", clutter_backend,
NULL); NULL);
g_signal_connect (seat_x11->keymap, g_signal_connect (seat_x11->keymap,
"state-changed", "state-changed",
@ -1878,7 +1878,7 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
ClutterEvent *event) ClutterEvent *event)
{ {
Display *xdisplay = xdisplay_from_seat (seat); Display *xdisplay = xdisplay_from_seat (seat);
ClutterBackend *backend = ClutterBackend *clutter_backend =
meta_backend_get_clutter_backend (seat->backend); meta_backend_get_clutter_backend (seat->backend);
gboolean retval = FALSE; gboolean retval = FALSE;
ClutterStage *stage = NULL; ClutterStage *stage = NULL;
@ -1927,7 +1927,7 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
{ {
XIHierarchyEvent *xev = (XIHierarchyEvent *) xi_event; XIHierarchyEvent *xev = (XIHierarchyEvent *) xi_event;
retval = translate_hierarchy_event (backend, seat, xev, event); retval = translate_hierarchy_event (clutter_backend, seat, xev, event);
} }
break; break;