mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

libtuxtxt: whitespace cleanup; leading eight spaces => tab

Browse Source 
Origin commit data
------------------
Commit: 6e1f4d2242
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: whitespace cleanup; leading eight spaces => tab
This commit is contained in:
vanhofen
2018-01-25 13:30:14 +01:00
parent a5c2b8e879
commit 20349c0df5
1 changed files with 76 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -278,7 +278,7 @@ void ClearB(fb_pixel_t color)
} }
#endif #endif
int GetCurFontWidth() int GetCurFontWidth()
{ {
int mx = (displaywidth)%(40-nofirst); // # of unused pixels int mx = (displaywidth)%(40-nofirst); // # of unused pixels
int abx = (mx == 0 ? displaywidth+1 : (displaywidth)/(mx+1));// distance between 'inserted' pixels int abx = (mx == 0 ? displaywidth+1 : (displaywidth)/(mx+1));// distance between 'inserted' pixels
@@ -1109,7 +1109,9 @@ void eval_l25()
printf("=== %03x/%02x %d/%d===\n", tuxtxt_cache.page, tuxtxt_cache.subpage,tuxtxt_cache.astCachetable[tuxtxt_cache.page][tuxtxt_cache.subpage]->pageinfo.nationalvalid,tuxtxt_cache.astCachetable[tuxtxt_cache.page][tuxtxt_cache.subpage]->pageinfo.national); printf("=== %03x/%02x %d/%d===\n", tuxtxt_cache.page, tuxtxt_cache.subpage,tuxtxt_cache.astCachetable[tuxtxt_cache.page][tuxtxt_cache.subpage]->pageinfo.nationalvalid,tuxtxt_cache.astCachetable[tuxtxt_cache.page][tuxtxt_cache.subpage]->pageinfo.national);
#endif #endif
#if 0 //TUXTXT_DEBUG I don't think we need this any longer because this code is unreachable (HexPages are handled before eval_l25() is called) #if 0
//TUXTXT_DEBUG
//I don't think we need this any longer because this code is unreachable (HexPages are handled before eval_l25() is called)
if (pageinfo->function == FUNC_MOT) /* magazine organization table */ if (pageinfo->function == FUNC_MOT) /* magazine organization table */
{ {
int i; int i;
@@ -2322,22 +2324,22 @@ int GetTeletextPIDs()
/* show infobar */ /* show infobar */
RenderMessage(ShowInfoBar); RenderMessage(ShowInfoBar);
unsigned char filter[DMX_FILTER_SIZE]; unsigned char filter[DMX_FILTER_SIZE];
unsigned char mask[DMX_FILTER_SIZE]; unsigned char mask[DMX_FILTER_SIZE];
int res; int res;
cDemux * dmx = new cDemux(1); cDemux * dmx = new cDemux(1);
dmx->Open(DMX_PSI_CHANNEL); dmx->Open(DMX_PSI_CHANNEL);
memset(filter, 0x00, DMX_FILTER_SIZE); memset(filter, 0x00, DMX_FILTER_SIZE);
memset(mask, 0x00, DMX_FILTER_SIZE); memset(mask, 0x00, DMX_FILTER_SIZE);
//filter[0] = 0x00; //filter[0] = 0x00;
//mask[0] = 0xFF; //mask[0] = 0xFF;
mask[0] = 0xFF; mask[0] = 0xFF;
mask[4] = 0xFF; mask[4] = 0xFF;
dmx->sectionFilter(0, filter, mask, 1); dmx->sectionFilter(0, filter, mask, 1);
res = dmx->Read(bufPAT, sizeof(bufPAT)); res = dmx->Read(bufPAT, sizeof(bufPAT));
dmx->Stop(); dmx->Stop();
if(res <= 0) { if(res <= 0) {
@@ -2403,7 +2405,8 @@ int GetTeletextPIDs()
pid_table[pids_found].national_subset = NAT_DEFAULT; /* use default charset */ pid_table[pids_found].national_subset = NAT_DEFAULT; /* use default charset */
} }
#if 1 // TUXTXT_DEBUG #if 1
// TUXTXT_DEBUG
printf("TuxTxt <Service #%d %04x pid %04x Country code \"%3s\" national subset %2d%s>\n", printf("TuxTxt <Service #%d %04x pid %04x Country code \"%3s\" national subset %2d%s>\n",
pids_found, pids_found,
pid_table[pids_found].service_id, pid_table[pids_found].service_id,
@@ -2527,52 +2530,52 @@ skip_pid:
******************************************************************************/ ******************************************************************************/
int GetNationalSubset(const char *cc) int GetNationalSubset(const char *cc)
{ {
if (memcmp(cc, "cze", 3) == 0 || memcmp(cc, "ces", 3) == 0 || if (memcmp(cc, "cze", 3) == 0 || memcmp(cc, "ces", 3) == 0 ||
memcmp(cc, "slo", 3) == 0 || memcmp(cc, "slk", 3) == 0) memcmp(cc, "slo", 3) == 0 || memcmp(cc, "slk", 3) == 0)
return NAT_CZ; return NAT_CZ;
if (memcmp(cc, "eng", 3) == 0) if (memcmp(cc, "eng", 3) == 0)
return NAT_UK; return NAT_UK;
if (memcmp(cc, "est", 3) == 0) if (memcmp(cc, "est", 3) == 0)
return NAT_ET; return NAT_ET;
if (memcmp(cc, "fre", 3) == 0 || memcmp(cc, "lb", 3) == 0 || memcmp(cc, "ltz", 3) == 0 || memcmp(cc, "fra", 3) == 0) if (memcmp(cc, "fre", 3) == 0 || memcmp(cc, "lb", 3) == 0 || memcmp(cc, "ltz", 3) == 0 || memcmp(cc, "fra", 3) == 0)
return NAT_FR; return NAT_FR;
if (memcmp(cc, "ger", 3) == 0 || memcmp(cc, "deu", 3) == 0) if (memcmp(cc, "ger", 3) == 0 || memcmp(cc, "deu", 3) == 0)
return NAT_DE; return NAT_DE;
if (memcmp(cc, "ita", 3) == 0) if (memcmp(cc, "ita", 3) == 0)
return NAT_IT; return NAT_IT;
if (memcmp(cc, "lav", 3) == 0 || memcmp(cc, "lit", 3) == 0) if (memcmp(cc, "lav", 3) == 0 || memcmp(cc, "lit", 3) == 0)
return NAT_LV; return NAT_LV;
if (memcmp(cc, "pol", 3) == 0) if (memcmp(cc, "pol", 3) == 0)
return NAT_PL; return NAT_PL;
if (memcmp(cc, "spa", 3) == 0 || memcmp(cc, "por", 3) == 0) if (memcmp(cc, "spa", 3) == 0 || memcmp(cc, "por", 3) == 0)
return NAT_SP; return NAT_SP;
if (memcmp(cc, "rum", 3) == 0 || memcmp(cc, "ron", 3) == 0) if (memcmp(cc, "rum", 3) == 0 || memcmp(cc, "ron", 3) == 0)
return NAT_RO; return NAT_RO;
if (memcmp(cc, "scc", 3) == 0 || memcmp(cc, "srp", 3) == 0 || if (memcmp(cc, "scc", 3) == 0 || memcmp(cc, "srp", 3) == 0 ||
memcmp(cc, "scr", 3) == 0 || memcmp(cc, "hrv", 3) == 0 || memcmp(cc, "scr", 3) == 0 || memcmp(cc, "hrv", 3) == 0 ||
memcmp(cc, "slv", 3) == 0) memcmp(cc, "slv", 3) == 0)
return NAT_SR; return NAT_SR;
if (memcmp(cc, "swe", 3) == 0 || if (memcmp(cc, "swe", 3) == 0 ||
memcmp(cc, "dan", 3) == 0 || memcmp(cc, "dan", 3) == 0 ||
memcmp(cc, "nor", 3) == 0 || memcmp(cc, "nor", 3) == 0 ||
memcmp(cc, "fin", 3) == 0 || memcmp(cc, "fin", 3) == 0 ||
memcmp(cc, "hun", 3) == 0) memcmp(cc, "hun", 3) == 0)
return NAT_SW; return NAT_SW;
if (memcmp(cc, "tur", 3) == 0) if (memcmp(cc, "tur", 3) == 0)
return NAT_TR; return NAT_TR;
if (memcmp(cc, "rus", 3) == 0 || memcmp(cc, "bul", 3) == 0) if (memcmp(cc, "rus", 3) == 0 || memcmp(cc, "bul", 3) == 0)
return NAT_RB; return NAT_RB;
if (memcmp(cc, "ser", 3) == 0 || memcmp(cc, "cro", 3) == 0) if (memcmp(cc, "ser", 3) == 0 || memcmp(cc, "cro", 3) == 0)
return NAT_SC; return NAT_SC;
if (memcmp(cc, "ukr", 3) == 0) if (memcmp(cc, "ukr", 3) == 0)
return NAT_UA; return NAT_UA;
if (memcmp(cc, "gre", 3) == 0) if (memcmp(cc, "gre", 3) == 0)
return NAT_GR; return NAT_GR;
if (memcmp(cc, "heb", 3) == 0) if (memcmp(cc, "heb", 3) == 0)
return NAT_HB; return NAT_HB;
if (memcmp(cc, "ara", 3) == 0) if (memcmp(cc, "ara", 3) == 0)
return NAT_AR; return NAT_AR;
return NAT_DEFAULT; /* use default charset */ return NAT_DEFAULT; /* use default charset */
} }
/****************************************************************************** /******************************************************************************
@@ -3484,7 +3487,8 @@ void PageInput(int Number)
{ {
tuxtxt_cache.subpage = subp; tuxtxt_cache.subpage = subp;
tuxtxt_cache.pageupdate = 1; tuxtxt_cache.pageupdate = 1;
#if 1 //TUXTXT_DEBUG #if 1
//TUXTXT_DEBUG
printf("TuxTxt <DirectInput: %.3X-%.2X>\n", tuxtxt_cache.page, tuxtxt_cache.subpage); printf("TuxTxt <DirectInput: %.3X-%.2X>\n", tuxtxt_cache.page, tuxtxt_cache.subpage);
#endif #endif
} }
@@ -4005,7 +4009,8 @@ void SwitchTranspMode()
SwitchScreenMode(0); /* turn off divided screen */ SwitchScreenMode(0); /* turn off divided screen */
} }
/* toggle mode */ /* toggle mode */
#if 0 // transparent first #if 0
// transparent first
if (transpmode == 2) if (transpmode == 2)
transpmode = 0; transpmode = 0;
else else
@@ -4738,7 +4743,7 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset)
// add diacritical marks // add diacritical marks
if (Attribute->diacrit) if (Attribute->diacrit)
{ {
FTC_SBit sbit_diacrit; FTC_SBit sbit_diacrit;
#if 0 #if 0
if (national_subset_local == NAT_GR) if (national_subset_local == NAT_GR)
Char = G2table[2][0x20+ Attribute->diacrit]; Char = G2table[2][0x20+ Attribute->diacrit];
@@ -4747,18 +4752,18 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset)
else else
Char = G2table[0][0x20+ Attribute->diacrit]; Char = G2table[0][0x20+ Attribute->diacrit];
#endif #endif
if ((national_subset_local == NAT_SC) || (national_subset_local == NAT_RB) || (national_subset_local == NAT_UA)) if ((national_subset_local == NAT_SC) || (national_subset_local == NAT_RB) || (national_subset_local == NAT_UA))
Char = G2table[1][0x20+ Attribute->diacrit]; Char = G2table[1][0x20+ Attribute->diacrit];
else if (national_subset_local == NAT_GR) else if (national_subset_local == NAT_GR)
Char = G2table[2][0x20+ Attribute->diacrit]; Char = G2table[2][0x20+ Attribute->diacrit];
#if 0 #if 0
else if (national_subset_local == NAT_HB) else if (national_subset_local == NAT_HB)
Char = G2table[3][0x20+ Attribute->diacrit]; Char = G2table[3][0x20+ Attribute->diacrit];
#endif #endif
else if (national_subset_local == NAT_AR) else if (national_subset_local == NAT_AR)
Char = G2table[3][0x20+ Attribute->diacrit]; Char = G2table[3][0x20+ Attribute->diacrit];
else else
Char = G2table[0][0x20+ Attribute->diacrit]; Char = G2table[0][0x20+ Attribute->diacrit];
if ((glyph = FT_Get_Char_Index(face, Char))) if ((glyph = FT_Get_Char_Index(face, Char)))
{ {
@@ -4888,8 +4893,8 @@ void RenderMessage(int Message)
int national_subset_back = national_subset; int national_subset_back = national_subset;
national_subset = menusubset[menulanguage]; national_subset = menusubset[menulanguage];
/* 00000000001111111111222222222233333333334 */ /* 00000000001111111111222222222233333333334 */
/* 01234567890123456789012345678901234567890 */ /* 01234567890123456789012345678901234567890 */
char message_1[] = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> www.tuxtxt.com x.xx <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"; char message_1[] = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> www.tuxtxt.com x.xx <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
char message_2[] = "<EFBFBD> <20><>"; char message_2[] = "<EFBFBD> <20><>";
/* char message_3[] = "<22> suche nach Teletext-Anbietern <20><>"; */ /* char message_3[] = "<22> suche nach Teletext-Anbietern <20><>"; */
@@ -6174,11 +6179,3 @@ int GetRCCode()
} }
return 0; return 0;
} }
/* Local Variables: */
/* indent-tabs-mode:t */
/* tab-width:3 */
/* c-basic-offset:3 */
/* comment-column:0 */
/* fill-column:120 */
/* End: */