summaryrefslogtreecommitdiff
path: root/enigma.c
diff options
context:
space:
mode:
Diffstat (limited to 'enigma.c')
-rw-r--r--enigma.c117
1 files changed, 99 insertions, 18 deletions
diff --git a/enigma.c b/enigma.c
index 7c2133b..e1a8811 100644
--- a/enigma.c
+++ b/enigma.c
@@ -269,6 +269,7 @@ private:
int idTitle;
int idEvTitle;
int idEvSubTitle;
+ int idEvCat;
int nBPP;
const cFont *pFontOsdTitle;
@@ -303,6 +304,7 @@ private:
#endif //DISABLE_SIGNALINFO
cString GetChannelName(const cChannel *Channel);
cString GetChannelNumber(const cChannel *Channel, int Number);
+ int FindCatTextAndLen(const cEvent* e, int& xTextWidth, std::string& cat);
public:
cSkinEnigmaDisplayChannel(bool WithInfo);
virtual ~ cSkinEnigmaDisplayChannel();
@@ -346,6 +348,7 @@ cSkinEnigmaDisplayChannel::cSkinEnigmaDisplayChannel(bool WithInfo)
idTitle = -1;
idEvTitle = -1;
idEvSubTitle = -1;
+ idEvCat = -1;
nBPP = 1;
int MessageHeight = 2 * SmallGap + pFontMessage->Height() + 2 * SmallGap;
@@ -780,6 +783,44 @@ cString cSkinEnigmaDisplayChannel::GetChannelNumber(const cChannel *Channel, int
return buffer;
}
+int cSkinEnigmaDisplayChannel::FindCatTextAndLen(const cEvent* e, int& xTextWidth, std::string& cat)
+{
+ int xCatWidth = 0;
+ cat = ExtractAttribute(e->Description(), EVENT_CATEGORY);
+ std::string gen = ExtractAttribute(e->Description(), EVENT_GENRE);
+ if (!cat.empty() && !gen.empty())
+ cat += " - ";
+ cat += gen;
+
+#if VDRVERSNUM >= 10711
+ if (cat.empty()) {
+ std::string strInfo;
+ bool fFirst = true;
+ for (int i = 0; e->Contents(i); i++) {
+ const char *s = e->ContentToString(e->Contents(i));
+ if (!isempty(s)) {
+ if (!fFirst)
+ strInfo += " ";
+ fFirst = false;
+ strInfo += s;
+ }
+ }
+ cat += strInfo;
+ }
+#endif
+
+ if (!cat.empty()) {
+ if (pFontSubtitle->Width(e->ShortText()) > xTextWidth * .5)
+ xCatWidth = std::min((int)(xTextWidth * .3), pFontLanguage->Width(cat.c_str()));
+ else
+ xCatWidth = std::min((int)(xTextWidth * .5), pFontLanguage->Width(cat.c_str()));
+ xTextWidth -= xCatWidth;
+ }
+
+ return xCatWidth;
+
+}
+
void cSkinEnigmaDisplayChannel::SetChannel(const cChannel *Channel, int Number)
{
debug("cSkinEnigmaDisplayChannel::SetChannel()");
@@ -853,10 +894,12 @@ void cSkinEnigmaDisplayChannel::SetEvents(const cEvent *Present,
EnigmaTextEffects.ResetText(idEvTitle, Theme.Color(clrMenuTxtFg), Theme.Color(clrBackground), false);
EnigmaTextEffects.ResetText(idEvSubTitle, Theme.Color(clrMenuItemNotSelectableFg), Theme.Color(clrBackground), false);
- idEvTitle = idEvSubTitle = -1;
+ EnigmaTextEffects.ResetText(idEvCat, Theme.Color(clrMenuItemNotSelectableFg), Theme.Color(clrBackground), false);
+ idEvTitle = idEvSubTitle = idEvCat = -1;
// check epg datas
const cEvent *e = Present; // Current event
+ int wDur = 0;
if (e) {
char sLen[6];
char sNow[12];
@@ -882,8 +925,9 @@ void cSkinEnigmaDisplayChannel::SetEvents(const cEvent *Present,
error("Invalid value for ShowRemaining: %d", EnigmaConfig.showRemaining);
}
}
+ wDur = std::max(pFontTitle->Width(sLen), pFontSubtitle->Width(sNow));
- int xDurationLeft = xEventNowRight - Gap - std::max(pFontTitle->Width(sLen), pFontSubtitle->Width(sNow));
+ int xDurationLeft = xEventNowRight - Gap - wDur;
int xDurationWidth = xEventNowRight - Gap - xDurationLeft;
int xTextLeft = xTimeLeft + xTimeWidth + BigGap;
int xTextWidth = xDurationLeft - xTextLeft - BigGap;
@@ -913,6 +957,17 @@ void cSkinEnigmaDisplayChannel::SetEvents(const cEvent *Present,
Theme.Color(clrSymbolTimerActive),
Theme.Color(clrBackground));
}
+
+ if (EnigmaConfig.showCatGenCon) {
+ std::string cat;
+ int xCatWidth = FindCatTextAndLen(e, xTextWidth, cat);
+
+ // draw category
+ idEvCat = TE_MARQUEE(osd, idEvCat, fScrollOther, xTextLeft + xTextWidth + SmallGap, yEventNowTop + lineHeightTitle, cat.c_str(),
+ Theme.Color(clrMenuItemNotSelectableFg),
+ Theme.Color(clrBackground), pFontSubtitle, nBPP, xCatWidth - SmallGap, pFontSubtitle->Height(), taRight);
+ }
+
// draw shorttext
idEvSubTitle = TE_MARQUEE(osd, idEvSubTitle, fScrollOther, xTextLeft, yEventNowTop + lineHeightTitle, e->ShortText(),
Theme.Color(clrMenuItemNotSelectableFg),
@@ -945,7 +1000,7 @@ void cSkinEnigmaDisplayChannel::SetEvents(const cEvent *Present,
char sLen[6];
snprintf(sLen, sizeof(sLen), "%d'", e->Duration() / 60);
- int xDurationLeft = xEventNowRight - Gap - pFontTitle->Width(sLen);
+ int xDurationLeft = xEventNowRight - Gap - wDur;
int xDurationWidth = xEventNowRight - Gap - xDurationLeft;
int xTextLeft = xTimeLeft + xTimeWidth + BigGap;
int xTextWidth = xDurationLeft - xTextLeft - BigGap;
@@ -966,6 +1021,17 @@ void cSkinEnigmaDisplayChannel::SetEvents(const cEvent *Present,
osd->DrawBitmap(xTimeLeft + (xTimeWidth - bmTimer.Width()) / 2,
yEventNextTop + lineHeightTitle, bmTimer,
Theme.Color(clrSymbolTimerActive), Theme.Color(clrAltBackground));
+
+ if (EnigmaConfig.showCatGenCon) {
+ std::string cat;
+ int xCatWidth = FindCatTextAndLen(e, xTextWidth, cat);
+
+ // draw category
+ osd->DrawText(xTextLeft + xTextWidth + SmallGap, yEventNextTop + lineHeightTitle, cat.c_str(),
+ Theme.Color(clrMenuItemNotSelectableFg),
+ Theme.Color(clrAltBackground), pFontSubtitle, xCatWidth - SmallGap, 0, taRight);
+ }
+
// draw shorttext
osd->DrawText(xTextLeft, yEventNextTop + lineHeightTitle, e->ShortText(),
Theme.Color(clrMenuItemNotSelectableFg),
@@ -1846,6 +1912,20 @@ void cSkinEnigmaDisplayMenu::SetButtons(const char *Red, const char *Green, cons
fLocked = true;
TE_LOCK;
}
+#if VDRVERSNUM < 10730
+ int n0 = 0;
+ int n1 = 1;
+ int n2= 2;
+ int n3 = 3;
+#else
+ int n0 = Setup.ColorKey0;
+ int n1 = Setup.ColorKey1;
+ int n2 = Setup.ColorKey2;
+ int n3 = Setup.ColorKey3;
+#endif
+ const char *lutText[] = { Red, Green, Yellow, Blue };
+ tColor lutFg[] = { clrButtonRedFg, clrButtonGreenFg, clrButtonYellowFg, clrButtonBlueFg };
+ tColor lutBg[] = { clrButtonRedBg, clrButtonGreenBg, clrButtonYellowBg, clrButtonBlueBg };
int w = (xButtonsRight - xButtonsLeft) / 4;
int t3 = xButtonsLeft + xButtonsRight - xButtonsLeft - w;
int t2 = t3 - w;
@@ -1853,32 +1933,33 @@ void cSkinEnigmaDisplayMenu::SetButtons(const char *Red, const char *Green, cons
int t0 = xButtonsLeft;
// draw color buttons
- if (Red)
- osd->DrawText(t0, yButtonsTop, Red, Theme.Color(clrButtonRedFg),
- Theme.Color(clrButtonRedBg), pFontHelpKeys, t1 - t0 + 1,
+ if (lutText[n0])
+ osd->DrawText(t0, yButtonsTop, lutText[n0], Theme.Color(lutFg[n0]),
+ Theme.Color(lutBg[n0]), pFontHelpKeys, t1 - t0 + 1,
yButtonsBottom - yButtonsTop, taCenter);
else {
- osd->DrawRectangle(t0, yButtonsTop, Green ? t1 - 1 : t1, yButtonsBottom - 1, Theme.Color(clrBottomBg));
+ osd->DrawRectangle(t0, yButtonsTop, lutText[n1] ? t1 - 1 : t1, yButtonsBottom - 1, Theme.Color(clrBottomBg));
if (EnigmaConfig.drawRoundCorners) {
osd->DrawEllipse(t0, yButtonsBottom - Roundness, t0 + Roundness - 1, yButtonsBottom - 1, clrTransparent, -3);
}
}
- if (Green)
- osd->DrawText(t1, yButtonsTop, Green, Theme.Color(clrButtonGreenFg),
- Theme.Color(clrButtonGreenBg), pFontHelpKeys, w,
+ if (lutText[n1])
+ osd->DrawText(t1, yButtonsTop, lutText[n1], Theme.Color(lutFg[n1]),
+ Theme.Color(lutBg[n1]), pFontHelpKeys, w,
yButtonsBottom - yButtonsTop, taCenter);
else
- osd->DrawRectangle(t1, yButtonsTop, Yellow ? t1 + w : t2 - 1, yButtonsBottom - 1, Theme.Color(clrBottomBg));
+ osd->DrawRectangle(t1, yButtonsTop, lutText[n2] ? t1 + w : t2 - 1, yButtonsBottom - 1, Theme.Color(clrBottomBg));
- if (Yellow)
- osd->DrawText(t2, yButtonsTop, Yellow, Theme.Color(clrButtonYellowFg),
- Theme.Color(clrButtonYellowBg), pFontHelpKeys, w,
+ if (lutText[n2])
+ osd->DrawText(t2, yButtonsTop, lutText[n2], Theme.Color(lutFg[n2]),
+ Theme.Color(lutBg[n2]), pFontHelpKeys, w,
yButtonsBottom - yButtonsTop, taCenter);
else
- osd->DrawRectangle(t2, yButtonsTop, Blue ? t2 + w : t3 - 1, yButtonsBottom - 1, Theme.Color(clrBottomBg));
- if (Blue)
- osd->DrawText(t3, yButtonsTop, Blue, Theme.Color(clrButtonBlueFg),
- Theme.Color(clrButtonBlueBg), pFontHelpKeys, w,
+ osd->DrawRectangle(t2, yButtonsTop, lutText[n3] ? t2 + w : t3 - 1, yButtonsBottom - 1, Theme.Color(clrBottomBg));
+
+ if (lutText[n3])
+ osd->DrawText(t3, yButtonsTop, lutText[n3], Theme.Color(lutFg[n3]),
+ Theme.Color(lutBg[n3]), pFontHelpKeys, w,
yButtonsBottom - yButtonsTop, taCenter);
else {
osd->DrawRectangle(t3, yButtonsTop, xButtonsRight, yButtonsBottom, Theme.Color(clrBottomBg));
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-05 19:05:03 +0000