openoffice-gui-splash-redraw.patch

   1 Index: vcl/unx/source/gdi/salbmp.cxx
   2 ===================================================================
   3 RCS file: /cvs/gsl/vcl/unx/source/gdi/salbmp.cxx,v
   4 retrieving revision 1.8
   5 diff -u -p -u -r1.8 salbmp.cxx
   6 --- vcl/unx/source/gdi/salbmp.cxx       11 Sep 2001 15:52:22 -0000      1.8
   7 +++ vcl/unx/source/gdi/salbmp.cxx       16 Sep 2003 12:51:50 -0000
   8 @@ -91,6 +91,9 @@
   9  #ifndef _SV_SALBMP_HXX
  10  #include <salbmp.hxx>
  11  #endif
  12 +#ifndef _SV_SALFRAME_HXX
  13 +#include <salframe.hxx>
  14 +#endif
  15
  16  // -----------
  17  // - Defines -
  18 @@ -1140,4 +1146,16 @@ void ImplSalBitmapCache::ImplClear()
  19
  20         maBmpList.Clear();
  21         mnTotalSize = 0;
  22 +}
  23 +
  24 +void
  25 +SalBitmap::SetWindowBg( SalFrame *pFrame )
  26 +{
  27 +    if( !pFrame )
  28 +        return;
  29 +
  30 +       XLIB_Window window = pFrame->maFrameData.GetWindow();
  31 +       DBG_ASSERT( mpDDB, "SetWindowBg needs valid DDB" );
  32 +       XSetWindowBackgroundPixmap (pFrame->maFrameData.GetXDisplay (),
  33 +                                                               window, mpDDB->ImplGetPixmap ());
  34  }
  35 Index: vcl/source/window/introwin.cxx
  36 ===================================================================
  37 RCS file: /cvs/gsl/vcl/source/window/introwin.cxx,v
  38 retrieving revision 1.2
  39 diff -u -p -u -r1.2 introwin.cxx
  40 --- vcl/source/window/introwin.cxx      27 Mar 2003 17:58:22 -0000      1.2
  41 +++ vcl/source/window/introwin.cxx      16 Sep 2003 12:51:51 -0000
  42 @@ -97,6 +97,18 @@
  43  #ifndef _SV_OPENGL_HXX
  44  #include <opengl.hxx>
  45  #endif
  46 +#ifndef _SV_BITMAP_HXX
  47 +#include <bitmap.hxx>
  48 +#endif
  49 +#ifndef _SV_BITMAPEX_HXX
  50 +#include <bitmapex.hxx>
  51 +#endif
  52 +#ifndef _SV_IMPBMP_HXX
  53 +#include <impbmp.hxx>
  54 +#endif
  55 +#ifndef _SV_SALBMP_HXX
  56 +#include <salbmp.hxx>
  57 +#endif
  58
  59  #include <introwin.hxx>
  60
  61 @@ -129,4 +141,21 @@ IntroWindow::~IntroWindow()
  62          pSVData->mpIntroWindow = NULL;
  63  }
  64
  65 +void
  66 +IntroWindow::SetBackgroundBitmap( const Bitmap &rBitmap )
  67 +{
  68 +    SetBackground( Wallpaper( BitmapEx( rBitmap ) ) );
  69 +}
  70
  71 +void
  72 +IntroWindow::Paint( const Rectangle &rRect )
  73 +{
  74 +    Bitmap aBmp( GetBackground().GetBitmap().GetBitmap() );
  75 +
  76 +       DrawBitmap( Point(), aBmp );
  77 +#ifdef UNX
  78 +       ImpBitmap *pImpBmp = aBmp.ImplGetImpBitmap();
  79 +       if( pImpBmp )
  80 +        pImpBmp->ImplGetSalBitmap ()->SetWindowBg( ImplGetFrame() );
  81 +#endif
  82 +}
  83 Index: vcl/inc/introwin.hxx
  84 ===================================================================
  85 RCS file: /cvs/gsl/vcl/inc/introwin.hxx,v
  86 retrieving revision 1.2
  87 diff -u -p -u -r1.2 introwin.hxx
  88 --- vcl/inc/introwin.hxx        27 Mar 2003 17:57:22 -0000      1.2
  89 +++ vcl/inc/introwin.hxx        16 Sep 2003 12:51:51 -0000
  90 @@ -82,6 +82,8 @@ private:
  91  public:
  92      IntroWindow();
  93      ~IntroWindow();
  94 +    void IntroWindow::SetBackgroundBitmap( const Bitmap &rBitmap );
  95 +       virtual void Paint( const Rectangle& );
  96  };
  97
  98  #endif // _SV_INTROWIN_HXX
  99 Index: desktop/source/splash/splash.cxx
 100 ===================================================================
 101 RCS file: /cvs/framework/desktop/source/splash/splash.cxx,v
 102 retrieving revision 1.4
 103 diff -u -p -u -r1.4 splash.cxx
 104 --- desktop/source/splash/splash.cxx    15 Jul 2003 14:06:11 -0000      1.4
 105 +++ desktop/source/splash/splash.cxx    16 Sep 2003 12:51:51 -0000
 106 @@ -235,15 +235,16 @@ void SplashScreen::initBitmap()
 107                         _aIntroBmp = Bitmap( aIntroBmpRes );
 108                         delete pLabelResMgr;
 109                 }
 110 +               SetBackgroundBitmap( _aIntroBmp );
 111         }
 112  }
 113
 114 -void SplashScreen::Paint( const Rectangle& )
 115 +void SplashScreen::Paint( const Rectangle& rRect )
 116  {
 117         if(!_bVisible) return;
 118         // draw bitmap
 119         if (_bPaintBitmap)
 120 -               DrawBitmap( Point(), _aIntroBmp );
 121 +        IntroWindow::Paint( rRect );
 122
 123         if (_bPaintProgress) {
 124                 // draw progress...
 125 Index: vcl/unx/inc/salbmp.hxx
 126 ===================================================================
 127 RCS file: /cvs/gsl/vcl/unx/inc/salbmp.hxx,v
 128 retrieving revision 1.3
 129 diff -u -p -u -r1.3 salbmp.hxx
 130 --- vcl/unx/inc/salbmp.hxx      29 Aug 2001 16:14:00 -0000      1.3
 131 +++ vcl/unx/inc/salbmp.hxx      16 Sep 2003 14:55:34 -0000
 132 @@ -77,6 +77,7 @@ class BitmapPalette;
 133  class  SalGraphics;
 134  class  ImplSalDDB;
 135  class  ImplSalBitmapCache;
 136 +class   SalFrame;
 137
 138  // -------------
 139  // - SalBitmap -
 140 @@ -133,6 +134,7 @@ public:
 141         void                    ImplDraw( Drawable aDrawable, long nDrawableDepth,
 142                                                           const SalTwoRect& rTwoRect, const GC& rGC ) const;
 143  #endif
 144 +    void            SetWindowBg( SalFrame *pFrame );
 145
 146  public:
 147