frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

input: switch InitValuatorAxisStruct to return Bool 

Return errors instead of silently ignoring them.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2011-09-23 12:03:48 +10:00
parent 5ac1f885f5
commit 8d1a414cca
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Xi/exevents.c
View File

@ -1067,16 +1067,16 @@ InitProximityClassDeviceStruct(DeviceIntPtr dev)
* *
* @see InitValuatorClassDeviceStruct * @see InitValuatorClassDeviceStruct
*/ */
void Bool
InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval, InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval,
int resolution, int min_res, int max_res, int mode) int resolution, int min_res, int max_res, int mode)
{ {
AxisInfoPtr ax; AxisInfoPtr ax;
if (!dev || !dev->valuator || minval > maxval) if (!dev || !dev->valuator || minval > maxval)
return; return FALSE;
if (axnum >= dev->valuator->numAxes) if (axnum >= dev->valuator->numAxes)
return; return FALSE;
ax = dev->valuator->axes + axnum; ax = dev->valuator->axes + axnum;
@ -1090,6 +1090,8 @@ InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int
if (mode & OutOfProximity) if (mode & OutOfProximity)
dev->proximity->in_proximity = FALSE; dev->proximity->in_proximity = FALSE;
return TRUE;
} }
static void static void

8
hw/xfree86/common/xf86Xinput.c
View File

@ -1363,15 +1363,15 @@ xf86XInputSetScreen(InputInfoPtr pInfo,
} }
void Bool
xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval, xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval,
int resolution, int min_res, int max_res, int mode) int resolution, int min_res, int max_res, int mode)
{ {
if (!dev || !dev->valuator) if (!dev || !dev->valuator)
return; return FALSE;
InitValuatorAxisStruct(dev, axnum, label, minval, maxval, resolution, min_res, return InitValuatorAxisStruct(dev, axnum, label, minval, maxval, resolution, min_res,
max_res, mode); max_res, mode);
} }
/* /*

2
hw/xfree86/common/xf86Xinput.h
View File

@ -145,7 +145,7 @@ extern _X_EXPORT InputInfoPtr xf86FirstLocalDevice(void);
extern _X_EXPORT int xf86ScaleAxis(int Cx, int to_max, int to_min, int from_max, int from_min); extern _X_EXPORT int xf86ScaleAxis(int Cx, int to_max, int to_min, int from_max, int from_min);
extern _X_EXPORT void xf86XInputSetScreen(InputInfoPtr pInfo, int screen_number, int x, int y); extern _X_EXPORT void xf86XInputSetScreen(InputInfoPtr pInfo, int screen_number, int x, int y);
extern _X_EXPORT void xf86ProcessCommonOptions(InputInfoPtr pInfo, XF86OptionPtr options); extern _X_EXPORT void xf86ProcessCommonOptions(InputInfoPtr pInfo, XF86OptionPtr options);
extern _X_EXPORT void xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, extern _X_EXPORT Bool xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval,
int maxval, int resolution, int min_res, int maxval, int resolution, int min_res,
int max_res, int mode); int max_res, int mode);
extern _X_EXPORT void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum); extern _X_EXPORT void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum);

2
include/exevents.h
View File

@ -40,7 +40,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
extern _X_EXPORT int InitProximityClassDeviceStruct( extern _X_EXPORT int InitProximityClassDeviceStruct(
DeviceIntPtr /* dev */); DeviceIntPtr /* dev */);
extern _X_EXPORT void InitValuatorAxisStruct( extern _X_EXPORT Bool InitValuatorAxisStruct(
DeviceIntPtr /* dev */, DeviceIntPtr /* dev */,
int /* axnum */, int /* axnum */,
Atom /* label */, Atom /* label */,