1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
|
diff -up xserver/hw/vnc/Makefile.am.xorg113 xserver/hw/vnc/Makefile.am
--- xserver/hw/vnc/Makefile.am.xorg113 2012-07-19 21:42:46.297455970 -0400
+++ xserver/hw/vnc/Makefile.am 2012-07-19 21:19:22.526005528 -0400
@@ -62,7 +62,7 @@ EXTRA_DIST = Xvnc.man
BUILT_SOURCES = $(nodist_Xvnc_SOURCES)
fb.h: $(top_srcdir)/fb/fb.h
- cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h
+ cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h
pixman.h: $(includedir)/pixman-1/pixman.h
cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h
diff -up xserver/hw/vnc/vncHooks.cc.xorg113 xserver/hw/vnc/vncHooks.cc
--- xserver/hw/vnc/vncHooks.cc.xorg113 2012-07-19 21:31:37.191820942 -0400
+++ xserver/hw/vnc/vncHooks.cc 2012-07-19 21:36:00.327531293 -0400
@@ -116,7 +116,7 @@ static DevPrivateKeyRec vncHooksGCKeyRec
// screen functions
-static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
+static Bool vncHooksCloseScreen(ScreenPtr pScreen);
static Bool vncHooksCreateGC(GCPtr pGC);
static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
RegionPtr pOldRegion);
@@ -133,7 +133,7 @@ static Bool vncHooksDisplayCursor(
DeviceIntPtr pDev,
#endif
ScreenPtr pScreen, CursorPtr cursor);
-static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
pointer pReadmask);
#ifdef RENDER
static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
@@ -335,7 +335,7 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse
// CloseScreen - unwrap the screen functions and call the original CloseScreen
// function
-static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_)
+static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
{
SCREEN_UNWRAP(pScreen_, CloseScreen);
@@ -366,7 +366,7 @@ static Bool vncHooksCloseScreen(int i, S
DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
- return (*pScreen->CloseScreen)(i, pScreen);
+ return (*pScreen->CloseScreen)(pScreen);
}
// CreateGC - wrap the "GC funcs"
@@ -531,14 +531,14 @@ static Bool vncHooksDisplayCursor(
// BlockHandler - ignore any changes during the block handler - it's likely
// these are just drawing the cursor.
-static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
pointer pReadmask)
{
- SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler);
+ SCREEN_UNWRAP(pScreen_, BlockHandler);
vncHooksScreen->desktop->ignoreHooks(true);
- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+ (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
vncHooksScreen->desktop->ignoreHooks(false);
diff -up xserver/hw/vnc/xf86vncModule.cc.xorg113 xserver/hw/vnc/xf86vncModule.cc
--- xserver/hw/vnc/xf86vncModule.cc.xorg113 2012-07-19 21:19:27.558942606 -0400
+++ xserver/hw/vnc/xf86vncModule.cc 2012-07-19 21:19:27.574942408 -0400
@@ -53,8 +53,6 @@ ExtensionModule vncExt =
{
vncExtensionInitWithParams,
"VNC",
- NULL,
- NULL,
NULL
};
diff -up xserver/hw/vnc/xorg-version.h.xorg113 xserver/hw/vnc/xorg-version.h
--- xserver/hw/vnc/xorg-version.h.xorg113 2012-07-19 21:19:27.560942582 -0400
+++ xserver/hw/vnc/xorg-version.h 2012-07-19 21:19:27.576942382 -0400
@@ -40,6 +40,8 @@
#define XORG 111
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000))
#define XORG 112
+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
+#define XORG 113
#else
#error "X.Org newer than 1.10 is not supported"
#endif
diff -up xserver/hw/vnc/xvnc.cc.xorg113 xserver/hw/vnc/xvnc.cc
--- xserver/hw/vnc/xvnc.cc.xorg113 2012-07-19 21:36:33.078121854 -0400
+++ xserver/hw/vnc/xvnc.cc 2012-07-19 21:39:49.685663920 -0400
@@ -267,7 +267,7 @@ OsVendorInit()
}
void
-OsVendorFatalError()
+OsVendorFatalError(const char *f, va_list args)
{
}
@@ -1135,9 +1135,9 @@ static Bool vncRandRSetConfig (ScreenPtr
#endif
static Bool
-vfbCloseScreen(int index, ScreenPtr pScreen)
+vfbCloseScreen(ScreenPtr pScreen)
{
- vfbScreenInfoPtr pvfb = &vfbScreens[index];
+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
int i;
pScreen->CloseScreen = pvfb->closeScreen;
@@ -1149,13 +1149,13 @@ vfbCloseScreen(int index, ScreenPtr pScr
for (i = 0; i < MAXSCREENS; i++)
InstalledMaps[i] = NULL;
- return pScreen->CloseScreen(index, pScreen);
+ return pScreen->CloseScreen(pScreen);
}
static Bool
-vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
+vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
{
- vfbScreenInfoPtr pvfb = &vfbScreens[index];
+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
int dpi;
int ret;
void *pbits;
@@ -1167,8 +1167,8 @@ vfbScreenInit(int index, ScreenPtr pScre
pbits = vfbAllocateFramebufferMemory(&pvfb->fb);
if (!pbits) return FALSE;
- vncFbptr[index] = pbits;
- vncFbstride[index] = pvfb->fb.paddedWidth;
+ vncFbptr[pScreen->myNum] = pbits;
+ vncFbstride[pScreen->myNum] = pvfb->fb.paddedWidth;
miSetPixmapDepths();
diff -up xserver/include/screenint.h.xorg113 xserver/include/screenint.h
--- xserver/include/screenint.h.xorg113 2012-07-19 21:30:38.258557709 -0400
+++ xserver/include/screenint.h 2012-07-19 21:30:45.415468235 -0400
@@ -72,18 +72,18 @@ extern _X_EXPORT int AddGPUScreen(Bool (
extern _X_EXPORT void RemoveGPUScreen(ScreenPtr pScreen);
extern _X_EXPORT void
-AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
+AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr);
extern _X_EXPORT void
DetachUnboundGPU(ScreenPtr unbound);
extern _X_EXPORT void
-AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
+AttachOutputGPU(ScreenPtr pScreen, ScreenPtr);
extern _X_EXPORT void
DetachOutputGPU(ScreenPtr output);
extern _X_EXPORT void
-AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
+AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr);
extern _X_EXPORT void
DetachOffloadGPU(ScreenPtr slave);
|
