From b1e4da3be6552f58f3890bf2ad48879823d2e130 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 17 Jun 2007 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.5.4=20-=20Increased=20APIVERSION=20(forgot?= =?UTF-8?q?=20to=20do=20that=20in=201.5.2=20and=201.5.3).=20-=20Fixed=20a?= =?UTF-8?q?=20crash=20in=20i18n=20character=20set=20conversion=20(thanks?= =?UTF-8?q?=20to=20Alexander=20Riedel,=20=20=20Jose=20Alberto=20Reguero=20?= =?UTF-8?q?and=20Christian=20Wieninger=20for=20patches=20that=20cured=20pa?= =?UTF-8?q?rt=20of=20=20=20the=20problem).=20-=20Adjusted=20the=20'skincur?= =?UTF-8?q?ses'=20plugin=20to=20UTF-8=20handling.=20-=20Using=20nl=5Flangi?= =?UTF-8?q?nfo(CODESET)=20to=20determine=20the=20local=20codeset=20to=20us?= =?UTF-8?q?e=20(thanks=20to=20=20=20Thomas=20G=C3=BCnther).=20The=20codese?= =?UTF-8?q?t=20names=20in=20'libsi/si.c'=20have=20been=20changed=20to=20th?= =?UTF-8?q?e=20=20=20canonical=20spelling=20with=20'-'=20(thanks=20to=20Lu?= =?UTF-8?q?dwig=20Nussel=20for=20pointing=20this=20out).=20-=20Modified=20?= =?UTF-8?q?handling=20invalid=20characters=20in=20VFAT=20mode.=20-=20Repla?= =?UTF-8?q?ced=20strn0cpy()=20with=20Utf8Strn0Cpy()=20where=20necessary.?= =?UTF-8?q?=20-=20Now=20using=20'fontconfig'=20to=20determine=20which=20fo?= =?UTF-8?q?nts=20to=20use=20(thanks=20to=20Anssi=20Hannula=20=20=20for=20c?= =?UTF-8?q?ode=20and=20hints=20on=20how=20to=20do=20this).=20-=20If=20no?= =?UTF-8?q?=20fonts=20are=20installed,=20VDR=20now=20uses=20a=20dummy=20fo?= =?UTF-8?q?nt=20that=20doesn't=20actually=20draw=20=20=20any=20text,=20and?= =?UTF-8?q?=20logs=20an=20error=20message.=20-=20The=20new=20function=20cF?= =?UTF-8?q?ont::CreateFont()=20can=20be=20used=20by=20plugins=20to=20creat?= =?UTF-8?q?e=20and=20use=20=20=20fonts=20of=20their=20own,=20independent?= =?UTF-8?q?=20of=20VDR's=20standard=20fonts.=20-=20Updated=20the=20Finnish?= =?UTF-8?q?=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Change?= =?UTF-8?q?d=20the=20parameter=20"OSD=20font"=20to=20"Default=20font"=20in?= =?UTF-8?q?=20"Setup/OSD"=20(suggested=20=20=20by=20Rolf=20Ahrenberg).=20-?= =?UTF-8?q?=20Fixed=20handling=20detached=20processes=20in=20SystemExec()?= =?UTF-8?q?=20(thanks=20to=20Udo=20Richter).=20-=20The=20info.vdr=20file?= =?UTF-8?q?=20now=20also=20stores=20the=20name=20of=20the=20channel,=20and?= =?UTF-8?q?=20the=20new=20function=20=20=20cRecordingInfo::ChannelName()?= =?UTF-8?q?=20returns=20this=20information=20if=20available=20(based=20on?= =?UTF-8?q?=20=20=20a=20patch=20from=20Alexander=20Hans).=20-=20The=20new?= =?UTF-8?q?=20function=20cOsd::SetOsdPosition()=20can=20be=20used=20to=20d?= =?UTF-8?q?ynamically=20change=20the=20=20=20position=20and=20size=20of=20?= =?UTF-8?q?the=20OSD=20(based=20on=20a=20request=20from=20Christoph=20Haub?= =?UTF-8?q?rich).=20=20=20Plugins=20that=20implement=20skins=20should=20no?= =?UTF-8?q?=20longer=20use=20Setup.OSDWidth=20etc.=20directly,=20=20=20but?= =?UTF-8?q?=20should=20rather=20use=20cOsd::OsdWidth()=20etc.=20instead.?= =?UTF-8?q?=20=20=20Currently=20a=20change=20to=20the=20OSD=20position=20w?= =?UTF-8?q?ill=20only=20apply=20to=20newly=20opened=20OSDs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PLUGINS/src/skincurses/HISTORY | 4 ++++ PLUGINS/src/skincurses/Makefile | 4 ++-- PLUGINS/src/skincurses/skincurses.c | 26 +++++++++++++------------- 3 files changed, 19 insertions(+), 15 deletions(-) (limited to 'PLUGINS') diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY index 96ff93c..3204f20 100644 --- a/PLUGINS/src/skincurses/HISTORY +++ b/PLUGINS/src/skincurses/HISTORY @@ -39,3 +39,7 @@ VDR Plugin 'skincurses' Revision History 2006-09-10: Version 0.0.8 - The size of the OSD is now adjusted to the size of the console window. + +2007-06-15: Version 0.1.0 + +- Implemented UTF-8 handling. diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile index 4f83614..a52f409 100644 --- a/PLUGINS/src/skincurses/Makefile +++ b/PLUGINS/src/skincurses/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $ +# $Id: Makefile 1.8 2007/06/10 16:19:08 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -66,7 +66,7 @@ $(DEPFILE): Makefile all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(OBJS) - $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncurses -o $@ + $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c index 243ddce..33fe194 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.11 2006/09/10 14:23:55 kls Exp $ + * $Id: skincurses.c 1.13 2007/06/16 09:05:04 kls Exp $ */ #include @@ -11,7 +11,7 @@ #include #include -static const char *VERSION = "0.0.8"; +static const char *VERSION = "0.1.0"; static const char *DESCRIPTION = "A text only skin"; static const char *MAINMENUENTRY = NULL; @@ -19,12 +19,10 @@ static const char *MAINMENUENTRY = NULL; class cCursesFont : public cFont { public: - cCursesFont(void): cFont(NULL) {} - virtual int Width(unsigned char c) const { return 1; } - virtual int Width(const char *s) const { return s ? strlen(s) : 0; } - virtual int Height(unsigned char c) const { return 1; } - virtual int Height(const char *s) const { return 1; } + virtual int Width(uint c) const { return 1; } + 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 {} }; static const cCursesFont Font; @@ -135,6 +133,8 @@ void cCursesOsd::RestoreRegion(void) void cCursesOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment) { + if (!s) + return; int w = Font->Width(s); int h = Font->Height(); if (Width || Height) { @@ -253,7 +253,7 @@ void cSkinCursesDisplayChannel::Flush(void) { if (!message) { cString date = DayDateTime(); - osd->DrawText(OsdWidth - strlen(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 - strlen(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 - strlen(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, strlen(Current) + 3); + osd->DrawText(0, 2, Current, clrWhite, clrBackground, &Font, Utf8StrLen(Current) + 3); } void cSkinCursesDisplayReplay::SetTotal(const char *Total) { - osd->DrawText(OsdWidth - strlen(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 = strlen(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); -- cgit v1.2.3