diff options
| -rw-r--r-- | PLUGINS/src/skincurses/skincurses.c | 16 | ||||
| -rw-r--r-- | tools.c | 4 | ||||
| -rw-r--r-- | tools.h | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c index f9a030f4..33fe194d 100644 --- a/PLUGINS/src/skincurses/skincurses.c +++ b/PLUGINS/src/skincurses/skincurses.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: skincurses.c 1.12 2007/06/15 12:23:31 kls Exp $ + * $Id: skincurses.c 1.13 2007/06/16 09:05:04 kls Exp $ */ #include <ncurses.h> @@ -20,7 +20,7 @@ static const char *MAINMENUENTRY = NULL; class cCursesFont : public cFont { public: virtual int Width(uint c) const { return 1; } - virtual int Width(const char *s) const { return s ? Utf8NumSyms(s) : 0; } + virtual int Width(const char *s) const { return s ? Utf8StrLen(s) : 0; } virtual int Height(void) const { return 1; } virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {} }; @@ -253,7 +253,7 @@ void cSkinCursesDisplayChannel::Flush(void) { if (!message) { cString date = DayDateTime(); - osd->DrawText(OsdWidth - Utf8NumSyms(date), 0, date, clrWhite, clrBackground, &Font); + osd->DrawText(OsdWidth - Utf8StrLen(date), 0, date, clrWhite, clrBackground, &Font); } osd->Flush(); } @@ -388,7 +388,7 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event) if (Event->Vps() && Event->Vps() != Event->StartTime()) { char *buffer; asprintf(&buffer, " VPS: %s", *Event->GetVpsString()); - osd->DrawText(OsdWidth - Utf8NumSyms(buffer), y, buffer, clrBlack, clrYellow, &Font); + osd->DrawText(OsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font); free(buffer); } y += ts.Height(); @@ -443,7 +443,7 @@ void cSkinCursesDisplayMenu::SetText(const char *Text, bool FixedFont) void cSkinCursesDisplayMenu::Flush(void) { cString date = DayDateTime(); - osd->DrawText(OsdWidth - Utf8NumSyms(date) - 2, 0, date, clrBlack, clrCyan, &Font); + osd->DrawText(OsdWidth - Utf8StrLen(date) - 2, 0, date, clrBlack, clrCyan, &Font); osd->Flush(); } @@ -508,12 +508,12 @@ void cSkinCursesDisplayReplay::SetProgress(int Current, int Total) void cSkinCursesDisplayReplay::SetCurrent(const char *Current) { - osd->DrawText(0, 2, Current, clrWhite, clrBackground, &Font, Utf8NumSyms(Current) + 3); + osd->DrawText(0, 2, Current, clrWhite, clrBackground, &Font, Utf8StrLen(Current) + 3); } void cSkinCursesDisplayReplay::SetTotal(const char *Total) { - osd->DrawText(OsdWidth - Utf8NumSyms(Total), 2, Total, clrWhite, clrBackground, &Font); + osd->DrawText(OsdWidth - Utf8StrLen(Total), 2, Total, clrWhite, clrBackground, &Font); } void cSkinCursesDisplayReplay::SetJump(const char *Jump) @@ -569,7 +569,7 @@ void cSkinCursesDisplayVolume::SetVolume(int Current, int Total, bool Mute) } else { const char *Prompt = tr("Volume "); - int l = Utf8NumSyms(Prompt); + int l = Utf8StrLen(Prompt); int p = (OsdWidth - l) * Current / Total; osd->DrawText(0, 0, Prompt, clrGreen, clrBackground, &Font); osd->DrawRectangle(l, 0, l + p - 1, 0, clrGreen); @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.c 1.126 2007/06/15 13:11:12 kls Exp $ + * $Id: tools.c 1.127 2007/06/16 09:05:11 kls Exp $ */ #include "tools.h" @@ -649,7 +649,7 @@ int Utf8SymChars(const char *s, int Symbols) return n; } -int Utf8NumSyms(const char *s) +int Utf8StrLen(const char *s) { if (cCharSetConv::SystemCharacterTable()) return strlen(s); @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.h 1.99 2007/06/15 12:18:37 kls Exp $ + * $Id: tools.h 1.100 2007/06/16 09:05:22 kls Exp $ */ #ifndef __TOOLS_H @@ -93,7 +93,7 @@ int Utf8CharSet(uint c, char *s = NULL); int Utf8SymChars(const char *s, int Symbols); ///< Returns the number of character bytes at the beginning of the given ///< string that form at most the given number of UTF-8 symbols. -int Utf8NumSyms(const char *s); +int Utf8StrLen(const char *s); ///< Returns the number of UTF-8 symbols formed by the given string of ///< character bytes. int Utf8ToArray(const char *s, uint *a, int Size); |