Menu
▾
▴
[aedGUI-cvs] aedGUI/src Makefile.am,1.33,1.34 aedApp.cpp,1.31,1.32 aedButton.cpp,1.23,1.24 aedTextBox.cpp,1.34,1.35 aedTheme.cpp,1.23,1.24 aedWidget.cpp,1.10,1.11 aedWindow.cpp,1.69,1.70 aedXmlFile.cpp,1.6,1.7 drawlibs.cpp,1.8,1.9
Update of /cvsroot/aedgui/aedGUI/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6822/src Modified Files: Makefile.am aedApp.cpp aedButton.cpp aedTextBox.cpp aedTheme.cpp aedWidget.cpp aedWindow.cpp aedXmlFile.cpp drawlibs.cpp Log Message: OpenGL Patch Index: aedXmlFile.cpp =================================================================== RCS file: /cvsroot/aedgui/aedGUI/src/aedXmlFile.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** aedXmlFile.cpp 6 Nov 2003 18:46:37 -0000 1.6 --- aedXmlFile.cpp 16 Apr 2004 01:29:56 -0000 1.7 *************** *** 21,443 **** #include <iostream> ! bool aedXmlFile::loadFromFile(const std::string & fileName, aedWidget * parent) ! { ! TiXmlDocument doc; ! std::cout << "LoadFromFile: " << fileName << std::endl; ! if(doc.LoadFile(fileName) == false) ! { ! m_ErrorText = doc.ErrorDesc(); ! return false; ! } ! return parseChildElements(doc.FirstChildElement(), parent); ! } ! ! bool aedXmlFile::loadFromString(const std::string & xml, aedWidget * parent) ! { ! TiXmlDocument doc; ! std::cout << "LoadFromXml: " << xml << std::endl; ! if(doc.Parse(xml.c_str()) == NULL) ! { ! m_ErrorText = doc.ErrorDesc(); ! return false; ! } ! return parseChildElements(doc.FirstChildElement(), parent); ! } ! ! std::string aedXmlFile::getError() ! { ! return m_ErrorText; ! } ! ! #define CREATE_IF(e, f) do { if (ElementType == e) return f(element, parent); } while(0); ! bool aedXmlFile::parseElement(TiXmlElement * element, aedWidget * parent) ! { ! std::string ElementType(element->Value()); ! CREATE_IF("window", parseWindow); ! CREATE_IF("button", parseButton); ! CREATE_IF("statictext", parseStaticText); ! CREATE_IF("textbox", parseTextBox); ! CREATE_IF("progressbar", parseTextBox); ! CREATE_IF("frame", parseFrame); ! CREATE_IF("checkbox", parseCheckBox); ! CREATE_IF("staticimage", parseStaticImage); ! CREATE_IF("slider", parseSlider); ! CREATE_IF("scrollbar", parseScrollBar); ! CREATE_IF("radiobuttongroup", parseRadioButtonGroup); ! CREATE_IF("listbox", parseListBox); ! CREATE_IF("spinner", parseSpinner); ! return true; ! } ! ! bool aedXmlFile::parseChildElements(TiXmlElement * element, aedWidget * parent) ! { ! TiXmlElement * ChildElement = element->FirstChildElement(); ! while(ChildElement) ! { ! if(parseElement(ChildElement, parent) == false) ! { ! return false; ! } ! ChildElement = ChildElement->NextSiblingElement(); ! } ! return true; ! } ! ! bool aedXmlFile::parseWindow(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedWindow * window = new aedWindow(); ! window->create(parent, Position, Caption, WF_NORMAL); ! window->setId(Name); ! std::cerr << "parseWindow: " << Name << std::endl; ! return parseChildElements(element, window); ! } ! ! bool aedXmlFile::parseStaticText(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedStaticText * statictext = new aedStaticText(); ! statictext->create(parent, Position, Caption); ! statictext->setId(Name); ! std::cerr << "parseStaticText: " << Name << std::endl; ! return true; ! } ! ! bool aedXmlFile::parseButton(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedButton * button = new aedButton(); ! button->create(parent, Position, Caption); ! button->setId(Name); ! std::cout << "parseButton: " << Name << std::endl; ! return true; ! } ! ! bool aedXmlFile::parseTextBox(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedTextBox * textbox = new aedTextBox(); ! textbox->create(parent, Position, Caption); ! textbox->setId(Name); ! std::cout << "parseTextBox: " << Name << std::endl; ! return true; ! } ! ! bool aedXmlFile::parseProgressBar(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedProgressBar * progressbar = new aedProgressBar(); ! progressbar->create(parent, Position, Caption); ! progressbar->setId(Name); ! std::cout << "parseProgressBar: " << Name << std::endl; ! int ! Value = safeExtractInt(element, "value"); ! ! progressbar->setValue(Value); ! return true; ! } ! ! bool aedXmlFile::parseFrame(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedFrame * frame = new aedFrame(); ! frame->create(parent, Position, Caption); ! frame->setId(Name); ! std::cout << "parseFrame: " << Name << std::endl; ! return parseChildElements(element, frame); ! } ! ! bool aedXmlFile::parseCheckBox(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedCheckBox * checkbox = new aedCheckBox(); ! checkbox->create(parent, Position, Caption); ! checkbox->setId(Name); ! std::cout << "parseCheckBox: " << Name << std::endl; ! std::string Value = safeExtractString(element, "value"); ! checkbox->setState(Value == "true"); ! return true; ! } ! ! bool aedXmlFile::parseStaticImage(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedStaticImage * staticimage = new aedStaticImage(); ! staticimage->create(parent, Position, Caption); ! staticimage->setId(Name); ! std::cout << "parseStaticImage: " << Name << std::endl; ! std::string Value = safeExtractString(element, "value"); ! if(Value.length() != 0) ! { ! SDL_Surface * surface = SDL_LoadBMP(Value.c_str()); ! if(surface != NULL) ! { ! if(safeExtractString(element, "colorkey") == "true") ! { ! int ! r = safeExtractInt(element, "key_r"); ! int ! g = safeExtractInt(element, "key_r"); ! int ! b = safeExtractInt(element, "key_r"); ! unsigned int ! ColourKey = SDL_MapRGB(surface->format, r, g, b); ! ! SDL_SetColorKey(surface, SDL_SRCCOLORKEY, ColourKey); ! } ! ConvertSurface(&surface); ! staticimage->setImage(aedImage(surface)); ! staticimage->setSize(surface->w, surface->h); ! } ! } ! return true; ! } ! ! bool aedXmlFile::parseSlider(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! std::string Orientation = safeExtractString(element, "orientation"); ! aedOrientation orient; ! if(Orientation == "vertical") ! { ! orient = AED_VERTICAL; ! } ! else if(Orientation == "horizontal") ! { ! orient = AED_HORIZONTAL; ! } ! else ! { // A required attribute was missing. Return true to continue // parsing xml, just don't create this widget ! return true; ! } ! aedSlider * slider = new aedSlider(orient); ! slider->create(parent, Position, Caption); ! slider->setId(Name); ! int ! Min = safeExtractInt(element, "min"); ! int ! Max = safeExtractInt(element, "max"); ! int ! Value = safeExtractInt(element, "value"); ! ! slider->setRange(Min, Max); ! slider->setValue(Value); ! std::cout << "parseSlider: " << Name << std::endl; ! return true; ! } ! ! bool aedXmlFile::parseScrollBar(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! std::string Orientation = safeExtractString(element, "orientation"); ! aedOrientation orient; ! if(Orientation == "vertical") ! { ! orient = AED_VERTICAL; ! } ! else if(Orientation == "horizontal") ! { ! orient = AED_HORIZONTAL; ! } ! else ! { // A required attribute was missing. Return true to continue // parsing xml, just don't create this widget ! return true; ! } ! aedScrollBar * scrollbar = new aedScrollBar(orient); ! scrollbar->create(parent, Position, Caption); ! scrollbar->setId(Name); ! int ! Min = safeExtractInt(element, "min"); ! int ! Max = safeExtractInt(element, "max"); ! int ! Value = safeExtractInt(element, "value"); ! ! scrollbar->setRange(Min, Max); ! scrollbar->setValue(Value); ! std::cout << "parseScrollBar: " << Name << std::endl; ! return true; ! } ! ! bool aedXmlFile::parseRadioButtonGroup(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedRadioButtonGroup * radiobuttongroup = new aedRadioButtonGroup(); ! radiobuttongroup->create(parent, Position, Caption); ! radiobuttongroup->setId(Name); ! std::cout << "parseRadioButtonGroup: " << Name << std::endl; ! TiXmlElement * ChildElement = element->FirstChildElement(); ! while(ChildElement) ! { ! if(std::string(ChildElement->Value()) == "radiobutton") ! { ! std::string Text = safeExtractString(ChildElement, "caption"); ! std::string Name = safeExtractString(ChildElement, "name"); ! radiobuttongroup->addButton(Text); ! std:: ! cerr << "Added radio button: " << Name << " : " << Text << std:: ! endl; ! } ! ChildElement = ChildElement->NextSiblingElement(); ! } ! int ! SelectedButton = safeExtractInt(element, "selected"); ! ! radiobuttongroup->selectButton(SelectedButton); ! return true; ! } ! ! bool aedXmlFile::parseListBox(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedListBox * listbox = new aedListBox(); ! listbox->create(parent, Position, Caption); ! listbox->setId(Name); ! std::cout << "parseListBox: " << Name << std::endl; ! TiXmlElement * ListBoxColumnElement = element->FirstChildElement(); ! while(ListBoxColumnElement) ! { ! std::string ColumnType = ! safeExtractString(ListBoxColumnElement, "type"); ! if(ColumnType == "string") ! { ! TiXmlElement * ListBoxElement = ! ListBoxColumnElement->FirstChildElement(); ! while(ListBoxElement) ! { ! if(std::string(ListBoxElement->Value()) == "listboxstringitem") ! { ! std::string Text = ! safeExtractString(ListBoxElement, "caption"); ! std::string Name = ! safeExtractString(ListBoxElement, "name"); ! listbox->add(Text); ! std:: ! cerr << "Added list box item: " << Name << " : " << Text ! << std::endl; ! } ! ListBoxElement = ListBoxElement->NextSiblingElement(); ! } ! ListBoxColumnElement = ListBoxColumnElement->NextSiblingElement(); ! } // else if (ColumnType == "...") // { // } ! } ! return true; ! } ! ! bool aedXmlFile::parseSpinner(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedSpinner * spinner = new aedSpinner(); ! spinner->create(parent, Position, Caption); ! spinner->setId(Name); ! std::cout << "parseSpinner: " << Name << std::endl; ! return true; ! } ! ! std::string aedXmlFile::safeExtractString(TiXmlElement * element, ! const std:: string & attributeName) ! { ! if(element->Attribute(attributeName) != NULL) ! { ! return element->Attribute(attributeName); ! } ! else ! { ! return ""; ! } ! } ! int ! aedXmlFile::safeExtractInt(TiXmlElement * element, const std::string & attributeName) ! { ! int val = 0; ! ! element->Attribute(attributeName, &val); ! return val; ! } ! ! aedRect aedXmlFile::safeExtractPosition(TiXmlElement * element) ! { ! int ! x, ! y, ! w, ! h; ! ! element->Attribute("x", &x); ! element->Attribute("y", &y); ! element->Attribute("w", &w); ! element->Attribute("h", &h); ! return aedRect(x, y, w, h); ! } ! --- 21,443 ---- #include <iostream> ! bool aedXmlFile::loadFromFile(const std::string & fileName, aedWidget * parent) ! { ! TiXmlDocument doc; ! std::cout << "LoadFromFile: " << fileName << std::endl; ! if(doc.LoadFile(fileName) == false) ! { ! m_ErrorText = doc.ErrorDesc(); ! return false; ! } ! return parseChildElements(doc.FirstChildElement(), parent); ! } ! ! bool aedXmlFile::loadFromString(const std::string & xml, aedWidget * parent) ! { ! TiXmlDocument doc; ! std::cout << "LoadFromXml: " << xml << std::endl; ! if(doc.Parse(xml.c_str()) == NULL) ! { ! m_ErrorText = doc.ErrorDesc(); ! return false; ! } ! return parseChildElements(doc.FirstChildElement(), parent); ! } ! ! std::string aedXmlFile::getError() ! { ! return m_ErrorText; ! } ! ! #define CREATE_IF(e, f) do { if (ElementType == e) return f(element, parent); } while(0); ! bool aedXmlFile::parseElement(TiXmlElement * element, aedWidget * parent) ! { ! std::string ElementType(element->Value()); ! CREATE_IF("window", parseWindow); ! CREATE_IF("button", parseButton); ! CREATE_IF("statictext", parseStaticText); ! CREATE_IF("textbox", parseTextBox); ! CREATE_IF("progressbar", parseTextBox); ! CREATE_IF("frame", parseFrame); ! CREATE_IF("checkbox", parseCheckBox); ! CREATE_IF("staticimage", parseStaticImage); ! CREATE_IF("slider", parseSlider); ! CREATE_IF("scrollbar", parseScrollBar); ! CREATE_IF("radiobuttongroup", parseRadioButtonGroup); ! CREATE_IF("listbox", parseListBox); ! CREATE_IF("spinner", parseSpinner); ! return true; ! } ! ! bool aedXmlFile::parseChildElements(TiXmlElement * element, aedWidget * parent) ! { ! TiXmlElement * ChildElement = element->FirstChildElement(); ! while(ChildElement) ! { ! if(parseElement(ChildElement, parent) == false) ! { ! return false; ! } ! ChildElement = ChildElement->NextSiblingElement(); ! } ! return true; ! } ! ! bool aedXmlFile::parseWindow(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedWindow * window = new aedWindow(); ! window->create(parent, Position, Caption, WF_NORMAL); ! window->setId(Name); ! std::cerr << "parseWindow: " << Name << std::endl; ! return parseChildElements(element, window); ! } ! ! bool aedXmlFile::parseStaticText(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedStaticText * statictext = new aedStaticText(); ! statictext->create(parent, Position, Caption); ! statictext->setId(Name); ! std::cerr << "parseStaticText: " << Name << std::endl; ! return true; ! } ! ! bool aedXmlFile::parseButton(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedButton * button = new aedButton(); ! button->create(parent, Position, Caption); ! button->setId(Name); ! std::cout << "parseButton: " << Name << std::endl; ! return true; ! } ! ! bool aedXmlFile::parseTextBox(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedTextBox * textbox = new aedTextBox(); ! textbox->create(parent, Position, Caption); ! textbox->setId(Name); ! std::cout << "parseTextBox: " << Name << std::endl; ! return true; ! } ! ! bool aedXmlFile::parseProgressBar(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedProgressBar * progressbar = new aedProgressBar(); ! progressbar->create(parent, Position, Caption); ! progressbar->setId(Name); ! std::cout << "parseProgressBar: " << Name << std::endl; ! int ! Value = safeExtractInt(element, "value"); ! ! progressbar->setValue(Value); ! return true; ! } ! ! bool aedXmlFile::parseFrame(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedFrame * frame = new aedFrame(); ! frame->create(parent, Position, Caption); ! frame->setId(Name); ! std::cout << "parseFrame: " << Name << std::endl; ! return parseChildElements(element, frame); ! } ! ! bool aedXmlFile::parseCheckBox(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedCheckBox * checkbox = new aedCheckBox(); ! checkbox->create(parent, Position, Caption); ! checkbox->setId(Name); ! std::cout << "parseCheckBox: " << Name << std::endl; ! std::string Value = safeExtractString(element, "value"); ! checkbox->setState(Value == "true"); ! return true; ! } ! ! bool aedXmlFile::parseStaticImage(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedStaticImage * staticimage = new aedStaticImage(); ! staticimage->create(parent, Position, Caption); ! staticimage->setId(Name); ! std::cout << "parseStaticImage: " << Name << std::endl; ! std::string Value = safeExtractString(element, "value"); ! if(Value.length() != 0) ! { ! SDL_Surface * surface = SDL_LoadBMP(Value.c_str()); ! if(surface != NULL) ! { ! if(safeExtractString(element, "colorkey") == "true") ! { ! int ! r = safeExtractInt(element, "key_r"); ! int ! g = safeExtractInt(element, "key_r"); ! int ! b = safeExtractInt(element, "key_r"); ! unsigned int ! ColourKey = SDL_MapRGB(surface->format, r, g, b); ! ! SDL_SetColorKey(surface, SDL_SRCCOLORKEY, ColourKey); ! } ! ConvertSurface(&surface); ! staticimage->setImage(aedImage(surface)); ! staticimage->setSize(surface->w, surface->h); ! } ! } ! return true; ! } ! ! bool aedXmlFile::parseSlider(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! std::string Orientation = safeExtractString(element, "orientation"); ! aedOrientation orient; ! if(Orientation == "vertical") ! { ! orient = AED_VERTICAL; ! } ! else if(Orientation == "horizontal") ! { ! orient = AED_HORIZONTAL; ! } ! else ! { // A required attribute was missing. Return true to continue // parsing xml, just don't create this widget ! return true; ! } ! aedSlider * slider = new aedSlider(orient); ! slider->create(parent, Position, Caption); ! slider->setId(Name); ! int ! Min = safeExtractInt(element, "min"); ! int ! Max = safeExtractInt(element, "max"); ! int ! Value = safeExtractInt(element, "value"); ! ! slider->setRange(Min, Max); ! slider->setValue(Value); ! std::cout << "parseSlider: " << Name << std::endl; ! return true; ! } ! ! bool aedXmlFile::parseScrollBar(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! std::string Orientation = safeExtractString(element, "orientation"); ! aedOrientation orient; ! if(Orientation == "vertical") ! { ! orient = AED_VERTICAL; ! } ! else if(Orientation == "horizontal") ! { ! orient = AED_HORIZONTAL; ! } ! else ! { // A required attribute was missing. Return true to continue // parsing xml, just don't create this widget ! return true; ! } ! aedScrollBar * scrollbar = new aedScrollBar(orient); ! scrollbar->create(parent, Position, Caption); ! scrollbar->setId(Name); ! int ! Min = safeExtractInt(element, "min"); ! int ! Max = safeExtractInt(element, "max"); ! int ! Value = safeExtractInt(element, "value"); ! ! scrollbar->setRange(Min, Max); ! scrollbar->setValue(Value); ! std::cout << "parseScrollBar: " << Name << std::endl; ! return true; ! } ! ! bool aedXmlFile::parseRadioButtonGroup(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedRadioButtonGroup * radiobuttongroup = new aedRadioButtonGroup(); ! radiobuttongroup->create(parent, Position, Caption); ! radiobuttongroup->setId(Name); ! std::cout << "parseRadioButtonGroup: " << Name << std::endl; ! TiXmlElement * ChildElement = element->FirstChildElement(); ! while(ChildElement) ! { ! if(std::string(ChildElement->Value()) == "radiobutton") ! { ! std::string Text = safeExtractString(ChildElement, "caption"); ! std::string Name = safeExtractString(ChildElement, "name"); ! radiobuttongroup->addButton(Text); ! std:: ! cerr << "Added radio button: " << Name << " : " << Text << std:: ! endl; ! } ! ChildElement = ChildElement->NextSiblingElement(); ! } ! int ! SelectedButton = safeExtractInt(element, "selected"); ! ! radiobuttongroup->selectButton(SelectedButton); ! return true; ! } ! ! bool aedXmlFile::parseListBox(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedListBox * listbox = new aedListBox(); ! listbox->create(parent, Position, Caption); ! listbox->setId(Name); ! std::cout << "parseListBox: " << Name << std::endl; ! TiXmlElement * ListBoxColumnElement = element->FirstChildElement(); ! while(ListBoxColumnElement) ! { ! std::string ColumnType = ! safeExtractString(ListBoxColumnElement, "type"); ! if(ColumnType == "string") ! { ! TiXmlElement * ListBoxElement = ! ListBoxColumnElement->FirstChildElement(); ! while(ListBoxElement) ! { ! if(std::string(ListBoxElement->Value()) == "listboxstringitem") ! { ! std::string Text = ! safeExtractString(ListBoxElement, "caption"); ! std::string Name = ! safeExtractString(ListBoxElement, "name"); ! listbox->add(Text); ! std:: ! cerr << "Added list box item: " << Name << " : " << Text ! << std::endl; ! } ! ListBoxElement = ListBoxElement->NextSiblingElement(); ! } ! ListBoxColumnElement = ListBoxColumnElement->NextSiblingElement(); ! } // else if (ColumnType == "...") // { // } ! } ! return true; ! } ! ! bool aedXmlFile::parseSpinner(TiXmlElement * element, aedWidget * parent) ! { ! aedRect Position = safeExtractPosition(element); ! std::string Name = safeExtractString(element, "name"); ! std::string Caption = safeExtractString(element, "caption"); ! aedSpinner * spinner = new aedSpinner(); ! spinner->create(parent, Position, Caption); ! spinner->setId(Name); ! std::cout << "parseSpinner: " << Name << std::endl; ! return true; ! } ! ! std::string aedXmlFile::safeExtractString(TiXmlElement * element, ! const std:: string & attributeName) ! { ! if(element->Attribute(attributeName) != NULL) ! { ! return element->Attribute(attributeName); ! } ! else ! { ! return ""; ! } ! } ! int ! aedXmlFile::safeExtractInt(TiXmlElement * element, const std::string & attributeName) ! { ! int val = 0; ! ! element->Attribute(attributeName, &val); ! return val; ! } ! ! aedRect aedXmlFile::safeExtractPosition(TiXmlElement * element) ! { ! int ! x, ! y, ! w, ! h; ! ! element->Attribute("x", &x); ! element->Attribute("y", &y); ! element->Attribute("w", &w); ! element->Attribute("h", &h); ! return aedRect(x, y, w, h); ! } ! Index: Makefile.am =================================================================== RCS file: /cvsroot/aedgui/aedGUI/src/Makefile.am,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Makefile.am 20 Dec 2003 19:17:23 -0000 1.33 --- Makefile.am 16 Apr 2004 01:29:56 -0000 1.34 *************** *** 1,4 **** SUBDIRS = tinyxml ! AM_LDFLAGS = @SDL_LIBS@ AM_CXXFLAGS = `@SDL_CONFIG@ --cflags` -I../include/ --- 1,4 ---- SUBDIRS = tinyxml ! AM_LDFLAGS = @SDL_LIBS@ @GL_LIBS@ AM_CXXFLAGS = `@SDL_CONFIG@ --cflags` -I../include/ Index: aedApp.cpp =================================================================== RCS file: /cvsroot/aedgui/aedGUI/src/aedApp.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** aedApp.cpp 20 Dec 2003 19:17:23 -0000 1.31 --- aedApp.cpp 16 Apr 2004 01:29:56 -0000 1.32 *************** *** 44,47 **** --- 44,48 ---- m_cancelButton = NULL; m_UTF8 = false; + m_use_OpenGL = false; pLog = new aedLog; Index: aedWindow.cpp =================================================================== RCS file: /cvsroot/aedgui/aedGUI/src/aedWindow.cpp,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** aedWindow.cpp 9 Apr 2004 05:03:00 -0000 1.69 --- aedWindow.cpp 16 Apr 2004 01:29:56 -0000 1.70 *************** *** 119,126 **** } 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); --- 119,137 ---- } aedColor temp(0, 0, 255, 255); ! void* screenORrect = NULL; ! aedRect rect; ! if(pApp->usesOpenGL()) ! { ! rect = getRealPos(); ! screenORrect = ▭ ! } ! else ! { ! screenORrect = m_Surface; ! } ! // we need to lock the surface before touching its pixels... SLOCK(m_Surface); ! DrawRect(screenORrect, TitleBarX1, TitleBarY1, TitleBarX2, TitleBarY2, temp.getUint32(m_Surface)); SUNLOCK(m_Surface); Index: aedWidget.cpp =================================================================== RCS file: /cvsroot/aedgui/aedGUI/src/aedWidget.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** aedWidget.cpp 6 Feb 2004 05:10:05 -0000 1.10 --- aedWidget.cpp 16 Apr 2004 01:29:56 -0000 1.11 *************** *** 5,8 **** --- 5,9 ---- #include "drawlibs.h" #include "rint.h" + #include "SDL_opengl.h" // flags used in findChildAtCoord() *************** *** 470,473 **** --- 471,488 ---- if(!isVisible()) return; + + if((pApp->getRoot() == this)&&(pApp->usesOpenGL())) + { + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); + glOrtho(0, m_ScreenWidth,m_ScreenHeight,0, 0, 1); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + //glDisable(GL_DEPTH_TEST); + fprintf(stdout,"OpenGL Set\r\n"); + //OpenGL needs everything to be drawn each frame + makeAllDirty(); + } if(!screen) *************** *** 511,515 **** --- 526,541 ---- // always call renderAll on the root widget if(pApp->getRoot() == this) + { pUpdateMgr->updateRects(screen); + if(pApp->usesOpenGL()) + { + glMatrixMode(GL_PROJECTION); + glPopMatrix(); + glMatrixMode(GL_MODELVIEW); + //glEnable(GL_DEPTH_TEST); + + fprintf(stdout,"OpenGL Reset\r\n"); + } + } } Index: aedTheme.cpp =================================================================== RCS file: /cvsroot/aedgui/aedGUI/src/aedTheme.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** aedTheme.cpp 6 Nov 2003 18:46:36 -0000 1.23 --- aedTheme.cpp 16 Apr 2004 01:29:56 -0000 1.24 *************** *** 40,48 **** { aedFont *font = widget->getFont(); std::string caption = widget->getCaption(); int sy, maxWidth = 18, maxHeight = 18; SDL_Rect gradRect; ! Uint32 borderColor; if(!caption.empty()) --- 40,59 ---- { aedFont *font = widget->getFont(); + void* screenORrect=NULL; + aedRect wdRect = widget->getRealPos(); + if(pApp->usesOpenGL()) + { + screenORrect = &wdRect; + } + else + { + screenORrect = screen; + } std::string caption = widget->getCaption(); int sy, maxWidth = 18, maxHeight = 18; SDL_Rect gradRect; ! //Uint32 borderColor; ! aedColor borderColor; if(!caption.empty()) *************** *** 62,72 **** if(widget->getActiveBorder()) { ! borderColor = SDL_MapRGBA(screen->format, 80, 80, 255, ! PROCESS_ALPHA(255, widget->getAlphaValue())); } else { ! borderColor = SDL_MapRGBA(screen->format, 0, 0, 0, ! PROCESS_ALPHA(60, widget->getAlphaValue())); } --- 73,83 ---- if(widget->getActiveBorder()) { ! borderColor.setAllColors(80, 80, 255, ! PROCESS_ALPHA(255, widget->getAlphaValue())); } else { ! borderColor.setAllColors(0, 0, 0, ! PROCESS_ALPHA(60, widget->getAlphaValue())); } *************** *** 83,106 **** SLOCK(screen); ! DrawPixel(screen, 2, sy + 2, borderColor); ! DrawPixel(screen, 2, sy + maxHeight - 2, borderColor); ! DrawPixel(screen, maxWidth - 2, sy + 2, borderColor); ! DrawPixel(screen, maxWidth - 2, sy + maxHeight - 2, borderColor); ! DrawLine(screen, 2, sy + 1, maxWidth - 3, sy + 1, borderColor); ! DrawLine(screen, 1, sy + 2, 1, sy + maxHeight - 3, borderColor); ! DrawLine(screen, maxWidth - 1, sy + 2, maxWidth - 1, sy + maxHeight - 3, borderColor); ! DrawLine(screen, 2, sy + maxHeight - 1, maxWidth - 3, sy + maxHeight - 1, borderColor); ! borderColor = ! SDL_MapRGBA(screen->format, 255, 255, 255, PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawLine(screen, 2, sy + 2, 2, sy + maxHeight - 3, borderColor); ! DrawLine(screen, maxWidth - 2, sy + 2, maxWidth - 2, sy + maxHeight - 3, borderColor); ! DrawLine(screen, 2, sy + 2, maxWidth - 3, sy + 2, borderColor); ! DrawLine(screen, 2, sy + maxHeight - 2, maxWidth - 3, sy + maxHeight - 2, borderColor); --- 94,116 ---- SLOCK(screen); ! DrawPixel(screenORrect, 2, sy + 2, borderColor); ! DrawPixel(screenORrect, 2, sy + maxHeight - 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, sy + 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, sy + maxHeight - 2, borderColor); ! DrawLine(screenORrect, 2, sy + 1, maxWidth - 3, sy + 1, borderColor); ! DrawLine(screenORrect, 1, sy + 2, 1, sy + maxHeight - 3, borderColor); ! DrawLine(screenORrect, maxWidth - 1, sy + 2, maxWidth - 1, sy + maxHeight - 3, borderColor); ! DrawLine(screenORrect, 2, sy + maxHeight - 1, maxWidth - 3, sy + maxHeight - 1, borderColor); ! borderColor.setAllColors(255, 255, 255, PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawLine(screenORrect, 2, sy + 2, 2, sy + maxHeight - 3, borderColor); ! DrawLine(screenORrect, maxWidth - 2, sy + 2, maxWidth - 2, sy + maxHeight - 3, borderColor); ! DrawLine(screenORrect, 2, sy + 2, maxWidth - 3, sy + 2, borderColor); ! DrawLine(screenORrect, 2, sy + maxHeight - 2, maxWidth - 3, sy + maxHeight - 2, borderColor); *************** *** 197,200 **** --- 207,221 ---- aedTheme::drawScrollBar(aedScrollBar * widget, SDL_Surface * screen) { + void* screenORrect=NULL; + aedRect wdRect = widget->getRealPos(); + if(pApp->usesOpenGL()) + { + screenORrect = &wdRect; + } + else + { + screenORrect = screen; + } + Uint16 maxHeight = screen->h - 1; Uint16 maxWidth = screen->w - 1; *************** *** 221,232 **** SLOCK(screen); ! Uint32 borderColor = SDL_MapRGBA(screen->format, 0, 0, 0, ! PROCESS_ALPHA(60, ! widget->getAlphaValue())); ! DrawLine(screen, -1, 0, maxWidth, 0, borderColor); ! DrawLine(screen, 0, 0, 0, maxHeight, borderColor); ! DrawLine(screen, maxWidth, 0, maxWidth, maxHeight, borderColor); ! DrawLine(screen, 0, maxHeight, maxWidth, maxHeight, borderColor); SUNLOCK(screen); } --- 242,253 ---- SLOCK(screen); ! aedColor borderColor(0, 0, 0, ! PROCESS_ALPHA(60, ! widget->getAlphaValue())); ! DrawLine(screenORrect, -1, 0, maxWidth, 0, borderColor); ! DrawLine(screenORrect, 0, 0, 0, maxHeight, borderColor); ! DrawLine(screenORrect, maxWidth, 0, maxWidth, maxHeight, borderColor); ! DrawLine(screenORrect, 0, maxHeight, maxWidth, maxHeight, borderColor); SUNLOCK(screen); } *************** *** 235,238 **** --- 256,269 ---- aedTheme::drawSlider(aedSlider * widget, SDL_Surface * screen) { + void* screenORrect=NULL; + aedRect wdRect = widget->getRealPos(); + if(pApp->usesOpenGL()) + { + screenORrect = &wdRect; + } + else + { + screenORrect = screen; + } Uint16 maxHeight = screen->h - 1; Uint16 maxWidth = screen->w - 1; *************** *** 260,271 **** SLOCK(screen); ! Uint32 borderColor = SDL_MapRGBA(screen->format, 0, 0, 0, ! PROCESS_ALPHA(60, ! widget->getAlphaValue())); ! ! DrawLine(screen, -1, 0, maxWidth, 0, borderColor); ! DrawLine(screen, 0, 0, 0, maxHeight, borderColor); ! DrawLine(screen, maxWidth, 0, maxWidth, maxHeight, borderColor); ! DrawLine(screen, 0, maxHeight, maxWidth, maxHeight, borderColor); SUNLOCK(screen); --- 291,302 ---- SLOCK(screen); ! aedColor borderColor(0, 0, 0, ! PROCESS_ALPHA(60, ! widget->getAlphaValue())); ! ! DrawLine(screenORrect, -1, 0, maxWidth, 0, borderColor); ! DrawLine(screenORrect, 0, 0, 0, maxHeight, borderColor); ! DrawLine(screenORrect, maxWidth, 0, maxWidth, maxHeight, borderColor); ! DrawLine(screenORrect, 0, maxHeight, maxWidth, maxHeight, borderColor); SUNLOCK(screen); *************** *** 275,278 **** --- 306,319 ---- aedTheme::drawFrame(aedFrame * widget, SDL_Surface * screen) { + void* screenORrect=NULL; + aedRect wdRect = widget->getRealPos(); + if(pApp->usesOpenGL()) + { + screenORrect = &wdRect; + } + else + { + screenORrect = screen; + } Uint16 minY = 0; Uint16 maxHeight = screen->h - 1; *************** *** 284,311 **** SLOCK(screen); ! Uint32 borderColor = SDL_MapRGBA(screen->format, 0, 0, 0, ! PROCESS_ALPHA(60, ! widget->getAlphaValue())); ! DrawPixel(screen, 2, minY + 2, borderColor); ! DrawPixel(screen, 2, maxHeight - 2, borderColor); ! DrawPixel(screen, maxWidth - 2, minY + 2, borderColor); ! DrawPixel(screen, maxWidth - 2, maxHeight - 2, borderColor); ! DrawLine(screen, 2, minY + 1, maxWidth - 3, minY + 1, borderColor); ! DrawLine(screen, 1, minY + 2, 1, maxHeight - 3, borderColor); ! DrawLine(screen, maxWidth - 1, minY + 2, maxWidth - 1, maxHeight - 3, borderColor); ! DrawLine(screen, 2, maxHeight - 1, maxWidth - 3, maxHeight - 1, borderColor); ! borderColor = ! SDL_MapRGBA(screen->format, 255, 255, 255, PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawLine(screen, 2, minY + 2, 2, maxHeight - 3, borderColor); ! DrawLine(screen, maxWidth - 2, minY + 2, maxWidth - 2, maxHeight - 3, borderColor); ! DrawLine(screen, 2, minY + 2, maxWidth - 3, minY + 2, borderColor); ! DrawLine(screen, 2, maxHeight - 2, maxWidth - 3, maxHeight - 2, borderColor); --- 325,351 ---- SLOCK(screen); ! aedColor borderColor(0, 0, 0, ! PROCESS_ALPHA(60, ! widget->getAlphaValue())); ! DrawPixel(screenORrect, 2, minY + 2, borderColor); ! DrawPixel(screenORrect, 2, maxHeight - 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, minY + 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, maxHeight - 2, borderColor); ! DrawLine(screenORrect, 2, minY + 1, maxWidth - 3, minY + 1, borderColor); ! DrawLine(screenORrect, 1, minY + 2, 1, maxHeight - 3, borderColor); ! DrawLine(screenORrect, maxWidth - 1, minY + 2, maxWidth - 1, maxHeight - 3, borderColor); ! DrawLine(screenORrect, 2, maxHeight - 1, maxWidth - 3, maxHeight - 1, borderColor); ! borderColor.setAllColors(255, 255, 255, PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawLine(screenORrect, 2, minY + 2, 2, maxHeight - 3, borderColor); ! DrawLine(screenORrect, maxWidth - 2, minY + 2, maxWidth - 2, maxHeight - 3, borderColor); ! DrawLine(screenORrect, 2, minY + 2, maxWidth - 3, minY + 2, borderColor); ! DrawLine(screenORrect, 2, maxHeight - 2, maxWidth - 3, maxHeight - 2, borderColor); *************** *** 357,363 **** aedTheme::drawBorder(aedWidget * widget, SDL_Surface * screen) { Uint16 maxWidth = screen->w - 1; Uint16 maxHeight = screen->h - 1; ! Uint32 borderColor; SLOCK(screen); --- 397,413 ---- aedTheme::drawBorder(aedWidget * widget, SDL_Surface * screen) { + void* screenORrect=NULL; + aedRect wdRect = widget->getRealPos(); + if(pApp->usesOpenGL()) + { + screenORrect = &wdRect; + } + else + { + screenORrect = screen; + } Uint16 maxWidth = screen->w - 1; Uint16 maxHeight = screen->h - 1; ! aedColor borderColor; SLOCK(screen); *************** *** 365,399 **** if(widget->hasFocus() && widget->isEnabled()) { ! borderColor = SDL_MapRGBA(screen->format, 80, 80, 255, ! PROCESS_ALPHA(255, widget->getAlphaValue())); } else { ! borderColor = SDL_MapRGBA(screen->format, 0, 0, 0, ! PROCESS_ALPHA(60, widget->getAlphaValue())); } if(widget->getBorder() == AED_BORDER_ROUND) { ! DrawPixel(screen, 2, 2, borderColor); ! DrawPixel(screen, 2, maxHeight - 2, borderColor); ! DrawPixel(screen, maxWidth - 2, 2, borderColor); ! DrawPixel(screen, maxWidth - 2, maxHeight - 2, borderColor); ! DrawLine(screen, 2, 1, maxWidth - 3, 1, borderColor); ! DrawLine(screen, 1, 2, 1, maxHeight - 3, borderColor); ! DrawLine(screen, maxWidth - 1, 2, maxWidth - 1, maxHeight - 3, borderColor); ! DrawLine(screen, 2, maxHeight - 1, maxWidth - 3, maxHeight - 1, borderColor); ! borderColor = ! SDL_MapRGBA(screen->format, 255, 255, 255, PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawLine(screen, 2, 2, 2, maxHeight - 3, borderColor); ! DrawLine(screen, maxWidth - 2, 2, maxWidth - 2, maxHeight - 3, borderColor); ! DrawLine(screen, 2, 2, maxWidth - 3, 2, borderColor); ! DrawLine(screen, 2, maxHeight - 2, maxWidth - 3, maxHeight - 2, borderColor); } --- 415,448 ---- if(widget->hasFocus() && widget->isEnabled()) { ! borderColor.setAllColors(80, 80, 255, ! PROCESS_ALPHA(255, widget->getAlphaValue())); } else { ! borderColor.setAllColors(0, 0, 0, ! PROCESS_ALPHA(60, widget->getAlphaValue())); } if(widget->getBorder() == AED_BORDER_ROUND) { ! DrawPixel(screenORrect, 2, 2, borderColor); ! DrawPixel(screenORrect, 2, maxHeight - 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, maxHeight - 2, borderColor); ! DrawLine(screenORrect, 2, 1, maxWidth - 3, 1, borderColor); ! DrawLine(screenORrect, 1, 2, 1, maxHeight - 3, borderColor); ! DrawLine(screenORrect, maxWidth - 1, 2, maxWidth - 1, maxHeight - 3, borderColor); ! DrawLine(screenORrect, 2, maxHeight - 1, maxWidth - 3, maxHeight - 1, borderColor); ! borderColor.setAllColors(255, 255, 255, PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawLine(screenORrect, 2, 2, 2, maxHeight - 3, borderColor); ! DrawLine(screenORrect, maxWidth - 2, 2, maxWidth - 2, maxHeight - 3, borderColor); ! DrawLine(screenORrect, 2, 2, maxWidth - 3, 2, borderColor); ! DrawLine(screenORrect, 2, maxHeight - 2, maxWidth - 3, maxHeight - 2, borderColor); } *************** *** 401,408 **** { /* AED_BORDER_SQUARED */ ! DrawLine(screen, -1, 0, maxWidth, 0, borderColor); ! DrawLine(screen, 0, 0, 0, maxHeight, borderColor); ! DrawLine(screen, maxWidth, 0, maxWidth, maxHeight, borderColor); ! DrawLine(screen, 0, maxHeight, maxWidth, maxHeight, borderColor); } --- 450,457 ---- { /* AED_BORDER_SQUARED */ ! DrawLine(screenORrect, -1, 0, maxWidth, 0, borderColor); ! DrawLine(screenORrect, 0, 0, 0, maxHeight, borderColor); ! DrawLine(screenORrect, maxWidth, 0, maxWidth, maxHeight, borderColor); ! DrawLine(screenORrect, 0, maxHeight, maxWidth, maxHeight, borderColor); } *************** *** 412,424 **** // SDL_FillRect(screen, NULL, widget->getBGColor().getUint32(screen)); SLOCK(screen); ! DrawLine(screen, 0, 0, screen->w, 0, SDL_MapRGBA(screen->format, 213, 214, 205, 255)); ! DrawLine(screen, 0, -1, 0, screen->h - 1, SDL_MapRGBA(screen->format, 213, 214, 205, 255)); ! DrawLine(screen, 1, 1, screen->w - 2, 1, SDL_MapRGBA(screen->format, 172, 170, 164, 255)); ! DrawLine(screen, 1, 0, 1, screen->h - 2, SDL_MapRGBA(screen->format, 172, 170, 164, 255)); ! DrawLine(screen, 1, screen->h - 2, screen->w - 2, screen->h - 2, SDL_MapRGBA(screen->format, 246, 246, 238, 255)); SUNLOCK(screen); --- 461,473 ---- // SDL_FillRect(screen, NULL, widget->getBGColor().getUint32(screen)); SLOCK(screen); ! DrawLine(screenORrect, 0, 0, screen->w, 0, SDL_MapRGBA(screen->format, 213, 214, 205, 255)); ! DrawLine(screenORrect, 0, -1, 0, screen->h - 1, SDL_MapRGBA(screen->format, 213, 214, 205, 255)); ! DrawLine(screenORrect, 1, 1, screen->w - 2, 1, SDL_MapRGBA(screen->format, 172, 170, 164, 255)); ! DrawLine(screenORrect, 1, 0, 1, screen->h - 2, SDL_MapRGBA(screen->format, 172, 170, 164, 255)); ! DrawLine(screenORrect, 1, screen->h - 2, screen->w - 2, screen->h - 2, SDL_MapRGBA(screen->format, 246, 246, 238, 255)); SUNLOCK(screen); *************** *** 430,436 **** aedTheme::drawButton(aedButton * widget, SDL_Surface * screen) { Uint16 maxWidth = screen->w - 1; Uint16 maxHeight = screen->h - 1; ! Uint32 borderColor = 0; bool btnDown = widget->getButtonState(); --- 479,495 ---- aedTheme::drawButton(aedButton * widget, SDL_Surface * screen) { + void* screenORrect=NULL; + aedRect wdRect = widget->getRealPos(); + if(pApp->usesOpenGL()) + { + screenORrect = &wdRect; + } + else + { + screenORrect = screen; + } Uint16 maxWidth = screen->w - 1; Uint16 maxHeight = screen->h - 1; ! aedColor borderColor; bool btnDown = widget->getButtonState(); *************** *** 438,454 **** if(widget->isEnabled() && widget->hasFocus()) // We have Focus { ! borderColor = ! SDL_MapRGBA(screen->format, 80, 80, 255, ! PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawPixel(screen, 2, 2, borderColor); ! DrawPixel(screen, 2, maxHeight - 2, borderColor); ! DrawPixel(screen, maxWidth - 2, 2, borderColor); ! DrawPixel(screen, maxWidth - 2, maxHeight - 2, borderColor); ! DrawLine(screen, 2, 1, maxWidth - 3, 1, borderColor); ! DrawLine(screen, 1, 2, 1, maxHeight - 3, borderColor); ! DrawLine(screen, maxWidth - 1, 2, maxWidth - 1, maxHeight - 3, borderColor); ! DrawLine(screen, 2, maxHeight - 1, maxWidth - 3, maxHeight - 1, borderColor); } --- 497,512 ---- if(widget->isEnabled() && widget->hasFocus()) // We have Focus { ! borderColor.setAllColors(80, 80, 255, ! PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawPixel(screenORrect, 2, 2, borderColor); ! DrawPixel(screenORrect, 2, maxHeight - 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, maxHeight - 2, borderColor); ! DrawLine(screenORrect, 2, 1, maxWidth - 3, 1, borderColor); ! DrawLine(screenORrect, 1, 2, 1, maxHeight - 3, borderColor); ! DrawLine(screenORrect, maxWidth - 1, 2, maxWidth - 1, maxHeight - 3, borderColor); ! DrawLine(screenORrect, 2, maxHeight - 1, maxWidth - 3, maxHeight - 1, borderColor); } *************** *** 456,509 **** { // this has to change ! borderColor = ! SDL_MapRGBA(screen->format, 0, 0, 0, PROCESS_ALPHA(60, widget->getAlphaValue())); ! DrawPixel(screen, 2, 2, borderColor); ! DrawPixel(screen, 2, maxHeight - 2, borderColor); ! DrawPixel(screen, maxWidth - 2, 2, borderColor); ! DrawPixel(screen, maxWidth - 2, maxHeight - 2, borderColor); ! DrawLine(screen, 2, 1, maxWidth - 3, 1, borderColor); ! DrawLine(screen, 1, 2, 1, maxHeight - 3, borderColor); ! DrawLine(screen, maxWidth - 1, 2, maxWidth - 1, maxHeight - 3, borderColor); ! DrawLine(screen, 2, maxHeight - 1, maxWidth - 3, maxHeight - 1, borderColor); } // Internal Borders ! borderColor = ! SDL_MapRGBA(screen->format, 255, 255, 255, PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawLine(screen, maxWidth - 2, 2, maxWidth - 2, maxHeight - 3, borderColor); ! DrawLine(screen, 2, maxHeight - 2, maxWidth - 3, maxHeight - 2, borderColor); ! borderColor = ! SDL_MapRGBA(screen->format, 238, 238, 230, PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawLine(screen, 2, 2, 2, maxHeight - 3, borderColor); if(btnDown) { // External Shadow ! borderColor = ! SDL_MapRGBA(screen->format, 0, 0, 0, PROCESS_ALPHA(25, widget->getAlphaValue())); ! DrawLine(screen, 2, 0, maxWidth - 4, 0, borderColor); ! DrawLine(screen, 0, 2, 0, maxHeight - 4, borderColor); ! DrawPixel(screen, 1, 2, borderColor); ! DrawPixel(screen, 2, 1, borderColor); } else { // External Shadow ! borderColor = ! SDL_MapRGBA(screen->format, 0, 0, 0, PROCESS_ALPHA(25, widget->getAlphaValue())); ! DrawLine(screen, 3, maxHeight, maxWidth - 3, maxHeight, borderColor); ! DrawLine(screen, maxWidth, 3, maxWidth, maxHeight - 3, borderColor); ! DrawPixel(screen, maxWidth - 1, maxHeight - 2, borderColor); ! DrawPixel(screen, maxWidth - 2, maxHeight - 1, borderColor); } --- 514,562 ---- { // this has to change ! borderColor.setAllColors(0, 0, 0, PROCESS_ALPHA(60, widget->getAlphaValue())); ! DrawPixel(screenORrect, 2, 2, borderColor); ! DrawPixel(screenORrect, 2, maxHeight - 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, maxHeight - 2, borderColor); ! DrawLine(screenORrect, 2, 1, maxWidth - 3, 1, borderColor); ! DrawLine(screenORrect, 1, 2, 1, maxHeight - 3, borderColor); ! DrawLine(screenORrect, maxWidth - 1, 2, maxWidth - 1, maxHeight - 3, borderColor); ! DrawLine(screenORrect, 2, maxHeight - 1, maxWidth - 3, maxHeight - 1, borderColor); } // Internal Borders ! borderColor.setAllColors(255, 255, 255, PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawLine(screenORrect, maxWidth - 2, 2, maxWidth - 2, maxHeight - 3, borderColor); ! DrawLine(screenORrect, 2, maxHeight - 2, maxWidth - 3, maxHeight - 2, borderColor); ! borderColor.setAllColors(238, 238, 230, PROCESS_ALPHA(255, widget->getAlphaValue())); ! DrawLine(screenORrect, 2, 2, 2, maxHeight - 3, borderColor); if(btnDown) { // External Shadow ! borderColor.setAllColors(0, 0, 0, PROCESS_ALPHA(25, widget->getAlphaValue())); ! DrawLine(screenORrect, 2, 0, maxWidth - 4, 0, borderColor); ! DrawLine(screenORrect, 0, 2, 0, maxHeight - 4, borderColor); ! DrawPixel(screenORrect, 1, 2, borderColor); ! DrawPixel(screenORrect, 2, 1, borderColor); } else { // External Shadow ! borderColor.setAllColors(0, 0, 0, PROCESS_ALPHA(25, widget->getAlphaValue())); ! DrawLine(screenORrect, 3, maxHeight, maxWidth - 3, maxHeight, borderColor); ! DrawLine(screenORrect, maxWidth, 3, maxWidth, maxHeight - 3, borderColor); ! DrawPixel(screenORrect, maxWidth - 1, maxHeight - 2, borderColor); ! DrawPixel(screenORrect, maxWidth - 2, maxHeight - 1, borderColor); } *************** *** 543,546 **** --- 596,609 ---- aedTheme::drawSquareButton(aedButton * widget, SDL_Surface * screen) { + void* screenORrect=NULL; + aedRect wdRect = widget->getRealPos(); + if(pApp->usesOpenGL()) + { + screenORrect = &wdRect; + } + else + { + screenORrect = screen; + } SDL_Color c1, c2; SDL_Rect rect; *************** *** 573,593 **** SLOCK(screen); ! Uint32 borderColor; if(widget->isEnabled() && widget->hasFocus()) { ! borderColor = SDL_MapRGBA(screen->format, 80, 80, 255, PROCESS_ALPHA(255, widget->getAlphaValue())); } else { ! borderColor = SDL_MapRGBA(screen->format, 0, 0, 0, PROCESS_ALPHA(60, widget->getAlphaValue())); } ! DrawLine(screen, -1, 0, maxWidth, 0, borderColor); ! DrawLine(screen, 0, 0, 0, maxHeight, borderColor); ! DrawLine(screen, maxWidth, 0, maxWidth, maxHeight, borderColor); ! DrawLine(screen, 0, maxHeight, maxWidth, maxHeight, borderColor); SUNLOCK(screen); --- 636,656 ---- SLOCK(screen); ! aedColor borderColor; if(widget->isEnabled() && widget->hasFocus()) { ! borderColor.setAllColors(80, 80, 255, PROCESS_ALPHA(255, widget->getAlphaValue())); } else { ! borderColor.setAllColors(0, 0, 0, PROCESS_ALPHA(60, widget->getAlphaValue())); } ! DrawLine(screenORrect, -1, 0, maxWidth, 0, borderColor); ! DrawLine(screenORrect, 0, 0, 0, maxHeight, borderColor); ! DrawLine(screenORrect, maxWidth, 0, maxWidth, maxHeight, borderColor); ! DrawLine(screenORrect, 0, maxHeight, maxWidth, maxHeight, borderColor); SUNLOCK(screen); Index: aedButton.cpp =================================================================== RCS file: /cvsroot/aedgui/aedGUI/src/aedButton.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** aedButton.cpp 6 Nov 2003 18:46:36 -0000 1.23 --- aedButton.cpp 16 Apr 2004 01:29:56 -0000 1.24 *************** *** 121,128 **** a /= 2; ! DrawArrow(m_Surface, m_ButtonType - BUTTON_ARROW_UP, ! m_Surface->w / 2, m_Surface->h / 2, a, ! SDL_MapRGBA(m_Surface->format, 0, 0, 0, 255), ! isMouseOver(), SDL_MapRGBA(m_Surface->format, 0, 0, 0, 255)); } --- 121,141 ---- a /= 2; ! void* screenORrect = NULL; ! aedRect rect = getRealPos(); ! if(pApp->usesOpenGL()) ! { ! screenORrect = ▭ ! } ! else ! { ! screenORrect = m_Surface; ! } ! aedColor arrowColor(0, 0, 0, 255); ! aedColor arrowFillColor(0, 0, 0, 255); ! ! DrawArrow(screenORrect, m_ButtonType - BUTTON_ARROW_UP, ! rect.getWidth()/ 2, rect.getHeight()/ 2, a, ! arrowColor, ! isMouseOver(),arrowFillColor); } Index: aedTextBox.cpp =================================================================== RCS file: /cvsroot/aedgui/aedGUI/src/aedTextBox.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** aedTextBox.cpp 9 Jan 2004 05:49:18 -0000 1.34 --- aedTextBox.cpp 16 Apr 2004 01:29:56 -0000 1.35 *************** *** 393,396 **** --- 393,408 ---- aedColor SelectColor(0, 0, 200, 255); // TODO: This needs to come from the theme + void* screenORrect = NULL; + aedRect rect; + if(pApp->usesOpenGL()) + { + rect = getRealPos(); + screenORrect = ▭ + } + else + { + screenORrect = s1; + } + SLOCK(s1); // TODO: What should selected text look like? int x2 = SelectionStartX + SelectionWidth - 1; *************** *** 398,403 **** if(x2 >= s1->w) x2 = s1->w - 1; ! DrawRect(s1, SelectionStartX, 0, x2, SelectionBoxHeight - 1, ! SelectColor.getUint32(s1)); SUNLOCK(s1); } --- 410,415 ---- if(x2 >= s1->w) x2 = s1->w - 1; ! DrawRect(screenORrect, SelectionStartX, 0, x2, SelectionBoxHeight - 1, ! SelectColor); SUNLOCK(s1); } *************** *** 444,452 **** if(hasFocus() && m_ShowCaret &&... [truncated message content] |