Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/tigervnc/patches/tigervnc-1.0.90-xserver111.patch

    Annotation of /trunk/tigervnc/patches/tigervnc-1.0.90-xserver111.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1524 - (hide annotations) (download)
    Thu Sep 8 21:58:14 2011 UTC (12 years, 9 months ago) by niro
    File size: 3389 byte(s) 
    added fedora patches
    1 niro 1524 diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Input.cc.xorg111 tigervnc-1.0.90/unix/xserver/hw/vnc/Input.cc
    2     --- tigervnc-1.0.90/unix/xserver/hw/vnc/Input.cc.xorg111 2011-05-12 10:42:52.813229993 +0200
    3     +++ tigervnc-1.0.90/unix/xserver/hw/vnc/Input.cc 2011-05-12 10:52:41.036211939 +0200
    4     @@ -305,7 +305,7 @@ static inline void pressKey(DeviceIntPtr
    5     vlog.debug("%s %d %s", msg, kc, down ? "down" : "up");
    6    
    7     action = down ? KeyPress : KeyRelease;
    8     - n = GetKeyboardEvents(eventq, dev, action, kc);
    9     + n = GetKeyboardEvents(eventq, dev, action, kc, NULL);
    10     enqueueEvents(dev, n);
    11     }
    12    
    13     @@ -341,8 +341,11 @@ public:
    14     int state, maxKeysPerMod, keycode;
    15     #if XORG >= 17
    16     KeyCode *modmap = NULL;
    17     + DeviceIntPtr master;
    18    
    19     - state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);
    20     + master = GetMaster(dev, MASTER_KEYBOARD);
    21     +
    22     + state = XkbStateFieldFromRec(&master->key->xkbInfo->state);
    23     #else
    24     KeyClassPtr keyc = dev->key;
    25     state = keyc->state;
    26     @@ -379,8 +382,10 @@ public:
    27     KeyClassPtr keyc;
    28     #if XORG >= 17
    29     KeyCode *modmap = NULL;
    30     + DeviceIntPtr master;
    31    
    32     - keyc = dev->u.master->key;
    33     + master = GetMaster(dev, MASTER_KEYBOARD);
    34     + keyc = master->key;
    35     state = XkbStateFieldFromRec(&keyc->xkbInfo->state);
    36     #else
    37     keyc = dev->key;
    38     @@ -565,9 +570,7 @@ static inline int isModifier(KeySymsPtr
    39    
    40     void InputDevice::keyEvent(rdr::U32 keysym, bool down)
    41     {
    42     -#if XORG < 17
    43     DeviceIntPtr master;
    44     -#endif
    45     KeyClassPtr keyc;
    46     KeySymsPtr keymap = NULL;
    47     KeySym *map = NULL;
    48     @@ -596,7 +599,8 @@ void InputDevice::keyEvent(rdr::U32 keys
    49     }
    50    
    51     #if XORG >= 17
    52     - keyc = keyboardDev->u.master->key;
    53     + master = GetMaster(keyboardDev, MASTER_KEYBOARD);
    54     + keyc = master->key;
    55    
    56     keymap = XkbGetCoreMap(keyboardDev);
    57     if (!keymap) {
    58     @@ -753,7 +757,7 @@ ModeSwitchFound:
    59     XkbApplyMappingChange(keyboardDev, keymap, minKeyCode,
    60     maxKeyCode - minKeyCode + 1,
    61     NULL, serverClient);
    62     - XkbCopyDeviceKeymap(keyboardDev->u.master, keyboardDev);
    63     + XkbCopyDeviceKeymap(master, keyboardDev);
    64     #endif /* XORG < 17 */
    65     break;
    66     }
    67     diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/xorg-version.h.xorg111 tigervnc-1.0.90/unix/xserver/hw/vnc/xorg-version.h
    68     --- tigervnc-1.0.90/unix/xserver/hw/vnc/xorg-version.h.xorg111 2011-05-12 10:40:34.109227333 +0200
    69     +++ tigervnc-1.0.90/unix/xserver/hw/vnc/xorg-version.h 2011-05-12 10:41:10.970229530 +0200
    70     @@ -36,6 +36,8 @@
    71     #define XORG 19
    72     #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (10 * 100000) + (99 * 1000))
    73     #define XORG 110
    74     +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (11 * 100000) + (99 * 1000))
    75     +#define XORG 111
    76     #else
    77     #error "X.Org newer than 1.10 is not supported"
    78     #endif
    79     diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/xvnc.cc.xorg111 tigervnc-1.0.90/unix/xserver/hw/vnc/xvnc.cc
    80     --- tigervnc-1.0.90/unix/xserver/hw/vnc/xvnc.cc.xorg111 2011-05-12 10:54:21.068235787 +0200
    81     +++ tigervnc-1.0.90/unix/xserver/hw/vnc/xvnc.cc 2011-05-12 10:59:01.867225478 +0200
    82     @@ -670,8 +670,13 @@ vfbUninstallColormap(ColormapPtr pmap)
    83     {
    84     if (pmap->mid != pmap->pScreen->defColormap)
    85     {
    86     +#if XORG < 111
    87     curpmap = (ColormapPtr) LookupIDByType(pmap->pScreen->defColormap,
    88     RT_COLORMAP);
    89     +#else
    90     + dixLookupResourceByType((pointer *) &curpmap, pmap->pScreen->defColormap,
    91     + RT_COLORMAP, serverClient, DixUnknownAccess);
    92     +#endif
    93     (*pmap->pScreen->InstallColormap)(curpmap);
    94     }
    95     }