Magellan Linux

Contents of /trunk/vnc/patches/vnc-server-paint.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 639 - (show annotations) (download)
Tue Jun 3 20:56:41 2008 UTC (16 years, 5 months ago) by niro
File size: 4716 byte(s)
-renamed patch

1 diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncHooks.cc.paint vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncHooks.cc
2 --- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncHooks.cc.paint 2008-03-06 14:54:52.000000000 +0100
3 +++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncHooks.cc 2008-03-06 14:56:54.000000000 +0100
4 @@ -72,8 +72,6 @@ typedef struct {
5
6 CloseScreenProcPtr CloseScreen;
7 CreateGCProcPtr CreateGC;
8 - PaintWindowBackgroundProcPtr PaintWindowBackground;
9 - PaintWindowBorderProcPtr PaintWindowBorder;
10 CopyWindowProcPtr CopyWindow;
11 ClearToBackgroundProcPtr ClearToBackground;
12 RestoreAreasProcPtr RestoreAreas;
13 @@ -106,10 +104,6 @@ static DevPrivateKey vncHooksGCPrivateKe
14
15 static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
16 static Bool vncHooksCreateGC(GCPtr pGC);
17 -static void vncHooksPaintWindowBackground(WindowPtr pWin, RegionPtr pRegion,
18 - int what);
19 -static void vncHooksPaintWindowBorder(WindowPtr pWin, RegionPtr pRegion,
20 - int what);
21 static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
22 RegionPtr pOldRegion);
23 static void vncHooksClearToBackground(WindowPtr pWin, int x, int y, int w,
24 @@ -231,8 +225,6 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse
25
26 vncHooksScreen->CloseScreen = pScreen->CloseScreen;
27 vncHooksScreen->CreateGC = pScreen->CreateGC;
28 - vncHooksScreen->PaintWindowBackground = pScreen->PaintWindowBackground;
29 - vncHooksScreen->PaintWindowBorder = pScreen->PaintWindowBorder;
30 vncHooksScreen->CopyWindow = pScreen->CopyWindow;
31 vncHooksScreen->ClearToBackground = pScreen->ClearToBackground;
32 vncHooksScreen->RestoreAreas = pScreen->RestoreAreas;
33 @@ -253,8 +245,6 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse
34
35 pScreen->CloseScreen = vncHooksCloseScreen;
36 pScreen->CreateGC = vncHooksCreateGC;
37 - pScreen->PaintWindowBackground = vncHooksPaintWindowBackground;
38 - pScreen->PaintWindowBorder = vncHooksPaintWindowBorder;
39 pScreen->CopyWindow = vncHooksCopyWindow;
40 pScreen->ClearToBackground = vncHooksClearToBackground;
41 pScreen->RestoreAreas = vncHooksRestoreAreas;
42 @@ -297,8 +287,6 @@ static Bool vncHooksCloseScreen(int i, S
43 SCREEN_UNWRAP(pScreen_, CloseScreen);
44
45 pScreen->CreateGC = vncHooksScreen->CreateGC;
46 - pScreen->PaintWindowBackground = vncHooksScreen->PaintWindowBackground;
47 - pScreen->PaintWindowBorder = vncHooksScreen->PaintWindowBorder;
48 pScreen->CopyWindow = vncHooksScreen->CopyWindow;
49 pScreen->ClearToBackground = vncHooksScreen->ClearToBackground;
50 pScreen->RestoreAreas = vncHooksScreen->RestoreAreas;
51 @@ -333,38 +321,6 @@ static Bool vncHooksCreateGC(GCPtr pGC)
52 return ret;
53 }
54
55 -// PaintWindowBackground - changed region is the given region
56 -
57 -static void vncHooksPaintWindowBackground(WindowPtr pWin, RegionPtr pRegion,
58 - int what)
59 -{
60 - SCREEN_UNWRAP(pWin->drawable.pScreen, PaintWindowBackground);
61 -
62 - RegionHelper changed(pScreen, pRegion);
63 -
64 - (*pScreen->PaintWindowBackground) (pWin, pRegion, what);
65 -
66 - vncHooksScreen->desktop->add_changed(changed.reg);
67 -
68 - SCREEN_REWRAP(PaintWindowBackground);
69 -}
70 -
71 -// PaintWindowBorder - changed region is the given region
72 -
73 -static void vncHooksPaintWindowBorder(WindowPtr pWin, RegionPtr pRegion,
74 - int what)
75 -{
76 - SCREEN_UNWRAP(pWin->drawable.pScreen, PaintWindowBorder);
77 -
78 - RegionHelper changed(pScreen, pRegion);
79 -
80 - (*pScreen->PaintWindowBorder) (pWin, pRegion, what);
81 -
82 - vncHooksScreen->desktop->add_changed(changed.reg);
83 -
84 - SCREEN_REWRAP(PaintWindowBorder);
85 -}
86 -
87 // CopyWindow - destination of the copy is the old region, clipped by
88 // borderClip, translated by the delta. This call only does the copy - it
89 // doesn't affect any other bits.
90 @@ -534,16 +490,9 @@ static void vncHooksValidateGC(GCPtr pGC
91 (*pGC->funcs->ValidateGC) (pGC, changes, pDrawable);
92
93 u.vncHooksGC->wrappedOps = 0;
94 - if (pDrawable->type == DRAWABLE_WINDOW && ((WindowPtr)pDrawable)->viewable) {
95 - WindowPtr pWin = (WindowPtr)pDrawable;
96 - RegionPtr pRegion = &pWin->clipList;
97 -
98 - if (pGC->subWindowMode == IncludeInferiors)
99 - pRegion = &pWin->borderClip;
100 - if (REGION_NOTEMPTY(pDrawable->pScreen, pRegion)) {
101 - u.vncHooksGC->wrappedOps = pGC->ops;
102 - DBGPRINT((stderr,"vncHooksValidateGC: wrapped GC ops\n"));
103 - }
104 + if (pDrawable->type == DRAWABLE_WINDOW || pDrawable->type == DRAWABLE_PIXMAP) {
105 + u.vncHooksGC->wrappedOps = pGC->ops;
106 + DBGPRINT((stderr,"vncHooksValidateGC: wrapped GC ops\n"));
107 }
108 }
109