libtuxtxt: minor clean-up, no code change

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1742453a06
Author: max_10 <max_10@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

lib/libtuxtxt/tuxtxt.cpp

@@ -268,6 +268,7 @@ void ClearFB(int /*color*/)
 	//memset(lfb,0, var_screeninfo.yres*fix_screeninfo.line_length);
 	CFrameBuffer::getInstance()->paintBackground();
 }
+
 #if 0 
 //never used
 void ClearB(fb_pixel_t color)
@@ -276,6 +277,7 @@ void ClearB(fb_pixel_t color)
 	FillRect(0, var_screeninfo.yres, var_screeninfo.xres, var_screeninfo.yres, color); /* backbuffer */
 }
 #endif
+
 int  GetCurFontWidth()
 {
 	int mx = (displaywidth)%(40-nofirst); // # of unused pixels
@@ -1649,6 +1651,7 @@ int tuxtx_main(int pid, int page, int source)
 	stride = fbp->getStride() / sizeof(fb_pixel_t);
 	memcpy(&var_screeninfo, var, sizeof(struct fb_var_screeninfo));
 	fix_screeninfo.line_length = var_screeninfo.xres * sizeof(fb_pixel_t);
+
 	/* set variable screeninfo for double buffering */
 	var_screeninfo.yoffset      = 0;
 #if 0
@@ -1686,7 +1689,7 @@ int tuxtx_main(int pid, int page, int source)
 		pthread_create(&ttx_sub_thread, 0, reader_thread, (void *) NULL);
 		return 1;
 	}
-	//transpmode = 1;
+
 	/* main loop */
 	do {
 		if (GetRCCode() == 1)
@@ -1725,7 +1728,6 @@ int tuxtx_main(int pid, int page, int source)
 					transpmode = 1; /* switch to normal mode */
 					SwitchTranspMode();
 					break;		/* and evaluate key */
-
 				case RC_TTTV:
 				case RC_MUTE:		/* regular toggle to transparent */
 				case RC_TEXT:
@@ -1801,16 +1803,31 @@ int tuxtx_main(int pid, int page, int source)
 			case RC_9:
 				PageInput(CRCInput::getNumericValue(RCCode));
 				break;
-			case RC_RED:	 ColorKey(prev_100);		break;
+			case RC_RED:
-			case RC_GREEN:	 ColorKey(prev_10);		break;
+				ColorKey(prev_100);
-			case RC_YELLOW: ColorKey(next_10);		break;
+				break;
-			case RC_BLUE:	 ColorKey(next_100);		break;
+			case RC_GREEN:
+				ColorKey(prev_10);
+				break;
+			case RC_YELLOW:
+				ColorKey(next_10);
+				break;
+			case RC_BLUE:
+				ColorKey(next_100);
+				break;
 			case RC_TTZOOM:
-			case RC_PLUS:	 SwitchZoomMode();		break;
+			case RC_PLUS:
+				SwitchZoomMode();
+				break;
 			case RC_SPLIT:
-			case RC_MINUS:	 SwitchScreenMode(-1);prevscreenmode = screenmode; break;
+			case RC_MINUS:
+				SwitchScreenMode(-1);
+				prevscreenmode = screenmode;
+				break;
 			case RC_TTTV:
-			case RC_MUTE:	 SwitchTranspMode();	break;
+			case RC_MUTE:
+				SwitchTranspMode();
+				break;
 			case RC_TEXT:
 				if(transpmode == 1)
 					RCCode = RC_HOME;
@@ -1818,8 +1835,12 @@ int tuxtx_main(int pid, int page, int source)
 				break;
 			case RC_TTREVEAL:
 			case RC_INFO:
-			case RC_HELP:	 SwitchHintMode();		break;
+			case RC_HELP:
-			case RC_DBOX:	 ConfigMenu(0);			break;
+				SwitchHintMode();
+				break;
+			case RC_DBOX:
+				ConfigMenu(0);
+				break;
 			case RC_HOME:
 				break;
 			}
@@ -3822,7 +3843,6 @@ void RenderCatchedPage()
 	}
 	SetPosX(catch_col);
 
-
 	if (zoommode == 2)
 		PosY = StartY + (catch_row-12)*fontheight*((zoom>>10)+1);
 	else
@@ -3949,8 +3969,7 @@ void SwitchScreenMode(int newscreenmode)
 		setfontwidth(fw);
 
 		CFrameBuffer *f = CFrameBuffer::getInstance();
-		videoDecoder->Pig(tx, ty, tw, th,
+		videoDecoder->Pig(tx, ty, tw, th, f->getScreenWidth(true), f->getScreenHeight(true));
-				  f->getScreenWidth(true), f->getScreenHeight(true));
 	}
 	else /* not split */
 	{
@@ -4076,14 +4095,18 @@ void RenderDRCS( //FIX ME
 				{
 //					memset(d + ax[x], f1, ax[x+1] - ax[x]);
 					for (ltmp=0 ; ltmp <= (ax[x+1]-ax[x]); ltmp++)
+					{
 						*(d + ax[x] + ltmp) = bgra[f1];
 					}
+				}
 				if (ax[x+7] > ax[x+6])
 				{
 //					memset(d + ax[x+6], f2, ax[x+7] - ax[x+6]); /* 2nd byte 6 pixels to the right */
 					for (ltmp=0 ; ltmp <= (ax[x+7]-ax[x+6]); ltmp++)
+					{
 						*(d + ax[x+6] + ltmp) = bgra[f2];
 					}
+				}
 				d += stride;
 			}
 			d -= h * stride;
@@ -4497,7 +4520,8 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset)
 		PosX += curfontwidth;
 		return;
 	}
-#if 0//old
+#if 0
+	//old
 	else if (Attribute->charset == C_G2 && Char >= 0x20 && Char <= 0x7F)
 	{
 		if (national_subset_local == NAT_GR)
@@ -4675,7 +4699,8 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset)
 	}
 	if (Char <= 0x20)
 	{
-#if 0//TUXTXT_DEBUG
+#if 0
+//TUXTXT_DEBUG
 		printf("TuxTxt found control char: %x \"%c\" \n", Char, Char);
 #endif
 		FillRect(PosX, PosY + yoffset, curfontwidth, factor*fontheight, bgcolor);
@@ -4686,7 +4711,8 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset)
 
 	if (!(glyph = FT_Get_Char_Index(face, Char)))
 	{
-#if 1// TUXTXT_DEBUG
+#if 1
+// TUXTXT_DEBUG
 		printf("TuxTxt <FT_Get_Char_Index for Char %d %x \"%c\" failed\n", Char, Char, Char);
 #endif
 		FillRect(PosX, PosY + yoffset, curfontwidth, factor*fontheight, bgcolor);
@@ -5081,7 +5107,6 @@ void RenderPage()
 		return;
 	}
 
-
 	/* update page or timestring */
 	if (transpmode != 2 && tuxtxt_cache.pageupdate && tuxtxt_cache.page_receiving != tuxtxt_cache.page && inputcounter == 2)
 	{
@@ -5563,6 +5588,7 @@ void CopyBB2FB()
 
 		topsrc += screenwidth;
 		topdst += screenwidth;
+
 		for (i=0; i < 24*fontheight; i++)
 		{
 			memmove(topdst, topsrc, width);
@@ -5579,8 +5605,10 @@ void CopyBB2FB()
 	for (i = StartY; i>0;i--)
 	{
 		for (swtmp=0; swtmp<=screenwidth; swtmp++)
+		{
 			*(dst - i * stride + swtmp) = bgra[fillcolor];
 		}
+	}
 
 	for (i = 12*fontheight; i; i--)
 	{
@@ -5594,8 +5622,10 @@ void CopyBB2FB()
 	for (i = var_screeninfo.yres - StartY - 25*fontheight; i >= 0;i--)
 	{
 		for (swtmp=0; swtmp<= screenwidth;swtmp++)
+		{
 			*(dst + stride * (fontheight + i) + swtmp) =  bgra[fillcolor];
 		}
+	}
 #if HAVE_SPARK_HARDWARE
 	f->mark(0, 0, var_screeninfo.xres, var_screeninfo.yres);
 #endif