tigervnc-xserver-1.16.patch

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