Reformatted source (into ANSI-C style)

1 files changed, 218 insertions, 218 deletions

diff --git a/anyfont.cpp b/anyfont.cpp
index 9022036..c230cbc 100644
--- a/anyfont.cpp
+++ b/anyfont.cpp
@@ -18,294 +18,294 @@ anyFont::anyFont(cOsd *_osd,const cFont::tPixelData *fd,int fheight,int transpar
 anyFont::anyFont(cOsdBase *_osd,const cFont::tPixelData *fd,int fheight,int transparent)
 #endif
 {
-	osd=_osd;
+    osd=_osd;
 #if VDRVERSNUM >= 10503
 #if VDRVERSNUM >= 10504
-	Font = cFont::CreateFont(Setup.FontOsd, fheight);
+    Font = cFont::CreateFont(Setup.FontOsd, fheight);
 #else
-	Font = new cFreetypeFont(*AddDirectory(FONTDIR, Setup.FontOsd, fheight);
+    Font = new cFreetypeFont(*AddDirectory(FONTDIR, Setup.FontOsd, fheight);
 #endif
-	if (!Font || !Font->Height())
-		Font = cFont::GetFont(fontSml);
+    if (!Font || !Font->Height())
+        Font = cFont::GetFont(fontSml);
 #else
-	FontData=fd;
-	FontHeight=fheight;
+    FontData=fd;
+    FontHeight=fheight;
 #endif
-	trans=transparent;
+    trans=transparent;
 }
 int anyFont::Height(void)
 {
 #if VDRVERSNUM >= 10503
-	return Font->Height();
+    return Font->Height();
 #else
-	return FontHeight-2-2;
+    return FontHeight-2-2;
 #endif
 }
-int anyFont::Width(const char *txt) 
+int anyFont::Width(const char *txt)
 {
-	int w = 0;
-	while (txt && *txt) w += Width(*txt++);
-	return w;
+    int w = 0;
+    while (txt && *txt) w += Width(*txt++);
+    return w;
 }
-int anyFont::LargeWidth(const char *txt) 
+int anyFont::LargeWidth(const char *txt)
 {
-	int w = 0;
-	while (txt && *txt) w += Width(*txt++);
-	return w*2;
+    int w = 0;
+    while (txt && *txt) w += Width(*txt++);
+    return w*2;
 }
-int anyFont::Width(char c) 
+int anyFont::Width(char c)
 {
 #if VDRVERSNUM >= 10503
-	return Font->Width(c);
+    return Font->Width(c);
 #else
-	if ((int)FontData[(((unsigned char)c)-32)*(FontHeight)]>100)
-	{
-		mzlog(1," big letter error %c: %d",c,(int)FontData[(((unsigned char)c)-32)*(FontHeight)]);
-		return 100;
-	}
-	return (int)FontData[(((unsigned char)c)-32)*(FontHeight)];
+    if ((int)FontData[(((unsigned char)c)-32)*(FontHeight)]>100)
+    {
+        mzlog(1," big letter error %c: %d",c,(int)FontData[(((unsigned char)c)-32)*(FontHeight)]);
+        return 100;
+    }
+    return (int)FontData[(((unsigned char)c)-32)*(FontHeight)];
 #endif
 }
-int anyFont::LargeWidth(char c) 
+int anyFont::LargeWidth(char c)
 {
 #if VDRVERSNUM >= 10503
-	return Font->Width(c);
+    return Font->Width(c);
 #else
-	if ((int)FontData[(((unsigned char)c)-32)*(FontHeight)]>100)
-	{
-		mzlog(1," big letter error %c: %d",c,(int)FontData[(((unsigned char)c)-32)*(FontHeight)]);
-		return 100;
-	}
-	return (int)FontData[(((unsigned char)c)-32)*(FontHeight)]*2;
+    if ((int)FontData[(((unsigned char)c)-32)*(FontHeight)]>100)
+    {
+        mzlog(1," big letter error %c: %d",c,(int)FontData[(((unsigned char)c)-32)*(FontHeight)]);
+        return 100;
+    }
+    return (int)FontData[(((unsigned char)c)-32)*(FontHeight)]*2;
 #endif
 }
 #if VDRVERSNUM >= 10307
 int anyFont::Text(int x, int y, const char *txt, tColor fg, tColor bg)
 #else
-int anyFont::Text(int x, int y, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh) 
+int anyFont::Text(int x, int y, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh)
 #endif
 {
 #if VDRVERSNUM >= 10503
-	osd->DrawText(x, y, txt, fg, trans ? clrTransparent : bg, Font);
-	return x += Font->Width(txt);
+    osd->DrawText(x, y, txt, fg, trans ? clrTransparent : bg, Font);
+    return x += Font->Width(txt);
 #else
-	unsigned int pxl;
-	int row,col;
+    unsigned int pxl;
+    int row,col;
 
-	while (txt && *txt)
-	{
-		for (row=0; row<Height()+2; row++) 
-		{
-			pxl = FontData[(((unsigned char)*txt)-32)*(FontHeight)+row+2];
+    while (txt && *txt)
+    {
+        for (row=0; row<Height()+2; row++)
+        {
+            pxl = FontData[(((unsigned char)*txt)-32)*(FontHeight)+row+2];
 
-			// XXX maybe increment col before starting?
-			for (col=Width(*txt); col>=0; col--) 
-			{
-				if (!trans || pxl&1)
+            // XXX maybe increment col before starting?
+            for (col=Width(*txt); col>=0; col--)
+            {
+                if (!trans || pxl&1)
 #if VDRVERSNUM >= 10307
-					osd->DrawRectangle(x+col-1,y+row,x+col-1,y+row,(pxl&1) ? fg : bg);
+                    osd->DrawRectangle(x+col-1,y+row,x+col-1,y+row,(pxl&1) ? fg : bg);
 #else
-					osd->Fill         (x+col-1,y+row,x+col-1,y+row,(pxl&1) ? fg : bg,wh);
+    osd->Fill         (x+col-1,y+row,x+col-1,y+row,(pxl&1) ? fg : bg,wh);
 #endif
-				pxl >>= 1; 
-			}
-		}
-		x += Width(*txt++);
-	}
-	return x;
+                pxl >>= 1;
+            }
+        }
+        x += Width(*txt++);
+    }
+    return x;
 #endif
 }
 #if VDRVERSNUM >= 10307
 int anyFont::LargeText(int x, int y, const char *txt, tColor fg, tColor bg)
 #else
-int anyFont::LargeText(int x, int y, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh) 
+int anyFont::LargeText(int x, int y, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh)
 #endif
 {
 #if VDRVERSNUM >= 10503
-	osd->DrawText(x, y, txt, fg, trans ? clrTransparent : bg, Font);
-	return x + Font->Width(txt);
+    osd->DrawText(x, y, txt, fg, trans ? clrTransparent : bg, Font);
+    return x + Font->Width(txt);
 #else
-	unsigned int pxl;
-	int row,col;
+    unsigned int pxl;
+    int row,col;
 
-	while (txt && *txt)
-	{
-		for (row=0; row<Height(); row++) 
-		{
-			pxl = FontData[(((unsigned char)*txt)-32)*(FontHeight)+row+2];
+    while (txt && *txt)
+    {
+        for (row=0; row<Height(); row++)
+        {
+            pxl = FontData[(((unsigned char)*txt)-32)*(FontHeight)+row+2];
 
-			// XXX maybe increment col befor starting?
-			for (col=Width(*txt); col>=0; col--) 
-			{
-				if (!trans || pxl&1)
+            // XXX maybe increment col befor starting?
+            for (col=Width(*txt); col>=0; col--)
+            {
+                if (!trans || pxl&1)
 #if VDRVERSNUM >= 10307
-					osd->DrawRectangle(x+(col-1)*2,y+row,x+(col-1)*2+1,y+row,(pxl&1) ? fg : bg);
+                    osd->DrawRectangle(x+(col-1)*2,y+row,x+(col-1)*2+1,y+row,(pxl&1) ? fg : bg);
 #else
-					osd->Fill         (x+(col-1)*2,y+row,x+(col-1)*2+1,y+row,(pxl&1) ? fg : bg,wh);
+    osd->Fill         (x+(col-1)*2,y+row,x+(col-1)*2+1,y+row,(pxl&1) ? fg : bg,wh);
 #endif
-				pxl >>= 1; 
-			}
-		}
-		x += LargeWidth(*txt++);
-	}
-	return x;
+                pxl >>= 1;
+            }
+        }
+        x += LargeWidth(*txt++);
+    }
+    return x;
 #endif
 }
 #if VDRVERSNUM >= 10307
 int anyFont::Text(int x, int y, int w, int h, const char *txt, tColor fg, tColor bg)
 #else
-int anyFont::Text(int x, int y, int w, int h, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh) 
+int anyFont::Text(int x, int y, int w, int h, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh)
 #endif
 {
-	if (txt==NULL)
-		return x;
-	char *memtxt=strdup(txt);
-	char *mytxt=memtxt;
-	char *t2=mytxt;
-	char c;
-	int x0=0;
-	int y0=0;
+    if (txt==NULL)
+        return x;
+    char *memtxt=strdup(txt);
+    char *mytxt=memtxt;
+    char *t2=mytxt;
+    char c;
+    int x0=0;
+    int y0=0;
 //mzlog(0,"'%s'",t2);
-	while (mytxt && *mytxt)
-	{
-		switch (*mytxt)
-		{
-			case ' ':
-			case '\t':
-			case '\n':
-				c=*(mytxt);
-				*(mytxt)=0;
-				if (x0+Width(t2)>w && x0>0)
-				{
-					x0=0;
-					y0+=Height();
-				}
-				if (y0<h*Height())
+    while (mytxt && *mytxt)
+    {
+        switch (*mytxt)
+        {
+        case ' ':
+        case '\t':
+        case '\n':
+            c=*(mytxt);
+            *(mytxt)=0;
+            if (x0+Width(t2)>w && x0>0)
+            {
+                x0=0;
+                y0+=Height();
+            }
+            if (y0<h*Height())
 #if VDRVERSNUM >= 10307
-					x0+=Text(x+x0,y+y0,t2,fg,bg)   -x-x0+Width(c);
+                x0+=Text(x+x0,y+y0,t2,fg,bg)   -x-x0+Width(c);
 #else
-					x0+=Text(x+x0,y+y0,t2,fg,bg,wh)-x-x0+Width(c);
+                x0+=Text(x+x0,y+y0,t2,fg,bg,wh)-x-x0+Width(c);
 #endif
-				*(mytxt)=c;
-				t2=mytxt+1;
-				if (c=='\t')
-				{
-					if (x0==0)
-					{
-						x+=20;
-						w-=20;
-					}
-					else
-						x0=((x0+20)/20)*20;
-				}
-				else if (c=='\n')
-				{
-					x0=0;
-					y0+=Height();
-				}
-				break;
-			case '-':
-			case '.':
-				c=*(mytxt+1);
-				*(mytxt+1)=0;
-				if (x0+Width(t2)>w && x0>0)
-				{
-					x0=0;
-					y0+=Height();
-				}
-				if (y0<h*Height())
+            *(mytxt)=c;
+            t2=mytxt+1;
+            if (c=='\t')
+            {
+                if (x0==0)
+                {
+                    x+=20;
+                    w-=20;
+                }
+                else
+                    x0=((x0+20)/20)*20;
+            }
+            else if (c=='\n')
+            {
+                x0=0;
+                y0+=Height();
+            }
+            break;
+        case '-':
+        case '.':
+            c=*(mytxt+1);
+            *(mytxt+1)=0;
+            if (x0+Width(t2)>w && x0>0)
+            {
+                x0=0;
+                y0+=Height();
+            }
+            if (y0<h*Height())
 #if VDRVERSNUM >= 10307
-					x0+=Text(x+x0,y+y0,t2,fg,bg)   -x-x0;
+                x0+=Text(x+x0,y+y0,t2,fg,bg)   -x-x0;
 #else
-					x0+=Text(x+x0,y+y0,t2,fg,bg,wh)-x-x0;
+                x0+=Text(x+x0,y+y0,t2,fg,bg,wh)-x-x0;
 #endif
-				*(mytxt+1)=c;
-				t2=mytxt+1;
-				break;
-		}
-		mytxt++;
-	}
-	if (t2!=mytxt && *t2!=0)
-	{
-		if (x0+Width(t2)>w && x0>0)
-		{
-			x0=0;
-			y0+=Height();
-		}
-		if (y0<h*Height())
+            *(mytxt+1)=c;
+            t2=mytxt+1;
+            break;
+        }
+        mytxt++;
+    }
+    if (t2!=mytxt && *t2!=0)
+    {
+        if (x0+Width(t2)>w && x0>0)
+        {
+            x0=0;
+            y0+=Height();
+        }
+        if (y0<h*Height())
 #if VDRVERSNUM >= 10307
-			x0+=Text(x+x0,y+y0,t2,fg,bg);
+            x0+=Text(x+x0,y+y0,t2,fg,bg);
 #else
-			x0+=Text(x+x0,y+y0,t2,fg,bg,wh);
+            x0+=Text(x+x0,y+y0,t2,fg,bg,wh);
 #endif
-	}
-	free(memtxt);
-	return y0/Height()+1;
+    }
+    free(memtxt);
+    return y0/Height()+1;
 }
-int anyFont::TextHeight(int w, const char *txt) 
+int anyFont::TextHeight(int w, const char *txt)
 {
-	if (txt==NULL)
-		return 0;
-	char *memtxt=strdup(txt);
-	char *mytxt=memtxt;
-	char *t2=mytxt;
-	char c;
-	int x0=0;
-	int y0=0;
-	while (mytxt && *mytxt)
-	{
-		switch (*mytxt)
-		{
-			case ' ':
-			case '\t':
-			case '\n':
-				c=*(mytxt);
-				*(mytxt)=0;
-				if (x0+Width(t2)>w && x0>0)
-				{
-					x0=0;
-					y0+=Height();
-				}
-				x0+=Width(t2)+Width(c);
-				*(mytxt)=c;
-				t2=mytxt+1;
-				if (c=='\t')
-				{
-					if (x0==0)
-						w-=20;
-					else
-						x0=((x0+20)/20)*20;
-				}
-				else if (c=='\n')
-				{
-					x0=0;
-					y0+=Height();
-				}
-				break;
-			case '-':
-			case '.':
-				c=*(mytxt+1);
-				*(mytxt+1)=0;
-				if (x0+Width(t2)>w && x0>0)
-				{
-					x0=0;
-					y0+=Height();
-				}
-				x0+=Width(t2);
-				*(mytxt+1)=c;
-				t2=mytxt+1;
-				break;
-		}
-		mytxt++;
-	}
-	if (t2!=mytxt && *t2!=0)
-	{
-		if (x0+Width(t2)>w && x0>0)
-		{
-			x0=0;
-			y0+=Height();
-		}
-	}
-	free(memtxt);
-	return y0/Height()+1;
+    if (txt==NULL)
+        return 0;
+    char *memtxt=strdup(txt);
+    char *mytxt=memtxt;
+    char *t2=mytxt;
+    char c;
+    int x0=0;
+    int y0=0;
+    while (mytxt && *mytxt)
+    {
+        switch (*mytxt)
+        {
+        case ' ':
+        case '\t':
+        case '\n':
+            c=*(mytxt);
+            *(mytxt)=0;
+            if (x0+Width(t2)>w && x0>0)
+            {
+                x0=0;
+                y0+=Height();
+            }
+            x0+=Width(t2)+Width(c);
+            *(mytxt)=c;
+            t2=mytxt+1;
+            if (c=='\t')
+            {
+                if (x0==0)
+                    w-=20;
+                else
+                    x0=((x0+20)/20)*20;
+            }
+            else if (c=='\n')
+            {
+                x0=0;
+                y0+=Height();
+            }
+            break;
+        case '-':
+        case '.':
+            c=*(mytxt+1);
+            *(mytxt+1)=0;
+            if (x0+Width(t2)>w && x0>0)
+            {
+                x0=0;
+                y0+=Height();
+            }
+            x0+=Width(t2);
+            *(mytxt+1)=c;
+            t2=mytxt+1;
+            break;
+        }
+        mytxt++;
+    }
+    if (t2!=mytxt && *t2!=0)
+    {
+        if (x0+Width(t2)>w && x0>0)
+        {
+            x0=0;
+            y0+=Height();
+        }
+    }
+    free(memtxt);
+    return y0/Height()+1;
 }