diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-23 12:15:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-23 12:15:03 +0000 |
| commit | 215417a52a66f9a2252c64f24e417297eba2331f (patch) | |
| tree | 4cc30bf3c04d3c2bc2255abbe4b7631b1fff70f3 /xorg-server/dix | |
| parent | 146833aa51df72bcb9b2bd566b0f18243611b0c0 (diff) | |
| download | vcxsrv-215417a52a66f9a2252c64f24e417297eba2331f.tar.gz vcxsrv-215417a52a66f9a2252c64f24e417297eba2331f.tar.bz2 vcxsrv-215417a52a66f9a2252c64f24e417297eba2331f.zip | |
Reverted last change to solve xmodmap problem
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/inpututils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c index 743e6208d..9d2bc3246 100644 --- a/xorg-server/dix/inpututils.c +++ b/xorg-server/dix/inpututils.c @@ -239,10 +239,10 @@ static int build_modmap_from_modkeymap(CARD8 *modmap, KeyCode *modkeymap, if (modkeymap[i] >= MAP_LENGTH)
return BadValue;
- //if (modmap[modkeymap[i]]) It looks like it needlessly gives errors back
- // return BadValue;
+ if (modmap[modkeymap[i]])
+ return BadValue;
- modmap[modkeymap[i]] |= 1 << (i / max_keys_per_mod); // Now or it because of previous line removal
+ modmap[modkeymap[i]] = 1 << (i / max_keys_per_mod);
}
return Success;
|