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

input: constify valuators passed in by input drivers. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
This commit is contained in:
Peter Hutterer 2010-08-10 15:19:20 +10:00
parent be978c7fc9
commit 79ea9ef399
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/getevents.c
View File

@ -912,7 +912,7 @@ GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code)
int int
GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type, GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
int key_code, int first_valuator, int key_code, int first_valuator,
int num_valuators, int *valuators_in) { int num_valuators, const int *valuators_in) {
int num_events = 0; int num_events = 0;
CARD32 ms = 0; CARD32 ms = 0;
DeviceEvent *event; DeviceEvent *event;
@ -1071,7 +1071,7 @@ transformAbsolute(DeviceIntPtr dev, int v[MAX_VALUATORS])
int int
GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons, GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
int flags, int first_valuator, int num_valuators, int flags, int first_valuator, int num_valuators,
int *valuators_in) { const int *valuators_in) {
int num_events = 1; int num_events = 1;
CARD32 ms; CARD32 ms;
DeviceEvent *event; DeviceEvent *event;
@ -1191,7 +1191,7 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
*/ */
int int
GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type,
int first_valuator, int num_valuators, int *valuators_in) int first_valuator, int num_valuators, const int *valuators_in)
{ {
int num_events = 1; int num_events = 1;
DeviceEvent *event; DeviceEvent *event;

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

@ -1016,7 +1016,7 @@ xf86PostMotionEventP(DeviceIntPtr device,
int is_absolute, int is_absolute,
int first_valuator, int first_valuator,
int num_valuators, int num_valuators,
int *valuators) const int *valuators)
{ {
int i = 0, nevents = 0; int i = 0, nevents = 0;
DeviceEvent *event; DeviceEvent *event;
@ -1097,7 +1097,7 @@ xf86PostProximityEventP(DeviceIntPtr device,
int is_in, int is_in,
int first_valuator, int first_valuator,
int num_valuators, int num_valuators,
int *valuators) const int *valuators)
{ {
int i, nevents; int i, nevents;
@ -1143,7 +1143,7 @@ xf86PostButtonEventP(DeviceIntPtr device,
int is_down, int is_down,
int first_valuator, int first_valuator,
int num_valuators, int num_valuators,
int *valuators) const int *valuators)
{ {
int i = 0, nevents = 0; int i = 0, nevents = 0;
int flags = 0; int flags = 0;
@ -1208,7 +1208,7 @@ xf86PostKeyEventP(DeviceIntPtr device,
int is_absolute, int is_absolute,
int first_valuator, int first_valuator,
int num_valuators, int num_valuators,
int *valuators) const int *valuators)
{ {
int i = 0, nevents = 0; int i = 0, nevents = 0;

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

@ -140,23 +140,23 @@ extern _X_EXPORT InputInfoPtr xf86InputDevs;
extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute, extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,
int first_valuator, int num_valuators, ...); int first_valuator, int num_valuators, ...);
extern _X_EXPORT void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute, extern _X_EXPORT void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute,
int first_valuator, int num_valuators, int *valuators); int first_valuator, int num_valuators, const int *valuators);
extern _X_EXPORT void xf86PostProximityEvent(DeviceIntPtr device, int is_in, extern _X_EXPORT void xf86PostProximityEvent(DeviceIntPtr device, int is_in,
int first_valuator, int num_valuators, ...); int first_valuator, int num_valuators, ...);
extern _X_EXPORT void xf86PostProximityEventP(DeviceIntPtr device, int is_in, int first_valuator, extern _X_EXPORT void xf86PostProximityEventP(DeviceIntPtr device, int is_in, int first_valuator,
int num_valuators, int *valuators); int num_valuators, const int *valuators);
extern _X_EXPORT void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute, int button, extern _X_EXPORT void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute, int button,
int is_down, int first_valuator, int num_valuators, int is_down, int first_valuator, int num_valuators,
...); ...);
extern _X_EXPORT void xf86PostButtonEventP(DeviceIntPtr device, int is_absolute, int button, extern _X_EXPORT void xf86PostButtonEventP(DeviceIntPtr device, int is_absolute, int button,
int is_down, int first_valuator, int num_valuators, int is_down, int first_valuator, int num_valuators,
int *valuators); const int *valuators);
extern _X_EXPORT void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down, extern _X_EXPORT void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down,
int is_absolute, int first_valuator, int num_valuators, int is_absolute, int first_valuator, int num_valuators,
...); ...);
extern _X_EXPORT void xf86PostKeyEventP(DeviceIntPtr device, unsigned int key_code, int is_down, extern _X_EXPORT void xf86PostKeyEventP(DeviceIntPtr device, unsigned int key_code, int is_down,
int is_absolute, int first_valuator, int num_valuators, int is_absolute, int first_valuator, int num_valuators,
int *valuators); const int *valuators);
extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code,
int is_down); int is_down);
extern _X_EXPORT InputInfoPtr xf86FirstLocalDevice(void); extern _X_EXPORT InputInfoPtr xf86FirstLocalDevice(void);

6
include/input.h
View File

@ -447,7 +447,7 @@ extern _X_EXPORT int GetPointerEvents(
int flags, int flags,
int first_valuator, int first_valuator,
int num_valuators, int num_valuators,
int *valuators); const int *valuators);
extern _X_EXPORT int GetKeyboardEvents( extern _X_EXPORT int GetKeyboardEvents(
EventListPtr events, EventListPtr events,
@ -462,7 +462,7 @@ extern int GetKeyboardValuatorEvents(
int key_code, int key_code,
int first_valuator, int first_valuator,
int num_valuator, int num_valuator,
int *valuators); const int *valuators);
extern int GetProximityEvents( extern int GetProximityEvents(
EventListPtr events, EventListPtr events,
@ -470,7 +470,7 @@ extern int GetProximityEvents(
int type, int type,
int first_valuator, int first_valuator,
int num_valuators, int num_valuators,
int *valuators); const int *valuators);
extern void PostSyntheticMotion( extern void PostSyntheticMotion(
DeviceIntPtr pDev, DeviceIntPtr pDev,