mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

libtuxtxt: minor clean-up, no code change

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>

# Conflicts:
#	lib/libtuxtxt/tuxtxt.cpp
This commit is contained in:
max_10
2018-01-26 22:44:06 +01:00
committed by Thilo Graf
parent e2eed8a2f5
commit 1336a55de3
1 changed files with 191 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -271,6 +271,7 @@ void ClearFB(int /*color*/)
//memset(lfb,0, var_screeninfo.yres*fix_screeninfo.line_length); //memset(lfb,0, var_screeninfo.yres*fix_screeninfo.line_length);
CFrameBuffer::getInstance()->paintBackground(); CFrameBuffer::getInstance()->paintBackground();
} }
#if 0 #if 0
//never used //never used
void ClearB(fb_pixel_t color) void ClearB(fb_pixel_t color)
@@ -279,6 +280,7 @@ void ClearB(fb_pixel_t color)
FillRect(0, var_screeninfo.yres, var_screeninfo.xres, var_screeninfo.yres, color); /* backbuffer */ FillRect(0, var_screeninfo.yres, var_screeninfo.xres, var_screeninfo.yres, color); /* backbuffer */
} }
#endif #endif
int GetCurFontWidth() int GetCurFontWidth()
{ {
int mx = (displaywidth)%(40-nofirst); // # of unused pixels int mx = (displaywidth)%(40-nofirst); // # of unused pixels
@@ -1670,6 +1672,7 @@ int tuxtx_main(int pid, int page, int source)
stride = fbp->getStride() / sizeof(fb_pixel_t); stride = fbp->getStride() / sizeof(fb_pixel_t);
memcpy(&var_screeninfo, var, sizeof(struct fb_var_screeninfo)); memcpy(&var_screeninfo, var, sizeof(struct fb_var_screeninfo));
fix_screeninfo.line_length = var_screeninfo.xres * sizeof(fb_pixel_t); fix_screeninfo.line_length = var_screeninfo.xres * sizeof(fb_pixel_t);
/* set variable screeninfo for double buffering */ /* set variable screeninfo for double buffering */
var_screeninfo.yoffset = 0; var_screeninfo.yoffset = 0;
#if 0 #if 0
@@ -1707,7 +1710,7 @@ int tuxtx_main(int pid, int page, int source)
pthread_create(&ttx_sub_thread, 0, reader_thread, (void *) NULL); pthread_create(&ttx_sub_thread, 0, reader_thread, (void *) NULL);
return 1; return 1;
} }
//transpmode = 1;
/* main loop */ /* main loop */
do { do {
if (GetRCCode() == 1) if (GetRCCode() == 1)
@@ -1746,7 +1749,6 @@ int tuxtx_main(int pid, int page, int source)
transpmode = 1; /* switch to normal mode */ transpmode = 1; /* switch to normal mode */
SwitchTranspMode(); SwitchTranspMode();
break; /* and evaluate key */ break; /* and evaluate key */
case RC_TTTV: case RC_TTTV:
case RC_MUTE: /* regular toggle to transparent */ case RC_MUTE: /* regular toggle to transparent */
case RC_TEXT: case RC_TEXT:
@@ -1822,16 +1824,31 @@ int tuxtx_main(int pid, int page, int source)
case RC_9: case RC_9:
PageInput(CRCInput::getNumericValue(RCCode)); PageInput(CRCInput::getNumericValue(RCCode));
break; 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_TTZOOM:
case RC_PLUS: SwitchZoomMode(); break; case RC_PLUS:
SwitchZoomMode();
break;
case RC_SPLIT: case RC_SPLIT:
case RC_MINUS: SwitchScreenMode(-1);prevscreenmode = screenmode; break; case RC_MINUS:
SwitchScreenMode(-1);
prevscreenmode = screenmode;
break;
case RC_TTTV: case RC_TTTV:
case RC_MUTE: SwitchTranspMode(); break; case RC_MUTE:
SwitchTranspMode();
break;
case RC_TEXT: case RC_TEXT:
if(transpmode == 1) if(transpmode == 1)
RCCode = RC_HOME; RCCode = RC_HOME;
@@ -1839,8 +1856,12 @@ int tuxtx_main(int pid, int page, int source)
break; break;
case RC_TTREVEAL: case RC_TTREVEAL:
case RC_INFO: 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: case RC_HOME:
break; break;
} }
@@ -2481,17 +2502,17 @@ skip_pid:
//FIXME ?? //FIXME ??
for (byte = 0; byte < pid_table[pid_test].service_name_len; byte++) for (byte = 0; byte < pid_table[pid_test].service_name_len; byte++)
{ {
if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'<EFBFBD>') if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'?')
bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x5B; bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x5B;
if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'<EFBFBD>') if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'<EFBFBD>')
bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x7B; bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x7B;
if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'<EFBFBD>') if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'?')
bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x5C; bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x5C;
if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'<EFBFBD>') if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'<EFBFBD>')
bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x7C; bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x7C;
if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'<EFBFBD>') if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'?')
bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x5D; bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x5D;
if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'<EFBFBD>') if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'?')
bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x7D; bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x7D;
if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'<EFBFBD>') if (bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] == (unsigned char)'<EFBFBD>')
bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x7E; bufSDT[sdt_scan+10 + bufSDT[sdt_scan + 8] + byte] = 0x7E;
@@ -3863,7 +3884,6 @@ void RenderCatchedPage()
} }
SetPosX(catch_col); SetPosX(catch_col);
if (zoommode == 2) if (zoommode == 2)
PosY = StartY + (catch_row-12)*fontheight*((zoom>>10)+1); PosY = StartY + (catch_row-12)*fontheight*((zoom>>10)+1);
else else
@@ -3993,17 +4013,7 @@ void SwitchScreenMode(int newscreenmode)
setfontwidth(fw); setfontwidth(fw);
CFrameBuffer *f = CFrameBuffer::getInstance(); CFrameBuffer *f = CFrameBuffer::getInstance();
#if HAVE_SPARK_HARDWARE
if (!boxed && (f->get3DMode() == CFrameBuffer::Mode3D_off))
videoDecoder->Pig(tx, ty, tw, th,
f->getScreenWidth(true), f->getScreenHeight(true),
g_settings.screen_StartX_int,
g_settings.screen_StartY_int,
g_settings.screen_EndX_int,
g_settings.screen_EndY_int);
#else
videoDecoder->Pig(tx, ty, tw, th, f->getScreenWidth(true), f->getScreenHeight(true)); videoDecoder->Pig(tx, ty, tw, th, f->getScreenWidth(true), f->getScreenHeight(true));
#endif
} }
else /* not split */ else /* not split */
{ {
@@ -4129,14 +4139,18 @@ void RenderDRCS( //FIX ME
{ {
// memset(d + ax[x], f1, ax[x+1] - ax[x]); // memset(d + ax[x], f1, ax[x+1] - ax[x]);
for (ltmp=0 ; ltmp <= (ax[x+1]-ax[x]); ltmp++) for (ltmp=0 ; ltmp <= (ax[x+1]-ax[x]); ltmp++)
{
*(d + ax[x] + ltmp) = bgra[f1]; *(d + ax[x] + ltmp) = bgra[f1];
} }
}
if (ax[x+7] > ax[x+6]) 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 */ // 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++) for (ltmp=0 ; ltmp <= (ax[x+7]-ax[x+6]); ltmp++)
{
*(d + ax[x+6] + ltmp) = bgra[f2]; *(d + ax[x+6] + ltmp) = bgra[f2];
} }
}
d += stride; d += stride;
} }
d -= h * stride; d -= h * stride;
@@ -4550,7 +4564,8 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset)
PosX += curfontwidth; PosX += curfontwidth;
return; return;
} }
#if 0//old #if 0
//old
else if (Attribute->charset == C_G2 && Char >= 0x20 && Char <= 0x7F) else if (Attribute->charset == C_G2 && Char >= 0x20 && Char <= 0x7F)
{ {
if (national_subset_local == NAT_GR) if (national_subset_local == NAT_GR)
@@ -4728,7 +4743,8 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset)
} }
if (Char <= 0x20) if (Char <= 0x20)
{ {
#if 0//TUXTXT_DEBUG #if 0
//TUXTXT_DEBUG
printf("TuxTxt found control char: %x \"%c\" \n", Char, Char); printf("TuxTxt found control char: %x \"%c\" \n", Char, Char);
#endif #endif
FillRect(PosX, PosY + yoffset, curfontwidth, factor*fontheight, bgcolor); FillRect(PosX, PosY + yoffset, curfontwidth, factor*fontheight, bgcolor);
@@ -4739,7 +4755,8 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset)
if (!(glyph = FT_Get_Char_Index(face, Char))) 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); printf("TuxTxt <FT_Get_Char_Index for Char %d %x \"%c\" failed\n", Char, Char, Char);
#endif #endif
FillRect(PosX, PosY + yoffset, curfontwidth, factor*fontheight, bgcolor); FillRect(PosX, PosY + yoffset, curfontwidth, factor*fontheight, bgcolor);
@@ -5145,7 +5162,6 @@ void RenderPage()
return; return;
} }
/* update page or timestring */ /* update page or timestring */
if (transpmode != 2 && tuxtxt_cache.pageupdate && tuxtxt_cache.page_receiving != tuxtxt_cache.page && inputcounter == 2) if (transpmode != 2 && tuxtxt_cache.pageupdate && tuxtxt_cache.page_receiving != tuxtxt_cache.page && inputcounter == 2)
{ {
@@ -5633,6 +5649,7 @@ void CopyBB2FB()
topsrc += screenwidth; topsrc += screenwidth;
topdst += screenwidth; topdst += screenwidth;
for (i=0; i < 24*fontheight; i++) for (i=0; i < 24*fontheight; i++)
{ {
memmove(topdst, topsrc, width); memmove(topdst, topsrc, width);
@@ -5649,8 +5666,10 @@ void CopyBB2FB()
for (i = StartY; i>0;i--) for (i = StartY; i>0;i--)
{ {
for (swtmp=0; swtmp<=screenwidth; swtmp++) for (swtmp=0; swtmp<=screenwidth; swtmp++)
{
*(dst - i * stride + swtmp) = bgra[fillcolor]; *(dst - i * stride + swtmp) = bgra[fillcolor];
} }
}
for (i = 12*fontheight; i; i--) for (i = 12*fontheight; i; i--)
{ {
@@ -5664,8 +5683,10 @@ void CopyBB2FB()
for (i = var_screeninfo.yres - StartY - 25*fontheight; i >= 0;i--) for (i = var_screeninfo.yres - StartY - 25*fontheight; i >= 0;i--)
{ {
for (swtmp=0; swtmp<= screenwidth;swtmp++) for (swtmp=0; swtmp<= screenwidth;swtmp++)
{
*(dst + stride * (fontheight + i) + swtmp) = bgra[fillcolor]; *(dst + stride * (fontheight + i) + swtmp) = bgra[fillcolor];
} }
}
#if HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
f->mark(0, 0, var_screeninfo.xres, var_screeninfo.yres); f->mark(0, 0, var_screeninfo.xres, var_screeninfo.yres);
f->blit(); f->blit();