Skip to content

Commit

Permalink
Re-enabled Xnest fix for focus in + modifier bug.
Browse files Browse the repository at this point in the history
* See https://bugs.freedesktop.org/show_bug.cgi?id=3030

Signed-off-by: Xiaoyang Yu (Max) <[email protected]>
Reviewed-by: Mikhail Gusarov <[email protected]>

This takes the xnest way of working around this (see
5904ef2 "xnest: restore
xnestUpdateModifierState") and copies it to Xephyr.

Signed-off-by: Peter Hutterer <[email protected]>
  • Loading branch information
maxyu authored and whot committed Jun 16, 2010
1 parent 505724c commit db0d3d4
Showing 1 changed file with 45 additions and 62 deletions.
107 changes: 45 additions & 62 deletions hw/kdrive/ephyr/ephyr.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
#include "ephyrglxext.h"
#endif /* XF86DRI */

#include "xkbsrv.h"

extern int KdTsPhyScreen;
#ifdef GLXEXT
extern Bool noGlxVisualInit;
Expand Down Expand Up @@ -748,75 +750,55 @@ ephyrScreenFini (KdScreenInfo *screen)
void
ephyrUpdateModifierState(unsigned int state)
{
#if 0
DeviceIntPtr pkeydev;
KeyClassPtr keyc;
int i;
CARD8 mask;

pkeydev = inputInfo.keyboard;

if (!pkeydev)
return;
DeviceIntPtr pDev = inputInfo.keyboard;
KeyClassPtr keyc = pDev->key;
int i;
CARD8 mask;
int xkb_state;

/* This is pretty broken.
*
* What should happen is that focus out should do as a VT switch does in
* traditional servers: fake releases for all keys (and buttons too, come
* to think of it) currently down. Then, on focus in, get the state from
* the host, and fake keypresses for everything currently down.
*
* So I'm leaving this broken for a little while. Sorry, folks.
*
* -daniels
*/
if (!pDev)
return;

keyc = pkeydev->key;

xkb_state = XkbStateFieldFromRec(&pDev->key->xkbInfo->state);
state = state & 0xff;
if (keyc->state == state)

if (xkb_state == state)
return;

for (i = 0, mask = 1; i < 8; i++, mask <<= 1)
{
int key;

/* Modifier is down, but shouldn't be */
if ((keyc->state & mask) && !(state & mask))
{
int count = keyc->modifierKeyCount[i];

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 && ephyrKbd &&
((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE); /* release */

if (--count == 0)
break;
}
}

/* Modifier shoud be down, but isn't */
if (!(keyc->state & mask) && (state & mask))
for (key = 0; key < MAP_LENGTH; key++)
if (keyc->xkbInfo->desc->map->modmap[key] & mask)
{
if (keyc->xkbInfo->desc->map->modmap[key] & mask && ephyrKbd &&
((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
KdEnqueueKeyboardEvent(ephyrKbd, key, FALSE); /* press */
break;
}
for (i = 0, mask = 1; i < 8; i++, mask <<= 1) {
int key;

/* Modifier is down, but shouldn't be
*/
if ((xkb_state & mask) && !(state & mask)) {
int count = keyc->modifierKeyCount[i];

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)
KdEnqueueKeyboardEvent (ephyrKbd, key, TRUE);

if (--count == 0)
break;
}
}
#endif

/* Modifier shoud be down, but isn't
*/
if (!(xkb_state & mask) && (state & mask))
for (key = 0; key < MAP_LENGTH; key++)
if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
KdEnqueueKeyboardEvent (ephyrKbd, key, FALSE);
break;
}
}
}

static void
Expand Down Expand Up @@ -998,6 +980,7 @@ ephyrPoll(void)
if (!ephyrKbd ||
!((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
continue;
ephyrUpdateModifierState(ev.key_state);
KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_up.scancode, TRUE);
break;

Expand Down

0 comments on commit db0d3d4

Please sign in to comment.