89 lines
3.0 KiB
Diff
89 lines
3.0 KiB
Diff
|
diff --git a/unix/xserver/hw/vnc/InputXKB.c b/unix/xserver/hw/vnc/InputXKB.c
|
||
|
|
index f84a6e4..4eac939 100644
|
||
|
|
--- a/unix/xserver/hw/vnc/InputXKB.c
|
||
|
|
+++ b/unix/xserver/hw/vnc/InputXKB.c
|
||
|
|
@@ -226,10 +226,7 @@ void vncPrepareInputDevices(void)
|
||
|
|
|
||
|
|
unsigned vncGetKeyboardState(void)
|
||
|
|
{
|
||
|
|
- DeviceIntPtr master;
|
||
|
|
-
|
||
|
|
- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
|
||
|
|
- return XkbStateFieldFromRec(&master->key->xkbInfo->state);
|
||
|
|
+ return XkbStateFieldFromRec(&vncKeyboardDev->master->key->xkbInfo->state);
|
||
|
|
}
|
||
|
|
|
||
|
|
unsigned vncGetLevelThreeMask(void)
|
||
|
|
@@ -250,7 +247,7 @@ unsigned vncGetLevelThreeMask(void)
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
||
|
|
+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
|
||
|
|
|
||
|
|
act = XkbKeyActionPtr(xkb, keycode, state);
|
||
|
|
if (act == NULL)
|
||
|
|
@@ -275,7 +272,7 @@ KeyCode vncPressShift(void)
|
||
|
|
if (state & ShiftMask)
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
||
|
|
+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
|
||
|
|
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
||
|
|
XkbAction *act;
|
||
|
|
unsigned char mask;
|
||
|
|
@@ -315,7 +312,7 @@ size_t vncReleaseShift(KeyCode *keys, size_t maxKeys)
|
||
|
|
|
||
|
|
count = 0;
|
||
|
|
|
||
|
|
- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
|
||
|
|
+ master = vncKeyboardDev->master;
|
||
|
|
xkb = master->key->xkbInfo->desc;
|
||
|
|
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
||
|
|
XkbAction *act;
|
||
|
|
@@ -371,7 +368,7 @@ KeyCode vncPressLevelThree(void)
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
||
|
|
+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
|
||
|
|
|
||
|
|
act = XkbKeyActionPtr(xkb, keycode, state);
|
||
|
|
if (act == NULL)
|
||
|
|
@@ -402,7 +399,7 @@ size_t vncReleaseLevelThree(KeyCode *keys, size_t maxKeys)
|
||
|
|
|
||
|
|
count = 0;
|
||
|
|
|
||
|
|
- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
|
||
|
|
+ master = vncKeyboardDev->master;
|
||
|
|
xkb = master->key->xkbInfo->desc;
|
||
|
|
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
||
|
|
XkbAction *act;
|
||
|
|
@@ -447,7 +444,7 @@ KeyCode vncKeysymToKeycode(KeySym keysym, unsigned state, unsigned *new_state)
|
||
|
|
*new_state = state;
|
||
|
|
|
||
|
|
fallback = 0;
|
||
|
|
- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
||
|
|
+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
|
||
|
|
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
||
|
|
unsigned int state_out;
|
||
|
|
KeySym dummy;
|
||
|
|
@@ -551,7 +548,7 @@ int vncIsAffectedByNumLock(KeyCode keycode)
|
||
|
|
if (numlock_keycode == 0)
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
||
|
|
+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
|
||
|
|
|
||
|
|
act = XkbKeyActionPtr(xkb, numlock_keycode, state);
|
||
|
|
if (act == NULL)
|
||
|
|
@@ -585,7 +582,7 @@ KeyCode vncAddKeysym(KeySym keysym, unsigned state)
|
||
|
|
KeySym *syms;
|
||
|
|
KeySym upper, lower;
|
||
|
|
|
||
|
|
- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
|
||
|
|
+ master = vncKeyboardDev->master;
|
||
|
|
xkb = master->key->xkbInfo->desc;
|
||
|
|
for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
|
||
|
|
if (XkbKeyNumGroups(xkb, key) == 0)
|