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 --- tools.h | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) (limited to 'tools.h') diff --git a/tools.h b/tools.h index 5d04807..8911967 100644 --- a/tools.h +++ b/tools.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.h 1.98 2007/06/10 08:46:23 kls Exp $ + * $Id: tools.h 1.102 2007/06/17 11:00:20 kls Exp $ */ #ifndef __TOOLS_H @@ -92,7 +92,15 @@ int Utf8CharSet(uint c, char *s = NULL); ///< is given, only the number of bytes is returned and nothing is copied. 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. + ///< string that form at most the given number of UTF-8 symbols. +int Utf8StrLen(const char *s); + ///< Returns the number of UTF-8 symbols formed by the given string of + ///< character bytes. +char *Utf8Strn0Cpy(char *Dest, const char *Src, int n); + ///< Copies at most n character bytes from Src to Dst, making sure that the + ///< resulting copy ends with a complete UTF-8 symbol. The copy is guaranteed + ///< to be zero terminated. + ///< Returns a pointer to Dest. int Utf8ToArray(const char *s, uint *a, int Size); ///< Converts the given character bytes (including the terminating 0) into an ///< array of UTF-8 symbols of the given Size. Returns the number of symbols @@ -394,7 +402,17 @@ private: mutable int allocated; mutable int size; mutable T *data; - void Realloc(int NewAllocated) const { data = (T *)realloc(data, (allocated = NewAllocated) * sizeof(T)); } + cVector(const cVector &Vector) {} // don't copy... + cVector &operator=(const cVector &Vector) { return *this; } // ...or assign this! + void Realloc(int Index) const + { + if (++Index > allocated) { + data = (T *)realloc(data, Index * sizeof(T)); + for (int i = allocated; i < Index; i++) + data[i] = T(0); + allocated = Index; + } + } public: cVector(int Allocated = 10) { @@ -406,8 +424,9 @@ public: virtual ~cVector() { free(data); } T& At(int Index) const { + Realloc(Index); if (Index >= size) - Realloc(size = Index + 1); + size = Index + 1; return data[Index]; } const T& operator[](int Index) const @@ -419,12 +438,24 @@ public: return At(Index); } int Size(void) const { return size; } + virtual void Insert(T Data, int Before = 0) + { + if (Before < size) { + Realloc(size); + memmove(&data[Before + 1], &data[Before], (size - Before) * sizeof(T)); + size++; + data[Before] = Data; + } + else + Append(Data); + } virtual void Append(T Data) { if (size >= allocated) Realloc(allocated * 4 / 2); // increase size by 50% data[size++] = Data; } + virtual void Clear(void) {} void Sort(__compar_fn_t Compare) { qsort(data, size, sizeof(T), Compare); @@ -436,12 +467,19 @@ inline int CompareStrings(const void *a, const void *b) return strcmp(*(const char **)a, *(const char **)b); } -class cFileNameList : public cVector { +class cStringList : public cVector { +public: + cStringList(int Allocated = 10): cVector(Allocated) {} + virtual ~cStringList(); + int Find(const char *s) const; + void Sort(void) { cVector::Sort(CompareStrings); } + virtual void Clear(void); + }; + +class cFileNameList : public cStringList { public: cFileNameList(const char *Directory = NULL); - virtual ~cFileNameList(); bool Load(const char *Directory); - int Find(const char *FileName); }; class cHashObject : public cListObject { -- cgit v1.2.3