|
 |
cde0eb1 |
diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc
|
|
|
cde0eb1 |
--- tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster 2013-07-12 09:30:50.551459439 +0100
|
|
|
cde0eb1 |
+++ tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc 2013-07-12 09:38:31.037480528 +0100
|
|
|
cde0eb1 |
@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
unsigned InputDevice::getKeyboardState(void)
|
|
|
cde0eb1 |
{
|
|
|
cde0eb1 |
- DeviceIntPtr master;
|
|
|
cde0eb1 |
-
|
|
|
cde0eb1 |
- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
|
|
|
cde0eb1 |
- return XkbStateFieldFromRec(&master->key->xkbInfo->state);
|
|
|
cde0eb1 |
+ return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state);
|
|
|
cde0eb1 |
}
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
unsigned InputDevice::getLevelThreeMask(void)
|
|
|
cde0eb1 |
@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask(
|
|
|
cde0eb1 |
return 0;
|
|
|
cde0eb1 |
}
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
cde0eb1 |
+ xkb = keyboardDev->master->key->xkbInfo->desc;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
act = XkbKeyActionPtr(xkb, keycode, state);
|
|
|
cde0eb1 |
if (act == NULL)
|
|
|
cde0eb1 |
@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void)
|
|
|
cde0eb1 |
if (state & ShiftMask)
|
|
|
cde0eb1 |
return 0;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
cde0eb1 |
+ xkb = keyboardDev->master->key->xkbInfo->desc;
|
|
|
cde0eb1 |
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
|
|
cde0eb1 |
XkbAction *act;
|
|
|
cde0eb1 |
unsigned char mask;
|
|
|
cde0eb1 |
@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS
|
|
|
cde0eb1 |
if (!(state & ShiftMask))
|
|
|
cde0eb1 |
return keys;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
|
|
|
cde0eb1 |
+ master = keyboardDev->master;
|
|
|
cde0eb1 |
xkb = master->key->xkbInfo->desc;
|
|
|
cde0eb1 |
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
|
|
cde0eb1 |
XkbAction *act;
|
|
|
cde0eb1 |
@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi
|
|
|
cde0eb1 |
return 0;
|
|
|
cde0eb1 |
}
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
cde0eb1 |
+ xkb = keyboardDev->master->key->xkbInfo->desc;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
act = XkbKeyActionPtr(xkb, keycode, state);
|
|
|
cde0eb1 |
if (act == NULL)
|
|
|
cde0eb1 |
@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL
|
|
|
cde0eb1 |
if (!(state & mask))
|
|
|
cde0eb1 |
return keys;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
|
|
|
cde0eb1 |
+ master = keyboardDev->master;
|
|
|
cde0eb1 |
xkb = master->key->xkbInfo->desc;
|
|
|
cde0eb1 |
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
|
|
cde0eb1 |
XkbAction *act;
|
|
|
cde0eb1 |
@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key
|
|
|
cde0eb1 |
if (new_state != NULL)
|
|
|
cde0eb1 |
*new_state = state;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
cde0eb1 |
+ xkb = keyboardDev->master->key->xkbInfo->desc;
|
|
|
cde0eb1 |
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
|
|
|
cde0eb1 |
unsigned int state_out;
|
|
|
cde0eb1 |
KeySym dummy;
|
|
|
cde0eb1 |
@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode
|
|
|
cde0eb1 |
XkbDescPtr xkb;
|
|
|
cde0eb1 |
XkbAction *act;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
cde0eb1 |
+ xkb = keyboardDev->master->key->xkbInfo->desc;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
act = XkbKeyActionPtr(xkb, keycode, state);
|
|
|
cde0eb1 |
if (act == NULL)
|
|
|
cde0eb1 |
@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke
|
|
|
cde0eb1 |
if (numlock_keycode == 0)
|
|
|
cde0eb1 |
return false;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
|
|
|
cde0eb1 |
+ xkb = keyboardDev->master->key->xkbInfo->desc;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
act = XkbKeyActionPtr(xkb, numlock_keycode, state);
|
|
|
cde0eb1 |
if (act == NULL)
|
|
|
cde0eb1 |
@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke
|
|
|
cde0eb1 |
KeySym *syms;
|
|
|
cde0eb1 |
KeySym upper, lower;
|
|
|
cde0eb1 |
|
|
|
cde0eb1 |
- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
|
|
|
cde0eb1 |
+ master = keyboardDev->master;
|
|
|
cde0eb1 |
xkb = master->key->xkbInfo->desc;
|
|
|
cde0eb1 |
for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
|
|
|
cde0eb1 |
if (XkbKeyNumGroups(xkb, key) == 0)
|