From b9b9ace9a8d2d1c0beda1dc0a2ebc6be9b47c305 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 10 Jun 2007 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.5.3=20-=20Fixed=20some=20spelling=20errors?= =?UTF-8?q?=20in=20'newplugin'=20(thanks=20to=20Ville=20Skytt=C3=A4).=20-?= =?UTF-8?q?=20Fixed=20a=20busy=20loop=20in=20fast=20forward=20if=20the=20n?= =?UTF-8?q?ext=20video=20data=20file=20is=20missing=20=20=20(thanks=20to?= =?UTF-8?q?=20Reinhard=20Nissl).=20-=20Fixed=20handling=20frequencies=20in?= =?UTF-8?q?=20NitFilter::Process()=20(thanks=20to=20Anssi=20Hannula).=20-?= =?UTF-8?q?=20Fixed=20a=20race=20condition=20with=20signal=20handlers=20at?= =?UTF-8?q?=20program=20exit=20(thanks=20to=20Udo=20=20=20Richter).=20-=20?= =?UTF-8?q?Non-primary=20devices=20in=20Transfer=20mode=20are=20now=20also?= =?UTF-8?q?=20used=20for=20recording=20(thanks=20=20=20to=20Anssi=20Hannul?= =?UTF-8?q?a).=20-=20Fixed=20handling=20ChannelUp/Down=20keys=20if=20there?= =?UTF-8?q?=20is=20currently=20a=20replay=20running=20=20=20(thanks=20to?= =?UTF-8?q?=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20The=20new=20SVDRP=20comm?= =?UTF-8?q?and=20REMO=20can=20be=20used=20to=20turn=20VDR's=20remote=20con?= =?UTF-8?q?trol=20off=20and=20=20=20on=20in=20case=20other=20programs=20ne?= =?UTF-8?q?ed=20to=20be=20controlled=20(based=20on=20patches=20from=20Krzy?= =?UTF-8?q?sztof=20=20=20Parma=20and=20Helmut=20Auer).=20-=20Increased=20t?= =?UTF-8?q?he=20maximum=20number=20of=20CA=20system=20ids=20to=20cope=20wi?= =?UTF-8?q?th=20the=20AlphaCrypt=20=20=20CAM's=20version=203.11=20firmware?= =?UTF-8?q?.=20-=20Fixed=20getting=20the=20code=20setting=20from=20the=20l?= =?UTF-8?q?ocale=20(thanks=20to=20Matthias=20Schwarzott).=20-=20Implemente?= =?UTF-8?q?d=20support=20for=20Freetype=20fonts=20(based=20on=20a=20patch?= =?UTF-8?q?=20from=20Alexander=20Riedel).=20=20=20The=20font=20names=20and?= =?UTF-8?q?=20sizes=20can=20be=20adjusted=20in=20the=20"Setup/OSD"=20menu.?= =?UTF-8?q?=20=20=20Note=20that=20VDR=20now=20requires=20freetype=20fonts?= =?UTF-8?q?=20to=20be=20installed=20in=20=20=20/usr/share/fonts/truetype.?= =?UTF-8?q?=20-=20If=20the=20OSD=20device=20in=20use=20has=20at=20least=20?= =?UTF-8?q?8bpp=20bitmap=20depth=20and=20this=20is=20also=20=20=20used=20b?= =?UTF-8?q?y=20the=20current=20skin,=20Freetype=20fonts=20are=20displayed?= =?UTF-8?q?=20"anti-aliased".=20=20=20The=20new=20setup=20parameter=20"OSD?= =?UTF-8?q?/Anti-alias"=20can=20be=20used=20to=20turn=20this=20off.=20-=20?= =?UTF-8?q?The=20new=20function=20cOsd::SetAntiAliasGranularity()=20can=20?= =?UTF-8?q?be=20used=20to=20help=20the=20OSD=20=20=20in=20managing=20the?= =?UTF-8?q?=20available=20color=20palette=20entries=20when=20doing=20anti-?= =?UTF-8?q?aliasing.=20=20=20Skins=20that=20use=208bpp=20bitmaps=20can=20c?= =?UTF-8?q?all=20this=20function=20with=20the=20maximum=20number=20=20=20o?= =?UTF-8?q?f=20colors=20used,=20and=20the=20maximum=20number=20of=20color?= =?UTF-8?q?=20combinations.=20The=20OSD=20will=20=20=20then=20evenly=20spl?= =?UTF-8?q?it=20the=20available=20palette=20entries=20between=20the=20vari?= =?UTF-8?q?ous=20colors=20=20=20combinations,=20so=20that=20fonts=20can=20?= =?UTF-8?q?be=20"anti-aliased".=20By=20default=20a=20total=20of=20=20=2010?= =?UTF-8?q?=20colors=20and=2010=20combinations=20is=20assumed.=20-=20The?= =?UTF-8?q?=20pixel=20fonts=20have=20been=20completely=20removed=20from=20?= =?UTF-8?q?the=20VDR=20source.=20-=20VDR=20is=20now=20"UTF-8=20aware".=20I?= =?UTF-8?q?t=20handles=20strings=20according=20to=20the=20character=20=20?= =?UTF-8?q?=20encoding=20used=20on=20the=20user's=20system.=20All=20intern?= =?UTF-8?q?ationalization=20strings=20and=20=20=20incoming=20SI=20data=20a?= =?UTF-8?q?re=20converted=20to=20the=20system=20encoding.=20-=20Plugins=20?= =?UTF-8?q?that=20handle=20strings=20need=20to=20be=20aware=20that=20on=20?= =?UTF-8?q?systems=20with=20UTF-8=20=20=20encoding=20a=20"character=20symb?= =?UTF-8?q?ol"=20may=20consist=20of=20more=20than=20a=20single=20byte=20in?= =?UTF-8?q?=20=20=20memory.=20The=20functions=20and=20macros=20named=20Utf?= =?UTF-8?q?8...()=20can=20be=20used=20to=20handle=20=20=20strings=20withou?= =?UTF-8?q?t=20needing=20to=20care=20about=20the=20underlying=20character?= =?UTF-8?q?=20encoding=20=20=20(see=20tools.h=20for=20details).=20-=20Even?= =?UTF-8?q?=20though=20the=20weekdays=20of=20repeating=20timers=20are=20pr?= =?UTF-8?q?esented=20to=20the=20user=20as=20UTF-8=20=20=20characters=20in?= =?UTF-8?q?=20the=20OSD,=20the=20timers.conf=20file=20and=20the=20SVDRP=20?= =?UTF-8?q?timer=20commands=20still=20=20=20use=20single=20byte=20characte?= =?UTF-8?q?rs=20("MTWTFSS")=20to=20make=20sure=20this=20information=20is?= =?UTF-8?q?=20handled=20=20=20correctly=20between=20systems=20with=20diffe?= =?UTF-8?q?rent=20character=20encodings.=20-=20Added=20a=20missing=20i18n?= =?UTF-8?q?=20string=20for=20"CAM"=20in=20the=20Turkish=20OSD=20texts.=20-?= =?UTF-8?q?=20Improved=20editing=20strings=20that=20are=20too=20long=20to?= =?UTF-8?q?=20fit=20into=20the=20editable=20area.=20-=20Changes=20to=20the?= =?UTF-8?q?=20OSD=20settings=20in=20the=20"Setup/OSD"=20menu=20now=20immed?= =?UTF-8?q?iately=20take=20effect=20=20=20when=20the=20"Ok"=20key=20is=20p?= =?UTF-8?q?ressed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools.c | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 260 insertions(+), 4 deletions(-) (limited to 'tools.c') diff --git a/tools.c b/tools.c index db79f95..a6af97a 100644 --- a/tools.c +++ b/tools.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.c 1.122 2007/01/05 10:44:57 kls Exp $ + * $Id: tools.c 1.123 2007/06/09 14:21:21 kls Exp $ */ #include "tools.h" @@ -570,6 +570,221 @@ uint64_t cTimeMs::Elapsed(void) return Now() - begin; } +// --- UTF-8 support --------------------------------------------------------- + +static uint SystemToUtf8[128] = { 0 }; + +int Utf8CharLen(const char *s) +{ + if (cCharSetConv::SystemCharacterTable()) + return 1; +#define MT(s, m, v) ((*(s) & (m)) == (v)) // Mask Test + if (MT(s, 0xE0, 0xC0) && MT(s + 1, 0xC0, 0x80)) + return 2; + if (MT(s, 0xF0, 0xE0) && MT(s + 1, 0xC0, 0x80) && MT(s + 2, 0xC0, 0x80)) + return 3; + if (MT(s, 0xF8, 0xF0) && MT(s + 1, 0xC0, 0x80) && MT(s + 2, 0xC0, 0x80) && MT(s + 3, 0xC0, 0x80)) + return 4; + return 1; +} + +uint Utf8CharGet(const char *s, int Length) +{ + if (cCharSetConv::SystemCharacterTable()) + return (uchar)*s < 128 ? *s : SystemToUtf8[(uchar)*s - 128]; + if (!Length) + Length = Utf8CharLen(s); + switch (Length) { + case 2: return ((*s & 0x1F) << 6) | (*(s + 1) & 0x3F); + case 3: return ((*s & 0x0F) << 4) | ((*(s + 1) & 0x3F) << 6) | (*(s + 2) & 0x3F); + case 4: return ((*s & 0x07) << 2) | ((*(s + 1) & 0x3F) << 4) | ((*(s + 2) & 0x3F) << 6) | (*(s + 3) & 0x3F); + } + return *s; +} + +int Utf8CharSet(uint c, char *s) +{ + if (c < 0x80 || cCharSetConv::SystemCharacterTable()) { + if (s) + *s = c; + return 1; + } + if (c < 0x800) { + if (s) { + *s++ = ((c >> 6) & 0x1F) | 0xC0; + *s = (c & 0x3F) | 0x80; + } + return 2; + } + if (c < 0x10000) { + if (s) { + *s++ = ((c >> 12) & 0x0F) | 0xE0; + *s++ = ((c >> 6) & 0x3F) | 0x80; + *s = (c & 0x3F) | 0x80; + } + return 3; + } + if (c < 0x110000) { + if (s) { + *s++ = ((c >> 18) & 0x07) | 0xF0; + *s++ = ((c >> 12) & 0x3F) | 0x80; + *s++ = ((c >> 6) & 0x3F) | 0x80; + *s = (c & 0x3F) | 0x80; + } + return 4; + } + return 0; // can't convert to UTF-8 +} + +int Utf8SymChars(const char *s, int Symbols) +{ + if (cCharSetConv::SystemCharacterTable()) + return Symbols; + int n = 0; + while (*s && Symbols--) { + int sl = Utf8CharLen(s); + s += sl; + n += sl; + } + return n; +} + +int Utf8ToArray(const char *s, uint *a, int Size) +{ + int n = 0; + while (*s && --Size > 0) { + if (cCharSetConv::SystemCharacterTable()) + *a++ = *s++; + else { + int sl = Utf8CharLen(s); + *a++ = Utf8CharGet(s, sl); + s += sl; + } + n++; + } + if (Size > 0) + *a = 0; + return n; +} + +int Utf8FromArray(const uint *a, char *s, int Size, int Max) +{ + int NumChars = 0; + int NumSyms = 0; + while (*a && NumChars < Size) { + if (Max >= 0 && NumSyms++ >= Max) + break; + if (cCharSetConv::SystemCharacterTable()) { + *s++ = *a++; + NumChars++; + } + else { + int sl = Utf8CharSet(*a); + if (NumChars + sl <= Size) { + Utf8CharSet(*a, s); + a++; + s += sl; + NumChars += sl; + } + else + break; + } + } + if (NumChars < Size) + *s = 0; + return NumChars; +} + +// --- cCharSetConv ---------------------------------------------------------- + +char *cCharSetConv::systemCharacterTable = NULL; + +cCharSetConv::cCharSetConv(const char *FromCode, const char *ToCode) +{ + if (!FromCode) + FromCode = systemCharacterTable; + if (!ToCode) + ToCode = "UTF-8"; + cd = (FromCode && ToCode) ? iconv_open(ToCode, FromCode) : (iconv_t)-1; + result = NULL; + length = 0; +} + +cCharSetConv::~cCharSetConv() +{ + free(result); + iconv_close(cd); +} + +void cCharSetConv::SetSystemCharacterTable(const char *CharacterTable) +{ + free(systemCharacterTable); + systemCharacterTable = NULL; + if (!strcasestr(CharacterTable, "UTF")) { + // Set up a map for the character values 128...255: + char buf[129]; + for (int i = 0; i < 128; i++) + buf[i] = i + 128; + buf[129] = 0; + cCharSetConv csc(CharacterTable); + const char *s = csc.Convert(buf); + int i = 0; + while (*s) { + int sl = Utf8CharLen(s); + SystemToUtf8[i] = Utf8CharGet(s, sl); + s += sl; + i++; + } + systemCharacterTable = strdup(CharacterTable); + } +} + +const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength) +{ + if (cd != (iconv_t)-1) { + char *FromPtr = (char *)From; + size_t FromLength = strlen(From); + char *ToPtr = To; + if (!ToPtr) { + length = max(length, FromLength * 2); // some reserve to avoid later reallocations + result = (char *)realloc(result, length); + ToPtr = result; + ToLength = length; + } + else if (!ToLength) + return From; // can't convert into a zero sized buffer + ToLength--; // save space for terminating 0 + char *Converted = ToPtr; + while (FromLength > 0) { + if (iconv(cd, &FromPtr, &FromLength, &ToPtr, &ToLength) == size_t(-1)) { + if (errno == E2BIG || errno == EILSEQ && ToLength < 1) { + if (To) + break; // caller provided a fixed size buffer, but it was too small + // The result buffer is too small, so increase it: + size_t d = ToPtr - result; + size_t r = length / 2; + length += r; + result = (char *)realloc(result, length); + ToLength += r; + ToPtr = result + d; + } + if (errno == EILSEQ) { + // A character can't be converted, so mark it with '?' and proceed: + FromPtr++; + FromLength--; + *ToPtr++ = '?'; + ToLength--; + } + else if (errno != E2BIG) + return From; // unknown error, return original string + } + } + *ToPtr = 0; + return Converted; + } + return From; +} + // --- cString --------------------------------------------------------------- cString::cString(const char *S, bool TakePointer) @@ -607,12 +822,12 @@ cString cString::sprintf(const char *fmt, ...) cString WeekDayName(int WeekDay) { - char buffer[4]; + char buffer[16]; WeekDay = WeekDay == 0 ? 6 : WeekDay - 1; // we start with Monday==0! if (0 <= WeekDay && WeekDay <= 6) { const char *day = tr("MonTueWedThuFriSatSun"); - day += WeekDay * 3; - strn0cpy(buffer, day, sizeof(buffer)); + day += Utf8SymChars(day, WeekDay * 3); + strn0cpy(buffer, day, min(Utf8SymChars(day, 3) + 1, int(sizeof(buffer)))); return buffer; } else @@ -890,6 +1105,47 @@ struct dirent *cReadDir::Next(void) return directory && readdir_r(directory, &u.d, &result) == 0 ? result : NULL; } +// --- cFileNameList --------------------------------------------------------- + +cFileNameList::cFileNameList(const char *Directory) +{ + Load(Directory); +} + +cFileNameList::~cFileNameList() +{ + for (int i = 0; i < Size(); i++) + free(At(i)); +} + +bool cFileNameList::Load(const char *Directory) +{ + if (Directory) { + cReadDir d(Directory); + struct dirent *e; + if (d.Ok()) { + while ((e = d.Next()) != NULL) { + if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) + Append(strdup(e->d_name)); + } + Sort(CompareStrings); + return true; + } + else + LOG_ERROR_STR(Directory); + } + return false; +} + +int cFileNameList::Find(const char *FileName) +{ + for (int i = 0; i < Size(); i++) { + if (!strcmp(FileName, At(i))) + return i; + } + return -1; +} + // --- cFile ----------------------------------------------------------------- bool cFile::files[FD_SETSIZE] = { false }; -- cgit v1.2.3