mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +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

 Conflicts:
	lib/libtuxtxt/tuxtxt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-01-25 13:30:14 +01:00
committed by Thilo Graf
parent bc5839fc7f
commit 926274c8ba
2 changed files with 345 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

632
lib/libtuxtxt/tuxtxt.cpp
View File

File diff suppressed because it is too large Load Diff

25
lib/libtuxtxt/tuxtxt.h
View File

@@ -21,6 +21,7 @@
#include <config.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -210,11 +211,9 @@ const char *ObjectType[] =
#define NoServicesFound 3
/* framebuffer stuff */
static fb_pixel_t *lfb = 0;
static fb_pixel_t *lbb = 0;
static fb_pixel_t *lfb = NULL;
static fb_pixel_t *lbb = NULL;
struct fb_var_screeninfo var_screeninfo;
struct fb_fix_screeninfo fix_screeninfo;
int stride;
/* freetype stuff */
FT_Library library;
@@ -556,11 +555,13 @@ char versioninfo[16];
int hotlist[10];
int maxhotlist;
int rc;
int sx, ex, sy, ey;
int PosX, PosY, StartX, StartY;
int lastpage;
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;
int catch_row, catch_col, catched_page, pagecatching;
int prev_100, prev_10, next_10, next_100;
@@ -1210,8 +1211,18 @@ const unsigned short defaultcolors[] = /* 0x0bgr */
0x420, 0x210, 0x420, 0x000, 0x000
};
/* filled in setcolors() */
fb_pixel_t bgra[SIZECOLTABLE];
fb_pixel_t argb[] = {
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 */
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 };