mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 02:41:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

framebuffer_spark: implement svn revisions 2082 2152 2155

Browse Source
This commit is contained in:
Stefan Seyfried
2012-04-14 12:44:29 +02:00
parent e4081f44a6
commit c769089fa0
1 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/driver/framebuffer_spark.cpp
View File

@@ -149,6 +149,10 @@ CFrameBuffer::CFrameBuffer()
tty = 0; tty = 0;
bpp = 0; bpp = 0;
locked = false; locked = false;
m_transparent_default = CFrameBuffer::TM_BLACK; // TM_BLACK: Transparency when black content ('pseudo' transparency)
// TM_NONE: No 'pseudo' transparency
// TM_INI: Transparency depends on g_settings.infobar_alpha ???
m_transparent = m_transparent_default;
//FIXME: test //FIXME: test
memset(red, 0, 256*sizeof(__u16)); memset(red, 0, 256*sizeof(__u16));
memset(green, 0, 256*sizeof(__u16)); memset(green, 0, 256*sizeof(__u16));
@@ -330,6 +334,8 @@ CFrameBuffer::~CFrameBuffer()
backupBackground = NULL; backupBackground = NULL;
} }
useBackground(false);
m_transparent = m_transparent_default;
#if 0 #if 0
#ifdef RETURN_FROM_GRAPHICS_MODE #ifdef RETURN_FROM_GRAPHICS_MODE
if (-1 == ioctl(tty,KDSETMODE, kd_mode)) if (-1 == ioctl(tty,KDSETMODE, kd_mode))
@@ -1364,27 +1370,36 @@ void * CFrameBuffer::int_convertRGB2FB(unsigned char *rgbbuff, unsigned long x,
unsigned long count = x * y; unsigned long count = x * y;
fbbuff = (unsigned int *) cs_malloc_uncached(count * sizeof(unsigned int)); fbbuff = (unsigned int *) cs_malloc_uncached(count * sizeof(unsigned int));
if(fbbuff == NULL) if(fbbuff == NULL) {
{
printf("convertRGB2FB%s: Error: cs_malloc_uncached\n", ((alpha) ? " (Alpha)" : "")); printf("convertRGB2FB%s: Error: cs_malloc_uncached\n", ((alpha) ? " (Alpha)" : ""));
return NULL; return NULL;
} }
if (alpha) if (alpha) {
{
for(i = 0; i < count ; i++) for(i = 0; i < count ; i++)
fbbuff[i] = ((rgbbuff[i*4+3] << 24) & 0xFF000000) | fbbuff[i] = ((rgbbuff[i*4+3] << 24) & 0xFF000000) |
((rgbbuff[i*4] << 16) & 0x00FF0000) | ((rgbbuff[i*4] << 16) & 0x00FF0000) |
((rgbbuff[i*4+1] << 8) & 0x0000FF00) | ((rgbbuff[i*4+1] << 8) & 0x0000FF00) |
((rgbbuff[i*4+2]) & 0x000000FF); ((rgbbuff[i*4+2]) & 0x000000FF);
}else } else {
{ switch (m_transparent) {
for(i = 0; i < count ; i++) case CFrameBuffer::TM_BLACK:
{ for(i = 0; i < count ; i++) {
transp = 0; transp = 0;
if(rgbbuff[i*3] || rgbbuff[i*3+1] || rgbbuff[i*3+2]) if(rgbbuff[i*3] || rgbbuff[i*3+1] || rgbbuff[i*3+2])
transp = 0xFF; transp = 0xFF;
fbbuff[i] = (transp << 24) | ((rgbbuff[i*3] << 16) & 0xFF0000) | ((rgbbuff[i*3+1] << 8) & 0xFF00) | (rgbbuff[i*3+2] & 0xFF); fbbuff[i] = (transp << 24) | ((rgbbuff[i*3] << 16) & 0xFF0000) | ((rgbbuff[i*3+1] << 8) & 0xFF00) | (rgbbuff[i*3+2] & 0xFF);
}
break;
case CFrameBuffer::TM_INI:
for(i = 0; i < count ; i++)
fbbuff[i] = (transp << 24) | ((rgbbuff[i*3] << 16) & 0xFF0000) | ((rgbbuff[i*3+1] << 8) & 0xFF00) | (rgbbuff[i*3+2] & 0xFF);
break;
case CFrameBuffer::TM_NONE:
default:
for(i = 0; i < count ; i++)
fbbuff[i] = 0xFF000000 | ((rgbbuff[i*3] << 16) & 0xFF0000) | ((rgbbuff[i*3+1] << 8) & 0xFF00) | (rgbbuff[i*3+2] & 0xFF);
break;
} }
} }
return (void *) fbbuff; return (void *) fbbuff;
@@ -1639,3 +1654,19 @@ void CFrameBuffer::blit()
to_blit.xe = to_blit.ye = 0; to_blit.xe = to_blit.ye = 0;
blit_unlock(); blit_unlock();
} }
void CFrameBuffer::paintMuteIcon(bool paint, int ax, int ay, int dx, int dy, bool paintFrame)
{
if(paint) {
if (paintFrame) {
paintBackgroundBoxRel(ax, ay, dx, dy);
paintBoxRel(ax, ay, dx, dy, COL_MENUCONTENT_PLUS_0, RADIUS_SMALL);
}
int icon_dx=0, icon_dy=0;
getIconSize(NEUTRINO_ICON_BUTTON_MUTE, &icon_dx, &icon_dy);
paintIcon(NEUTRINO_ICON_BUTTON_MUTE, ax+((dx-icon_dx)/2), ay+((dy-icon_dy)/2));
}
else
paintBackgroundBoxRel(ax, ay, dx, dy);
blit();
}