mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove platform-dependent code from Fl_File_Icon2.cxx

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11576 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-04-10 18:45:59 +00:00
parent 99b3c6813a
commit 78213fc57e
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Fl_File_Icon2.cxx
View File

@ -40,22 +40,14 @@
#include <ctype.h>
#include <errno.h>
#include <FL/math.h>
#include <sys/types.h>
#if defined(WIN32) && !defined(__CYGWIN__)
# include <io.h>
# define F_OK 0
// Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs
// on Windows, which is supposed to be POSIX compliant...
# define access _access
#else
# include <unistd.h>
#endif // WIN32
#include <FL/Fl_File_Icon.H>
#include <FL/Fl_Shared_Image.H>
#include <FL/Fl_Widget.H>
#include <FL/fl_draw.H>
#include <FL/filename.H>
#ifndef F_OK
# define F_OK 0
#endif
//
// Local functions...
@ -662,15 +654,15 @@ Fl_File_Icon::load_system_icons(void) {
if (!kdedir) {
// Figure out where KDE is installed...
if ((kdedir = getenv("KDEDIR")) == NULL) {
if (!access("/opt/kde", F_OK)) kdedir = "/opt/kde";
else if (!access("/usr/local/share/mimelnk", F_OK)) kdedir = "/usr/local";
if (!fl_access("/opt/kde", F_OK)) kdedir = "/opt/kde";
else if (!fl_access("/usr/local/share/mimelnk", F_OK)) kdedir = "/usr/local";
else kdedir = "/usr";
}
}
snprintf(filename, sizeof(filename), "%s/share/mimelnk", kdedir);
if (!access(filename, F_OK)) {
if (!fl_access(filename, F_OK)) {
// Load KDE icons...
icon = new Fl_File_Icon("*", Fl_File_Icon::PLAIN);
@ -678,7 +670,7 @@ Fl_File_Icon::load_system_icons(void) {
snprintf(icondir, sizeof(icondir), "%s/share/icons/%s", kdedir,
icondirs[i]);
if (!access(icondir, F_OK)) break;
if (!fl_access(icondir, F_OK)) break;
}
if (icondirs[i]) {
@ -689,25 +681,25 @@ Fl_File_Icon::load_system_icons(void) {
kdedir);
}
if (!access(filename, F_OK)) icon->load_image(filename);
if (!fl_access(filename, F_OK)) icon->load_image(filename);
icon = new Fl_File_Icon("*", Fl_File_Icon::LINK);
snprintf(filename, sizeof(filename), "%s/16x16/filesystems/link.png",
icondir);
if (!access(filename, F_OK)) icon->load_image(filename);
if (!fl_access(filename, F_OK)) icon->load_image(filename);
snprintf(filename, sizeof(filename), "%s/share/mimelnk", kdedir);
load_kde_icons(filename, icondir);
} else if (!access("/usr/share/icons/folder.xpm", F_OK)) {
} else if (!fl_access("/usr/share/icons/folder.xpm", F_OK)) {
// Load GNOME icons...
icon = new Fl_File_Icon("*", Fl_File_Icon::PLAIN);
icon->load_image("/usr/share/icons/page.xpm");
icon = new Fl_File_Icon("*", Fl_File_Icon::DIRECTORY);
icon->load_image("/usr/share/icons/folder.xpm");
} else if (!access("/usr/dt/appconfig/icons", F_OK)) {
} else if (!fl_access("/usr/dt/appconfig/icons", F_OK)) {
// Load CDE icons...
icon = new Fl_File_Icon("*", Fl_File_Icon::PLAIN);
icon->load_image("/usr/dt/appconfig/icons/C/Dtdata.m.pm");
@ -726,7 +718,7 @@ Fl_File_Icon::load_system_icons(void) {
icon = new Fl_File_Icon("*.ppd", Fl_File_Icon::PLAIN);
icon->load_image("/usr/dt/appconfig/icons/C/DtPrtpr.m.pm");
} else if (!access("/usr/lib/filetype", F_OK)) {
} else if (!fl_access("/usr/lib/filetype", F_OK)) {
// Load SGI icons...
icon = new Fl_File_Icon("*", Fl_File_Icon::PLAIN);
icon->load_fti("/usr/lib/filetype/iconlib/generic.doc.fti");
@ -740,7 +732,7 @@ Fl_File_Icon::load_system_icons(void) {
icon = new Fl_File_Icon("*.{bmp|bw|gif|jpg|pbm|pcd|pgm|ppm|png|ras|rgb|tif|xbm|xpm}", Fl_File_Icon::PLAIN);
icon->load_fti("/usr/lib/filetype/system/iconlib/ImageFile.fti");
if (!access("/usr/lib/filetype/install/iconlib/acroread.doc.fti", F_OK)) {
if (!fl_access("/usr/lib/filetype/install/iconlib/acroread.doc.fti", F_OK)) {
icon = new Fl_File_Icon("*.{eps|ps}", Fl_File_Icon::PLAIN);
icon->load_fti("/usr/lib/filetype/system/iconlib/PostScriptFile.closed.fti");
@ -751,13 +743,13 @@ Fl_File_Icon::load_system_icons(void) {
icon->load_fti("/usr/lib/filetype/system/iconlib/PostScriptFile.closed.fti");
}
if (!access("/usr/lib/filetype/install/iconlib/html.fti", F_OK)) {
if (!fl_access("/usr/lib/filetype/install/iconlib/html.fti", F_OK)) {
icon = new Fl_File_Icon("*.{htm|html|shtml}", Fl_File_Icon::PLAIN);
icon->load_fti("/usr/lib/filetype/iconlib/generic.doc.fti");
icon->load_fti("/usr/lib/filetype/install/iconlib/html.fti");
}
if (!access("/usr/lib/filetype/install/iconlib/color.ps.idle.fti", F_OK)) {
if (!fl_access("/usr/lib/filetype/install/iconlib/color.ps.idle.fti", F_OK)) {
icon = new Fl_File_Icon("*.ppd", Fl_File_Icon::PLAIN);
icon->load_fti("/usr/lib/filetype/install/iconlib/color.ps.idle.fti");
}
@ -856,7 +848,7 @@ load_kde_mimelnk(const char *filename, // I - mimelnk filename
if (iconfilename[0]) {
if (iconfilename[0] == '/') {
strlcpy(full_iconfilename, iconfilename, sizeof(full_iconfilename));
} else if (!access(icondir, F_OK)) {
} else if (!fl_access(icondir, F_OK)) {
// KDE 3.x and 2.x icons
int i; // Looping var
static const char *paths[] = { // Subdirs to look in...
@ -919,7 +911,7 @@ load_kde_mimelnk(const char *filename, // I - mimelnk filename
snprintf(full_iconfilename, sizeof(full_iconfilename),
"%s/%s/%s.png", icondir, paths[i], iconfilename);
if (!access(full_iconfilename, F_OK)) break;
if (!fl_access(full_iconfilename, F_OK)) break;
}
if (i >= (int)(sizeof(paths) / sizeof(paths[0]))) return;
@ -928,7 +920,7 @@ load_kde_mimelnk(const char *filename, // I - mimelnk filename
snprintf(full_iconfilename, sizeof(full_iconfilename),
"%s/%s", tmp, iconfilename);
if (access(full_iconfilename, F_OK)) return;
if (fl_access(full_iconfilename, F_OK)) return;
}
if (strncmp(mimetype, "inode/", 6) == 0) {