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

Define real text color for use in RenderString()

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e60067545f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2013-07-11 09:34:04 +02:00
committed by Thilo Graf
parent b0b2210236
commit 16684836ce
3 changed files with 121 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/color.cpp
View File

@@ -89,7 +89,7 @@ void fadeColor(unsigned char &r, unsigned char &g, unsigned char &b, int fade, b
protectColor(r,g,b, protect); protectColor(r,g,b, protect);
} }
unsigned char getBrightnessRGB(fb_pixel_t &color) unsigned char getBrightnessRGB(fb_pixel_t color)
{ {
RgbColor rgb; RgbColor rgb;
rgb.r = (color & 0x00FF0000) >> 16; rgb.r = (color & 0x00FF0000) >> 16;
@@ -99,7 +99,7 @@ unsigned char getBrightnessRGB(fb_pixel_t &color)
return rgb.r > rgb.g ? (rgb.r > rgb.b ? rgb.r : rgb.b) : (rgb.g > rgb.b ? rgb.g : rgb.b); return rgb.r > rgb.g ? (rgb.r > rgb.b ? rgb.r : rgb.b) : (rgb.g > rgb.b ? rgb.g : rgb.b);
} }
fb_pixel_t changeBrightnessRGBRel(fb_pixel_t &color, int br) fb_pixel_t changeBrightnessRGBRel(fb_pixel_t color, int br)
{ {
int br_ = (int)getBrightnessRGB(color); int br_ = (int)getBrightnessRGB(color);
br_ += br; br_ += br;
@@ -108,7 +108,23 @@ fb_pixel_t changeBrightnessRGBRel(fb_pixel_t &color, int br)
return changeBrightnessRGB(color, (unsigned char)br_); return changeBrightnessRGB(color, (unsigned char)br_);
} }
fb_pixel_t changeBrightnessRGB(fb_pixel_t &color, unsigned char br) void changeBrightnessRGBRel2(RgbColor *rgb, int br)
{
fb_pixel_t color = (((rgb->r << 16) & 0x00FF0000) |
((rgb->g << 8) & 0x0000FF00) |
((rgb->b ) & 0x000000FF));
int br_ = (int)getBrightnessRGB(color);
br_ += br;
if (br_ < 0) br_ = 0;
if (br_ > 255) br_ = 255;
HsvColor hsv;
Rgb2Hsv(rgb, &hsv);
hsv.v = br;
Hsv2Rgb(&hsv, rgb);
}
fb_pixel_t changeBrightnessRGB(fb_pixel_t color, unsigned char br)
{ {
HsvColor hsv; HsvColor hsv;
RgbColor rgb; RgbColor rgb;

30
src/gui/color.h
View File

@@ -33,8 +33,10 @@
#ifndef __color__ #ifndef __color__
#define __color__ #define __color__
#define COL_MAXFREE 254-8*9 - 1
#include <driver/framebuffer.h> #include <driver/framebuffer.h>
#define COL_MAXFREE 254-8*12 - 1
#define COL_NEUTRINO_TEXT 254-8*12 // 24 values
#define COL_COLORED_EVENTS_CHANNELLIST 254-8*9 #define COL_COLORED_EVENTS_CHANNELLIST 254-8*9
#define COL_COLORED_EVENTS_INFOBAR 254-8*8 #define COL_COLORED_EVENTS_INFOBAR 254-8*8
#define COL_INFOBAR_SHADOW 254-8*7 #define COL_INFOBAR_SHADOW 254-8*7
@@ -91,6 +93,23 @@
#define COL_MENUCONTENTSELECTED_PLUS_2 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTSELECTED + 2)]) #define COL_MENUCONTENTSELECTED_PLUS_2 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTSELECTED + 2)])
#define COL_MENUCONTENTINACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTINACTIVE + 0)]) #define COL_MENUCONTENTINACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTINACTIVE + 0)])
#define COL_BACKGROUND_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_BACKGROUND + 0)]) #define COL_BACKGROUND_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_BACKGROUND + 0)])
// text colors
#define COL_COLORED_EVENTS_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 0)])
#define COL_INFOBAR_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 1)])
#define COL_INFOBAR_SHADOW_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 2)])
#define COL_MENUHEAD_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 3)])
#define COL_MENUCONTENT_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 4)])
#define COL_MENUCONTENT_TEXT_PLUS_1 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 5)])
#define COL_MENUCONTENT_TEXT_PLUS_2 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 6)])
#define COL_MENUCONTENT_TEXT_PLUS_3 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 7)])
#define COL_MENUCONTENTDARK_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 8)])
#define COL_MENUCONTENTDARK_TEXT_PLUS_1 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 9)])
#define COL_MENUCONTENTDARK_TEXT_PLUS_2 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 10)])
#define COL_MENUCONTENTSELECTED_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 11)])
#define COL_MENUCONTENTSELECTED_TEXT_PLUS_1 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 12)])
#define COL_MENUCONTENTSELECTED_TEXT_PLUS_2 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 13)])
#define COL_MENUCONTENTINACTIVE_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 14)])
#endif #endif
@@ -111,9 +130,12 @@ typedef struct {
unsigned char v; unsigned char v;
} HsvColor; } HsvColor;
unsigned char getBrightnessRGB(fb_pixel_t &color); unsigned char getBrightnessRGB(fb_pixel_t color);
fb_pixel_t changeBrightnessRGBRel(fb_pixel_t &color, int br);
fb_pixel_t changeBrightnessRGB(fb_pixel_t &color, unsigned char br); fb_pixel_t changeBrightnessRGBRel(fb_pixel_t color, int br);
fb_pixel_t changeBrightnessRGB(fb_pixel_t color, unsigned char br);
void changeBrightnessRGBRel2(RgbColor *rgb, int br);
void Hsv2Rgb(HsvColor *hsv, RgbColor *rgb); void Hsv2Rgb(HsvColor *hsv, RgbColor *rgb);
void Rgb2Hsv(RgbColor *rgb, HsvColor *hsv); void Rgb2Hsv(RgbColor *rgb, HsvColor *hsv);

76
src/system/setting_helpers.cpp
View File

@@ -178,6 +178,82 @@ void CColorSetupNotifier::setPalette()
convertSetupColor2RGB(g_settings.colored_events_red, g_settings.colored_events_green, g_settings.colored_events_blue), convertSetupColor2RGB(g_settings.colored_events_red, g_settings.colored_events_green, g_settings.colored_events_blue),
8, convertSetupAlpha2Alpha(g_settings.infobar_alpha) ); 8, convertSetupAlpha2Alpha(g_settings.infobar_alpha) );
// ##### TEXT COLORS #####
// COL_COLORED_EVENTS_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 0,
convertSetupColor2RGB(g_settings.colored_events_red, g_settings.colored_events_green, g_settings.colored_events_blue),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
// COL_INFOBAR_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 1,
convertSetupColor2RGB(g_settings.infobar_Text_red, g_settings.infobar_Text_green, g_settings.infobar_Text_blue),
convertSetupAlpha2Alpha(g_settings.infobar_alpha));
// COL_INFOBAR_SHADOW_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 2,
convertSetupColor2RGB(int(g_settings.infobar_Text_red*0.6), int(g_settings.infobar_Text_green*0.6), int(g_settings.infobar_Text_blue*0.6)),
convertSetupAlpha2Alpha(g_settings.infobar_alpha));
// COL_MENUHEAD_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 3,
convertSetupColor2RGB(g_settings.menu_Head_Text_red, g_settings.menu_Head_Text_green, g_settings.menu_Head_Text_blue),
convertSetupAlpha2Alpha(g_settings.menu_Head_alpha));
// COL_MENUCONTENT_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 4,
convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
// COL_MENUCONTENT_TEXT_PLUS_1
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 5,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue), -16),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
// COL_MENUCONTENT_TEXT_PLUS_2
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 6,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue), -32),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
// COL_MENUCONTENT_TEXT_PLUS_3
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 7,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue), -48),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
// COL_MENUCONTENTDARK_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 8,
convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
// COL_MENUCONTENTDARK_TEXT_PLUS_1
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 9,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue), -52),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
// COL_MENUCONTENTDARK_TEXT_PLUS_2
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 10,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue), -60),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
// COL_MENUCONTENTSELECTED_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 11,
convertSetupColor2RGB(g_settings.menu_Content_Selected_Text_red, g_settings.menu_Content_Selected_Text_green, g_settings.menu_Content_Selected_Text_blue),
convertSetupAlpha2Alpha(g_settings.menu_Content_Selected_alpha));
// COL_MENUCONTENTSELECTED_TEXT_PLUS_1
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 12,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Selected_Text_red, g_settings.menu_Content_Selected_Text_green, g_settings.menu_Content_Selected_Text_blue), -16),
convertSetupAlpha2Alpha(g_settings.menu_Content_Selected_alpha));
// COL_MENUCONTENTSELECTED_TEXT_PLUS_2
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 13,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Selected_Text_red, g_settings.menu_Content_Selected_Text_green, g_settings.menu_Content_Selected_Text_blue), -32),
convertSetupAlpha2Alpha(g_settings.menu_Content_Selected_alpha));
// COL_MENUCONTENTINACTIVE_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 14,
convertSetupColor2RGB(g_settings.menu_Content_inactive_Text_red, g_settings.menu_Content_inactive_Text_green, g_settings.menu_Content_inactive_Text_blue),
convertSetupAlpha2Alpha(g_settings.menu_Content_inactive_alpha));
frameBuffer->paletteSet(); frameBuffer->paletteSet();
} }