diff options
| -rw-r--r-- | osd.c | 78 | ||||
| -rw-r--r-- | osd.h | 12 |
2 files changed, 44 insertions, 46 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.c 2.15 2011/02/27 10:14:43 kls Exp $ + * $Id: osd.c 2.16 2011/02/27 11:57:37 kls Exp $ */ #include "osd.h" @@ -949,7 +949,7 @@ void cPixmap::SetLayer(int Layer) esyslog("ERROR: pixmap layer %d limited to %d", Layer, MAXPIXMAPLAYERS - 1); Layer = MAXPIXMAPLAYERS - 1; } - if (Layer && Layer != layer) { + if (Layer != layer) { if (Layer > 0 || layer > 0) MarkViewPortDirty(viewPort); layer = Layer; @@ -1089,7 +1089,7 @@ void cPixmapMemory::Fill(tColor Color) Unlock(); } -void cPixmap::DrawPixmap(const cPixmap *Pixmap, const cRect &Dirty, bool Opaque) +void cPixmap::DrawPixmap(const cPixmap *Pixmap, const cRect &Dirty) { if (Pixmap->Tile() && (Pixmap->DrawPort().Point() != cPoint(0, 0) || Pixmap->DrawPort().Size() < Pixmap->ViewPort().Size())) { cPoint t0 = Pixmap->DrawPort().Point().Shifted(Pixmap->ViewPort().Point()); // the origin of the draw port in absolute OSD coordinates @@ -1112,7 +1112,7 @@ void cPixmap::DrawPixmap(const cPixmap *Pixmap, const cRect &Dirty, bool Opaque) Source.Shift(Delta); // Source is now back at the pixmap's draw port location, still in absolute OSD coordinates Source.Shift(-Pixmap->ViewPort().Point()); // Source is now relative to the pixmap's view port again Source.Shift(-Pixmap->DrawPort().Point()); // Source is now relative to the pixmap's data - if (Opaque) + if (Pixmap->Layer() == 0) Copy(Pixmap, Source, Dest); // this is the "background" pixmap else Render(Pixmap, Source, Dest); // all others are alpha blended over the background @@ -1132,7 +1132,7 @@ void cPixmap::DrawPixmap(const cPixmap *Pixmap, const cRect &Dirty, bool Opaque) cPoint Dest = Source.Point().Shifted(-ViewPort().Point()); // remember the destination point Source.Shift(-Pixmap->ViewPort().Point()); // Source is now relative to the pixmap's draw port again Source.Shift(-Pixmap->DrawPort().Point()); // Source is now relative to the pixmap's data - if (Opaque) + if (Pixmap->Layer() == 0) Copy(Pixmap, Source, Dest); // this is the "background" pixmap else Render(Pixmap, Source, Dest); // all others are alpha blended over the background @@ -1662,46 +1662,44 @@ cPixmapMemory *cOsd::RenderPixmaps(void) cPixmapMemory *Pixmap = NULL; if (isTrueColor) { LOCK_PIXMAPS; - for (;;) { - // Collect overlapping dirty rectangles: - cRect d; - for (int i = 0; i < numPixmaps; i++) { - cPixmap *pm = pixmaps[i]; - if (!pm->DirtyViewPort().IsEmpty()) { - if (d.IsEmpty() || d.Intersects(pm->DirtyViewPort())) { - d.Combine(pm->DirtyViewPort()); - pm->SetClean(); - } - } - } - if (d.IsEmpty()) - break; + // Collect overlapping dirty rectangles: + cRect d; + for (int i = 0; i < numPixmaps; i++) { + cPixmap *pm = pixmaps[i]; + if (!pm->DirtyViewPort().IsEmpty()) { + if (d.IsEmpty() || d.Intersects(pm->DirtyViewPort())) { + d.Combine(pm->DirtyViewPort()); + pm->SetClean(); + } + } + } + if (!d.IsEmpty()) { //#define DebugDirty #ifdef DebugDirty - static cRect OldDirty; - cRect NewDirty = d; - d.Combine(OldDirty); - OldDirty = NewDirty; + static cRect OldDirty; + cRect NewDirty = d; + d.Combine(OldDirty); + OldDirty = NewDirty; #endif - Pixmap = new cPixmapMemory(0, d); - Pixmap->Clear(); - // Render the individual pixmaps into the resulting pixmap: - for (int Layer = 0; Layer < MAXPIXMAPLAYERS; Layer++) { - for (int i = 0; i < numPixmaps; i++) { - cPixmap *pm = pixmaps[i]; - if (pm->Layer() == Layer) - Pixmap->DrawPixmap(pm, d, i == 0); - } - } + Pixmap = new cPixmapMemory(0, d); + Pixmap->Clear(); + // Render the individual pixmaps into the resulting pixmap: + for (int Layer = 0; Layer < MAXPIXMAPLAYERS; Layer++) { + for (int i = 0; i < numPixmaps; i++) { + cPixmap *pm = pixmaps[i]; + if (pm->Layer() == Layer) + Pixmap->DrawPixmap(pm, d); + } + } #ifdef DebugDirty - cPixmapMemory DirtyIndicator(7, NewDirty); - static tColor DirtyIndicatorColors[] = { 0x7FFFFF00, 0x7F00FFFF }; - static int DirtyIndicatorIndex = 0; - DirtyIndicator.Fill(DirtyIndicatorColors[DirtyIndicatorIndex]); - DirtyIndicatorIndex = 1 - DirtyIndicatorIndex; - Pixmap->Render(&DirtyIndicator, DirtyIndicator.DrawPort(), DirtyIndicator.ViewPort().Point().Shifted(-Pixmap->ViewPort().Point())); + cPixmapMemory DirtyIndicator(7, NewDirty); + static tColor DirtyIndicatorColors[] = { 0x7FFFFF00, 0x7F00FFFF }; + static int DirtyIndicatorIndex = 0; + DirtyIndicator.Fill(DirtyIndicatorColors[DirtyIndicatorIndex]); + DirtyIndicatorIndex = 1 - DirtyIndicatorIndex; + Pixmap->Render(&DirtyIndicator, DirtyIndicator.DrawPort(), DirtyIndicator.ViewPort().Point().Shifted(-Pixmap->ViewPort().Point())); #endif - } + } } return Pixmap; } @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.h 2.8 2011/02/26 14:10:30 kls Exp $ + * $Id: osd.h 2.9 2011/02/27 11:40:02 kls Exp $ */ #ifndef __OSD_H @@ -465,9 +465,11 @@ protected: ///< The coordinates of Point are relative to the pixmap's draw port. ///< If Point is within the currently visible view port of this pixmap, ///< MarkViewPortDirty() is called with the appropriate value. - virtual void DrawPixmap(const cPixmap *Pixmap, const cRect &Dirty, bool Opaque); - ///< Draws the Dirty part of the given Pixmap into this pixmap. If Opaque - ///< is true, the Pixmap is copied, otherwise it is rendered into this + void SetClean(void); + ///< Resets the "dirty" rectangles of this pixmap. + virtual void DrawPixmap(const cPixmap *Pixmap, const cRect &Dirty); + ///< Draws the Dirty part of the given Pixmap into this pixmap. If the + ///< Pixmap's layer is 0, it is copied, otherwise it is rendered into this ///< pixmap. This function is used only to implement the tile handling ///< in the final rendering to the OSD. public: @@ -524,8 +526,6 @@ public: ///< the surrounding rectangle around all pixels that have been modified since the ///< last time this pixmap has been rendered to the OSD. The rectangle is ///< relative to the draw port's origin. - void SetClean(void); - ///< Resets the "dirty" rectangles of this pixmap. virtual void SetLayer(int Layer); ///< Sets the layer of this pixmap to the given value. ///< If the new layer is greater than zero, the pixmap will be visible. |