aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-28 11:38:55 +0000
committermarha <marha@users.sourceforge.net>2011-02-28 11:38:55 +0000
commit46ff5affddfec90a099d55945ab2f857a5a75e57 (patch)
tree285ce5edd15858ed18691ab25d3a816d9357e4d5 /xorg-server/dix
parent5177dc18bc47fd17459faed21f15ee6d128e5c73 (diff)
downloadvcxsrv-46ff5affddfec90a099d55945ab2f857a5a75e57.tar.gz
vcxsrv-46ff5affddfec90a099d55945ab2f857a5a75e57.tar.bz2
vcxsrv-46ff5affddfec90a099d55945ab2f857a5a75e57.zip
Solved error running xmodmap
Diffstat (limited to 'xorg-server/dix')
-rw-r--r--xorg-server/dix/inpututils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c
index ef3142c84..4c6112b7f 100644
--- a/xorg-server/dix/inpututils.c
+++ b/xorg-server/dix/inpututils.c
@@ -238,10 +238,10 @@ static int build_modmap_from_modkeymap(CARD8 *modmap, KeyCode *modkeymap,
if (modkeymap[i] >= MAP_LENGTH)
return BadValue;
- if (modmap[modkeymap[i]])
- return BadValue;
+ //if (modmap[modkeymap[i]]) It looks like it needlessly gives errors back
+ // return BadValue;
- modmap[modkeymap[i]] = 1 << (i / max_keys_per_mod);
+ modmap[modkeymap[i]] |= 1 << (i / max_keys_per_mod); // Now or it because of previous line removal
}
return Success;