hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-29 21:46:40 +00:00
Code Issues Projects Releases Wiki Activity

Bug #3030: Fix Xnest keyboard state handling. (Mark McLoughlin)

Browse source
This commit is contained in:
Adam Jackson 2005-06-25 21:28:48 +00:00
commit aa7fb99bc7
7 changed files with 77 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

49
hw/xnest/Keyboard.c
View file

@ -31,6 +31,7 @@ is" without express or implied warranty.
#include "Screen.h"
#include "Keyboard.h"
#include "Args.h"
#include "Events.h"
#ifdef XKB
#include <X11/extensions/XKB.h>
@ -83,6 +84,8 @@ extern Status XkbGetControls(
#endif
DeviceIntPtr xnestKeyboardDevice = NULL;
void
xnestBell(int volume, DeviceIntPtr pDev, pointer ctrl, int cls)
{
@ -282,3 +285,49 @@ LegalModifier(unsigned int key, DevicePtr pDev)
{
return TRUE;
}
void
xnestUpdateModifierState(unsigned int state)
{
DeviceIntPtr pDev = xnestKeyboardDevice;
KeyClassPtr keyc = pDev->key;
int i;
CARD8 mask;
if (keyc->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->modifierMap[key] & mask) {
int bit;
BYTE *kptr;
kptr = &keyc->down[key >> 3];
bit = 1 << (key & 7);
if (*kptr & bit)
xnestQueueKeyEvent(KeyRelease, key);
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->modifierMap[key] & mask) {
xnestQueueKeyEvent(KeyPress, key);
break;
}
}
}