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

clutter: Drop ClutterInputDevice::enabled and setter/getter

Browse Source 
This is unused now, and not something we generally allow.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403>
This commit is contained in:
Carlos Garnacho
2020-07-16 12:13:04 +02:00
committed by Marge Bot
parent c2940efe8b
commit b1d12a994d
6 changed files with 1 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/native/meta-input-device-native.c
View File

@ -1295,7 +1295,6 @@ meta_input_device_native_new (MetaSeatNative *seat,
"name", libinput_device_get_name (libinput_device),
"device-type", type,
"device-mode", CLUTTER_INPUT_MODE_PHYSICAL,
"enabled", TRUE,
"vendor-id", vendor,
"product-id", product,
"n-rings", n_rings,
@ -1355,7 +1354,6 @@ meta_input_device_native_new_virtual (MetaSeatNative *seat,
"name", name,
"device-type", type,
"device-mode", mode,
"enabled", TRUE,
"seat", seat,
NULL);

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

@ -474,7 +474,6 @@ create_device (MetaSeatX11 *seat_x11,
ClutterInputDeviceType source, touch_source;
ClutterInputDevice *retval;
ClutterInputMode mode;
gboolean is_enabled;
uint32_t num_touches = 0, num_rings = 0, num_strips = 0;
char *vendor_id = NULL, *product_id = NULL, *node_path = NULL;
@ -520,19 +519,16 @@ create_device (MetaSeatX11 *seat_x11,
case XIMasterKeyboard:
case XIMasterPointer:
mode = CLUTTER_INPUT_MODE_LOGICAL;
is_enabled = TRUE;
break;
case XISlaveKeyboard:
case XISlavePointer:
mode = CLUTTER_INPUT_MODE_PHYSICAL;
is_enabled = FALSE;
break;
case XIFloatingSlave:
default:
mode = CLUTTER_INPUT_MODE_FLOATING;
is_enabled = FALSE;
break;
}
@ -544,10 +540,7 @@ create_device (MetaSeatX11 *seat_x11,
}
if (source == CLUTTER_PAD_DEVICE)
{
is_enabled = TRUE;
get_pad_features (info, &num_rings, &num_strips);
}
get_pad_features (info, &num_rings, &num_strips);
retval = g_object_new (META_TYPE_INPUT_DEVICE_X11,
"name", info->name,
@ -556,7 +549,6 @@ create_device (MetaSeatX11 *seat_x11,
"device-type", source,
"device-mode", mode,
"backend", backend,
"enabled", is_enabled,
"vendor-id", vendor_id,
"product-id", product_id,
"device-node", node_path,