diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
| commit | 6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d (patch) | |
| tree | 8dc28411ab42ebb9183bc090c10024a39fc669d6 /xorg-server/dix/window.c | |
| parent | 22891980a76b862bfcda406521b454f072090fb8 (diff) | |
| parent | e22891346b85a7db40dec7260a100f90b451cbc8 (diff) | |
| download | vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.gz vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.bz2 vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/dispatch.h
xorg-server/glx/glapi.c
xorg-server/glx/indirect_dispatch.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/glx/indirect_size.h
xorg-server/glx/indirect_size_get.c
xorg-server/glx/indirect_size_get.h
xorg-server/glx/indirect_table.c
xorg-server/mi/mieq.c
Diffstat (limited to 'xorg-server/dix/window.c')
| -rw-r--r-- | xorg-server/dix/window.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c index 1953f025b..823294b9a 100644 --- a/xorg-server/dix/window.c +++ b/xorg-server/dix/window.c @@ -131,6 +131,7 @@ Equipment Corporation. #include "privates.h" #include "xace.h" +#include "exevents.h" #include <X11/Xatom.h> /* must come after server includes */ @@ -2971,8 +2972,10 @@ UnmapWindow(WindowPtr pWin, Bool fromConfigure) if (!fromConfigure && pScreen->PostValidateTree) (*pScreen->PostValidateTree)(pLayerWin->parent, pWin, VTUnmap); } - if (wasRealized && !fromConfigure) + if (wasRealized && !fromConfigure) { WindowsRestructured (); + WindowGone(pWin); + } return Success; } @@ -3055,8 +3058,10 @@ UnmapSubwindows(WindowPtr pWin) if (anyMarked && pScreen->PostValidateTree) (*pScreen->PostValidateTree)(pLayerWin->parent, pHead, VTUnmap); } - if (wasRealized) + if (wasRealized) { WindowsRestructured (); + WindowGone(pWin); + } } |