diff options
author | Jay Sorg <jay.sorg@gmail.com> | 2013-07-23 23:24:46 -0700 |
---|---|---|
committer | Jay Sorg <jay.sorg@gmail.com> | 2013-07-23 23:24:46 -0700 |
commit | 48aa165729099cb12092023f88af8e2a3ee7702c (patch) | |
tree | fca7372a9744820cad9fc23273ab6a52ccbf215c /xorg/server/module | |
parent | 17bf2abe309c5e146ae53c25e634089842e847f1 (diff) | |
download | xrdp-proprietary-48aa165729099cb12092023f88af8e2a3ee7702c.tar.gz xrdp-proprietary-48aa165729099cb12092023f88af8e2a3ee7702c.zip |
xorg driver, mouse input
Diffstat (limited to 'xorg/server/module')
-rw-r--r-- | xorg/server/module/rdpInput.c | 10 | ||||
-rw-r--r-- | xorg/server/module/rdpInput.h | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/xorg/server/module/rdpInput.c b/xorg/server/module/rdpInput.c index 156165e2..a7bafd08 100644 --- a/xorg/server/module/rdpInput.c +++ b/xorg/server/module/rdpInput.c @@ -87,24 +87,26 @@ rdpUnregisterInputCallback(rdpInputEventProcPtr proc) /******************************************************************************/ int -rdpInputKeyboardEvent(int msg, long param1, long param2, +rdpInputKeyboardEvent(rdpPtr dev, int msg, + long param1, long param2, long param3, long param4) { if (g_input_proc[0].proc != 0) { - return g_input_proc[0].proc(msg, param1, param2, param3, param4); + return g_input_proc[0].proc(dev, msg, param1, param2, param3, param4); } return 0; } /******************************************************************************/ int -rdpInputMouseEvent(int msg, long param1, long param2, +rdpInputMouseEvent(rdpPtr dev, int msg, + long param1, long param2, long param3, long param4) { if (g_input_proc[1].proc != 0) { - return g_input_proc[1].proc(msg, param1, param2, param3, param4); + return g_input_proc[1].proc(dev, msg, param1, param2, param3, param4); } return 0; } diff --git a/xorg/server/module/rdpInput.h b/xorg/server/module/rdpInput.h index f41a1025..19315026 100644 --- a/xorg/server/module/rdpInput.h +++ b/xorg/server/module/rdpInput.h @@ -24,7 +24,8 @@ input #ifndef _RDPINPUT_H #define _RDPINPUT_H -typedef int (*rdpInputEventProcPtr)(int msg, long param1, long param2, +typedef int (*rdpInputEventProcPtr)(rdpPtr dev, int msg, + long param1, long param2, long param3, long param4); int @@ -32,10 +33,12 @@ rdpRegisterInputCallback(int type, rdpInputEventProcPtr proc); int rdpUnregisterInputCallback(rdpInputEventProcPtr proc); int -rdpInputKeyboardEvent(int msg, long param1, long param2, +rdpInputKeyboardEvent(rdpPtr dev, int msg, + long param1, long param2, long param3, long param4); int -rdpInputMouseEvent(int msg, long param1, long param2, +rdpInputMouseEvent(rdpPtr dev, int msg, + long param1, long param2, long param3, long param4); int rdpInputInit(void); |