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

libtuxtxt: ports from martii's neutrino-mp ...

Browse Source 
* port screenmode handling
* switch from bgra to argb color handling
* port font rendering improvement


Origin commit data
------------------
Commit: 7e54af7726
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: ports from martii's neutrino-mp ...

* port screenmode handling
* switch from bgra to argb color handling
* port font rendering improvement
This commit is contained in:
vanhofen
2018-01-25 13:30:14 +01:00
parent a0f7d0739d
commit d8d53e7419
2 changed files with 346 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

623
lib/libtuxtxt/tuxtxt.cpp
View File

File diff suppressed because it is too large Load Diff

26
lib/libtuxtxt/tuxtxt.h
View File

@@ -21,6 +21,7 @@
#include <config.h> #include <config.h>
#include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -56,6 +57,7 @@ extern void tuxtxt_decode_adip(); /* additional information table */
extern void tuxtxt_compress_page(int p, int sp, unsigned char* buffer); extern void tuxtxt_compress_page(int p, int sp, unsigned char* buffer);
extern void tuxtxt_decompress_page(int p, int sp, unsigned char* buffer); extern void tuxtxt_decompress_page(int p, int sp, unsigned char* buffer);
extern void tuxtxt_clear_p26(tstExtData* extData); extern void tuxtxt_clear_p26(tstExtData* extData);
extern void tuxtxt_clear_cache(void);
#if TUXTXT_DEBUG #if TUXTXT_DEBUG
extern int tuxtxt_get_zipsize(int p, int sp); extern int tuxtxt_get_zipsize(int p, int sp);
#endif #endif
@@ -211,11 +213,9 @@ const char *ObjectType[] =
#define NoServicesFound 3 #define NoServicesFound 3
/* framebuffer stuff */ /* framebuffer stuff */
static fb_pixel_t *lfb = 0; static fb_pixel_t *lfb = NULL;
static fb_pixel_t *lbb = 0; static fb_pixel_t *lbb = NULL;
struct fb_var_screeninfo var_screeninfo; struct fb_var_screeninfo var_screeninfo;
struct fb_fix_screeninfo fix_screeninfo;
int stride;
/* freetype stuff */ /* freetype stuff */
FT_Library library; FT_Library library;
@@ -557,11 +557,13 @@ char versioninfo[16];
int hotlist[10]; int hotlist[10];
int maxhotlist; int maxhotlist;
int rc;
int sx, ex, sy, ey; int sx, ex, sy, ey;
int PosX, PosY, StartX, StartY; int PosX, PosY, StartX, StartY;
int lastpage; int lastpage;
int inputcounter; int inputcounter;
int zoommode, screenmode, transpmode, hintmode, boxed, nofirst, savedscreenmode, showflof, show39, showl25, prevscreenmode; int zoommode[2], screenmode[2], transpmode[2], hintmode, nofirst, savedscreenmode[2], showflof, show39, showl25, prevscreenmode[2];
bool boxed, oldboxed;
char dumpl25; char dumpl25;
int catch_row, catch_col, catched_page, pagecatching; int catch_row, catch_col, catched_page, pagecatching;
int prev_100, prev_10, next_10, next_100; int prev_100, prev_10, next_10, next_100;
@@ -1211,8 +1213,18 @@ const unsigned short defaultcolors[] = /* 0x0bgr */
0x420, 0x210, 0x420, 0x000, 0x000 0x420, 0x210, 0x420, 0x000, 0x000
}; };
/* filled in setcolors() */ fb_pixel_t argb[] = {
fb_pixel_t bgra[SIZECOLTABLE]; 0xff000000, 0xff000000, 0xff000000, 0xff000000,
0xff000000, 0xff000000, 0xff000000, 0xff000000,
0xff000000, 0xff000000, 0xff000000, 0xff000000,
0xff000000, 0xff000000, 0xff000000, 0xff000000,
0xff000000, 0xff000000, 0xff000000, 0xff000000,
0xff000000, 0xff000000, 0xff000000, 0xff000000,
0xff000000, 0xff000000, 0xff000000, 0xff000000,
0xff000000, 0xff000000, 0xff000000, 0xff000000,
0xff000000, 0xff000000, 0xc0000000, 0x00000000,
0x33000000
};
/* old 8bit color table */ /* old 8bit color table */
unsigned short rd0[] = {0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0x00<<8, 0x00<<8, 0x00<<8, 0, 0 }; unsigned short rd0[] = {0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0x00<<8, 0x00<<8, 0x00<<8, 0, 0 };