]>
Commit | Line | Data |
---|---|---|
d1864078 JR |
1 | diff -up tigervnc/unix/xserver/hw/vnc/vncHooks.cc.xorg113 tigervnc/unix/xserver/hw/vnc/vncHooks.cc |
2 | --- tigervnc/unix/xserver/hw/vnc/vncHooks.cc.xorg113 2012-07-19 21:31:37.191820942 -0400 | |
3 | +++ tigervnc/unix/xserver/hw/vnc/vncHooks.cc 2012-07-19 21:36:00.327531293 -0400 | |
4 | @@ -116,7 +116,7 @@ static DevPrivateKeyRec vncHooksGCKeyRec | |
5 | ||
6 | // screen functions | |
7 | ||
8 | -static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen); | |
9 | +static Bool vncHooksCloseScreen(ScreenPtr pScreen); | |
10 | static Bool vncHooksCreateGC(GCPtr pGC); | |
11 | static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, | |
12 | RegionPtr pOldRegion); | |
13 | @@ -133,7 +133,7 @@ static Bool vncHooksDisplayCursor( | |
14 | DeviceIntPtr pDev, | |
15 | #endif | |
16 | ScreenPtr pScreen, CursorPtr cursor); | |
17 | -static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, | |
18 | +static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout, | |
19 | pointer pReadmask); | |
20 | #ifdef RENDER | |
21 | static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, | |
22 | @@ -335,7 +335,7 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse | |
23 | // CloseScreen - unwrap the screen functions and call the original CloseScreen | |
24 | // function | |
25 | ||
26 | -static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_) | |
27 | +static Bool vncHooksCloseScreen(ScreenPtr pScreen_) | |
28 | { | |
29 | SCREEN_UNWRAP(pScreen_, CloseScreen); | |
30 | ||
31 | @@ -366,7 +366,7 @@ static Bool vncHooksCloseScreen(int i, S | |
32 | ||
33 | DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n")); | |
34 | ||
35 | - return (*pScreen->CloseScreen)(i, pScreen); | |
36 | + return (*pScreen->CloseScreen)(pScreen); | |
37 | } | |
38 | ||
39 | // CreateGC - wrap the "GC funcs" | |
40 | @@ -531,14 +531,14 @@ static Bool vncHooksDisplayCursor( | |
41 | // BlockHandler - ignore any changes during the block handler - it's likely | |
42 | // these are just drawing the cursor. | |
43 | ||
44 | -static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, | |
45 | +static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout, | |
46 | pointer pReadmask) | |
47 | { | |
48 | - SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler); | |
49 | + SCREEN_UNWRAP(pScreen_, BlockHandler); | |
50 | ||
51 | vncHooksScreen->desktop->ignoreHooks(true); | |
52 | ||
53 | - (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); | |
54 | + (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask); | |
55 | ||
56 | vncHooksScreen->desktop->ignoreHooks(false); | |
57 | ||
58 | diff -up tigervnc/unix/xserver/hw/vnc/xf86vncModule.cc.xorg113 tigervnc/unix/xserver/hw/vnc/xf86vncModule.cc | |
59 | --- tigervnc/unix/xserver/hw/vnc/xf86vncModule.cc.xorg113 2012-07-19 21:19:27.558942606 -0400 | |
60 | +++ tigervnc/unix/xserver/hw/vnc/xf86vncModule.cc 2012-07-19 21:19:27.574942408 -0400 | |
61 | @@ -53,8 +53,6 @@ ExtensionModule vncExt = | |
62 | { | |
63 | vncExtensionInitWithParams, | |
64 | "VNC", | |
65 | - NULL, | |
66 | - NULL, | |
67 | NULL | |
68 | }; | |
69 | ||
70 | diff -up tigervnc/unix/xserver/hw/vnc/xorg-version.h.xorg113 tigervnc/unix/xserver/hw/vnc/xorg-version.h | |
71 | --- tigervnc/unix/xserver/hw/vnc/xorg-version.h.xorg113 2012-07-19 21:19:27.560942582 -0400 | |
72 | +++ tigervnc/unix/xserver/hw/vnc/xorg-version.h 2012-07-19 21:19:27.576942382 -0400 | |
73 | @@ -40,6 +40,8 @@ | |
74 | #define XORG 111 | |
75 | #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000)) | |
76 | #define XORG 112 | |
77 | +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000)) | |
78 | +#define XORG 113 | |
79 | #else | |
80 | #error "X.Org newer than 1.10 is not supported" | |
81 | #endif | |
82 | diff -up tigervnc/unix/xserver/hw/vnc/xvnc.cc.xorg113 tigervnc/unix/xserver/hw/vnc/xvnc.cc | |
83 | --- tigervnc/unix/xserver/hw/vnc/xvnc.cc.xorg113 2012-07-19 21:36:33.078121854 -0400 | |
84 | +++ tigervnc/unix/xserver/hw/vnc/xvnc.cc 2012-07-19 21:39:49.685663920 -0400 | |
85 | @@ -267,7 +267,7 @@ OsVendorInit() | |
86 | } | |
87 | ||
88 | void | |
89 | -OsVendorFatalError() | |
90 | +OsVendorFatalError(const char *f, va_list args) | |
91 | { | |
92 | } | |
93 | ||
94 | @@ -1135,9 +1135,9 @@ static Bool vncRandRSetConfig (ScreenPtr | |
95 | #endif | |
96 | ||
97 | static Bool | |
98 | -vfbCloseScreen(int index, ScreenPtr pScreen) | |
99 | +vfbCloseScreen(ScreenPtr pScreen) | |
100 | { | |
101 | - vfbScreenInfoPtr pvfb = &vfbScreens[index]; | |
102 | + vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum]; | |
103 | int i; | |
104 | ||
105 | pScreen->CloseScreen = pvfb->closeScreen; | |
106 | @@ -1149,13 +1149,13 @@ vfbCloseScreen(int index, ScreenPtr pScr | |
107 | for (i = 0; i < MAXSCREENS; i++) | |
108 | InstalledMaps[i] = NULL; | |
109 | ||
110 | - return pScreen->CloseScreen(index, pScreen); | |
111 | + return pScreen->CloseScreen(pScreen); | |
112 | } | |
113 | ||
114 | static Bool | |
115 | -vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) | |
116 | +vfbScreenInit(ScreenPtr pScreen, int argc, char **argv) | |
117 | { | |
118 | - vfbScreenInfoPtr pvfb = &vfbScreens[index]; | |
119 | + vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum]; | |
120 | int dpi; | |
121 | int ret; | |
122 | void *pbits; | |
123 | @@ -1167,8 +1167,8 @@ vfbScreenInit(int index, ScreenPtr pScre | |
124 | ||
125 | pbits = vfbAllocateFramebufferMemory(&pvfb->fb); | |
126 | if (!pbits) return FALSE; | |
127 | - vncFbptr[index] = pbits; | |
128 | - vncFbstride[index] = pvfb->fb.paddedWidth; | |
129 | + vncFbptr[pScreen->myNum] = pbits; | |
130 | + vncFbstride[pScreen->myNum] = pvfb->fb.paddedWidth; | |
131 | ||
132 | miSetPixmapDepths(); | |
133 | ||
18151d72 JR |
134 | --- tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc~ 2012-09-23 19:45:21.946623087 +0200 |
135 | +++ tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc 2012-09-23 19:49:31.809947601 +0200 | |
136 | @@ -943,7 +943,7 @@ | |
137 | { | |
138 | REQUEST(xVncExtApproveConnectReq); | |
139 | REQUEST_SIZE_MATCH(xVncExtApproveConnectReq); | |
140 | - if (queryConnectId == (void*)stuff->opaqueId) { | |
141 | + if ((CARD32)(long)queryConnectId == stuff->opaqueId) { | |
142 | for (int scr = 0; scr < screenInfo.numScreens; scr++) { | |
143 | if (desktop[scr]) { | |
144 | desktop[scr]->approveConnection(queryConnectId, stuff->approve, |