tigervnc-xserver-1.16.patch

   1 diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h
   2 --- tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx        2013-07-01 08:41:24.000000000 -0400
   3 +++ tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h   2013-11-07 11:39:49.749992669 -0500
   4 @@ -44,8 +44,10 @@
   5  #define XORG 114
   6  #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (15 * 100000) + (99 * 1000))
   7  #define XORG 115
   8 +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000))
   9 +#define XORG 116
  10  #else
  11 -#error "X.Org newer than 1.15 is not supported"
  12 +#error "X.Org newer than 1.16 is not supported"
  13  #endif
  14
  15  #endif
  16 diff -up tigervnc-1.3.1/unix/xserver/hw/vnc/Input.cc.116 tigervnc-1.3.1/unix/xserver/hw/vnc/Input.cc
  17 --- tigervnc-1.3.1/unix/xserver/hw/vnc/Input.cc.116     2013-05-30 16:53:40.000000000 +0200
  18 +++ tigervnc-1.3.1/unix/xserver/hw/vnc/Input.cc 2014-04-28 16:55:02.591440218 +0200
  19 @@ -262,7 +262,7 @@ static int pointerProc(DeviceIntPtr pDev
  20         return Success;
  21  }
  22
  23 -static void keyboardBell(int percent, DeviceIntPtr device, pointer ctrl,
  24 +static void keyboardBell(int percent, DeviceIntPtr device, void * ctrl,
  25                          int class_)
  26  {
  27         if (percent > 0)
  28 diff -up tigervnc-1.3.1/unix/xserver/hw/vnc/XserverDesktop.cc.116 tigervnc-1.3.1/unix/xserver/hw/vnc/XserverDesktop.cc
  29 --- tigervnc-1.3.1/unix/xserver/hw/vnc/XserverDesktop.cc.116    2014-04-28 16:55:02.530441812 +0200
  30 +++ tigervnc-1.3.1/unix/xserver/hw/vnc/XserverDesktop.cc        2014-04-28 16:55:02.592440192 +0200
  31 @@ -48,7 +48,7 @@ extern "C" {
  32  #define public c_public
  33  #define class c_class
  34
  35 -extern char *display;
  36 +extern const char *display;
  37
  38  #include "colormapst.h"
  39  #ifdef RANDR
  40 @@ -174,7 +174,7 @@ void XserverDesktop::serverReset(ScreenP
  41  {
  42    pScreen = pScreen_;
  43    int i;
  44 -  pointer retval;
  45 +  void * retval;
  46
  47  #if XORG >= 17
  48  #define dixLookupResource dixLookupResourceByType
  49 diff -up tigervnc-1.3.1/unix/xserver/hw/vnc/vncExtInit.cc.116 tigervnc-1.3.1/unix/xserver/hw/vnc/vncExtInit.cc
  50 --- tigervnc-1.3.1/unix/xserver/hw/vnc/vncExtInit.cc.116        2014-04-28 16:55:02.524441969 +0200
  51 +++ tigervnc-1.3.1/unix/xserver/hw/vnc/vncExtInit.cc    2014-04-28 16:55:02.592440192 +0200
  52 @@ -65,18 +65,18 @@ extern "C" {
  53
  54    extern void vncExtensionInit();
  55    static void vncResetProc(ExtensionEntry* extEntry);
  56 -  static void vncBlockHandler(pointer data, OSTimePtr t, pointer readmask);
  57 -  static void vncWakeupHandler(pointer data, int nfds, pointer readmask);
  58 +  static void vncBlockHandler(void * data, OSTimePtr t, void * readmask);
  59 +  static void vncWakeupHandler(void * data, int nfds, void * readmask);
  60    void vncWriteBlockHandler(fd_set *fds);
  61    void vncWriteWakeupHandler(int nfds, fd_set *fds);
  62 -  static void vncClientStateChange(CallbackListPtr*, pointer, pointer);
  63 +  static void vncClientStateChange(CallbackListPtr*, void *, void *);
  64    static void SendSelectionChangeEvent(Atom selection);
  65    static int ProcVncExtDispatch(ClientPtr client);
  66    static int SProcVncExtDispatch(ClientPtr client);
  67 -  static void vncSelectionCallback(CallbackListPtr *callbacks, pointer data,
  68 -                                  pointer args);
  69 +  static void vncSelectionCallback(CallbackListPtr *callbacks, void * data,
  70 +                                  void * args);
  71
  72 -  extern char *display;
  73 +  extern const char *display;
  74    extern char *listenaddr;
  75  }
  76
  77 @@ -284,7 +284,7 @@ static void vncResetProc(ExtensionEntry*
  78  {
  79  }
  80
  81 -static void vncSelectionCallback(CallbackListPtr *callbacks, pointer data, pointer args)
  82 +static void vncSelectionCallback(CallbackListPtr *callbacks, void * data, void * args)
  83  {
  84    SelectionInfoRec *info = (SelectionInfoRec *) args;
  85    Selection *selection = info->selection;
  86 @@ -301,7 +301,7 @@ static void vncWriteWakeupHandlerFallbac
  87  // selections have changed, and if so, notify any interested X clients.
  88  //
  89
  90 -static void vncBlockHandler(pointer data, OSTimePtr timeout, pointer readmask)
  91 +static void vncBlockHandler(void * data, OSTimePtr timeout, void * readmask)
  92  {
  93    fd_set* fds = (fd_set*)readmask;
  94
  95 @@ -312,7 +312,7 @@ static void vncBlockHandler(pointer data
  96        desktop[scr]->blockHandler(fds, timeout);
  97  }
  98
  99 -static void vncWakeupHandler(pointer data, int nfds, pointer readmask)
 100 +static void vncWakeupHandler(void * data, int nfds, void * readmask)
 101  {
 102    fd_set* fds = (fd_set*)readmask;
 103
 104 @@ -402,7 +402,7 @@ static void vncWriteWakeupHandlerFallbac
 105    vncWriteWakeupHandler(ret, &fallbackFds);
 106  }
 107
 108 -static void vncClientStateChange(CallbackListPtr*, pointer, pointer p)
 109 +static void vncClientStateChange(CallbackListPtr*, void *, void * p)
 110  {
 111    ClientPtr client = ((NewClientInfoRec*)p)->client;
 112    if (client->clientState == ClientStateGone) {
 113 @@ -468,7 +468,7 @@ void vncClientCutText(const char* str, i
 114
 115
 116  static CARD32 queryConnectTimerCallback(OsTimerPtr timer,
 117 -                                        CARD32 now, pointer arg)
 118 +                                        CARD32 now, void * arg)
 119  {
 120    if (queryConnectTimeout)
 121      queryConnectDesktop->approveConnection(queryConnectId, false, "The attempt to prompt the user to accept the connection failed");
 122 diff -up tigervnc-1.3.1/unix/xserver/hw/vnc/vncHooks.cc.116 tigervnc-1.3.1/unix/xserver/hw/vnc/vncHooks.cc
 123 --- tigervnc-1.3.1/unix/xserver/hw/vnc/vncHooks.cc.116  2013-05-22 14:57:16.000000000 +0200
 124 +++ tigervnc-1.3.1/unix/xserver/hw/vnc/vncHooks.cc      2014-04-28 16:55:02.593440166 +0200
 125 @@ -91,8 +91,8 @@ typedef struct {
 126  } vncHooksScreenRec, *vncHooksScreenPtr;
 127
 128  typedef struct {
 129 -    GCFuncs *wrappedFuncs;
 130 -    GCOps *wrappedOps;
 131 +    const GCFuncs *wrappedFuncs;
 132 +    const GCOps *wrappedOps;
 133  } vncHooksGCRec, *vncHooksGCPtr;
 134
 135  #if XORG == 15
 136 @@ -141,11 +141,11 @@ static Bool vncHooksDisplayCursor(
 137  #endif
 138                                   ScreenPtr pScreen, CursorPtr cursor);
 139  #if XORG < 112
 140 -static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
 141 -                                 pointer pReadmask);
 142 +static void vncHooksBlockHandler(int i, void * blockData, void * pTimeout,
 143 +                                 void * pReadmask);
 144  #else
 145 -static void vncHooksBlockHandler(ScreenPtr pScreen, pointer pTimeout,
 146 -                                 pointer pReadmask);
 147 +static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout,
 148 +                                 void * pReadmask);
 149  #endif
 150  #ifdef RENDER
 151  static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
 152 @@ -174,7 +174,7 @@ static void vncHooksValidateGC(GCPtr pGC
 153  static void vncHooksChangeGC(GCPtr pGC, unsigned long mask);
 154  static void vncHooksCopyGC(GCPtr src, unsigned long mask, GCPtr dst);
 155  static void vncHooksDestroyGC(GCPtr pGC);
 156 -static void vncHooksChangeClip(GCPtr pGC, int type, pointer pValue,int nrects);
 157 +static void vncHooksChangeClip(GCPtr pGC, int type, void * pValue,int nrects);
 158  static void vncHooksDestroyClip(GCPtr pGC);
 159  static void vncHooksCopyClip(GCPtr dst, GCPtr src);
 160
 161 @@ -226,10 +226,10 @@ static void vncHooksImageText16(Drawable
 162                                  int count, unsigned short *chars);
 163  static void vncHooksImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x,
 164                                    int y, unsigned int nglyph,
 165 -                                  CharInfoPtr *ppci, pointer pglyphBase);
 166 +                                  CharInfoPtr *ppci, void * pglyphBase);
 167  static void vncHooksPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x,
 168                                   int y, unsigned int nglyph,
 169 -                                 CharInfoPtr *ppci, pointer pglyphBase);
 170 +                                 CharInfoPtr *ppci, void * pglyphBase);
 171  static void vncHooksPushPixels(GCPtr pGC, PixmapPtr pBitMap,
 172                                 DrawablePtr pDrawable, int w, int h, int x,
 173                                 int y);
 174 @@ -575,11 +575,11 @@ static Bool vncHooksDisplayCursor(
 175  // these are just drawing the cursor.
 176
 177  #if XORG < 112
 178 -static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
 179 -                                 pointer pReadmask)
 180 +static void vncHooksBlockHandler(int i, void * blockData, void * pTimeout,
 181 +                                 void * pReadmask)
 182  #else
 183 -static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
 184 -                                 pointer pReadmask)
 185 +static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout,
 186 +                                 void * pReadmask)
 187  #endif
 188  {
 189  #if XORG < 112
 190 @@ -914,7 +914,7 @@ static void vncHooksDestroyGC(GCPtr pGC)
 191    GCFuncUnwrapper u(pGC);
 192    (*pGC->funcs->DestroyGC) (pGC);
 193  }
 194 -static void vncHooksChangeClip(GCPtr pGC, int type, pointer pValue, int nrects)
 195 +static void vncHooksChangeClip(GCPtr pGC, int type, void * pValue, int nrects)
 196  {
 197    GCFuncUnwrapper u(pGC);
 198    (*pGC->funcs->ChangeClip) (pGC, type, pValue, nrects);
 199 @@ -954,7 +954,7 @@ public:
 200    }
 201    GCPtr pGC;
 202    vncHooksGCPtr vncHooksGC;
 203 -  GCFuncs* oldFuncs;
 204 +  const GCFuncs* oldFuncs;
 205    ScreenPtr pScreen;
 206  };
 207
 208 @@ -1793,7 +1793,7 @@ static void vncHooksImageText16(Drawable
 209
 210  static void vncHooksImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x,
 211                                    int y, unsigned int nglyph,
 212 -                                  CharInfoPtr *ppci, pointer pglyphBase)
 213 +                                  CharInfoPtr *ppci, void * pglyphBase)
 214  {
 215    GC_OP_UNWRAPPER(pDrawable, pGC, ImageGlyphBlt);
 216
 217 @@ -1819,7 +1819,7 @@ static void vncHooksImageGlyphBlt(Drawab
 218
 219  static void vncHooksPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x,
 220                                   int y, unsigned int nglyph,
 221 -                                 CharInfoPtr *ppci, pointer pglyphBase)
 222 +                                 CharInfoPtr *ppci, void * pglyphBase)
 223  {
 224    GC_OP_UNWRAPPER(pDrawable, pGC, PolyGlyphBlt);
 225
 226 diff -up tigervnc-1.3.1/unix/xserver/hw/vnc/xf86vncModule.cc.116 tigervnc-1.3.1/unix/xserver/hw/vnc/xf86vncModule.cc
 227 --- tigervnc-1.3.1/unix/xserver/hw/vnc/xf86vncModule.cc.116     2013-03-14 18:52:53.000000000 +0100
 228 +++ tigervnc-1.3.1/unix/xserver/hw/vnc/xf86vncModule.cc 2014-04-28 16:55:02.593440166 +0200
 229 @@ -81,11 +81,11 @@ static XF86ModuleVersionInfo vncVersRec
 230
 231  _X_EXPORT XF86ModuleData vncModuleData = { &vncVersRec, vncSetup, NULL };
 232
 233 -static pointer
 234 -vncSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
 235 -    LoadExtension(&vncExt, FALSE);
 236 +static void *
 237 +vncSetup(void * module, void * opts, int *errmaj, int *errmin) {
 238 +    LoadExtensionList(&vncExt, 1, FALSE);
 239      /* Need a non-NULL return value to indicate success */
 240 -    return (pointer)1;
 241 +    return (void *)1;
 242  }
 243
 244  static void vncExtensionInitWithParams(INITARGS)
 245 diff -up tigervnc-1.3.1/unix/xserver/hw/vnc/xvnc.cc.116 tigervnc-1.3.1/unix/xserver/hw/vnc/xvnc.cc
 246 --- tigervnc-1.3.1/unix/xserver/hw/vnc/xvnc.cc.116      2014-03-19 13:11:09.000000000 +0100
 247 +++ tigervnc-1.3.1/unix/xserver/hw/vnc/xvnc.cc  2014-04-28 16:53:12.580314921 +0200
 248 @@ -103,7 +103,7 @@ extern "C" {
 249                         "See http://www.tigervnc.org for information on TigerVNC.\n")
 250
 251
 252 -extern char *display;
 253 +extern const char *display;
 254  extern int monitorResolution;
 255
 256  #define VFB_DEFAULT_WIDTH  1024
 257 @@ -762,7 +762,7 @@ vfbUninstallColormap(ColormapPtr pmap)
 258             curpmap = (ColormapPtr) LookupIDByType(pmap->pScreen->defColormap,
 259                                                    RT_COLORMAP);
 260  #else
 261 -           dixLookupResourceByType((pointer *) &curpmap, pmap->pScreen->defColormap,
 262 +           dixLookupResourceByType((void * *) &curpmap, pmap->pScreen->defColormap,
 263                                     RT_COLORMAP, serverClient, DixUnknownAccess);
 264  #endif
 265             (*pmap->pScreen->InstallColormap)(curpmap);
 266 @@ -1597,7 +1597,7 @@ vfbScreenInit(ScreenPtr pScreen, int arg
 267  } /* end vfbScreenInit */
 268
 269
 270 -static void vfbClientStateChange(CallbackListPtr*, pointer, pointer) {
 271 +static void vfbClientStateChange(CallbackListPtr*, void *, void *) {
 272    dispatchException &= ~DE_RESET;
 273  }
 274
 275 @@ -1625,7 +1625,7 @@ InitOutput(ScreenInfo *screenInfo, int a
 276  #if XORG >= 113
 277  #ifdef GLXEXT
 278      if (serverGeneration == 1)
 279 -        LoadExtension(&glxExt, TRUE);
 280 +        LoadExtensionList(&glxExt, 1, TRUE);
 281  #endif
 282  #endif
 283