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

framebuffer_ng: implement getIconPath

Browse Source 
this implements upstream commit 97343d11 in framebuffer_ng
This commit is contained in:
Stefan Seyfried
2016-10-22 11:46:34 +02:00
parent 8f5f8781e6
commit 3f48c41090
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/driver/framebuffer_ng.cpp
View File

@@ -719,6 +719,18 @@ void CFrameBuffer::setIconBasePath(const std::string & iconPath)
iconBasePath += "/"; iconBasePath += "/";
} }
std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_type)
{
std::string path, filetype;
filetype = "." + file_type;
path = std::string(ICONSDIR_VAR) + "/" + icon_name + filetype;
if (access(path.c_str(), F_OK))
path = iconBasePath + "/" + icon_name + filetype;
if (icon_name.find("/", 0) != std::string::npos)
path = icon_name;
return path;
}
void CFrameBuffer::getIconSize(const char * const filename, int* width, int *height) void CFrameBuffer::getIconSize(const char * const filename, int* width, int *height)
{ {
*width = 0; *width = 0;
@@ -816,13 +828,7 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
/* we cache and check original name */ /* we cache and check original name */
it = icon_cache.find(filename); it = icon_cache.find(filename);
if(it == icon_cache.end()) { if(it == icon_cache.end()) {
std::string newname = filename; std::string newname = getIconPath(filename);
/* if it is not an absolute path, search in configured paths */
if (filename.find("/", 0) == std::string::npos) {
newname = ICONSDIR_VAR + filename + ".png";
if (access(newname.c_str(), F_OK))
newname = iconBasePath + filename + ".png";
}
//printf("CFrameBuffer::paintIcon: check for %s\n", newname.c_str());fflush(stdout); //printf("CFrameBuffer::paintIcon: check for %s\n", newname.c_str());fflush(stdout);
data = g_PicViewer->getIcon(newname, &width, &height); data = g_PicViewer->getIcon(newname, &width, &height);
@@ -841,9 +847,7 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
goto _display; goto _display;
} }
newname = ICONSDIR_VAR + filename + ".raw"; newname = getIconPath(filename, "raw");
if (access(newname.c_str(), F_OK))
newname = iconBasePath + filename + ".raw";
lfd = open(newname.c_str(), O_RDONLY); lfd = open(newname.c_str(), O_RDONLY);

1
src/driver/framebuffer_ng.h
View File

@@ -218,6 +218,7 @@ class CFrameBuffer : public sigc::trackable
void setIconBasePath(const std::string & iconPath); void setIconBasePath(const std::string & iconPath);
std::string getIconBasePath(){return iconBasePath;}; std::string getIconBasePath(){return iconBasePath;};
std::string getIconPath(std::string icon_name, std::string file_type = "png");
void getIconSize(const char * const filename, int* width, int *height); void getIconSize(const char * const filename, int* width, int *height);
/* h is the height of the target "window", if != 0 the icon gets centered in that window */ /* h is the height of the target "window", if != 0 the icon gets centered in that window */