diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-16 13:46:01 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-16 13:46:01 +0000 |
| commit | 578938f1cdd5a06dd6fa28167d575ec980322a5d (patch) | |
| tree | e31cf77fab7cc6e005b0e726e7951d7eef79550f /xorg-server/dix/devices.c | |
| parent | 0032f9b66d63a4b1c5222edb8603fb60da379fb0 (diff) | |
| download | vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.tar.gz vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.tar.bz2 vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.zip | |
Update to git master branch of xserver.
Diffstat (limited to 'xorg-server/dix/devices.c')
| -rw-r--r-- | xorg-server/dix/devices.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c index 6a7907399..395e19acf 100644 --- a/xorg-server/dix/devices.c +++ b/xorg-server/dix/devices.c @@ -539,7 +539,7 @@ CoreKeyboardProc(DeviceIntPtr pDev, int what) int CorePointerProc(DeviceIntPtr pDev, int what) { -#define NBUTTONS 7 +#define NBUTTONS 10 #define NAXES 2 BYTE map[NBUTTONS + 1]; int i = 0; @@ -1520,14 +1520,12 @@ int ProcGetModifierMapping(ClientPtr client) { xGetModifierMappingReply rep; - int ret, max_keys_per_mod = 0; + int max_keys_per_mod = 0; KeyCode *modkeymap = NULL; REQUEST_SIZE_MATCH(xReq); - ret = generate_modkeymap(client, PickKeyboard(client), &modkeymap, - &max_keys_per_mod); - if (ret != Success) - return ret; + generate_modkeymap(client, PickKeyboard(client), &modkeymap, + &max_keys_per_mod); memset(&rep, 0, sizeof(xGetModifierMappingReply)); rep.type = X_Reply; |