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
|
--- vnc-4.0b4-unixsrc/xc/programs/Xserver/vnc/XserverDesktop.cc.xorg 2003-09-04 14:04:40.000000000 +0100
+++ vnc-4.0b4-unixsrc/xc/programs/Xserver/vnc/XserverDesktop.cc 2004-03-22 17:50:05.000000000 +0000
@@ -376,25 +376,6 @@
}
}
-static void printRegion(RegionPtr reg)
-{
- int nrects = REGION_NUM_RECTS(reg);
-
- fprintf(stderr,"Region num rects %2d extents %3d,%3d %3dx%3d\n",nrects,
- (REGION_EXTENTS(pScreen,reg))->x1,
- (REGION_EXTENTS(pScreen,reg))->y1,
- (REGION_EXTENTS(pScreen,reg))->x2-(REGION_EXTENTS(pScreen,reg))->x1,
- (REGION_EXTENTS(pScreen,reg))->y2-(REGION_EXTENTS(pScreen,reg))->y1);
-
- for (int i = 0; i < nrects; i++) {
- fprintf(stderr," rect %3d,%3d %3dx%3d\n",
- REGION_RECTS(reg)[i].x1,
- REGION_RECTS(reg)[i].y1,
- REGION_RECTS(reg)[i].x2-REGION_RECTS(reg)[i].x1,
- REGION_RECTS(reg)[i].y2-REGION_RECTS(reg)[i].y1);
- }
-}
-
CARD32 XserverDesktop::deferredUpdateTimerCallback(OsTimerPtr timer,
CARD32 now, pointer arg)
{
--- vnc-4.0b4-unixsrc/xc/programs/Xserver/Imakefile.xorg 2004-03-04 17:47:16.000000000 +0000
+++ vnc-4.0b4-unixsrc/xc/programs/Xserver/Imakefile 2004-03-22 17:50:05.000000000 +0000
@@ -119,7 +119,7 @@
LIBREGEX = RegexLibrary
#if DoLoadableServer
- LIBCWRAPPER = os/libcwrapper.o
+ LIBCWRAPPER = os/libcwrapper.o os/libos.a
#endif
#if BuildXprint
--- vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h.xorg 2003-05-30 11:42:38.000000000 +0100
+++ vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h 2004-05-27 11:26:06.499536143 +0100
@@ -36,7 +36,7 @@
RegionHelper(ScreenPtr pScreen_, RegionPtr pRegion)
: pScreen(pScreen_), reg(®Rec)
{
- REGION_INIT(pScreen, reg, NullBox, 0);
+ REGION_NULL(pScreen, reg);
REGION_COPY(pScreen, reg, pRegion);
}
@@ -54,8 +54,8 @@
void init(BoxPtr rect, int size) {
reg = ®Rec;
- if (rect && (rect->x2 == rect->x1 || rect->y2 == rect->y1)) {
- REGION_INIT(pScreen, reg, NullBox, 0);
+ if (!rect || (rect->x2 == rect->x1 || rect->y2 == rect->y1)) {
+ REGION_NULL(pScreen, reg);
} else {
REGION_INIT(pScreen, reg, rect, size);
}
--- vnc-4.0-unixsrc/xc.patch.xorg 2004-08-25 16:10:52.131987786 +0100
+++ vnc-4.0-unixsrc/xc.patch 2004-08-25 16:12:23.896276533 +0100
@@ -8,11 +8,11 @@
+ XCOMM
+ XCOMM X VNC server
+ XCOMM
-+ MFBDIR = mfb
-+ CFB8DIR = cfb
-+ CFB16DIR = cfb16
-+ CFB24DIR = cfb24
-+ CFB32DIR = cfb32
++ MFBSUBDIR = mfb
++ CFB8SUBDIR = cfb
++ CFB16SUBDIR = cfb16
++ CFB24SUBDIR = cfb24
++ CFB32SUBDIR = cfb32
+ XVNCDDXDIR = vnc/Xvnc
+ XVNCDIRS = $(STDDIRS) $(MFBDIR) \
+ $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
--- vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.xorg 2004-08-31 14:24:12.140503335 +0100
+++ vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2004-08-31 14:24:45.189675775 +0100
@@ -201,6 +201,7 @@
}
extern "C" {
+ void ddxInitGlobals() {}
void ddxGiveUp()
{
int i;
--- vnc-4.0-unixsrc/xc/config/cf/vnc.def 2004-09-29 15:55:57.732303799 +0100
+++ vnc-4.0-unixsrc/xc/config/cf/vnc.def 2004-09-29 15:56:30.495034234 +0100
@@ -9,6 +9,8 @@
#define XnestServer YES
#define XF86Server NO
#define XprtServer NO
+#define BuildXFree86ConfigTools NO
+#define BuildScanpci NO
#ifdef SunArchitecture
#define ProjectRoot /usr/openwin
|
GitWeb