aedgui-cvs — CVS Tracking List

[aedGUI-cvs] aedGUI/themes gtk.cpp,1.4,1.5

[Rodrigo H. <kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/themes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6822/themes

Modified Files:
	gtk.cpp 
Log Message:
OpenGL Patch

Index: gtk.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/themes/gtk.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gtk.cpp	26 Oct 2003 08:50:59 -0000	1.4
--- gtk.cpp	16 Apr 2004 01:29:57 -0000	1.5
***************
*** 52,125 ****
      Uint16 screenHeight = screen->h - 1;
      bool btnDown = widget->getButtonState();
! 
      //bool setActiveBorder = true;
  
      if(!btnDown)
      {
          SDL_FillRect(screen, NULL, colorButtonNormal1.getUint32(screen));
          DrawLine(screen, 0, 0, screenWidth - 1, 0,
!                  aedColor(255, 255, 255,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
          DrawLine(screen, 0, -1, 0, screenHeight - 1,
!                  aedColor(255, 255, 255,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
          DrawLine(screen, 0, screenHeight, screenWidth, screenHeight,
!                  aedColor(0, 0, 0,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
          DrawLine(screen, screenWidth, 0, screenWidth, screenHeight,
!                  aedColor(0, 0, 0,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
          DrawLine(screen, 2, screenHeight - 1, screenWidth - 1, screenHeight - 1,
!                  aedColor(148, 149, 148,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
          DrawLine(screen, screenWidth - 1, 2, screenWidth - 1, screenHeight - 1,
!                  aedColor(148, 149, 148,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
      }
      else
      {
          SDL_FillRect(screen, NULL, colorButtonPushed1.getUint32(screen));
          DrawLine(screen, 0, 0, screenWidth - 1, 0,
!                  aedColor(148, 149, 148,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
          DrawLine(screen, 0, -1, 0, screenHeight - 1,
!                  aedColor(148, 149, 148,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
          DrawLine(screen, 0, screenHeight, screenWidth, screenHeight,
!                  aedColor(0, 0, 0,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
          DrawLine(screen, screenWidth, 0, screenWidth, screenHeight,
!                  aedColor(0, 0, 0,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
          DrawLine(screen, 2, screenHeight - 1, screenWidth - 1, screenHeight - 1,
!                  aedColor(255, 255, 255,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
          DrawLine(screen, screenWidth - 1, 2, screenWidth - 1, screenHeight - 1,
!                  aedColor(255, 255, 255,
!                           PROCESS_ALPHA(255,
!                                         widget->getAlphaValue())).
!                  getUint32(screen));
      }
  
--- 52,112 ----
      Uint16 screenHeight = screen->h - 1;
      bool btnDown = widget->getButtonState();
!     aedColor color;
      //bool setActiveBorder = true;
  
      if(!btnDown)
      {
+         color.setAllColors(255, 255, 255,
+ 		   PROCESS_ALPHA(255,widget->getAlphaValue()));
+ 
          SDL_FillRect(screen, NULL, colorButtonNormal1.getUint32(screen));
          DrawLine(screen, 0, 0, screenWidth - 1, 0,
!                  color);
          DrawLine(screen, 0, -1, 0, screenHeight - 1,
!                  color);
! 
!         color.setAllColors(0, 0, 0,
!                           PROCESS_ALPHA(255,widget->getAlphaValue()));
! 
          DrawLine(screen, 0, screenHeight, screenWidth, screenHeight,
!                  color);
! 
          DrawLine(screen, screenWidth, 0, screenWidth, screenHeight,
!                  color);
! 
!         color.setAllColors(148, 149, 148,
!                           PROCESS_ALPHA(255,widget->getAlphaValue()));
! 
          DrawLine(screen, 2, screenHeight - 1, screenWidth - 1, screenHeight - 1,
!                  color);
          DrawLine(screen, screenWidth - 1, 2, screenWidth - 1, screenHeight - 1,
!                  color);
      }
      else
      {
+         color.setAllColors(148, 149, 148,
+                           PROCESS_ALPHA(255,widget->getAlphaValue()));
+ 
          SDL_FillRect(screen, NULL, colorButtonPushed1.getUint32(screen));
          DrawLine(screen, 0, 0, screenWidth - 1, 0,
!                  color);
          DrawLine(screen, 0, -1, 0, screenHeight - 1,
!                  color);
! 
!         color.setAllColors(0, 0, 0,
!                           PROCESS_ALPHA(255,widget->getAlphaValue()));
! 
          DrawLine(screen, 0, screenHeight, screenWidth, screenHeight,
!                  color);
          DrawLine(screen, screenWidth, 0, screenWidth, screenHeight,
!                  color);
! 
! 	color.setAllColors(255, 255, 255,
! 			   PROCESS_ALPHA(255,widget->getAlphaValue()));
! 
          DrawLine(screen, 2, screenHeight - 1, screenWidth - 1, screenHeight - 1,
!                  color);
          DrawLine(screen, screenWidth - 1, 2, screenWidth - 1, screenHeight - 1,
!                  color);
      }
  
***************
*** 129,167 ****
  gtkStyle::drawBorder(aedWidget * widget, SDL_Surface * screen)
  {
!     DrawLine(screen, 0, 0, screen->w, 0,
!              aedColor(213, 214, 205,
                        PROCESS_ALPHA(255,
!                                     widget->getAlphaValue())).
!              getUint32(screen));
      DrawLine(screen, screen->w - 1, 0, screen->w - 1, screen->h - 1,
!              aedColor(213, 214, 205,
!                       PROCESS_ALPHA(255,
!                                     widget->getAlphaValue())).
!              getUint32(screen));
      DrawLine(screen, 0, -1, 0, screen->h - 1,
!              aedColor(213, 214, 205,
!                       PROCESS_ALPHA(255,
!                                     widget->getAlphaValue())).
!              getUint32(screen));
      DrawLine(screen, screen->w - 2, 1, screen->w - 2, screen->h - 2,
!              aedColor(246, 246, 238,
!                       PROCESS_ALPHA(255,
!                                     widget->getAlphaValue())).
!              getUint32(screen));
      DrawLine(screen, 1, 1, screen->w - 2, 1,
!              aedColor(172, 170, 164,
!                       PROCESS_ALPHA(255,
!                                     widget->getAlphaValue())).
!              getUint32(screen));
      DrawLine(screen, 1, 0, 1, screen->h - 2,
!              aedColor(172, 170, 164,
!                       PROCESS_ALPHA(255,
!                                     widget->getAlphaValue())).
!              getUint32(screen));
!     DrawLine(screen, 1, screen->h - 2, screen->w - 2, screen->h - 2,
!              aedColor(246, 246, 238,
!                       PROCESS_ALPHA(255,
!                                     widget->getAlphaValue())).
!              getUint32(screen));
  }
  
--- 116,147 ----
  gtkStyle::drawBorder(aedWidget * widget, SDL_Surface * screen)
  {
!     aedColor color;
! 
!     color.setAllColors(213, 214, 205,
                        PROCESS_ALPHA(255,
!                                     widget->getAlphaValue()));
!    
!     DrawLine(screen, 0, 0, screen->w, 0,
!              color);
      DrawLine(screen, screen->w - 1, 0, screen->w - 1, screen->h - 1,
!              color);
      DrawLine(screen, 0, -1, 0, screen->h - 1,
!              color);
! 
!     color.setAllColors(246, 246, 238,
!                       PROCESS_ALPHA(255,widget->getAlphaValue()));
! 
      DrawLine(screen, screen->w - 2, 1, screen->w - 2, screen->h - 2,
!              color);
!     DrawLine(screen, 1, screen->h - 2, screen->w - 2, screen->h - 2,
!              color);
! 
!     color.setAllColors(172, 170, 164,
!                       PROCESS_ALPHA(255,widget->getAlphaValue()));
! 
      DrawLine(screen, 1, 1, screen->w - 2, 1,
!              color);
      DrawLine(screen, 1, 0, 1, screen->h - 2,
!              color);
  }
  

[aedGUI-cvs] aedGUI/test gltest.cpp,1.15,1.16

[Rodrigo H. <kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6822/test

Modified Files:
	gltest.cpp 
Log Message:
OpenGL Patch

Index: gltest.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/test/gltest.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** gltest.cpp	6 Feb 2004 05:52:56 -0000	1.15
--- gltest.cpp	16 Apr 2004 01:29:56 -0000	1.16
***************
*** 157,161 ****
      glEnable(GL_TEXTURE_2D);   // Enable Texture Mapping
      glShadeModel(GL_SMOOTH);    // Enable Smooth Shading
!     glClearColor(0.0f, 0.0f, 0.0f, 0.5f);       // Black Background
      glClearDepth(1.0f);         // Depth Buffer Setup
      glEnable(GL_DEPTH_TEST);    // Enables Depth Testing
--- 157,161 ----
      glEnable(GL_TEXTURE_2D);   // Enable Texture Mapping
      glShadeModel(GL_SMOOTH);    // Enable Smooth Shading
!     glClearColor(0.5f, 0.5f, 0.5f, 1.0f);       // Black Background
      glClearDepth(1.0f);         // Depth Buffer Setup
      glEnable(GL_DEPTH_TEST);    // Enables Depth Testing
***************
*** 314,327 ****
  DrawGUI(SDL_Surface * surface) 
  {
!     
!         /*
!            This Function Draws our aedGUI surface to the screen
!          */ 
!         glMatrixMode(GL_PROJECTION);
      glPushMatrix();
      glLoadIdentity();
!     glOrtho(0, 800, 0, 600, 0, 1);
      glMatrixMode(GL_MODELVIEW);
      glLoadIdentity();
      glBindTexture(GL_TEXTURE_2D, ScreenTex);
      glTexImage2D(GL_TEXTURE_2D, 0, 4, surface->w, surface->h, 0, GL_RGBA,
--- 314,329 ----
  DrawGUI(SDL_Surface * surface) 
  {
!     glMatrixMode(GL_PROJECTION);
      glPushMatrix();
      glLoadIdentity();
!     glOrtho(0, 800, 0,600, 0, 1);
      glMatrixMode(GL_MODELVIEW);
      glLoadIdentity();
+     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+     glEnable(GL_BLEND);
+ 
+         /*
+            This Function Draws our aedGUI surface to the screen
+          */ 
      glBindTexture(GL_TEXTURE_2D, ScreenTex);
      glTexImage2D(GL_TEXTURE_2D, 0, 4, surface->w, surface->h, 0, GL_RGBA,
***************
*** 331,336 ****
      //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
      //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-     glEnable(GL_BLEND);
      glBegin(GL_QUADS);
      glTexCoord2f(0.0f, 1.0f);
--- 333,336 ----
***************
*** 347,350 ****
--- 347,351 ----
      glMatrixMode(GL_MODELVIEW);
      glDisable(GL_BLEND);
+ 
  } 
  
***************
*** 353,356 ****
--- 354,358 ----
  {
      aedApp app;
+     app.setOpenGL(true);
      app.setDefaultFontName("Vera.ttf");
      if(SDL_Init(SDL_INIT_VIDEO) < 0)
***************
*** 417,421 ****
                       SDL_MapRGB(imgCursor->format, 255, 0, 255));
      Cursor.setImage(imgCursor);
!     SDL_ShowCursor(0);
      ReSizeGLScene(800, 600);
      if(!InitGL())
--- 419,423 ----
                       SDL_MapRGB(imgCursor->format, 255, 0, 255));
      Cursor.setImage(imgCursor);
!     //SDL_ShowCursor(0);
      ReSizeGLScene(800, 600);
      if(!InitGL())
***************
*** 443,451 ****
              }
          }
          desktop.update();
          desktop.renderAll(surface);
          Cursor.render(surface);
!         DrawGLScene();
!         DrawGUI(surface);
          SDL_GL_SwapBuffers();
      }
--- 445,453 ----
              }
          }
+         DrawGLScene();
          desktop.update();
          desktop.renderAll(surface);
          Cursor.render(surface);
!         //DrawGUI(surface);
          SDL_GL_SwapBuffers();
      }

[aedGUI-cvs] aedGUI/include aedApp.h,1.18,1.19 drawlibs.h,1.6,1.7

[Rodrigo H. <kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6822/include

Modified Files:
	aedApp.h drawlibs.h 
Log Message:
OpenGL Patch

Index: drawlibs.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/drawlibs.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** drawlibs.h	6 Nov 2003 18:46:34 -0000	1.6
--- drawlibs.h	16 Apr 2004 01:29:56 -0000	1.7
***************
*** 24,27 ****
--- 24,28 ----
  
  #include "SDL.h"
+ #include "aedColor.h"
  
  #define sgn(x) ((x<0)?-1:((x>0)?1:0))   /* macro to return the sign of a
***************
*** 32,40 ****
  DLLEXPORT void ConvertSurface(SDL_Surface ** surface);
  
! DLLEXPORT void DrawPixel(SDL_Surface * screen, int x, int y, Uint32 color);
! DLLEXPORT void DrawLine(SDL_Surface * screen, int x1, int y1, int x2, int y2,
!                         Uint32 color);
! DLLEXPORT void DrawRect(SDL_Surface * screen, int x1, int y1, int x2, int y2,
!                         Uint32 color);
  DLLEXPORT void DrawRound(SDL_Surface * screen, int x0, int y0, int w, int h,
                           int corner, Uint32 color);
--- 33,41 ----
  DLLEXPORT void ConvertSurface(SDL_Surface ** surface);
  
! DLLEXPORT void DrawPixel(void* screenORrect, int x, int y, aedColor &aedColor);
! DLLEXPORT void DrawLine(void* screenORrect, int x1, int y1, int x2, int y2,
!                         aedColor &aedColor);
! DLLEXPORT void DrawRect(void* screenORrect, int x1, int y1, int x2, int y2,
!                         aedColor &aedColor);
  DLLEXPORT void DrawRound(SDL_Surface * screen, int x0, int y0, int w, int h,
                           int corner, Uint32 color);
***************
*** 49,53 ****
  DLLEXPORT Uint32 GetPixel(SDL_Surface * surface, int x, int y);
  DLLEXPORT void FloodFill(SDL_Surface * screen, int x, int y, Uint32 c);
! DLLEXPORT void DrawTriangle(SDL_Surface * s, int x[3], int y[3], Uint32 c);
  
  enum
--- 50,54 ----
  DLLEXPORT Uint32 GetPixel(SDL_Surface * surface, int x, int y);
  DLLEXPORT void FloodFill(SDL_Surface * screen, int x, int y, Uint32 c);
! DLLEXPORT void DrawTriangle(void* s, int x[3], int y[3], Uint32 c);
  
  enum
***************
*** 58,63 ****
      ARROW_RIGHT
  };
! DLLEXPORT void DrawArrow(SDL_Surface * s, int type, int x, int y, int a,
!                          Uint32 color, bool fill = false, Uint32 fillcolor = 0);
  
  #define SLOCK(surface) \
--- 59,64 ----
      ARROW_RIGHT
  };
! DLLEXPORT void DrawArrow(void* s, int type, int x, int y, int a,
!                          aedColor &aedColor, bool fill, aedColor &fillcolor);
  
  #define SLOCK(surface) \

Index: aedApp.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedApp.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** aedApp.h	6 Nov 2003 18:46:32 -0000	1.18
--- aedApp.h	16 Apr 2004 01:29:56 -0000	1.19
***************
*** 170,173 ****
--- 170,181 ----
          return m_UTF8;
      }
+     bool usesOpenGL()
+     {
+       return m_use_OpenGL;
+     };
+     void setOpenGL(bool use_OpenGL)
+     {
+       m_use_OpenGL = use_OpenGL;
+     };
  
    private:
***************
*** 184,188 ****
      aedButton *m_okayButton;
      aedButton *m_cancelButton;
! 
      bool m_UTF8;
  };
--- 192,196 ----
      aedButton *m_okayButton;
      aedButton *m_cancelButton;
!     bool m_use_OpenGL;
      bool m_UTF8;
  };

[aedGUI-cvs] aedGUI/src aedWindow.cpp,1.68,1.69

[Rodrigo H. <kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31724/src

Modified Files:
	aedWindow.cpp 
Log Message:
just removed some carriage returns from aedWindow

Index: aedWindow.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedWindow.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** aedWindow.cpp	6 Nov 2003 18:46:37 -0000	1.68
--- aedWindow.cpp	9 Apr 2004 05:03:00 -0000	1.69
***************
*** 1,220 ****
  #include "aedWindow.h"
! 
 aedWindow::aedWindow() 
! {
!     
m_InitComplete = false;
!     

m_isLPressed = false;
!     
m_Moveable = false;
!     
m_Caption = "";
!     

m_TitleBarBorderX = 5;
!     
m_TitleBarBorderY = 5;
!     
m_TitleBarHeight = 25;
!     

m_CloseButton = NULL;
!     
m_MinimizeButton = NULL;
!     
m_MaximizeButton = NULL;
!     
m_CaptionLabel = NULL;
! 
}
! 
! 

aedWindow::~aedWindow() 
! {
!     
delete m_CloseButton;
!     
delete m_MinimizeButton;
!     
delete m_MaximizeButton;
!     
delete m_CaptionLabel;
! 
}
! 

void
! aedWindow::create(aedWidget * parent, aedRect pos, std::string caption,
                    Uint32 flags) 
! {
!     
if(flags & WF_TITLEBAR)
          
-     {
-         
int TitleBarX = m_TitleBarBorderX;
-         
int TitleBarY = m_TitleBarBorderY;
-         
int TitleBarWidth = pos.getWidth() - (2 * m_TitleBarBorderX);
-         
int TitleBarHeight = m_TitleBarHeight;
-         

int ClientX = m_TitleBarBorderX;
-         
int ClientY = TitleBarY + TitleBarHeight + m_TitleBarBorderY;
-         
int ClientWidth = pos.getWidth() - (2 * m_TitleBarBorderX);
-         
int ClientHeight = pos.getHeight() - ClientY - m_TitleBarBorderY;
- 
-         

              // Create the client area
!             m_ClientArea.create(this,
!                                 aedRect(ClientX, ClientY, ClientWidth,
!                                         ClientHeight));
!         
m_ClientArea.setUserData(reinterpret_cast < void *>(this));
! 
!         
m_ClientArea.setBGColor(aedColor(240, 240, 240, 255));
!         

m_CaptionLabel = new aedStaticText();
!         
m_CaptionLabel->create(this, aedRect(0, 0, 0, 0));
!         
m_CaptionLabel->setUserData(reinterpret_cast < void *>(this));
! 
!         
m_CaptionLabel->bringToTop();
!         

if(flags & WF_CLOSEBUTTON)
              
!         {
!             
int ButtonSpacing = 2;     // Eeep, magic number
!             int ButtonWidth = m_TitleBarHeight - ButtonSpacing;
!             
int ButtonHeight = m_TitleBarHeight - (ButtonSpacing * 2);
!             
int ButtonX = pos.getWidth() - ButtonWidth - m_TitleBarBorderY;
!             
int ButtonY = TitleBarY + ButtonSpacing;
! 
!             

m_CloseButton = new aedButton();
!             

m_CloseButton->create(this,
!                                     aedRect(ButtonX, ButtonY, ButtonWidth,
!                                             ButtonHeight), "X");
!             
m_CloseButton->setUserData(reinterpret_cast < void *>(this));
! 
!             
m_CloseButton->connect(MOUSE_LBUTTON_UP,
!                                     aedCallBack
!                                     (__aedInternal__WindowCloseButtonHandler));
!             
m_CloseButton->bringToTop();
!         
}
!     
}
      
!     else
          
!     {
!         
m_ClientArea.create(this, pos);
!     
}
!     

if(flags & WF_MOVEABLE)
          
!     {
!         
m_Moveable = true;
!     
}
!     

          // TODO: Rest of creation flags
!         
aedWidget::create(parent, pos, caption);
!     

m_InitComplete = true;
! 
}
! 


void
  aedWindow::render(void) 
! {
      
          // Position our title caption correctly
!         Uint16 CaptionWidth, CaptionHeight;
!     
int x, y;
! 
!     

m_CaptionLabel->getFont()->getTextSize(m_Caption.c_str(), &CaptionWidth,
!                                              &CaptionHeight);
!     
m_CaptionLabel->setPos(m_TitleBarBorderX * 2,
!                             (m_TitleBarHeight / 2) + m_TitleBarBorderY -
!                             (CaptionHeight / 2));
!     
m_CaptionLabel->setSize(CaptionWidth, CaptionHeight);
!     

          // Draw the actual window
!         m_Theme->drawBox(reinterpret_cast < aedWidget * >(this), m_Surface);
!     
m_Theme->drawBorder(reinterpret_cast < aedWidget * >(this), m_Surface);
!     

          // Draw a box around the title bar
!     int TitleBarX1 = m_TitleBarBorderX;
!     
int TitleBarY1 = m_TitleBarBorderY;
!     
int TitleBarX2 = m_Pos.getWidth() - (2 * m_TitleBarBorderX);
!     
int TitleBarY2 = m_TitleBarHeight + m_TitleBarBorderY;
! 
!     

if(m_CloseButton != NULL)
          
!     {
!         
TitleBarX2 -= (m_CloseButton->getPos().getWidth());
!     
}
!     

aedColor temp(0, 0, 255, 255);
      
          // we need to lock the surface before touching its pixels...
!         SLOCK(m_Surface);
!     
DrawRect(m_Surface, TitleBarX1, TitleBarY1, TitleBarX2, TitleBarY2,
!               temp.getUint32(m_Surface));
!     
SUNLOCK(m_Surface);
! 
}
! 

int
  aedWindow::wm_lbuttondown(Uint16 x, Uint16 y) 
! {
!     
if(!m_Moveable)
          
!     {
!         
return 0;
!     
}
!     
screenToClient(x, y);
!     

if((x > (m_Pos.getX() + 5)) &&
!          (x < (m_Pos.getX() + m_Pos.getWidth() - 5)))
          
!     {
!         
if((y > m_Pos.getY() + 5) && y < m_Pos.getY() + 45)
              
!         {
!             
m_isLPressed = true;
!             
dragXoffset = x - m_Pos.getX();
!             
dragYoffset = y - m_Pos.getY();
!         
}
!     
}
!     
return 0;
! 
}
! 

int
  aedWindow::wm_lbuttonup(Uint16 x, Uint16 y) 
! {
!     
m_isLPressed = false;
!     
return 0;
! 
}
! 

int
  aedWindow::wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy) 
! {
!     
if(m_isLPressed)
          
!     {
          
              //setPos(getPos().getX() + dx, getPos().getY() + dy);
!             setPos(x - dragXoffset, y - dragYoffset);
          
              //setRenderState(true);
!             getParent()->setRenderState(true);
!     
}
!     
return 0;
! 
}
! 

void
  aedWindow::Maximize() 
! {
      
          // TODO: Write me
! } 

void
! 
  aedWindow::Minimize() 
! {
      
          // TODO: Write me
! } 

void
  __aedInternal__WindowCloseButtonHandler(void *caller, void *data) 
! {
!     
aedButton * TheButton = reinterpret_cast < aedButton * >(caller);
!     
aedWidget * TheWindow =
!         reinterpret_cast < aedWidget * >(TheButton->getUserData());
!     

if(TheWindow != NULL)
          
!     {
!         
TheWindow->hide();
!     
}
! 
}
! 

void
  __aedInternal__WindowMaxButtonHandler(void *caller, void *data) 
! {
!     
aedButton * TheButton = reinterpret_cast < aedButton * >(caller);
!     
aedWindow * TheWindow =
!         reinterpret_cast < aedWindow * >(TheButton->getUserData());
!     

if(TheWindow != NULL)
          
!     {
!         
TheWindow->Maximize();
!     
}
! 
}
! 

void
  __aedInternal__WindowMinButtonHandler(void *caller, void *data) 
! {
!     
aedButton * TheButton = reinterpret_cast < aedButton * >(caller);
!     
aedWindow * TheWindow =
!         reinterpret_cast < aedWindow * >(TheButton->getUserData());
!     

if(TheWindow != NULL)
          
!     {
!         
TheWindow->Minimize();
!     
}
! 
}
! 
  
--- 1,220 ----
  #include "aedWindow.h"
!  aedWindow::aedWindow() 
! {
!     m_InitComplete = false;
!     m_isLPressed = false;
!     m_Moveable = false;
!     m_Caption = "";
!     m_TitleBarBorderX = 5;
!     m_TitleBarBorderY = 5;
!     m_TitleBarHeight = 25;
!     m_CloseButton = NULL;
!     m_MinimizeButton = NULL;
!     m_MaximizeButton = NULL;
!     m_CaptionLabel = NULL;
! }
! 
! aedWindow::~aedWindow() 
! {
!     delete m_CloseButton;
!     delete m_MinimizeButton;
!     delete m_MaximizeButton;
!     delete m_CaptionLabel;
! }
! void
! aedWindow::create(aedWidget * parent, aedRect pos, std::string caption,
                    Uint32 flags) 
! {
!     if(flags & WF_TITLEBAR)
!         
!     {
!         int TitleBarX = m_TitleBarBorderX;
!         int TitleBarY = m_TitleBarBorderY;
!         int TitleBarWidth = pos.getWidth() - (2 * m_TitleBarBorderX);
!         int TitleBarHeight = m_TitleBarHeight;
!         int ClientX = m_TitleBarBorderX;
!         int ClientY = TitleBarY + TitleBarHeight + m_TitleBarBorderY;
!         int ClientWidth = pos.getWidth() - (2 * m_TitleBarBorderX);
!         int ClientHeight = pos.getHeight() - ClientY - m_TitleBarBorderY;
! 
          
              // Create the client area
!             m_ClientArea.create(this,
!                                 aedRect(ClientX, ClientY, ClientWidth,
!                                         ClientHeight));
!         m_ClientArea.setUserData(reinterpret_cast < void *>(this));
! 
!         m_ClientArea.setBGColor(aedColor(240, 240, 240, 255));
!         m_CaptionLabel = new aedStaticText();
!         m_CaptionLabel->create(this, aedRect(0, 0, 0, 0));
!         m_CaptionLabel->setUserData(reinterpret_cast < void *>(this));
! 
!         m_CaptionLabel->bringToTop();
!         if(flags & WF_CLOSEBUTTON)
              
!         {
!             int ButtonSpacing = 2;     // Eeep, magic number
!             int ButtonWidth = m_TitleBarHeight - ButtonSpacing;
!             int ButtonHeight = m_TitleBarHeight - (ButtonSpacing * 2);
!             int ButtonX = pos.getWidth() - ButtonWidth - m_TitleBarBorderY;
!             int ButtonY = TitleBarY + ButtonSpacing;
! 
!             m_CloseButton = new aedButton();
!             m_CloseButton->create(this,
!                                     aedRect(ButtonX, ButtonY, ButtonWidth,
!                                             ButtonHeight), "X");
!             m_CloseButton->setUserData(reinterpret_cast < void *>(this));
! 
!             m_CloseButton->connect(MOUSE_LBUTTON_UP,
!                                     aedCallBack
!                                     (__aedInternal__WindowCloseButtonHandler));
!             m_CloseButton->bringToTop();
!         }
!     }
      
!     else
          
!     {
!         m_ClientArea.create(this, pos);
!     }
!     if(flags & WF_MOVEABLE)
          
!     {
!         m_Moveable = true;
!     }
!     
          // TODO: Rest of creation flags
!         aedWidget::create(parent, pos, caption);
!     m_InitComplete = true;
! }
! void
  aedWindow::render(void) 
! {
      
          // Position our title caption correctly
!         Uint16 CaptionWidth, CaptionHeight;
!     int x, y;
! 
!     m_CaptionLabel->getFont()->getTextSize(m_Caption.c_str(), &CaptionWidth,
!                                              &CaptionHeight);
!     m_CaptionLabel->setPos(m_TitleBarBorderX * 2,
!                             (m_TitleBarHeight / 2) + m_TitleBarBorderY -
!                             (CaptionHeight / 2));
!     m_CaptionLabel->setSize(CaptionWidth, CaptionHeight);
!     
          // Draw the actual window
!         m_Theme->drawBox(reinterpret_cast < aedWidget * >(this), m_Surface);
!     m_Theme->drawBorder(reinterpret_cast < aedWidget * >(this), m_Surface);
!     
          // Draw a box around the title bar
!     int TitleBarX1 = m_TitleBarBorderX;
!     int TitleBarY1 = m_TitleBarBorderY;
!     int TitleBarX2 = m_Pos.getWidth() - (2 * m_TitleBarBorderX);
!     int TitleBarY2 = m_TitleBarHeight + m_TitleBarBorderY;
! 
!     if(m_CloseButton != NULL)
          
!     {
!         TitleBarX2 -= (m_CloseButton->getPos().getWidth());
!     }
!     aedColor temp(0, 0, 255, 255);
      
          // we need to lock the surface before touching its pixels...
!         SLOCK(m_Surface);
!     DrawRect(m_Surface, TitleBarX1, TitleBarY1, TitleBarX2, TitleBarY2,
!               temp.getUint32(m_Surface));
!     SUNLOCK(m_Surface);
! }
! int
  aedWindow::wm_lbuttondown(Uint16 x, Uint16 y) 
! {
!     if(!m_Moveable)
          
!     {
!         return 0;
!     }
!     screenToClient(x, y);
!     if((x > (m_Pos.getX() + 5)) &&
!          (x < (m_Pos.getX() + m_Pos.getWidth() - 5)))
          
!     {
!         if((y > m_Pos.getY() + 5) && y < m_Pos.getY() + 45)
              
!         {
!             m_isLPressed = true;
!             dragXoffset = x - m_Pos.getX();
!             dragYoffset = y - m_Pos.getY();
!         }
!     }
!     return 0;
! }
! int
  aedWindow::wm_lbuttonup(Uint16 x, Uint16 y) 
! {
!     m_isLPressed = false;
!     return 0;
! }
! int
  aedWindow::wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy) 
! {
!     if(m_isLPressed)
          
!     {
          
              //setPos(getPos().getX() + dx, getPos().getY() + dy);
!             setPos(x - dragXoffset, y - dragYoffset);
          
              //setRenderState(true);
!             getParent()->setRenderState(true);
!     }
!     return 0;
! }
! void
  aedWindow::Maximize() 
! {
      
          // TODO: Write me
! } void
! 
  aedWindow::Minimize() 
! {
      
          // TODO: Write me
! } void
  __aedInternal__WindowCloseButtonHandler(void *caller, void *data) 
! {
!     aedButton * TheButton = reinterpret_cast < aedButton * >(caller);
!     aedWidget * TheWindow =
!         reinterpret_cast < aedWidget * >(TheButton->getUserData());
!     if(TheWindow != NULL)
          
!     {
!         TheWindow->hide();
!     }
! }
! void
  __aedInternal__WindowMaxButtonHandler(void *caller, void *data) 
! {
!     aedButton * TheButton = reinterpret_cast < aedButton * >(caller);
!     aedWindow * TheWindow =
!         reinterpret_cast < aedWindow * >(TheButton->getUserData());
!     if(TheWindow != NULL)
          
!     {
!         TheWindow->Maximize();
!     }
! }
! void
  __aedInternal__WindowMinButtonHandler(void *caller, void *data) 
! {
!     aedButton * TheButton = reinterpret_cast < aedButton * >(caller);
!     aedWindow * TheWindow =
!         reinterpret_cast < aedWindow * >(TheButton->getUserData());
!     if(TheWindow != NULL)
          
!     {
!         TheWindow->Minimize();
!     }
! }
! 
  

[aedGUI-cvs] aedGUI/include aedListBox.h,1.8,1.9

[Rodrigo H. <kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18178/include

Modified Files:
	aedListBox.h 
Log Message:
Added Mark's ListBox code

Index: aedListBox.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedListBox.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** aedListBox.h	6 Nov 2003 18:46:32 -0000	1.8
--- aedListBox.h	22 Mar 2004 20:35:05 -0000	1.9
***************
*** 4,7 ****
--- 4,8 ----
   * This widget provides an entry textbox on screen
   * Initial design by Eduardo B. Fonseca <eb...@ae...>
+  * Extended by Mark Tolmacs <to...@sc...>
   *
   * This library is free software; you can redistribute it and/or
***************
*** 26,29 ****
--- 27,31 ----
  #include "aedWidget.h"
  #include "aedFont.h"
+ #include "aedScrollBar.h"
  
  class DLLEXPORT aedListBox:public aedWidget
***************
*** 31,34 ****
--- 33,40 ----
    public:
      aedListBox();
+     virtual ~aedListBox();
+ 
+     virtual void create(aedWidget * parent = NULL, aedRect pos =
+                         aedDEFAULTPOSITION, std::string caption = "");
  
      virtual void add(std::string string);
***************
*** 38,47 ****
      virtual int size();
  
      virtual int wm_update(Uint32 msdelta);
      virtual void render(void);
  
    protected:
!       std::vector < std::string > m_Strings;
!     int m_currentLine;
  };
  
--- 44,71 ----
      virtual int size();
  
+ 		std::string getCurrentSelection() { return m_Strings[m_currentLine]; } 
+ 
+     // Message controll
+     virtual int wm_lbuttondown(Uint16 x, Uint16 y);
+     virtual int wm_lbuttonup(Uint16 x, Uint16 y);
+     virtual int wm_rbuttondown(Uint16 x, Uint16 y);
+     virtual int wm_rbuttonup(Uint16 x, Uint16 y);
+     virtual int wm_keydown(aedKeyEvent & event);
      virtual int wm_update(Uint32 msdelta);
+ 
+     // Drawing function(s)
      virtual void render(void);
+   private:
+ 		void resetScrollBar();
+     void scrollChanged(void *caller, void *data);
  
    protected:
!     std::vector < std::string > m_Strings;
! 
!     Uint16 m_currentLine;  // This means global coordinate
!     Uint16 m_currentLineBase;  // Global base address
!     Uint16 m_maxLinesInTheBox;
!     Uint16 m_RowHeight;
!     aedScrollBar * m_VScrollBar;
  };
  

[aedGUI-cvs] aedGUI/src aedListBox.cpp,1.19,1.20

[Rodrigo H. <kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18178/src

Modified Files:
	aedListBox.cpp 
Log Message:
Added Mark's ListBox code

Index: aedListBox.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedListBox.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** aedListBox.cpp	6 Nov 2003 18:46:36 -0000	1.19
--- aedListBox.cpp	22 Mar 2004 20:35:05 -0000	1.20
***************
*** 6,18 ****
  {
      m_IsWidget = true;
      m_currentLine = 0;
      setBorder(AED_BORDER_ROUND);
  }
  
  void
! aedListBox::add(std::string string)
  {
!     m_Strings.push_back(string);
      m_ReRender = true;
  }
  
--- 6,126 ----
  {
      m_IsWidget = true;
+     m_CanFocus = true;
+ 
      m_currentLine = 0;
+     m_currentLineBase = 0;
+     m_RowHeight = 1;
+     m_maxLinesInTheBox = 1;
      setBorder(AED_BORDER_ROUND);
+ 
+     m_VScrollBar = NULL;
  }
  
  void
! aedListBox::create(aedWidget * parent, aedRect pos, std::string caption)
  {
!     aedWidget::create(parent, pos, caption);
! 
!     //Setting the ScrollBar...
! 		resetScrollBar();
! }
! 
! void
! aedListBox::scrollChanged(void *caller, void *data) //Explicitly called function...
! {
!     aedScrollBar * cp = (aedScrollBar *) caller;
!     aedListBox *pp = dynamic_cast < aedListBox * >(cp->getParent());
! 
!     pp->m_currentLineBase = cp->getValue();
!     pp->m_ReRender = true;
! }
! 
! aedListBox::~aedListBox()
! {
!     if(m_VScrollBar)
!     {
!     	m_VScrollBar->disconnect(VALUE_CHANGED);
!     	delete m_VScrollBar;
!     }
! }
! 
! int
! aedListBox::wm_lbuttondown(Uint16 x, Uint16 y)
! {
!     Uint16 item;
! 
!     item = (y - getRealPos().getY()) / m_RowHeight;  // Because  x,y are global coords
!     m_currentLine = m_currentLineBase + item;
      m_ReRender = true;
+ 
+ 		cout << "New current line: " << m_currentLine << endl;
+     return 0;
+ }
+ 
+ int
+ aedListBox::wm_lbuttonup(Uint16 x, Uint16 y)
+ {
+     return 0;
+ }
+ 
+ int
+ aedListBox::wm_rbuttondown(Uint16 x, Uint16 y)
+ {
+     Uint16 item;
+ 
+     item = (y - getRealPos().getY()) / m_RowHeight;
+     m_currentLine = m_currentLineBase + item;
+     m_ReRender = true;
+ 
+     return 0;
+ }
+ 
+ int
+ aedListBox::wm_rbuttonup(Uint16 x, Uint16 y)
+ {
+     return 0;
+ }
+ 
+ int
+ aedListBox::wm_keydown(aedKeyEvent & event)
+ {
+     int retval;
+ 
+     switch(event.sym)
+     {
+     	case SDLK_UP:
+ 		if(m_currentLine > 0) m_currentLine--;
+ 		retval = 0;
+ 	break;
+ 	case SDLK_DOWN:
+ 		if(m_currentLine < m_Strings.size() - 1) m_currentLine++;
+ 		retval = 0;
+ 	break;
+ 	default: retval = aedWidget::wm_keydown(event);
+ 	break;
+     }
+ 
+     // For key controlled sliding
+     if(m_currentLine < m_currentLineBase) m_currentLineBase = m_currentLine;
+     if(m_currentLine > m_currentLineBase + m_maxLinesInTheBox - 1)
+     	m_currentLineBase = m_currentLine - m_maxLinesInTheBox + 1;
+ 
+     m_ReRender = true;
+ 
+     return retval;
+ }
+ 
+ void
+ aedListBox::add(std::string string)
+ {
+ 	// CHANGE- reset values for when information changes
+ 	m_currentLine     = 0;
+ 	m_currentLineBase = 0;
+ 	resetScrollBar();
+ 	m_VScrollBar->enable(true);
+ 	//--
+ 		
+   m_Strings.push_back(string);
+   m_ReRender = true;
  }
  
***************
*** 20,25 ****
  aedListBox::insert(int line, std::string string)
  {
!     m_Strings.insert(m_Strings.begin() + line, string);
!     m_ReRender = true;
  }
  
--- 128,140 ----
  aedListBox::insert(int line, std::string string)
  {
! 	// CHANGE- reset values for when information changes
! 	m_currentLine     = 0;
! 	m_currentLineBase = 0;
! 	resetScrollBar();
! 	m_VScrollBar->enable(true);
! 	//--
! 			
!   m_Strings.insert(m_Strings.begin() + line, string);
!   m_ReRender = true;
  }
  
***************
*** 27,32 ****
  aedListBox::del(int line)
  {
!     m_Strings.erase(m_Strings.begin() + line);
!     m_ReRender = true;
  }
  
--- 142,154 ----
  aedListBox::del(int line)
  {
! 	// CHANGE- reset values for when information changes
! 	m_currentLine     = 0;
! 	m_currentLineBase = 0;		
! 	resetScrollBar();
! 	m_VScrollBar->enable(true);
! 	//--
! 				
!   m_Strings.erase(m_Strings.begin() + line);
!   m_ReRender = true;
  }
  
***************
*** 34,40 ****
  aedListBox::del(int startLine, int stopLine)
  {
!     m_Strings.erase(m_Strings.begin() + startLine,
!                     m_Strings.begin() + stopLine);
!     m_ReRender = true;
  }
  
--- 156,170 ----
  aedListBox::del(int startLine, int stopLine)
  {
! 	// CHANGE- reset values for when information changes
! 	m_currentLine     = 0;
! 	m_currentLineBase = 0;
! 	resetScrollBar();
! 	m_VScrollBar->enable(true);
! 	//--
! 		
!   m_Strings.erase(m_Strings.begin() + startLine,
!                   m_Strings.begin() + stopLine);
! 		
!   m_ReRender = true;
  }
  
***************
*** 51,117 ****
  }
  
  void
  aedListBox::render(void)
  {
!     aedRect myPos(0, 0, m_Surface->w, m_Surface->h);
!     SDL_Surface *s1 = NULL;
!     SDL_Rect src, dest;
!     Uint16 line;
  
!     myPos.setX(myPos.getX() + (cPad * 2));
!     myPos.setY(myPos.getY() + cPad);
!     myPos.setWidth(myPos.getWidth() - (2 * cPad * 2));
!     myPos.setHeight(myPos.getHeight() - (2 * cPad));
  
!     src.x = 0;
!     src.y = 0;
!     dest.x = myPos.getX();
!     dest.y = myPos.getY();
  
!     for(line = m_currentLine; line < m_Strings.size(); line++)
!     {
!         if(m_Strings[line] != "")
!         {
!             if(isEnabled())
!             {
!                 aedColor thisColor = aedColor(0, 0, 0, 255);
  
!                 thisColor.setA(this->getAlphaValue());
!                 s1 = m_Font->renderTextBlended(m_Strings[line].c_str(),
!                                                thisColor);
!             }
!             else
!             {
!                 s1 = m_Font->renderTextBlended(m_Strings[line].c_str(),
!                                                aedColor(130, 130,
!                                                         130,
!                                                         this->getAlphaValue()));
!             }
  
!             src.w = myPos.getWidth();
!             src.h = s1->h;
!             dest.w = src.w;
!             dest.h = src.h;
  
!             if(dest.y > myPos.getY() + myPos.getHeight())
!             {
!                 break;
!             }
!             else if(myPos.getY() + myPos.getHeight() - dest.y < src.h)
!             {
!                 src.h = myPos.getY() + myPos.getHeight() - dest.y;
!             }
  
!             if(src.w > s1->w)
!             {
!                 src.w = s1->w;
!             }
  
!             SDL_BlitSurface(s1, &src, m_Surface, &dest);
!             SDL_FreeSurface(s1);
!         }
  
!         dest.y += dest.h + 1;
!     }
  
  }
--- 181,323 ----
  }
  
+ void 
+ aedListBox::resetScrollBar()
+ {
+ 	if (m_VScrollBar) { 
+ 		m_VScrollBar->disconnect(VALUE_CHANGED);
+ 		delete m_VScrollBar;
+ 	}
+ 
+   m_VScrollBar = new aedScrollBar(AED_VERTICAL);
+   m_VScrollBar->create(this, aedRect(getPos().getWidth() - 10 , 0,
+         				       10, getPos().getHeight()));
+   m_VScrollBar->hide();
+   m_VScrollBar->connect(VALUE_CHANGED, 
+ 			                  aedCallBack(this, &aedListBox::scrollChanged) );
+ 	m_VScrollBar->bringToTop();
+ }
+ 
  void
  aedListBox::render(void)
  {
! 	aedRect myPos(0, 0, m_Surface->w, m_Surface->h);
!  	SDL_Surface *s1 = NULL;
! 	SDL_Rect src, dest;
! 	Uint16 line;
! 	Uint32 scrollRange;
! 	Uint16 prevHeight;
! 	
! 	// CHANGE
! 	// FIXME- for some reason, this is geting reset to 0 after del() is called
! 	if (m_Strings.size() == 0) { return; }
! 	//--
! 		
!  	myPos.setX(myPos.getX() + (cPad * 2));
!  	myPos.setY(myPos.getY() + cPad);
! 	myPos.setWidth(myPos.getWidth() - (2 * cPad * 2));
! 	myPos.setHeight(myPos.getHeight() - (2 * cPad));
  
! 	// Calculating the actual LinesMax, according to the actual font height set
! 	m_maxLinesInTheBox = (Uint16)(myPos.getHeight()/(Sint32)m_Font->getHeight());
! 	if(m_maxLinesInTheBox > m_Strings.size()) {
! 		m_maxLinesInTheBox = m_Strings.size();
!   }
!   if(m_maxLinesInTheBox < 1) {
! 		m_maxLinesInTheBox = 1;
! 	}
  
!  	// Setting the actual range of the m_ScrollBar
! 	if(m_Strings.size() - m_maxLinesInTheBox > 0) {
! 		scrollRange = m_Strings.size() - m_maxLinesInTheBox;
! 	} else {
! 		scrollRange = 2;
! 	}
! 	m_VScrollBar->setRange(0, scrollRange);
  
! 	// Showing the scrollbar when it's neccessary
! 	if(m_VScrollBar) {
! 		if(m_maxLinesInTheBox < m_Strings.size()) {
! 			if(!m_VScrollBar->isVisible()) {
! 				m_VScrollBar->enable(true);
! 				m_VScrollBar->show();
! 			}
! 		}	else if (m_VScrollBar->isVisible()) {
! 			m_VScrollBar->hide();
! 			m_VScrollBar->enable(false);
! 		}
!   }
  
! 	//Workaround
! 	if(isEnabled()) { m_VScrollBar->enable(true);  }
!  	else            { m_VScrollBar->enable(false); }
! 	//---
! 	
!   src.x = 0;
!   src.y = 0;
!   dest.x = myPos.getX();
!   dest.y = myPos.getY();
  
!   for(line = m_currentLineBase; line<m_currentLineBase+m_maxLinesInTheBox;line++) {
! 		if(m_Strings[line] != "") {
! 			if(isEnabled()) {
! 	    	aedColor thisColor = aedColor(0, 0, 0, 255);
! 				aedColor thisBgColor;
  
! 				if(hasFocus()) { thisBgColor = aedColor(200, 0, 0, 255); }
! 			  else           { thisBgColor = aedColor(0, 200, 0, 255); }
  
! 				thisBgColor.setA(this->getAlphaValue());
! 	      thisColor.setA(this->getAlphaValue());
  
!         if (line == m_currentLine) {
! 					// this is the Chosen One ;)
! 					s1 = m_Font->renderTextShaded(m_Strings[line].c_str(),
!                  	                      thisColor,
! 				                                thisBgColor);
! 					dest.w=myPos.getWidth();
! 					dest.h=s1->h;
! 					
! 					// It is very ugly but simple and fast!
! 					SDL_FillRect(m_Surface, &dest, thisBgColor.getUint32(m_Surface)); 
! 				} else {
! 					s1 = m_Font->renderTextBlended(m_Strings[line].c_str(),
!                         	                       thisColor);
! 				}
! 			} else {
!         s1 = m_Font->renderTextBlended(m_Strings[line].c_str(),
!                                        aedColor(130, 130,
!                                                 130,
!                                                 this->getAlphaValue()));
! 			}
  
!       src.w = myPos.getWidth();
!       src.h = s1->h;
!       dest.w = src.w;
!       dest.h = src.h;
! 
!       if(dest.y > myPos.getY() + myPos.getHeight()) {
! 				break;
! 			} else if(myPos.getY() + myPos.getHeight() - dest.y < src.h) {
!         src.h = myPos.getY() + myPos.getHeight() - dest.y;
!       }
! 
!       if(src.w > s1->w) { src.w = s1->w; }
! 
! 			// FIXME- Hack to prevent problem with dest.h getting overwritten in
! 			//        SDL_BlitSurface call...
! 			prevHeight = dest.h;
! 			//--
! 			
!       SDL_BlitSurface(s1, &src, m_Surface, &dest);
!       SDL_FreeSurface(s1);
! 
! 			// FIXME- Continuation of the hack mentioned above
! 			if (dest.h != prevHeight) { dest.h = prevHeight; }
! 			//--
  
+ 	    dest.y += dest.h + 1;
+ 		}
+ 
+ 	}
+   m_RowHeight = dest.h + 1;
  }

[aedGUI-cvs] aedGUI/include aedFont.h,1.12,1.13

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6331/include

Modified Files:
	aedFont.h 
Log Message:
Some fixes to acinclude.m4

Index: aedFont.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedFont.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** aedFont.h	16 Feb 2004 19:46:34 -0000	1.12
--- aedFont.h	12 Mar 2004 03:33:25 -0000	1.13
***************
*** 24,29 ****
  #define AEDFONT_H
  
- #include "dllmacros.h"
  #include "SDL.h"
  #include "aedColor.h"
  
--- 24,29 ----
  #define AEDFONT_H
  
  #include "SDL.h"
+ #include "dllmacros.h"
  #include "aedColor.h"
  
***************
*** 46,52 ****
    public:
      aedFont();
!     virtual ~ aedFont();
  
      int getStyle() const;
      void setStyle(int style);
  
--- 46,55 ----
    public:
      aedFont();
!     virtual ~aedFont();
  
      int getStyle() const;
+ #ifndef _MSC_VER
+     DLLEXPORT 
+ #endif
      void setStyle(int style);
  
***************
*** 96,115 ****
      void renderTextBlended(SDL_Surface * s, int x, int y, const char *str,
                             const aedColor & color);
- 
-   private:
-       TTF_Font * data;
- 
-     // This isn't the best design, but it does what we need:
-     // allow only aedApp to open and close fonts
-     friend class aedApp;
-     bool openFont(const char *file, int pointsize);
-     bool openFont(unsigned char *data, unsigned long int datasize,
-                   int pointsize);
-     void closeFont();
- 
-   public:
- #ifndef _MSC_VER
-     DLLEXPORT 
- #endif
  static Uint16 getUnicode(const char *utf8, int *advance)
      {
--- 99,102 ----
***************
*** 139,142 ****
--- 126,140 ----
          return ch;
      }
+ 
+   private:
+       TTF_Font * data;
+ 
+     // This isn't the best design, but it does what we need:
+     // allow only aedApp to open and close fonts
+     friend class aedApp;
+     bool openFont(const char *file, int pointsize);
+     bool openFont(unsigned char *data, unsigned long int datasize,
+                   int pointsize);
+     void closeFont();
  };
  

[aedGUI-cvs] aedGUI acinclude.m4,1.9,1.10

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6331

Modified Files:
	acinclude.m4 
Log Message:
Some fixes to acinclude.m4

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/acinclude.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** acinclude.m4	18 Feb 2004 02:31:01 -0000	1.9
--- acinclude.m4	12 Mar 2004 03:33:25 -0000	1.10
***************
*** 9,13 ****
  dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
  dnl
! AC_DEFUN(AM_PATH_SDL,
  [dnl 
  dnl Get the cflags and libraries from the sdl-config script
--- 9,13 ----
  dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
  dnl
! AC_DEFUN([AM_PATH_SDL],
  [dnl 
  dnl Get the cflags and libraries from the sdl-config script
***************
*** 186,190 ****
  dnl Test for AEDGUI, and define AEDGUI_CFLAGS and AEDGUI_LIBS
  dnl
! AC_DEFUN(AM_PATH_AEDGUI,
  [dnl 
  dnl Get the cflags and libraries from the aedgui-config script
--- 186,190 ----
  dnl Test for AEDGUI, and define AEDGUI_CFLAGS and AEDGUI_LIBS
  dnl
! AC_DEFUN([AM_PATH_AEDGUI],
  [dnl 
  dnl Get the cflags and libraries from the aedgui-config script

[aedGUI-cvs] aedGUI acinclude.m4,1.8,1.9

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23598

Modified Files:
	acinclude.m4 
Log Message:
small fix to aclocal aedGUI finder function

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/acinclude.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** acinclude.m4	3 Feb 2004 04:40:15 -0000	1.8
--- acinclude.m4	18 Feb 2004 02:31:01 -0000	1.9
***************
*** 250,254 ****
  #include <stdlib.h>
  #include <string.h>
! #include "aedGUI.h"
  
  char*
--- 250,254 ----
  #include <stdlib.h>
  #include <string.h>
! #include "aedGui.h"
  
  char*
***************
*** 268,272 ****
  }
  
! int SDL_main (int argc, char *argv[])
  {
    int major, minor, micro;
--- 268,272 ----
  }
  
! int main (int argc, char *argv[])
  {
    int major, minor, micro;
***************
*** 328,334 ****
            AC_TRY_LINK([
  #include <stdio.h>
! #include "aedGUI.h"
  
! int SDL_main(int argc, char *argv[])
  { return 0; }
  #undef  main
--- 328,334 ----
            AC_TRY_LINK([
  #include <stdio.h>
! #include "aedGui.h"
  
! int main(int argc, char *argv[])
  { return 0; }
  #undef  main

[aedGUI-cvs] aedGUI/VisualC7 aedgui.vcproj,1.14,1.15

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/VisualC7
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32354/VisualC7

Modified Files:
	aedgui.vcproj 
Log Message:
Added SDL_rtf to VisualC7 project files

Index: aedgui.vcproj
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/VisualC7/aedgui.vcproj,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** aedgui.vcproj	16 Feb 2004 19:46:33 -0000	1.14
--- aedgui.vcproj	16 Feb 2004 20:56:01 -0000	1.15
***************
*** 69,73 ****
  				OmitFramePointers="TRUE"
  				AdditionalIncludeDirectories="..\include"
! 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AEDGUI_EXPORTS;AEDGUI;HAVE_SDL_TTF"
  				StringPooling="TRUE"
  				RuntimeLibrary="0"
--- 69,73 ----
  				OmitFramePointers="TRUE"
  				AdditionalIncludeDirectories="..\include"
! 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AEDGUI_EXPORTS;AEDGUI;HAVE_SDL_TTF;HAVE_SDL_RTF"
  				StringPooling="TRUE"
  				RuntimeLibrary="0"
***************
*** 82,86 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="SDL.lib SDL_ttf.lib"
  				OutputFile="$(OutDir)/aedGUI.dll"
  				LinkIncremental="1"
--- 82,86 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="SDL.lib SDL_ttf.lib SDL_rtf.lib"
  				OutputFile="$(OutDir)/aedGUI.dll"
  				LinkIncremental="1"

[aedGUI-cvs] aedGUI/VisualC7 Test.vcproj,1.3,1.4 aedgui.vcproj,1.13,1.14

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/VisualC7
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17300/VisualC7

Modified Files:
	Test.vcproj aedgui.vcproj 
Log Message:
Fixed VisualC7 project files

Index: Test.vcproj
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/VisualC7/Test.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Test.vcproj	25 Sep 2003 01:15:37 -0000	1.3
--- Test.vcproj	16 Feb 2004 19:46:26 -0000	1.4
***************
*** 69,76 ****
  				InlineFunctionExpansion="1"
  				OmitFramePointers="TRUE"
! 				AdditionalIncludeDirectories="F:\Code\aedGUI\include"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
  				StringPooling="TRUE"
! 				RuntimeLibrary="4"
  				EnableFunctionLevelLinking="TRUE"
  				UsePrecompiledHeader="0"
--- 69,76 ----
  				InlineFunctionExpansion="1"
  				OmitFramePointers="TRUE"
! 				AdditionalIncludeDirectories="..\include"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
  				StringPooling="TRUE"
! 				RuntimeLibrary="2"
  				EnableFunctionLevelLinking="TRUE"
  				UsePrecompiledHeader="0"
***************
*** 82,89 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="SDL.lib freetype214MT.lib $(OutDir)\aedGUI.lib SDLmain.lib"
  				OutputFile="$(OutDir)/Test.exe"
  				LinkIncremental="1"
! 				IgnoreAllDefaultLibraries="TRUE"
  				GenerateDebugInformation="TRUE"
  				SubSystem="2"
--- 82,89 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="SDL.lib SDL_ttf.lib $(OutDir)\aedGUI.lib SDLmain.lib"
  				OutputFile="$(OutDir)/Test.exe"
  				LinkIncremental="1"
! 				IgnoreAllDefaultLibraries="FALSE"
  				GenerateDebugInformation="TRUE"
  				SubSystem="2"

Index: aedgui.vcproj
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/VisualC7/aedgui.vcproj,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** aedgui.vcproj	10 Feb 2004 16:25:23 -0000	1.13
--- aedgui.vcproj	16 Feb 2004 19:46:33 -0000	1.14
***************
*** 69,73 ****
  				OmitFramePointers="TRUE"
  				AdditionalIncludeDirectories="..\include"
! 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AEDGUI_EXPORTS;AEDGUI"
  				StringPooling="TRUE"
  				RuntimeLibrary="0"
--- 69,73 ----
  				OmitFramePointers="TRUE"
  				AdditionalIncludeDirectories="..\include"
! 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AEDGUI_EXPORTS;AEDGUI;HAVE_SDL_TTF"
  				StringPooling="TRUE"
  				RuntimeLibrary="0"
***************
*** 82,86 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="SDL.lib freetype214MT.lib"
  				OutputFile="$(OutDir)/aedGUI.dll"
  				LinkIncremental="1"
--- 82,86 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="SDL.lib SDL_ttf.lib"
  				OutputFile="$(OutDir)/aedGUI.dll"
  				LinkIncremental="1"

[aedGUI-cvs] aedGUI/test main.cpp,1.51,1.52

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17300/test

Modified Files:
	main.cpp 
Log Message:
Fixed VisualC7 project files

Index: main.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/test/main.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** main.cpp	12 Feb 2004 21:20:22 -0000	1.51
--- main.cpp	16 Feb 2004 19:46:34 -0000	1.52
***************
*** 7,10 ****
--- 7,14 ----
  //
  #include <stdio.h>
+ #ifndef PATH_MAX
+ #define PATH_MAX 1024
+ #endif
+ 
  char cursor_bmp[ PATH_MAX ];
  

[aedGUI-cvs] aedGUI/include aedFont.h,1.11,1.12

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17300/include

Modified Files:
	aedFont.h 
Log Message:
Fixed VisualC7 project files

Index: aedFont.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedFont.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aedFont.h	16 Feb 2004 17:33:50 -0000	1.11
--- aedFont.h	16 Feb 2004 19:46:34 -0000	1.12
***************
*** 55,76 ****
      int getDescent() const;
      int getLineSkip() const;
! 
!     DLLEXPORT bool getGlyphMetrics(Uint16 c, int *minx, int *maxx, int *miny, int *maxy,
                           int *advance);
! 
!     DLLEXPORT int getTextSize(const char *text, Uint16 * w, Uint16 * h);
  
      // These return rendered string as a surface which the caller must free
!     DLLEXPORT SDL_Surface *renderTextSolid(const char *str, const aedColor & color);
!     DLLEXPORT SDL_Surface *renderTextShaded(const char *str, const aedColor & fg,
                                    const aedColor & bg);
!     DLLEXPORT SDL_Surface *renderTextBlended(const char *str, const aedColor & color);
  
      // These are just for convenience, render directly to the given surface
!     DLLEXPORT void renderTextSolid(SDL_Surface * s, int x, int y, const char *str,
                           const aedColor & color);
!     DLLEXPORT void renderTextShaded(SDL_Surface * s, int x, int y, const char *str,
                            const aedColor & fg, const aedColor & bg);
!     DLLEXPORT void renderTextBlended(SDL_Surface * s, int x, int y, const char *str,
                             const aedColor & color);
  
--- 55,98 ----
      int getDescent() const;
      int getLineSkip() const;
! #ifndef _MSC_VER
!     DLLEXPORT 
! #endif
! 	bool getGlyphMetrics(Uint16 c, int *minx, int *maxx, int *miny, int *maxy,
                           int *advance);
! #ifndef _MSC_VER
!     DLLEXPORT 
! #endif
!     int getTextSize(const char *text, Uint16 * w, Uint16 * h);
  
      // These return rendered string as a surface which the caller must free
! #ifndef _MSC_VER
!     DLLEXPORT 
! #endif
!     SDL_Surface *renderTextSolid(const char *str, const aedColor & color);
! #ifndef _MSC_VER
!     DLLEXPORT 
! #endif
!     SDL_Surface *renderTextShaded(const char *str, const aedColor & fg,
                                    const aedColor & bg);
! #ifndef _MSC_VER
!     DLLEXPORT 
! #endif
! 	SDL_Surface *renderTextBlended(const char *str, const aedColor & color);
  
      // These are just for convenience, render directly to the given surface
! #ifndef _MSC_VER
!     DLLEXPORT 
! #endif
!     void renderTextSolid(SDL_Surface * s, int x, int y, const char *str,
                           const aedColor & color);
! #ifndef _MSC_VER
!     DLLEXPORT 
! #endif
!     void renderTextShaded(SDL_Surface * s, int x, int y, const char *str,
                            const aedColor & fg, const aedColor & bg);
! #ifndef _MSC_VER
!     DLLEXPORT 
! #endif
!     void renderTextBlended(SDL_Surface * s, int x, int y, const char *str,
                             const aedColor & color);
  
***************
*** 87,91 ****
  
    public:
!     DLLEXPORT static Uint16 getUnicode(const char *utf8, int *advance)
      {
          int i = 0;
--- 109,116 ----
  
    public:
! #ifndef _MSC_VER
!     DLLEXPORT 
! #endif
! static Uint16 getUnicode(const char *utf8, int *advance)
      {
          int i = 0;

[aedGUI-cvs] aedGUI/include aedFont.h,1.10,1.11

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21593/include

Modified Files:
	aedFont.h 
Log Message:
Added DLLEXPORT to public functions in aedFont so they get properly exported with MinGW's gcc 3.2.3

Index: aedFont.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedFont.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** aedFont.h	6 Nov 2003 18:46:32 -0000	1.10
--- aedFont.h	16 Feb 2004 17:33:50 -0000	1.11
***************
*** 40,43 ****
--- 40,45 ----
  
  /** The aedFont class handles text rendering. */
+ // Added DLLEXPORT to some functions to see if it solves the problem with
+ // MinGW gcc 3.2.3 not exporting the symbols
  class DLLEXPORT aedFont
  {
***************
*** 54,74 ****
      int getLineSkip() const;
  
!     bool getGlyphMetrics(Uint16 c, int *minx, int *maxx, int *miny, int *maxy,
                           int *advance);
  
!     int getTextSize(const char *text, Uint16 * w, Uint16 * h);
  
      // These return rendered string as a surface which the caller must free
!     SDL_Surface *renderTextSolid(const char *str, const aedColor & color);
!     SDL_Surface *renderTextShaded(const char *str, const aedColor & fg,
                                    const aedColor & bg);
!     SDL_Surface *renderTextBlended(const char *str, const aedColor & color);
  
      // These are just for convenience, render directly to the given surface
!     void renderTextSolid(SDL_Surface * s, int x, int y, const char *str,
                           const aedColor & color);
!     void renderTextShaded(SDL_Surface * s, int x, int y, const char *str,
                            const aedColor & fg, const aedColor & bg);
!     void renderTextBlended(SDL_Surface * s, int x, int y, const char *str,
                             const aedColor & color);
  
--- 56,76 ----
      int getLineSkip() const;
  
!     DLLEXPORT bool getGlyphMetrics(Uint16 c, int *minx, int *maxx, int *miny, int *maxy,
                           int *advance);
  
!     DLLEXPORT int getTextSize(const char *text, Uint16 * w, Uint16 * h);
  
      // These return rendered string as a surface which the caller must free
!     DLLEXPORT SDL_Surface *renderTextSolid(const char *str, const aedColor & color);
!     DLLEXPORT SDL_Surface *renderTextShaded(const char *str, const aedColor & fg,
                                    const aedColor & bg);
!     DLLEXPORT SDL_Surface *renderTextBlended(const char *str, const aedColor & color);
  
      // These are just for convenience, render directly to the given surface
!     DLLEXPORT void renderTextSolid(SDL_Surface * s, int x, int y, const char *str,
                           const aedColor & color);
!     DLLEXPORT void renderTextShaded(SDL_Surface * s, int x, int y, const char *str,
                            const aedColor & fg, const aedColor & bg);
!     DLLEXPORT void renderTextBlended(SDL_Surface * s, int x, int y, const char *str,
                             const aedColor & color);
  
***************
*** 85,89 ****
  
    public:
!     static Uint16 getUnicode(const char *utf8, int *advance)
      {
          int i = 0;
--- 87,91 ----
  
    public:
!     DLLEXPORT static Uint16 getUnicode(const char *utf8, int *advance)
      {
          int i = 0;

[aedGUI-cvs] aedGUI/test main.cpp,1.50,1.51

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10648/test

Modified Files:
	main.cpp 
Log Message:
Added Asko's cursor.bmp search code to test app

Index: main.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/test/main.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** main.cpp	6 Nov 2003 18:46:40 -0000	1.50
--- main.cpp	12 Feb 2004 21:20:22 -0000	1.51
***************
*** 4,7 ****
--- 4,12 ----
  #include "aedBoxSizer.h"
  
+ //AK(12-Feb-04): Modified so that 'cursor.bmp' is always found where the executable is
+ //
+ #include <stdio.h>
+ char cursor_bmp[ PATH_MAX ];
+ 
  aedButton *tb2;
  
***************
*** 9,12 ****
--- 14,27 ----
  main(int argc, char *argv[])
  {
+     //AK(12-Feb-04)
+     {
+     int i;
+     for( i=strlen(argv[0])-1; i>0; i-- )
+         if (strchr( "/\\", argv[0][i])) break;
+         
+     memcpy( cursor_bmp, argv[0], i?(i+1):0 );
+     strcpy( cursor_bmp+(i?(i+1):0), "cursor.bmp" );
+     }
+     
      // initialization
      if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0)
***************
*** 239,243 ****
  
      aedCursor Cursor;
!     SDL_Surface *imgCursor = SDL_LoadBMP("./cursor.bmp");
  
      SDL_SetColorKey(imgCursor, SDL_SRCCOLORKEY | SDL_RLEACCEL,
--- 254,258 ----
  
      aedCursor Cursor;
!     SDL_Surface *imgCursor = SDL_LoadBMP( cursor_bmp /*"./cursor.bmp"*/ );  //AK(12-Feb-04)
  
      SDL_SetColorKey(imgCursor, SDL_SRCCOLORKEY | SDL_RLEACCEL,
***************
*** 379,380 ****
--- 394,396 ----
      txtBox->setPasswordMode(chkBox->getState());
  }
+ 

[aedGUI-cvs] aedGUI/include aedWindow.h,1.42,1.43

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21763/include

Modified Files:
	aedWindow.h 
Log Message:
Fixed VisualC7 project

Index: aedWindow.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedWindow.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** aedWindow.h	6 Nov 2003 18:46:33 -0000	1.42
--- aedWindow.h	10 Feb 2004 16:25:24 -0000	1.43
***************
*** 85,89 ****
  

  #if defined(_MSC_VER)
!     DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedButton >;
  
  #endif  /* 
 */
--- 85,89 ----
  

  #if defined(_MSC_VER)
!     DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedWindow >;
  
  #endif  /* 
 */

[aedGUI-cvs] aedGUI/VisualC7 aedgui.vcproj,1.12,1.13

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/VisualC7
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21763/VisualC7

Modified Files:
	aedgui.vcproj 
Log Message:
Fixed VisualC7 project

Index: aedgui.vcproj
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/VisualC7/aedgui.vcproj,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** aedgui.vcproj	25 Sep 2003 01:15:37 -0000	1.12
--- aedgui.vcproj	10 Feb 2004 16:25:23 -0000	1.13
***************
*** 24,28 ****
  				MinimalRebuild="TRUE"
  				BasicRuntimeChecks="3"
! 				RuntimeLibrary="1"
  				RuntimeTypeInfo="TRUE"
  				UsePrecompiledHeader="0"
--- 24,28 ----
  				MinimalRebuild="TRUE"
  				BasicRuntimeChecks="3"
! 				RuntimeLibrary="3"
  				RuntimeTypeInfo="TRUE"
  				UsePrecompiledHeader="0"
***************
*** 124,127 ****
--- 124,130 ----
  			</File>
  			<File
+ 				RelativePath="..\src\aedBoxSizer.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\src\aedButton.cpp">
  			</File>
***************
*** 130,133 ****
--- 133,145 ----
  			</File>
  			<File
+ 				RelativePath="..\src\aedClipboard.cpp">
+ 			</File>
+ 			<File
+ 				RelativePath="..\src\aedClipboard.h">
+ 			</File>
+ 			<File
+ 				RelativePath="..\src\aedCursor.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\src\aedDialogBox.cpp">
  			</File>
***************
*** 172,175 ****
--- 184,190 ----
  			</File>
  			<File
+ 				RelativePath="..\src\aedSizer.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\src\aedSlider.cpp">
  			</File>
***************
*** 199,205 ****
--- 214,226 ----
  			</File>
  			<File
+ 				RelativePath="..\src\aedWidget.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\src\aedWindow.cpp">
  			</File>
  			<File
+ 				RelativePath="..\src\aedXmlFile.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\src\drawlibs.cpp">
  			</File>

[aedGUI-cvs] aedGUI/test gltest.cpp,1.14,1.15

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12139

Modified Files:
	gltest.cpp 
Log Message:
did some gltest fixing, will be optimized soon

Index: gltest.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/test/gltest.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gltest.cpp	5 Feb 2004 01:21:59 -0000	1.14
--- gltest.cpp	6 Feb 2004 05:52:56 -0000	1.15
***************
*** 69,73 ****
      int nTotalPixels = image->w * image->h;
  
!     if(image->format->BitsPerPixel = 24)
          
      {
--- 69,73 ----
      int nTotalPixels = image->w * image->h;
  
!     if(image->format->BitsPerPixel == 24)
          
      {
***************
*** 90,94 ****
      }
      
!     else if(image->format->BitsPerPixel = 32)
          
      {
--- 90,94 ----
      }
      
!     else if(image->format->BitsPerPixel == 32)
          
      {
***************
*** 166,171 ****
      glLightfv(GL_LIGHT1, GL_POSITION, LightPosition);   // Position The Light
      glEnable(GL_LIGHT1);        // Enable Light One
-     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-     glEnable(GL_BLEND);
      return true;               // Initialization Went OK
  }
--- 166,169 ----
***************
*** 331,336 ****
      
          //glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, surface->w,surface->h,GL_RGBA, GL_UNSIGNED_BYTE,surface->pixels);
!         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
!     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
      glBegin(GL_QUADS);
      glTexCoord2f(0.0f, 1.0f);
--- 329,336 ----
      
          //glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, surface->w,surface->h,GL_RGBA, GL_UNSIGNED_BYTE,surface->pixels);
!     //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
!     //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
!     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
!     glEnable(GL_BLEND);
      glBegin(GL_QUADS);
      glTexCoord2f(0.0f, 1.0f);
***************
*** 346,349 ****
--- 346,350 ----
      glPopMatrix();
      glMatrixMode(GL_MODELVIEW);
+     glDisable(GL_BLEND);
  } 
  
***************
*** 452,455 ****
--- 453,457 ----
      SDL_FreeSurface(surface);
      SDL_Quit();
+     return 0;
  }
  void

[aedGUI-cvs] aedGUI/src aedWidget.cpp,1.9,1.10

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5293/src

Modified Files:
	aedWidget.cpp 
Log Message:
Added aedWidget::GetChildrenTranslatedPositions()

Index: aedWidget.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedWidget.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** aedWidget.cpp	20 Dec 2003 19:17:24 -0000	1.9
--- aedWidget.cpp	6 Feb 2004 05:10:05 -0000	1.10
***************
*** 877,880 ****
--- 877,895 ----
  };
  
+ void aedWidget::getChildrenTranslatedPositions(vector<aedRect> &vRects)
+ {
+     size_t ChildrenCount = m_Children.size();
+     aedRect CurrentChild;
+     for(size_t i = 0;i<ChildrenCount;++i)
+     {
+         CurrentChild = m_Children[i]->getMyTranslatedPosition();
+         if((CurrentChild.getWidth()>0)&&
+ 	   (CurrentChild.getHeight()>0))
+ 	  {
+ 	      vRects.push_back(CurrentChild);
+ 	  }
+     }
+ };
+ 
  #if !defined(HAVE_RINT)
  double

[aedGUI-cvs] aedGUI/include aedWidget.h,1.8,1.9

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5293/include

Modified Files:
	aedWidget.h 
Log Message:
Added aedWidget::GetChildrenTranslatedPositions()

Index: aedWidget.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedWidget.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** aedWidget.h	20 Dec 2003 19:17:23 -0000	1.8
--- aedWidget.h	6 Feb 2004 05:10:04 -0000	1.9
***************
*** 144,147 ****
--- 144,148 ----
      aedRect getPosition(void);
      aedRect getMyTranslatedPosition(void);
+     void getChildrenTranslatedPositions(vector<aedRect> &vRects);
      aedRect getRealPos(void)
      {

[aedGUI-cvs] aedGUI/include aedLog.h,1.11,1.12

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27833/include

Modified Files:
	aedLog.h 
Log Message:
Changed aedLog::m_BufferSize

Index: aedLog.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedLog.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aedLog.h	6 Nov 2003 18:46:32 -0000	1.11
--- aedLog.h	5 Feb 2004 16:41:54 -0000	1.12
***************
*** 95,99 ****
      std::vector < std::ostream * >m_Destinations;
      int m_Mask;
!     static const int m_BufferSize = 1024;
  
      friend class aedApp;
--- 95,99 ----
      std::vector < std::ostream * >m_Destinations;
      int m_Mask;
!     static const int m_BufferSize;// = 1024;
  
      friend class aedApp;

[aedGUI-cvs] aedGUI/src aedLog.cpp,1.9,1.10

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27833/src

Modified Files:
	aedLog.cpp 
Log Message:
Changed aedLog::m_BufferSize

Index: aedLog.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedLog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** aedLog.cpp	6 Nov 2003 18:46:36 -0000	1.9
--- aedLog.cpp	5 Feb 2004 16:41:55 -0000	1.10
***************
*** 10,13 ****
--- 10,15 ----
  using namespace std;
  
+ const int aedLog::m_BufferSize = 1024;
+ 
  aedLog::aedLog()
  {

[aedGUI-cvs] aedGUI/include dllmacros.h,1.7,1.8

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30950/include

Modified Files:
	dllmacros.h 
Log Message:
added some preprocessor checks to remove some VC Annoyances

Index: dllmacros.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/dllmacros.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dllmacros.h	6 Nov 2003 18:46:34 -0000	1.7
--- dllmacros.h	5 Feb 2004 04:40:25 -0000	1.8
***************
*** 18,22 ****
--- 18,24 ----
  #endif
  #else
+ #ifndef DLLEXPORT
  #define DLLEXPORT
+ #endif
  #define DLLEXTERN
  #endif

[aedGUI-cvs] aedGUI/test Makefile.am,1.27,1.28

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31730/test

Modified Files:
	Makefile.am 
Log Message:
Some more changes to be able to use gprof

Index: Makefile.am
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/test/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Makefile.am	30 Dec 2003 01:17:34 -0000	1.27
--- Makefile.am	5 Feb 2004 02:08:46 -0000	1.28
***************
*** 1,3 ****
! AM_CXXFLAGS = -g -O2 `@SDL_CONFIG@ --cflags` -I../include/
  
  TEST_PROGS = aedGuiTest@EXEEXT@ testsprite@EXEEXT@ gltest@EXEEXT@ menutest@EXEEXT@ xmltest@EXEEXT@
--- 1,4 ----
! AM_CXXFLAGS = @CPPFLAGS@ `@SDL_CONFIG@ --cflags` -I../include/
! AM_LDFLAGS = @LDFLAGS@ @SDL_LIBS@
  
  TEST_PROGS = aedGuiTest@EXEEXT@ testsprite@EXEEXT@ gltest@EXEEXT@ menutest@EXEEXT@ xmltest@EXEEXT@
***************
*** 11,15 ****
  aedGuiTest@EXEEXT@: main.o ../src/.libs/libaedGUI.la
  	$(CXX) $(AM_CXXFLAGS) $< -o $@ @TESTLDFLAGS@ \
! 	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  main.o: main.cpp main.h ../include/*h
--- 12,16 ----
  aedGuiTest@EXEEXT@: main.o ../src/.libs/libaedGUI.la
  	$(CXX) $(AM_CXXFLAGS) $< -o $@ @TESTLDFLAGS@ \
! 	-L../src/.libs/ -laedGUI $(AM_LDFLAGS)
  
  main.o: main.cpp main.h ../include/*h
***************
*** 18,22 ****
  testsprite@EXEEXT@: testsprite.o ../src/.libs/libaedGUI.la
  	$(CXX) $(AM_CXXFLAGS) $< -o $@ @TESTLDFLAGS@ \
! 	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  testsprite.o: testsprite.cpp ../include/*h
--- 19,23 ----
  testsprite@EXEEXT@: testsprite.o ../src/.libs/libaedGUI.la
  	$(CXX) $(AM_CXXFLAGS) $< -o $@ @TESTLDFLAGS@ \
! 	-L../src/.libs/ -laedGUI $(AM_LDFLAGS)
  
  testsprite.o: testsprite.cpp ../include/*h
***************
*** 25,29 ****
  menutest@EXEEXT@: menutest.o ../src/.libs/libaedGUI.la
  	$(CXX) $(AM_CXXFLAGS) $< -o $@ @TESTLDFLAGS@ \
! 	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  menutest.o: menutest.cpp ../include/*h
--- 26,30 ----
  menutest@EXEEXT@: menutest.o ../src/.libs/libaedGUI.la
  	$(CXX) $(AM_CXXFLAGS) $< -o $@ @TESTLDFLAGS@ \
! 	-L../src/.libs/ -laedGUI $(AM_LDFLAGS)
  
  menutest.o: menutest.cpp ../include/*h
***************
*** 32,36 ****
  xmltest@EXEEXT@: xmltest.o ../src/.libs/libaedGUI.la
  	$(CXX) $(AM_CXXFLAGS) $< -o $@ @TESTLDFLAGS@ \
! 	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  xmltest.o: xmltest.cpp ../include/*h
--- 33,37 ----
  xmltest@EXEEXT@: xmltest.o ../src/.libs/libaedGUI.la
  	$(CXX) $(AM_CXXFLAGS) $< -o $@ @TESTLDFLAGS@ \
! 	-L../src/.libs/ -laedGUI $(AM_LDFLAGS)
  
  xmltest.o: xmltest.cpp ../include/*h
***************
*** 40,44 ****
  	$(CXX) $(AM_CXXFLAGS) gltest.o -o gltest@EXEEXT@ \
  	@TESTLDFLAGS@ \
! 	-L../src/.libs/ -laedGUI @SDL_LIBS@ @GL_LIBS@
  
  gltest.o: gltest.cpp
--- 41,45 ----
  	$(CXX) $(AM_CXXFLAGS) gltest.o -o gltest@EXEEXT@ \
  	@TESTLDFLAGS@ \
! 	-L../src/.libs/ -laedGUI $(AM_LDFLAGS) @GL_LIBS@
  
  gltest.o: gltest.cpp

[aedGUI-cvs] aedGUI configure.in,1.55,1.56

[<kw...@us...>]

Update of /cvsroot/aedgui/aedGUI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31730

Modified Files:
	configure.in 
Log Message:
Some more changes to be able to use gprof

Index: configure.in
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/configure.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** configure.in	3 Feb 2004 06:08:36 -0000	1.55
--- configure.in	5 Feb 2004 02:08:45 -0000	1.56
***************
*** 1,12 ****
! AC_INIT(include/aedGui.h,0.1.8a,aed...@li...)
  
  AC_CANONICAL_HOST
  AC_CANONICAL_TARGET
  
! AM_INIT_AUTOMAKE(aedGUI,0.1.8a)
  AM_CONFIG_HEADER(include/config.h)
  
  dnl The current aedGUI version 
! AEDGUI_VERSION="0.1.8a"
  AC_SUBST(AEDGUI_VERSION, [$AEDGUI_VERSION])
  
--- 1,12 ----
! AC_INIT(include/aedGui.h,0.1.9,aed...@li...)
  
  AC_CANONICAL_HOST
  AC_CANONICAL_TARGET
  
! AM_INIT_AUTOMAKE(aedGUI,0.1.9)
  AM_CONFIG_HEADER(include/config.h)
  
  dnl The current aedGUI version 
! AEDGUI_VERSION="0.1.9"
  AC_SUBST(AEDGUI_VERSION, [$AEDGUI_VERSION])
  
***************
*** 21,25 ****
  AEDGUI_REVISION=0
  AEDGUI_AGE=0
! AEDGUI_RELEASE=0.1.8a
  AC_SUBST(AEDGUI_CURRENT)
  AC_SUBST(AEDGUI_REVISION)
--- 21,25 ----
  AEDGUI_REVISION=0
  AEDGUI_AGE=0
! AEDGUI_RELEASE=0.1.9
  AC_SUBST(AEDGUI_CURRENT)
  AC_SUBST(AEDGUI_REVISION)
***************
*** 33,37 ****
  #CPPFLAGS="-Wall -pedantic -DAEDGUI"
  CPPFLAGS="-Wall -DAEDGUI"
- AC_SUBST(CPPFLAGS)
  AC_PROG_CXX
  AC_PROG_INSTALL
--- 33,36 ----