aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/kdrive
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-07-07 09:37:20 +0000
committermarha <marha@users.sourceforge.net>2010-07-07 09:37:20 +0000
commit3dd9390c49402534bc391f621a6b0f497a9407f7 (patch)
treebc5cd4665a525dbc9550292ad393fa0e5590c4a1 /xorg-server/hw/kdrive
parenta31abc5ff6da849ed1ac579a1c905d16ffaafcc7 (diff)
parent5da15e274b35656568f59602f2e3fd00d5718879 (diff)
downloadvcxsrv-3dd9390c49402534bc391f621a6b0f497a9407f7.tar.gz
vcxsrv-3dd9390c49402534bc391f621a6b0f497a9407f7.tar.bz2
vcxsrv-3dd9390c49402534bc391f621a6b0f497a9407f7.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/kdrive')
-rw-r--r--xorg-server/hw/kdrive/ephyr/ephyr.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c
index 9cb228d06..4519398a9 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.c
@@ -779,13 +779,7 @@ ephyrUpdateModifierState(unsigned int state)
for (key = 0; key < MAP_LENGTH; key++)
if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
- int bit;
- BYTE *kptr;
-
- kptr = &keyc->down[key >> 3];
- bit = 1 << (key & 7);
-
- if (*kptr & bit)
+ if (key_is_down(pDev, key, KEY_PROCESSED))
KdEnqueueKeyboardEvent (ephyrKbd, key, TRUE);
if (--count == 0)