[aedGUI-cvs] aedGUI/src Makefile.am,1.34,1.35 aedFont.cpp,1.15,1.16 aedListBox.cpp,1.20,1.21 aedMenu.cpp,1.7,1.8 aedMenuBar.cpp,1.5,1.6 aedStaticRTF.cpp,1.6,1.7 aedStaticText.cpp,1.33,1.34 aedTextBox.cpp,1.35,1.36

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

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

Modified Files:
	Makefile.am aedFont.cpp aedListBox.cpp aedMenu.cpp 
	aedMenuBar.cpp aedStaticRTF.cpp aedStaticText.cpp 
	aedTextBox.cpp 
Log Message:
aedFont now uses a vector of surfaces for text rendering

Index: aedStaticRTF.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedStaticRTF.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aedStaticRTF.cpp	6 Nov 2003 18:46:36 -0000	1.6
--- aedStaticRTF.cpp	21 May 2004 13:48:30 -0000	1.7
***************
*** 4,7 ****
--- 4,12 ----
  #ifdef HAVE_SDL_RTF
  
+ #include "SDL_ttf.h"
+ #ifndef HAVE_SDL_TTF
+ #include "SDL_ttf.c"
+ #endif
+ 
  #include "SDL_rtf.h"
  
***************
*** 63,69 ****
  RenderText(void *_font, const char *text, SDL_Color fg)
  {
!     aedFont *font = (aedFont *) _font;
! 
!     return font->renderTextBlended(text, aedColor(fg.r, fg.g, fg.b, 255));
  }
  
--- 68,76 ----
  RenderText(void *_font, const char *text, SDL_Color fg)
  {
!   // Moved this from the renderTextBlended Function that was removed
!     if(pApp->getUTF8())
!       return TTF_RenderUTF8_Blended(((aedFont*)_font)->getTTFFont(), text, fg);
!     else
!       return TTF_RenderText_Blended(((aedFont*)_font)->getTTFFont(), text, fg);
  }
  

Index: aedMenu.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedMenu.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** aedMenu.cpp	6 Nov 2003 18:46:36 -0000	1.7
--- aedMenu.cpp	21 May 2004 13:48:30 -0000	1.8
***************
*** 37,43 ****
  aedMenu::render()
  {
!     SDL_Surface *s;
      SDL_Rect dst;
! 
      dst.x = 4;
      dst.y = SPACING;
--- 37,44 ----
  aedMenu::render()
  {
!   //SDL_Surface *s;
      SDL_Rect dst;
!     Uint16 width;
!     Uint16 height;
      dst.x = 4;
      dst.y = SPACING;
***************
*** 51,59 ****
              color = aedColor(255, 255, 255, 255);
  
!         s = m_Font->renderTextBlended(m_Items[i].caption.c_str(), color);
          if((int) i == m_Highlight)
          {
              SDL_Surface *bg =
!                 CreateSurface(SDL_SWSURFACE, m_Surface->w - 8, s->h);
              SDL_FillRect(bg, NULL, SDL_MapRGBA(bg->format, 0, 0, 255, 255));
              SDL_SetAlpha(bg, SDL_SRCALPHA, 170);
--- 52,62 ----
              color = aedColor(255, 255, 255, 255);
  
!         //s = m_Font->renderTextBlended(m_Items[i].caption.c_str(), color);
!         m_Font->getTextSize(m_Items[i].caption.c_str(), &width, &height);
! 
          if((int) i == m_Highlight)
          {
              SDL_Surface *bg =
!                 CreateSurface(SDL_SWSURFACE, m_Surface->w - 8, height);
              SDL_FillRect(bg, NULL, SDL_MapRGBA(bg->format, 0, 0, 255, 255));
              SDL_SetAlpha(bg, SDL_SRCALPHA, 170);
***************
*** 61,68 ****
              SDL_FreeSurface(bg);
          }
  
!         SDL_BlitSurface(s, NULL, m_Surface, &dst);
!         dst.y += s->h + SPACING;
!         SDL_FreeSurface(s);
      }
  }
--- 64,77 ----
              SDL_FreeSurface(bg);
          }
+ 	
+ 	m_Font->renderTextBlended(m_Surface,
+ 				  dst.x,
+ 				  dst.y,
+ 				  m_Items[i].caption.c_str(),
+ 				  color);
  
!         //SDL_BlitSurface(s, NULL, m_Surface, &dst);
!         dst.y += height + SPACING;
!         //SDL_FreeSurface(s);
      }
  }

Index: Makefile.am
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Makefile.am	16 Apr 2004 01:29:56 -0000	1.34
--- Makefile.am	21 May 2004 13:48:30 -0000	1.35
***************
*** 46,49 ****
  			aedSizer.cpp \
  			aedBoxSizer.cpp \
! 			aedClipboard.cpp
  
--- 46,50 ----
  			aedSizer.cpp \
  			aedBoxSizer.cpp \
! 			aedClipboard.cpp \
! 			aedRect.cpp
  

Index: aedListBox.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedListBox.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** aedListBox.cpp	22 Mar 2004 20:35:05 -0000	1.20
--- aedListBox.cpp	21 May 2004 13:48:30 -0000	1.21
***************
*** 142,152 ****
  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;
--- 142,151 ----
  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;
***************
*** 201,323 ****
  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;
  }
--- 200,322 ----
  aedListBox::render(void)
  {
!   aedRect myPos(0, 0, m_Surface->w, m_Surface->h);
!   //SDL_Surface *s1 = NULL;
!   SDL_Rect src, dest;
!   Uint16 line = 0, width = 0, height = 0;
!   Uint32 scrollRange;
!   // these should really be members
!   aedColor thisColor;
!   aedColor thisBgColor;
!   
!   // 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] != "") 
! 	{
! 	  m_Font->getTextSize(m_Strings[line].c_str(), &width, &height);
! 	  if(isEnabled()) 
! 	    {
! 	      thisColor = aedColor(0, 0, 0, 255);
! 	      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=height;
! 		  
! 		  // It is very ugly but simple and fast!
! 		  SDL_FillRect(m_Surface, &dest, thisBgColor.getUint32(m_Surface)); 
! 		} 
! 	    } 
! 	  else 
! 	    {
! 	      thisColor = aedColor(130, 
! 				   130,
! 				   130,
! 				   this->getAlphaValue());	      
! 	    }	  
! 	  src.w = myPos.getWidth();
! 	  src.h = height;
! 	  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;
! 	  }
! 	  m_Font->renderTextBlended(m_Surface,dest.x,dest.y,m_Strings[line].c_str(),thisColor);
! 	  dest.y += dest.h + 1;
! 	}   
!     }
    m_RowHeight = dest.h + 1;
  }

Index: aedMenuBar.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedMenuBar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aedMenuBar.cpp	6 Nov 2003 18:46:36 -0000	1.5
--- aedMenuBar.cpp	21 May 2004 13:48:30 -0000	1.6
***************
*** 52,57 ****
  {
      unsigned int i;
!     SDL_Surface *s;
      SDL_Rect dst;
  
      // needs centering!
--- 52,59 ----
  {
      unsigned int i;
!     //SDL_Surface *s;
      SDL_Rect dst;
+     Uint16 width;
+     Uint16 height;
  
      // needs centering!
***************
*** 65,74 ****
              color = aedColor(255, 255, 255, 255);
  
!         s = m_Font->renderTextBlended(m_Menus[i]->getCaption().c_str(), color);
!         dst.w = s->w;
!         dst.h = s->h;
          if(i == (unsigned) m_Highlight)
          {
!             SDL_Surface *bg = CreateSurface(SDL_SWSURFACE, s->w, s->h);
  
              SDL_FillRect(bg, NULL, SDL_MapRGBA(bg->format, 0, 0, 255, 255));
--- 67,78 ----
              color = aedColor(255, 255, 255, 255);
  
!         //s = m_Font->renderTextBlended(m_Menus[i]->getCaption().c_str(), color);
!         m_Font->getTextSize(m_Menus[i]->getCaption().c_str(), &width, &height);
! 
!         dst.w = width;
!         dst.h = height;
          if(i == (unsigned) m_Highlight)
          {
!             SDL_Surface *bg = CreateSurface(SDL_SWSURFACE, width, height);
  
              SDL_FillRect(bg, NULL, SDL_MapRGBA(bg->format, 0, 0, 255, 255));
***************
*** 78,84 ****
          }
  
!         SDL_BlitSurface(s, NULL, m_Surface, &dst);
!         dst.x += s->w + PADDING;
!         SDL_FreeSurface(s);
      }
      setRenderState(true);
--- 82,94 ----
          }
  
!         //SDL_BlitSurface(s, NULL, m_Surface, &dst);
! 	m_Font->renderTextBlended(m_Surface,
! 				  dst.x,
! 				  dst.y,
! 				  m_Menus[i]->getCaption().c_str(),
! 				  color);
! 
!         dst.x += width + PADDING;
!         //SDL_FreeSurface(s);
      }
      setRenderState(true);

Index: aedStaticText.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedStaticText.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** aedStaticText.cpp	6 Nov 2003 18:46:36 -0000	1.33
--- aedStaticText.cpp	21 May 2004 13:48:30 -0000	1.34
***************
*** 80,89 ****
      SDL_Rect src, dest;
  
!     std::string::size_type startPos = 0, endPos = 0;
      Uint16 line = 0, width = 0, height = 0;
      size_t x;
  
!     std::string temp;
!     SDL_Surface *s1 = NULL;
  
      SDL_Rect rect = myPos.getSDLRect();
--- 80,88 ----
      SDL_Rect src, dest;
  
!     size_t startPos = 0, endPos = 0;
      Uint16 line = 0, width = 0, height = 0;
      size_t x;
  
!     std::string temp,temp2;
  
      SDL_Rect rect = myPos.getSDLRect();
***************
*** 98,164 ****
  
      thisColor.setA(this->getAlphaValue());
!     s1 = m_Font->renderTextBlended(m_Caption.c_str(), thisColor);
  
      src.x = 0;
      src.y = 0;
      src.w = myPos.getWidth();
!     src.h = s1->h;
  
      dest.x = myPos.getX();
!     dest.y = myPos.getY();
      dest.w = src.w;
      dest.h = src.h;
  
!     // vertical alignment
!     m_Font->getTextSize(m_Caption.c_str(), &width, &height);
!     if(width <= myPos.getWidth())
!         dest.y = myPos.getY() + int ((myPos.getHeight() - height) / 2);
! 
!     for(line = 1; endPos < m_Caption.size(); line++)
!     {
!         if(src.x + src.w > s1->w)
!             src.w = s1->w - src.x;
! 
!         if(dest.y + dest.h > myPos.getY() + myPos.getHeight())
!             break;
! 
!         endPos = getPosAtPixel(src.x + src.w, src.y) - 1;
!         if(endPos < 1)
!             break;
! 
!         temp = m_Caption.substr(startPos, endPos);
! 
!         if(m_WordWrap)
!         {
!             for(x = temp.size(); x > 0; x--)
!             {
!                 if(temp.substr(x, 1) == " ")
!                 {
!                     endPos = startPos + x + 1;
!                     temp = temp.substr(startPos, endPos);
!                     break;
!                 }
!             }
!         }
! 
!         m_Font->getTextSize(temp.c_str(), &width, &height);
!         src.w = width;
!         dest.w = src.w;
! 
!         if(m_Justification == AED_JUST_RIGHT)
!             dest.x = myPos.getX() + (myPos.getWidth() - dest.w);
!         else if(m_Justification == AED_JUST_CENTER)
!             dest.x = myPos.getX() + int ((myPos.getWidth() - dest.w) / 2);
! 
!         SDL_SetAlpha(s1, 0, 0);
!         SDL_BlitSurface(s1, &src, m_Surface, &dest);
! 
!         src.x += src.w;
!         src.w = myPos.getWidth();
!         dest.x = myPos.getX();
!         dest.y += dest.h;
!         startPos = endPos;
!     }
! 
!     SDL_FreeSurface(s1);
  }
--- 97,160 ----
  
      thisColor.setA(this->getAlphaValue());
! 
!     m_Font->getTextSize(m_Caption.c_str(), &width, &height);
  
      src.x = 0;
      src.y = 0;
      src.w = myPos.getWidth();
!     src.h = height;
  
      dest.x = myPos.getX();
!     if(width <= myPos.getWidth()) // Why set dest.y twice?
!       {
!         dest.y = myPos.getY() + int ((myPos.getHeight() - height) / 2);
!       }
!     else
!       {
! 	dest.y = myPos.getY();
!       }
      dest.w = src.w;
      dest.h = src.h;
  
!     if(m_WordWrap)
!       {
! 	temp = m_Caption;
! 	for(;;)
! 	  {
! 	    temp2 = temp.substr(0,m_Font->getMaxCharLen(m_Surface,
! 							dest.x,
! 							dest.y,
! 							temp.c_str()));
! 	    temp = temp.substr(temp2.size(),temp.size()-temp2.size());
! 	    m_Font->getTextSize(temp2.c_str(), &width, &height);
! 	    dest.w = width;
! 	    if(m_Justification == AED_JUST_RIGHT)
! 	      {
! 		dest.x = myPos.getX() + (myPos.getWidth() - dest.w);
! 	      }
! 	    else if(m_Justification == AED_JUST_CENTER)
! 	      {
! 		dest.x = myPos.getX() + int ((myPos.getWidth() - dest.w) / 2);
! 	      }
! 	    startPos = m_Font->renderTextBlended(m_Surface,
! 						 dest.x,
! 						 dest.y,
! 						 temp2.c_str(),
! 						 thisColor);
!  	    if((temp.empty())||(startPos==0)) break;
!  	    else dest.y += m_Font->getHeight();
! 	  } 
!       }
!     else
!       {
! 	// if no WordWrap is needed just render the string, there is code
! 	// inside renderTextBlended to deal with text clipping, so,
! 	// no need to do all those nasty calculations here
! 	  m_Font->getTextSize(m_Caption.c_str(), &width, &height);
! 	  dest.w = width;	  
! 	  if(m_Justification == AED_JUST_RIGHT)
! 	    dest.x = myPos.getX() + (myPos.getWidth() - dest.w);
! 	  else if(m_Justification == AED_JUST_CENTER)
! 	    dest.x = myPos.getX() + int ((myPos.getWidth() - dest.w) / 2);
!       }
  }

Index: aedTextBox.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedTextBox.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** aedTextBox.cpp	16 Apr 2004 01:29:56 -0000	1.35
--- aedTextBox.cpp	21 May 2004 13:48:30 -0000	1.36
***************
*** 329,333 ****
  aedTextBox::render(void)
  {
!     SDL_Surface *s1 = NULL;
      SDL_Rect src = {
          0, 0, 0, 0
--- 329,333 ----
  aedTextBox::render(void)
  {
!   //SDL_Surface *s1 = NULL;
      SDL_Rect src = {
          0, 0, 0, 0
***************
*** 369,373 ****
  
      thisColor.setA(this->getAlphaValue());
!     s1 = m_Font->renderTextBlended(m_Caption.c_str(), thisColor);
  
      if(m_SelectionStart != m_SelectionEnd)
--- 369,373 ----
  
      thisColor.setA(this->getAlphaValue());
!     //s1 = m_Font->renderTextBlended(m_Caption.c_str(), thisColor);
  
      if(m_SelectionStart != m_SelectionEnd)
***************
*** 402,416 ****
        else
  	{
! 	  screenORrect = s1;
  	}
  
!         SLOCK(s1);              // TODO: What should selected text look like?
          int x2 = SelectionStartX + SelectionWidth - 1;
  
!         if(x2 >= s1->w)
!             x2 = s1->w - 1;
          DrawRect(screenORrect, SelectionStartX, 0, x2, SelectionBoxHeight - 1,
                   SelectColor);
!         SUNLOCK(s1);
      }
  
--- 402,416 ----
        else
  	{
! 	  //screenORrect = s1;
  	}
  
!       //SLOCK(s1);              // TODO: What should selected text look like?
          int x2 = SelectionStartX + SelectionWidth - 1;
  
!         if(x2 >= width1)
!             x2 = width1 - 1;
          DrawRect(screenORrect, SelectionStartX, 0, x2, SelectionBoxHeight - 1,
                   SelectColor);
!         //SUNLOCK(s1);
      }
  
***************
*** 420,425 ****
      dest.h -= cPad * 3;
  
!     if(s1)
!     {
          if(width1 < m_StartPixel)
          {
--- 420,425 ----
      dest.h -= cPad * 3;
  
!     if(width1>=0) // don't bother if there's no text
!      {
          if(width1 < m_StartPixel)
          {
***************
*** 433,438 ****
              m_StartPixel = int (width1 - dest.w + (dest.w / 4));
  
!             if(m_StartPixel + dest.w > s1->w)
!                 m_StartPixel = s1->w - dest.w;
          }
  
--- 433,438 ----
              m_StartPixel = int (width1 - dest.w + (dest.w / 4));
  
!             if(m_StartPixel + dest.w > width1)
!                 m_StartPixel = width1 - dest.w;
          }
  
***************
*** 447,455 ****
          src.x = m_StartPixel;
          src.y = 0;
!         src.h = s1->h;
          src.w = dest.w;
!         SDL_BlitSurface(s1, &src, m_Surface, &dest);
!         SDL_FreeSurface(s1);
!     }
  
      // caret
--- 447,460 ----
          src.x = m_StartPixel;
          src.y = 0;
!         src.h = height1;
          src.w = dest.w;
! 	m_Font->renderTextBlended(m_Surface,
! 				  dest.x,
! 				  dest.y,
! 				  m_Caption.c_str(),
! 				  thisColor);
!         //SDL_BlitSurface(s1, &src, m_Surface, &dest);
!         //SDL_FreeSurface(s1);
!      }
  
      // caret

Index: aedFont.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedFont.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** aedFont.cpp	23 Nov 2003 18:19:09 -0000	1.15
--- aedFont.cpp	21 May 2004 13:48:30 -0000	1.16
***************
*** 7,13 ****
--- 7,17 ----
  #endif
  
+ 
  aedFont::aedFont()
  {
      data = NULL;
+     
+     charcount = 224;
+     charoffset = 32;
  }
  
***************
*** 21,24 ****
--- 25,29 ----
      closeFont();
      data = TTF_OpenFont(file, pointsize);
+     generateFontVector();
      return (data != NULL);
  }
***************
*** 29,32 ****
--- 34,38 ----
      closeFont();
      this->data = TTF_OpenFontRW(SDL_RWFromMem(data, datasize), 1, pointsize);
+     generateFontVector();
      return (this->data != NULL);
  }
***************
*** 40,43 ****
--- 46,50 ----
          data = NULL;
      }
+     destroyFontVector();
  }
  
***************
*** 54,57 ****
--- 61,65 ----
      // The AED_FONT styles are the same as TTF styles
      TTF_SetFontStyle(data, style);
+     generateFontVector();
  }
  
***************
*** 105,184 ****
  }
  
! SDL_Surface *
! aedFont::renderTextSolid(const char *str, const aedColor & color)
! {
!     if(pApp->getUTF8())
!         return TTF_RenderUTF8_Solid(data, str, color);
!     else
!         return TTF_RenderText_Solid(data, str, color);
! }
  
! SDL_Surface *
! aedFont::renderTextShaded(const char *str, const aedColor & fg,
!                           const aedColor & bg)
! {
!     if(pApp->getUTF8())
!         return TTF_RenderUTF8_Shaded(data, str, fg, bg);
!     else
!         return TTF_RenderText_Shaded(data, str, fg, bg);
! }
  
! SDL_Surface *
! aedFont::renderTextBlended(const char *str, const aedColor & color)
! {
!     if(pApp->getUTF8())
!         return TTF_RenderUTF8_Blended(data, str, color);
!     else
!         return TTF_RenderText_Blended(data, str, color);
! }
  
! void
  aedFont::renderTextSolid(SDL_Surface * s, int x, int y, const char *str,
!                          const aedColor & color)
  {
      SDL_Rect dst;
!     SDL_Surface *tmp;
! 
!     tmp = renderTextSolid(str, color);
!     if(tmp)
!     {
!         dst.x = x;
!         dst.y = y;
!         SDL_BlitSurface(tmp, NULL, s, &dst);
!         SDL_FreeSurface(tmp);
!     }
  }
  
! void
  aedFont::renderTextShaded(SDL_Surface * s, int x, int y, const char *str,
!                           const aedColor & fg, const aedColor & bg)
  {
      SDL_Rect dst;
!     SDL_Surface *tmp;
! 
!     tmp = renderTextShaded(str, fg, bg);
!     if(tmp)
!     {
!         dst.x = x;
!         dst.y = y;
!         SDL_BlitSurface(tmp, NULL, s, &dst);
!         SDL_FreeSurface(tmp);
!     }
  }
  
! void
  aedFont::renderTextBlended(SDL_Surface * s, int x, int y, const char *str,
!                            const aedColor & color)
  {
      SDL_Rect dst;
!     SDL_Surface *tmp;
  
!     tmp = renderTextBlended(str, color);
!     if(tmp)
!     {
!         dst.x = x;
!         dst.y = y;
!         SDL_BlitSurface(tmp, NULL, s, &dst);
!         SDL_FreeSurface(tmp);
!     }
  }
--- 113,353 ----
  }
  
! // SDL_Surface *
! // aedFont::renderTextSolid(const char *str, const aedColor & color)
! // {
! //     if(pApp->getUTF8())
! //         return TTF_RenderUTF8_Solid(data, str, color);
! //     else
! //         return TTF_RenderText_Solid(data, str, color);
! // }
  
! // SDL_Surface *
! // aedFont::renderTextShaded(const char *str, const aedColor & fg,
! //                           const aedColor & bg)
! // {
! //     if(pApp->getUTF8())
! //         return TTF_RenderUTF8_Shaded(data, str, fg, bg);
! //     else
! //         return TTF_RenderText_Shaded(data, str, fg, bg);
! // }
  
! // SDL_Surface *
! // aedFont::renderTextBlended(const char *str, const aedColor & color)
! // {
! //     if(pApp->getUTF8())
! //         return TTF_RenderUTF8_Blended(data, str, color);
! //     else
! //         return TTF_RenderText_Blended(data, str, color);
! // }
  
! int
  aedFont::renderTextSolid(SDL_Surface * s, int x, int y, const char *str,
!                          aedColor & color)
  {
      SDL_Rect dst;
!     SDL_Palette *palette;
!     int nTextLenght = strlen(str); // no need to call slow strlen more than once
!     aedRect cliprect;
!     SDL_Rect src = {0,0,s->w,s->h};
!     dst.x = x;
!     dst.y = y;
!     for(int i=0;i<nTextLenght;++i)
!       {
! 	dst.w = charVector[str[i]-charoffset].solidSurface->w;
! 	dst.h = charVector[str[i]-charoffset].solidSurface->h;
! 	if(!cliprect.intersectRect(dst,src))
! 	  return i;
! 	dst = cliprect.getSDLRect();
! 	if(charVector[str[i]-charoffset].solidColor != color)
! 	  {
! 	    // Borrowed the following from SDL_ttf.c
! 	    palette = 
! 	      charVector[str[i]-charoffset].solidSurface->format->palette;
! 	    palette->colors[0].r = 255 - color.getR();
! 	    palette->colors[0].g = 255 - color.getG();
! 	    palette->colors[0].b = 255 - color.getB();
! 	    palette->colors[1].r = color.getR();
! 	    palette->colors[1].g = color.getG();
! 	    palette->colors[1].b = color.getB();
! 	    SDL_SetColorKey(charVector[str[i]-charoffset].solidSurface,
! 			    SDL_SRCCOLORKEY, 0);
! 	    charVector[str[i]-charoffset].solidColor = color;
! 	  }
! 	dst.y = y+charVector[str[i]-charoffset].yoffset;
! 	SDL_BlitSurface(charVector[str[i]-charoffset].solidSurface, NULL, s, &dst);
! 	dst.x+=charVector[str[i]-charoffset].advance;
!       };
!     return nTextLenght;
  }
  
! int
  aedFont::renderTextShaded(SDL_Surface * s, int x, int y, const char *str,
!                           aedColor & fg, aedColor & bg)
  {
      SDL_Rect dst;
!     SDL_Surface *srf;
! //     SDL_Palette *palette;
!     int nTextLenght = strlen(str);
!     // no need to call slow strlen more than once
! //     int rdiff;
! //     int gdiff;
! //     int bdiff;
!     Uint32 *pixel;
!     Uint32 uColor = 
!       (0xFF         << 24) | 
!       (fg.getR() << 16) | 
!       (fg.getG() << 8)  | 
!        fg.getB();
!     aedRect cliprect;
!     SDL_Rect src = {0,0,s->w,s->h};
!     SDL_Rect shaderect = {x,y,0,TTF_FontHeight(data)};
!     dst.x = x;
!     dst.y = y;
!     for(int i=0;i<nTextLenght;++i)
!       {
! 	shaderect.w = dst.w = charVector[str[i]-charoffset].advance;
! 	dst.h = charVector[str[i]-charoffset].blendedSurface->h;
! 	if(!cliprect.intersectRect(dst,src))
! 	  return i;
! 	dst = cliprect.getSDLRect();
! 	if(charVector[str[i]-charoffset].blendedColor != fg)
! 	  {
! 	    srf = charVector[str[i]-charoffset].blendedSurface;
! 	    SDL_LockSurface(srf);
! 	    pixel = (Uint32*) srf->pixels;
! 	    for(int j=0;j<(srf->w * srf->h);++j)
! 	      {
! 		pixel[j] |= 0x00FFFFFF;
! 		pixel[j] &= uColor;
! 	      };
! 	    SDL_UnlockSurface(srf);
! 	    charVector[str[i]-charoffset].blendedColor = fg;
! 	  }
! 	dst.y = y+charVector[str[i]-charoffset].yoffset;
! 	SDL_FillRect(s, &shaderect,bg.getUint32(s));
! 	SDL_BlitSurface(charVector[str[i]-charoffset].blendedSurface, 
! 			NULL, 
! 			s, 
! 			&dst);
! 	dst.x+=charVector[str[i]-charoffset].advance;
! 	shaderect.x = dst.x;
!       };
!     return nTextLenght;
  }
  
! int
  aedFont::renderTextBlended(SDL_Surface * s, int x, int y, const char *str,
!                            aedColor & color)
  {
      SDL_Rect dst;
!     SDL_Surface *srf;
!     int nTextLenght = strlen(str);
!     aedRect cliprect;
!     SDL_Rect src = {0,0,s->w,s->h};
!     dst.x = x;
!     dst.y = y;
!     Uint32 *pixel;
!     Uint32 uColor = 
!       (0xFF         << 24) | 
!       (color.getR() << 16) | 
!       (color.getG() << 8)  | 
!        color.getB();
!     for(int i=0;i<nTextLenght;++i)
!       {
! 	dst.w = charVector[str[i]-charoffset].blendedSurface->w;
! 	dst.h = charVector[str[i]-charoffset].blendedSurface->h;
! 	if(!cliprect.intersectRect(dst,src))
! 	  return i;
! 	dst = cliprect.getSDLRect();
! 	if(charVector[str[i]-charoffset].blendedColor != color)
! 	  {
! 	    srf = charVector[str[i]-charoffset].blendedSurface;
! 	    SDL_LockSurface(srf);
! 	    pixel = (Uint32*) srf->pixels;
! 	    for(int j=0;j<(srf->w * srf->h);++j)
! 	      {
! 		pixel[j] |= 0x00FFFFFF;
! 		pixel[j] &= uColor; //0x00FFFFFF;
! 	      };
! 	    SDL_UnlockSurface(srf);
! 	    charVector[str[i]-charoffset].blendedColor = color;
! 	  }
! 	dst.y = y+charVector[str[i]-charoffset].yoffset;
! 	SDL_BlitSurface(charVector[str[i]-charoffset].blendedSurface, NULL, s, &dst);
! 	dst.x+=charVector[str[i]-charoffset].advance;
!       };
!     return nTextLenght;
! }
  
! int
! aedFont::getMaxCharLen(SDL_Surface * s, int x, int y, const char *str)
! {
!     SDL_Rect dst;
!     int nTextLenght = strlen(str);
!     aedRect cliprect;
!     SDL_Rect src = {0,0,s->w,s->h};
!     dst.x = x;
!     dst.y = y;
!     for(int i=0;i<nTextLenght;++i)
!       {
! 	dst.w = charVector[str[i]-charoffset].blendedSurface->w;
! 	dst.h = charVector[str[i]-charoffset].blendedSurface->h;
! 	// take into account half chars
! 	if((!cliprect.intersectRect(dst,src))||(cliprect.getWidth()!=dst.w))
! 	  return i;	
! 	dst = cliprect.getSDLRect();
! 	dst.y = y+charVector[str[i]-charoffset].yoffset;
! 	dst.x+=charVector[str[i]-charoffset].advance;
!       };
!     return nTextLenght;
  }
+ 
+ void
+ aedFont::generateFontVector()
+ {
+     char ch;
+     // these Colors are not randomly selected
+     // in OpenGL these will help us get proper
+     // text coloring
+     aedColor bg(0,0,0,0);
+     aedColor fg(255,255,255,255);
+     chardata charData;
+     int minx;
+     int maxx;
+     int miny;
+     int maxy;
+     int advance;
+     destroyFontVector();
+     for(int i=0;i<charcount;++i)
+       {
+ 	ch = i+charoffset;
+ 	TTF_GlyphMetrics(data,
+ 			 ch,
+ 			 &minx,
+ 			 &maxx,
+ 			 &miny,
+ 			 &maxy,
+ 			 &advance);
+ 	charVector.push_back(charData);
+ 	charVector[i].solidSurface = TTF_RenderGlyph_Solid(data,ch,fg);
+ 	charVector[i].blendedSurface = TTF_RenderGlyph_Blended(data,ch,fg);
+ 	charVector[i].advance = advance;
+ 	charVector[i].yoffset = TTF_FontAscent(data) - maxy;
+ 	charVector[i].blendedColor = fg;
+ 	charVector[i].solidColor = fg;
+       };
+ };
+ 
+ void
+ aedFont::destroyFontVector()
+ {
+     size_t vectorsize;
+     size_t i;
+     vectorsize = charVector.size();
+     for(i=0;i<vectorsize;++i)
+       {
+ 	SDL_FreeSurface(charVector[i].solidSurface);
+ 	SDL_FreeSurface(charVector[i].blendedSurface);
+       }
+     charVector.clear();
+ };