diff options
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/object.h | 4 | ||||
| -rw-r--r-- | xml/parser.c | 37 |
2 files changed, 22 insertions, 19 deletions
diff --git a/xml/object.h b/xml/object.h index fca86f2..bbc37a0 100644 --- a/xml/object.h +++ b/xml/object.h @@ -1,5 +1,5 @@ /* - * $Id: object.h,v 1.5 2005/01/01 23:44:36 lordjaxom Exp $ + * $Id: object.h,v 1.6 2005/01/26 20:39:12 lordjaxom Exp $ */ #ifndef VDR_TEXT2SKIN_XML_OBJECT_H @@ -73,6 +73,7 @@ private: int mArc; std::string mFg; std::string mBg; + std::string mMask; std::string mMark; std::string mActive; std::string mKeep; @@ -122,6 +123,7 @@ public: const cFont *Font(void) const; const tColor *Fg(void) const; const tColor *Bg(void) const; + const tColor *Mask(void) const; const tColor *Mark(void) const; const tColor *Active(void) const; const tColor *Keep(void) const; diff --git a/xml/parser.c b/xml/parser.c index 0f5a2d4..f573398 100644 --- a/xml/parser.c +++ b/xml/parser.c @@ -1,5 +1,5 @@ /* - * $Id: parser.c,v 1.8 2005/01/20 14:46:12 lordjaxom Exp $ + * $Id: parser.c,v 1.9 2005/01/26 20:39:12 lordjaxom Exp $ */ #include "xml/parser.h" @@ -129,30 +129,31 @@ bool xStartElem(const std::string &name, std::map<std::string,std::string> &attr else { object = new cxObject(display); if (object->ParseType(name)) { - ATTRIB_OPT_NUMBER("x1", object->mPos1.x); - ATTRIB_OPT_NUMBER("y1", object->mPos1.y); - ATTRIB_OPT_NUMBER("x2", object->mPos2.x); - ATTRIB_OPT_NUMBER("y2", object->mPos2.y); - ATTRIB_OPT_FUNC ("condition", object->ParseCondition); + ATTRIB_OPT_NUMBER("x1", object->mPos1.x); + ATTRIB_OPT_NUMBER("y1", object->mPos1.y); + ATTRIB_OPT_NUMBER("x2", object->mPos2.x); + ATTRIB_OPT_NUMBER("y2", object->mPos2.y); + ATTRIB_OPT_FUNC ("condition", object->ParseCondition); if (name == "image") { - ATTRIB_OPT_NUMBER("x", object->mPos1.x); - ATTRIB_OPT_NUMBER("y", object->mPos1.y); - ATTRIB_OPT_NUMBER("x", object->mPos2.x); - ATTRIB_OPT_NUMBER("y", object->mPos2.y); - ATTRIB_OPT_NUMBER("alpha", object->mAlpha); - ATTRIB_OPT_NUMBER("colors", object->mColors); - ATTRIB_OPT_STRING("color", object->mFg); - ATTRIB_OPT_STRING("bgColor", object->mBg); - ATTRIB_MAN_FUNC ("path", object->mPath.Parse); + ATTRIB_OPT_NUMBER("x", object->mPos1.x); + ATTRIB_OPT_NUMBER("y", object->mPos1.y); + ATTRIB_OPT_NUMBER("x", object->mPos2.x); + ATTRIB_OPT_NUMBER("y", object->mPos2.y); + ATTRIB_OPT_NUMBER("alpha", object->mAlpha); + ATTRIB_OPT_NUMBER("colors", object->mColors); + ATTRIB_OPT_STRING("color", object->mFg); + ATTRIB_OPT_STRING("bgColor", object->mBg); + ATTRIB_OPT_STRING("maskColor", object->mMask); + ATTRIB_MAN_FUNC ("path", object->mPath.Parse); } else if (name == "text" || name == "marquee" || name == "blink" || name == "scrolltext") { - ATTRIB_OPT_STRING("color", object->mFg); - ATTRIB_OPT_FUNC ("align", object->ParseAlignment); - ATTRIB_OPT_FUNC ("font", object->ParseFontFace); + ATTRIB_OPT_STRING("color", object->mFg); + ATTRIB_OPT_FUNC ("align", object->ParseAlignment); + ATTRIB_OPT_FUNC ("font", object->ParseFontFace); if (name == "blink") { ATTRIB_OPT_STRING("blinkColor", object->mBg); |