From 215417a52a66f9a2252c64f24e417297eba2331f Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 23 May 2011 12:15:03 +0000 Subject: Reverted last change to solve xmodmap problem --- xorg-server/dix/inpututils.c | 6 +++--- 1 file 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; -- cgit v1.2.3