[paragui-cvs] CVS: paragui/src/widgets pgthemewidget.cpp,1.6.2.5,1.6.2.6

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/src/widgets
In directory subversions:/tmp/cvs-serv4742/src/widgets

Modified Files:
      Tag: devel-opengl
        pgthemewidget.cpp 
Log Message:
Further opengl driver work
SDL driver now almost entirely works
opengl isn't rendering correctly but IS operational


Index: pgthemewidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgthemewidget.cpp,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -C2 -r1.6.2.5 -r1.6.2.6
*** pgthemewidget.cpp   30 Oct 2002 09:16:29 -0000      1.6.2.5
--- pgthemewidget.cpp   4 Nov 2002 10:58:32 -0000       1.6.2.6
***************
*** 505,517 ****
                               
        // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
-       if ( bpp == 8 )
-               surface->SetPalette ( SDL_LOGPAL, 
screen->GetFormat()->palette->colors, 0, 256 );
- 
        if(surface) {
!               if(background || gradient) {
!                       surface->DrawThemedSurface(PG_Rect(0, 0, r.my_width, 
r.my_height), gradient, background, bkmode, blend);
!               } else {
!                       surface->SetColorKey(SDL_SRCCOLORKEY, 0);
!               }
        }
        
--- 505,534 ----
                               
        // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(surface) {
!         if ( bpp == 8 )
!           surface->SetPalette ( SDL_LOGPAL, 
screen->GetFormat()->palette->colors, 0, 256 );
! 
! #if 0
!         PG_Draw::PG_DrawableSurface *ts;
!         bool talph = true;
! #if 1
!         talph = ((surface->GetSDLFlags() & SDL_SRCALPHA) ||
!                  (surface->GetSDLFlags() & SDL_SRCCOLORKEY) ||
!                  surface->GetFormat()->Amask) || true; /* force alpha for now 
*/
!         // PG_LogMSG("create accelerated surface(alpha=%s)", 
talph?"true":"false");
! #endif
!         ts = draw->AccelerateSurface(surface,talph);
!         if (ts != NULL) {
!           delete surface;
!           surface = ts;
!         };
!         // PG_LogDBG("ParaGUI[%s]: %s:%i accelerated surface %p", __FILE__, 
__FUNCTION__, __LINE__, surface->SDL());
! #endif
!         
!         if(background || gradient) {
!           surface->DrawThemedSurface(PG_Rect(0, 0, r.my_width, r.my_height), 
gradient, background, bkmode, blend);
!         } else {
!           surface->SetColorKey(SDL_SRCCOLORKEY, 0);
!         }
        }