diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-09-23 12:03:48 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-09-29 12:26:43 +1000 |
| commit | 8d1a414cca51e7f8a93470c5aa2e998f5ca1bc9a (patch) | |
| tree | 26473b72f0124336db20d52c888173553aa3f95d | |
| parent | 5ac1f885f5c106b970835de36e13a9a7ea413df4 (diff) | |
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>
| -rw-r--r-- | Xi/exevents.c | 8 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 8 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.h | 2 | ||||
| -rw-r--r-- | include/exevents.h | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c index 4dd9b85d5..8a3c25680 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -1067,16 +1067,16 @@ InitProximityClassDeviceStruct(DeviceIntPtr dev) * * @see InitValuatorClassDeviceStruct */ -void +Bool InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval, int resolution, int min_res, int max_res, int mode) { AxisInfoPtr ax; if (!dev || !dev->valuator || minval > maxval) - return; + return FALSE; if (axnum >= dev->valuator->numAxes) - return; + return FALSE; ax = dev->valuator->axes + axnum; @@ -1090,6 +1090,8 @@ InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int if (mode & OutOfProximity) dev->proximity->in_proximity = FALSE; + + return TRUE; } static void diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 9fbcba9d5..49b2fb2e8 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -1363,15 +1363,15 @@ xf86XInputSetScreen(InputInfoPtr pInfo, } -void +Bool xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval, int resolution, int min_res, int max_res, int mode) { if (!dev || !dev->valuator) - return; + return FALSE; - InitValuatorAxisStruct(dev, axnum, label, minval, maxval, resolution, min_res, - max_res, mode); + return InitValuatorAxisStruct(dev, axnum, label, minval, maxval, resolution, min_res, + max_res, mode); } /* diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index a4d9e58a5..189f7abaf 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -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 void xf86XInputSetScreen(InputInfoPtr pInfo, int screen_number, int x, int y); 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 max_res, int mode); extern _X_EXPORT void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum); diff --git a/include/exevents.h b/include/exevents.h index 2b226986b..731f31eac 100644 --- a/include/exevents.h +++ b/include/exevents.h @@ -40,7 +40,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. extern _X_EXPORT int InitProximityClassDeviceStruct( DeviceIntPtr /* dev */); -extern _X_EXPORT void InitValuatorAxisStruct( +extern _X_EXPORT Bool InitValuatorAxisStruct( DeviceIntPtr /* dev */, int /* axnum */, Atom /* label */, |