|
 |
be441b |
diff --git a/unix/xserver/hw/vnc/InputXKB.c b/unix/xserver/hw/vnc/InputXKB.c
|
|
|
be441b |
index a9bd11d..7b54b43 100644
|
|
|
be441b |
--- a/unix/xserver/hw/vnc/InputXKB.c
|
|
|
be441b |
+++ b/unix/xserver/hw/vnc/InputXKB.c
|
|
|
be441b |
@@ -214,10 +214,7 @@ void vncPrepareInputDevices(void)
|
|
|
be441b |
|
|
|
be441b |
unsigned vncGetKeyboardState(void)
|
|
|
be441b |
{
|
|
|
be441b |
- DeviceIntPtr master;
|
|
|
be441b |
-
|
|
|
be441b |
- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
|
|
|
be441b |
- return XkbStateFieldFromRec(&master->key->xkbInfo->state);
|
|
|
be441b |
+ return XkbStateFieldFromRec(&vncKeyboardDev->master->key->xkbInfo->state);
|
|
|
be441b |
}
|
|
|
be441b |
|
|
|
be441b |
unsigned vncGetLevelThreeMask(void)
|
|
|
be441b |
@@ -238,7 +235,7 @@ unsigned vncGetLevelThreeMask(void)
|
|
|
be441b |
return 0;
|
|
|
be441b |
}
|
|
|
be441b |
|
|
|
be441b |
- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
be441b |
+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
|
|
|
be441b |
|
|
|
be441b |
act = XkbKeyActionPtr(xkb, keycode, state);
|
|
|
be441b |
if (act == NULL)
|
|
|
be441b |
@@ -263,7 +260,7 @@ KeyCode vncPressShift(void)
|
|
|
be441b |
if (state & ShiftMask)
|
|
|
be441b |
return 0;
|
|
|
be441b |
|
|
|
be441b |
- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
be441b |
+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
|
|
|
be441b |
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
|
|
be441b |
XkbAction *act;
|
|
|
be441b |
unsigned char mask;
|
|
|
be441b |
@@ -303,7 +300,7 @@ size_t vncReleaseShift(KeyCode *keys, size_t maxKeys)
|
|
|
be441b |
|
|
|
be441b |
count = 0;
|
|
|
be441b |
|
|
|
be441b |
- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
|
|
|
be441b |
+ master = vncKeyboardDev->master;
|
|
|
be441b |
xkb = master->key->xkbInfo->desc;
|
|
|
be441b |
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
|
|
be441b |
XkbAction *act;
|
|
|
be441b |
@@ -359,7 +356,7 @@ KeyCode vncPressLevelThree(void)
|
|
|
be441b |
return 0;
|
|
|
be441b |
}
|
|
|
be441b |
|
|
|
be441b |
- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
be441b |
+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
|
|
|
be441b |
|
|
|
be441b |
act = XkbKeyActionPtr(xkb, keycode, state);
|
|
|
be441b |
if (act == NULL)
|
|
|
be441b |
@@ -390,7 +387,7 @@ size_t vncReleaseLevelThree(KeyCode *keys, size_t maxKeys)
|
|
|
be441b |
|
|
|
be441b |
count = 0;
|
|
|
be441b |
|
|
|
be441b |
- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
|
|
|
be441b |
+ master = vncKeyboardDev->master;
|
|
|
be441b |
xkb = master->key->xkbInfo->desc;
|
|
|
be441b |
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
|
|
be441b |
XkbAction *act;
|
|
|
be441b |
@@ -433,7 +430,7 @@ KeyCode vncKeysymToKeycode(KeySym keysym, unsigned state, unsigned *new_state)
|
|
|
be441b |
if (new_state != NULL)
|
|
|
be441b |
*new_state = state;
|
|
|
be441b |
|
|
|
be441b |
- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
be441b |
+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
|
|
|
be441b |
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
|
|
be441b |
unsigned int state_out;
|
|
|
be441b |
KeySym dummy;
|
|
|
be441b |
@@ -511,7 +508,7 @@ int vncIsAffectedByNumLock(KeyCode keycode)
|
|
|
be441b |
if (numlock_keycode == 0)
|
|
|
be441b |
return 0;
|
|
|
be441b |
|
|
|
be441b |
- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
be441b |
+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
|
|
|
be441b |
|
|
|
be441b |
act = XkbKeyActionPtr(xkb, numlock_keycode, state);
|
|
|
be441b |
if (act == NULL)
|
|
|
be441b |
@@ -545,7 +542,7 @@ KeyCode vncAddKeysym(KeySym keysym, unsigned state)
|
|
|
be441b |
KeySym *syms;
|
|
|
be441b |
KeySym upper, lower;
|
|
|
be441b |
|
|
|
be441b |
- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
|
|
|
be441b |
+ master = vncKeyboardDev->master;
|
|
|
be441b |
xkb = master->key->xkbInfo->desc;
|
|
|
be441b |
for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
|
|
|
be441b |
if (XkbKeyNumGroups(xkb, key) == 0)
|