diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-23 07:03:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-23 07:03:58 +0000 |
| commit | 345335d61c71c245846d679d568a8b5eca1a5ca9 (patch) | |
| tree | 7b878ae84134fa091dd2bdc2695251e609209ebe /xorg-server/composite/compinit.c | |
| parent | fbbbbe88405440920f4baa5a3107ec0b9a6f8cb7 (diff) | |
| parent | c356d5298f18cd103ef7caad015d98d2022044ac (diff) | |
| download | vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.tar.gz vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.tar.bz2 vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/composite/compinit.c')
| -rw-r--r-- | xorg-server/composite/compinit.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/xorg-server/composite/compinit.c b/xorg-server/composite/compinit.c index 389cf0bfb..d3910c4b4 100644 --- a/xorg-server/composite/compinit.c +++ b/xorg-server/composite/compinit.c @@ -66,6 +66,9 @@ compCloseScreen (int index, ScreenPtr pScreen) pScreen->ChangeWindowAttributes = cs->ChangeWindowAttributes;
pScreen->ReparentWindow = cs->ReparentWindow;
pScreen->ConfigNotify = cs->ConfigNotify;
+ pScreen->MoveWindow = cs->MoveWindow;
+ pScreen->ResizeWindow = cs->ResizeWindow;
+ pScreen->ChangeBorderWidth = cs->ChangeBorderWidth;
pScreen->ClipNotify = cs->ClipNotify;
pScreen->UnrealizeWindow = cs->UnrealizeWindow;
@@ -366,6 +369,15 @@ compScreenInit (ScreenPtr pScreen) cs->ConfigNotify = pScreen->ConfigNotify;
pScreen->ConfigNotify = compConfigNotify;
+ cs->MoveWindow = pScreen->MoveWindow;
+ pScreen->MoveWindow = compMoveWindow;
+
+ cs->ResizeWindow = pScreen->ResizeWindow;
+ pScreen->ResizeWindow = compResizeWindow;
+
+ cs->ChangeBorderWidth = pScreen->ChangeBorderWidth;
+ pScreen->ChangeBorderWidth = compChangeBorderWidth;
+
cs->ReparentWindow = pScreen->ReparentWindow;
pScreen->ReparentWindow = compReparentWindow;
|