[paragui-cvs] CVS: paragui/src/themes theme_priv.cpp,1.3,1.3.2.1 theme_priv.h,1.3,1.3.2.1 themeloader.cpp,1.3,1.3.2.1

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/src/themes
In directory subversions:/tmp/cvs-serv27818/src/themes

Modified Files:
      Tag: devel-opengl
        theme_priv.cpp theme_priv.h themeloader.cpp 
Log Message:
Initial checkin of code by Teunis Peters
Added abstraction layer for display support.
Initial OpenGL testing mode - use SDL_GLSDL to activate
A lot of test code is still present - FIXME
Some demos do not operate at all.  Some work barely.
only animation works flawlessly at this time.


Index: theme_priv.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/theme_priv.cpp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** theme_priv.cpp      15 Apr 2002 13:35:36 -0000      1.3
--- theme_priv.cpp      18 Jun 2002 22:40:39 -0000      1.3.2.1
***************
*** 65,69 ****
  }
  
! SDL_Surface* THEME_THEME::FindSurface(const char* widgettype, const char* 
objectname, const char* name) {
        THEME_OBJECT* object = FindObject(widgettype, objectname);
  
--- 65,69 ----
  }
  
! PG_Draw::PG_DrawableSurface* THEME_THEME::FindSurface(const char* widgettype, 
const char* objectname, const char* name) {
        THEME_OBJECT* object = FindObject(widgettype, objectname);
  
***************
*** 222,226 ****
  }
  
! SDL_Surface* THEME_OBJECT::FindSurface(const char* name) {
        if (!name)
                return NULL;
--- 222,226 ----
  }
  
! PG_Draw::PG_DrawableSurface* THEME_OBJECT::FindSurface(const char* name) {
        if (!name)
                return NULL;

Index: theme_priv.h
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/theme_priv.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** theme_priv.h        15 Apr 2002 13:35:36 -0000      1.3
--- theme_priv.h        18 Jun 2002 22:40:39 -0000      1.3.2.1
***************
*** 87,91 ****
        Uint32 colorkey;
        bool hasColorKey;
!       SDL_Surface* surface;
  };
  
--- 87,91 ----
        Uint32 colorkey;
        bool hasColorKey;
!       PG_Draw::PG_DrawableSurface* surface;
  };
  
***************
*** 119,123 ****
        virtual ~THEME_OBJECT();
  
!       SDL_Surface* FindSurface(const char* name);
        PG_Gradient* FindGradient(const char* name);
        long FindProperty(const char* name);
--- 119,123 ----
        virtual ~THEME_OBJECT();
  
!       PG_Draw::PG_DrawableSurface* FindSurface(const char* name);
        PG_Gradient* FindGradient(const char* name);
        long FindProperty(const char* name);
***************
*** 182,186 ****
        int FindFontStyle(const char*, const char*);
  
!       SDL_Surface* FindSurface(const char* widgettype, const char* object, 
const char* name);
        PG_Gradient* FindGradient(const char* widgettype, const char* object, 
const char* name);
        long FindProperty(const char* widgettype, const char* object, const 
char* name);
--- 182,186 ----
        int FindFontStyle(const char*, const char*);
  
!       PG_Draw::PG_DrawableSurface* FindSurface(const char* widgettype, const 
char* object, const char* name);
        PG_Gradient* FindGradient(const char* widgettype, const char* object, 
const char* name);
        long FindProperty(const char* widgettype, const char* object, const 
char* name);

Index: themeloader.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/themeloader.cpp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** themeloader.cpp     15 Apr 2002 13:35:36 -0000      1.3
--- themeloader.cpp     18 Jun 2002 22:40:39 -0000      1.3.2.1
***************
*** 30,33 ****
--- 30,34 ----
  #include "theme_priv.h"
  #include "pglog.h"
+ #include "pgdraw.h"
  
  #include <string>
***************
*** 203,208 ****
                        SDL_Color c;
                        splitColor(&c, filename->colorkey);
!                       Uint32 key = SDL_MapRGB(filename->surface->format, c.r, 
c.g, c.b);
!                       SDL_SetColorKey(filename->surface, SDL_SRCCOLORKEY, 
key);
                }
                object->filename[filename->name] = filename;
--- 204,209 ----
                        SDL_Color c;
                        splitColor(&c, filename->colorkey);
!                       Uint32 key = 
SDL_MapRGB(filename->surface->getScreen()->format, c.r, c.g, c.b);
!                       filename->surface->SetColorKey(SDL_SRCCOLORKEY, key);
                }
                object->filename[filename->name] = filename;