diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-01-29 15:24:33 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-01-30 22:49:08 +0100 |
| commit | 3b90a3f1eaf9b98e52917d97b6991762d498c10d (patch) | |
| tree | 6431e5b8a2e0f3e916a86f773f7af75e2c6e6885 /vcl | |
| parent | 9c1a107696d032ec4e5e5ac0526c643d3a666c06 (diff) | |
vcl: stuff
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 90cfe61b65af..4c106651b9ed 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -243,14 +243,18 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay, VisualID nDefVID = XVisualIDFromVisual( DefaultVisual( pDisplay, nScreen ) ); XVisualInfo aVI; +// aVI.visualid = nDefVID; aVI.screen = nScreen; // get all visuals int nVisuals; XVisualInfo* pVInfos = XGetVisualInfo( pDisplay, VisualScreenMask, &aVI, &nVisuals ); + if (!pVInfos) + return sal_False; + // HACK - rVI = pVInfos[ 0 ]; + rVI = *pVInfos; XFree( pVInfos ); return rVI.visualid == nDefVID; @@ -434,10 +438,11 @@ SalDisplay::initScreen( SalX11Screen nXScreen ) const if( SalDisplay::BestVisual( pDisp_, nXScreen.getXScreen(), aVI ) ) // DefaultVisual aColMap = DefaultColormap( pDisp_, nXScreen.getXScreen() ); else - aColMap = XCreateColormap( pDisp_, - RootWindow( pDisp_, nXScreen.getXScreen() ), - aVI.visual, - AllocNone ); + fprintf( stderr, "HACK: XCreateColormap would be called...\n" ); +// aColMap = XCreateColormap( pDisp_, +// RootWindow( pDisp_, nXScreen.getXScreen() ), +// aVI.visual, +// AllocNone ); Screen* pScreen = ScreenOfDisplay( pDisp_, nXScreen.getXScreen() ); |