tigervnc-getmaster.patch

   1 diff --git a/unix/xserver/hw/vnc/InputXKB.c b/unix/xserver/hw/vnc/InputXKB.c
   2 index f84a6e4..4eac939 100644
   3 --- a/unix/xserver/hw/vnc/InputXKB.c
   4 +++ b/unix/xserver/hw/vnc/InputXKB.c
   5 @@ -226,10 +226,7 @@ void vncPrepareInputDevices(void)
   6
   7  unsigned vncGetKeyboardState(void)
   8  {
   9 -       DeviceIntPtr master;
  10 -
  11 -       master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
  12 -       return XkbStateFieldFromRec(&master->key->xkbInfo->state);
  13 +       return XkbStateFieldFromRec(&vncKeyboardDev->master->key->xkbInfo->state);
  14  }
  15
  16  unsigned vncGetLevelThreeMask(void)
  17 @@ -250,7 +247,7 @@ unsigned vncGetLevelThreeMask(void)
  18                         return 0;
  19         }
  20
  21 -       xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
  22 +       xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  23
  24         act = XkbKeyActionPtr(xkb, keycode, state);
  25         if (act == NULL)
  26 @@ -275,7 +272,7 @@ KeyCode vncPressShift(void)
  27         if (state & ShiftMask)
  28                 return 0;
  29
  30 -       xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
  31 +       xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  32         for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
  33                 XkbAction *act;
  34                 unsigned char mask;
  35 @@ -315,7 +312,7 @@ size_t vncReleaseShift(KeyCode *keys, size_t maxKeys)
  36
  37         count = 0;
  38
  39 -       master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
  40 +       master = vncKeyboardDev->master;
  41         xkb = master->key->xkbInfo->desc;
  42         for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
  43                 XkbAction *act;
  44 @@ -371,7 +368,7 @@ KeyCode vncPressLevelThree(void)
  45                         return 0;
  46         }
  47
  48 -       xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
  49 +       xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  50
  51         act = XkbKeyActionPtr(xkb, keycode, state);
  52         if (act == NULL)
  53 @@ -402,7 +399,7 @@ size_t vncReleaseLevelThree(KeyCode *keys, size_t maxKeys)
  54
  55         count = 0;
  56
  57 -       master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
  58 +       master = vncKeyboardDev->master;
  59         xkb = master->key->xkbInfo->desc;
  60         for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
  61                 XkbAction *act;
  62 @@ -447,7 +444,7 @@ KeyCode vncKeysymToKeycode(KeySym keysym, unsigned state, unsigned *new_state)
  63                 *new_state = state;
  64
  65         fallback = 0;
  66 -       xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
  67 +       xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  68         for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
  69                 unsigned int state_out;
  70                 KeySym dummy;
  71 @@ -551,7 +548,7 @@ int vncIsAffectedByNumLock(KeyCode keycode)
  72         if (numlock_keycode == 0)
  73                 return 0;
  74
  75 -       xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
  76 +       xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  77
  78         act = XkbKeyActionPtr(xkb, numlock_keycode, state);
  79         if (act == NULL)
  80 @@ -585,7 +582,7 @@ KeyCode vncAddKeysym(KeySym keysym, unsigned state)
  81         KeySym *syms;
  82         KeySym upper, lower;
  83
  84 -       master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
  85 +       master = vncKeyboardDev->master;
  86         xkb = master->key->xkbInfo->desc;
  87         for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
  88                 if (XkbKeyNumGroups(xkb, key) == 0)