diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 16:07:56 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 16:07:56 +0000 |
| commit | 01dfa203f5613c89304fe3a8570f0e8911c26ad9 (patch) | |
| tree | b1308261e8953b545f14af6a55d10287cd802eb5 /vcl | |
| parent | e83f96bb5236a5a0b38bf90e665b47aacdd3f3a9 (diff) | |
INTEGRATION: CWS vcl87 (1.93.16); FILE MERGED
2008/03/31 16:44:44 pl 1.93.16.2: #i76650# fix crash on exit
2008/03/07 16:46:28 pl 1.93.16.1: #i76650# RandR support for screen size changes
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index aa7cfeb10184..4b5799e90c70 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: saldisp.cxx,v $ * - * $Revision: 1.93 $ + * $Revision: 1.94 $ * - * last change: $Author: rt $ $Date: 2008-01-29 16:22:34 $ + * last change: $Author: kz $ $Date: 2008-04-03 17:07:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -715,6 +715,9 @@ SalX11Display::~SalX11Display() XCloseDisplay( pDisp_ ); pDisp_ = NULL; } + // don't do this in doDestruct since RandR extension adds hooks into Display + // that is XCloseDisplay still needs the RandR library if it was used + DeInitRandR(); } void SalDisplay::initScreen( int nScreen ) const @@ -744,6 +747,9 @@ void SalDisplay::initScreen( int nScreen ) const rSD.m_aVisual = SalVisual( &aVI ); rSD.m_aColormap = SalColormap( this, aColMap, nScreen ); + // we're interested in configure notification of root windows + InitRandR( rSD.m_aRoot ); + // - - - - - - - - - - Reference Window/Default Drawable - - XSetWindowAttributes aXWAttributes; aXWAttributes.border_pixel = 0; @@ -2420,6 +2426,9 @@ long SalX11Display::Dispatch( XEvent *pEvent ) // dispatch to salobjects X11SalObject::Dispatch( pEvent ); + // is this perhaps a root window that changed size ? + processRandREvent( pEvent ); + return 0; } |