From 83adc38e5918e455ad5b830008b6dbc1adb4b8ea Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 30 Jun 2025 16:40:36 +0200
Subject: [PATCH] fix name clash on `range` parameter

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 src/xf86libinput.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index 9cfb83a..b62173b 100644
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -463,7 +463,7 @@ xf86libinput_set_pressurecurve(struct xf86libinput *driver_data,
 
 static inline bool
 xf86libinput_set_pressure_range(struct xf86libinput *driver_data,
-				const struct range *range)
+				const struct range *rangeopt)
 {
 #if HAVE_LIBINPUT_PRESSURE_RANGE
 	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
@@ -473,8 +473,8 @@ xf86libinput_set_pressure_range(struct xf86libinput *driver_data,
 
 	return libinput_tablet_tool_config_pressure_range_is_available(tool) &&
 	       libinput_tablet_tool_config_pressure_range_set(tool,
-							      range->min,
-							      range->max) == LIBINPUT_CONFIG_STATUS_SUCCESS;
+							      rangeopt->min,
+							      rangeopt->max) == LIBINPUT_CONFIG_STATUS_SUCCESS;
 #else
 	return FALSE;
 #endif
@@ -935,16 +935,16 @@ LibinputApplyConfigPressureRange(DeviceIntPtr dev,
 #if HAVE_LIBINPUT_PRESSURE_RANGE
 	InputInfoPtr pInfo = dev->public.devicePrivate;
 	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
-	struct range *range = &driver_data->options.pressure_range;
+	struct range *rangeopt = &driver_data->options.pressure_range;
 
 	if (!subdevice_has_capabilities(dev, CAP_TABLET_TOOL))
 		return;
 
 	if (tool && libinput_tablet_tool_config_pressure_range_is_available(tool) &&
-	    libinput_tablet_tool_config_pressure_range_set(tool, range->min, range->max) != LIBINPUT_CONFIG_STATUS_SUCCESS)
+	    libinput_tablet_tool_config_pressure_range_set(tool, rangeopt->min, rangeopt->max) != LIBINPUT_CONFIG_STATUS_SUCCESS)
 		xf86IDrvMsg(pInfo, X_ERROR,
 			    "Failed to set PressureRange to %.2f..%.2f\n",
-			    range->min, range->max);
+			    rangeopt->min, rangeopt->max);
 #endif
 }
 
@@ -3666,7 +3666,7 @@ out:
 static void
 xf86libinput_parse_pressure_range_option(InputInfoPtr pInfo,
 					 struct xf86libinput *driver_data,
-					 struct range *range)
+					 struct range *rangeopt)
 {
 #if HAVE_LIBINPUT_PRESSURE_RANGE
 	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
@@ -3674,8 +3674,8 @@ xf86libinput_parse_pressure_range_option(InputInfoPtr pInfo,
 	char *str;
 	int rc;
 
-	range->min = 0.0;
-	range->max = 1.0;
+	rangeopt->min = 0.0;
+	rangeopt->max = 1.0;
 
 	if ((driver_data->capabilities & CAP_TABLET_TOOL) == 0)
 		return;
@@ -3696,8 +3696,8 @@ xf86libinput_parse_pressure_range_option(InputInfoPtr pInfo,
 	if (min < 0.0 || max > 1.0 || min >= max)
 		goto out;
 
-	range->min = min;
-	range->max = max;
+	rangeopt->min = min;
+	rangeopt->max = max;
 out:
 	free(str);
 #endif
@@ -5334,28 +5334,28 @@ LibinputSetPropertyPressureRange(DeviceIntPtr dev,
 	InputInfoPtr pInfo = dev->public.devicePrivate;
 	struct xf86libinput *driver_data = pInfo->private;
 	float *vals;
-	struct range range = { 0.0, 1.0 };
+	struct range rangeopt = { 0.0, 1.0 };
 
 	if (val->format != 32 || val->size != 2 || val->type != prop_float)
 		return BadMatch;
 
 	vals = val->data;
-	range.min = vals[0];
-	range.max = vals[1];
+	rangeopt.min = vals[0];
+	rangeopt.max = vals[1];
 
 	if (checkonly) {
-		if (range.min < 0.0 || range.max > 1.0 || range.min >= range.max)
+		if (rangeopt.min < 0.0 || rangeopt.max > 1.0 || rangeopt.min >= rangeopt.max)
 			return BadValue;
 
 		/* Disallow reducing the range to less than 20% of the range, mostly
 		 * to avoid footguns */
-		if (range.max - range.min < 0.2)
+		if (rangeopt.max - rangeopt.min < 0.2)
 			return BadValue;
 
 		if (!xf86libinput_check_device(dev, atom))
 			return BadMatch;
 	} else {
-		driver_data->options.pressure_range = range;
+		driver_data->options.pressure_range = rangeopt;
 	}
 
 	return Success;
@@ -6584,10 +6584,10 @@ LibinputInitPressureRangeProperty(DeviceIntPtr dev,
 {
 #if HAVE_LIBINPUT_PRESSURE_RANGE
 	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
-	const struct range *range = &driver_data->options.pressure_range;
+	const struct range *rangeopt = &driver_data->options.pressure_range;
 	float data[2] = {
-		range->min,
-		range->max,
+		rangeopt->min,
+		rangeopt->max,
 	};
 
 	if ((driver_data->capabilities & CAP_TABLET_TOOL) == 0)