X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..bd77da975b1aeeb52c56d2aacb02beec039b5bc3:/src/gtk1/utilsres.cpp diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp index 24e7904c26..c12f461e11 100644 --- a/src/gtk1/utilsres.cpp +++ b/src/gtk1/utilsres.cpp @@ -2,10 +2,9 @@ // Name: utils.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: +// Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,13 +15,15 @@ #include "wx/utils.h" #include "wx/string.h" #include "wx/list.h" +#include "wx/log.h" +#include "wx/gdicmn.h" #include #include #include -#ifdef __SVR4__ -#include -#endif +//#ifdef __SVR4__ +//#include +//#endif #include "gdk/gdkx.h" // GDK_DISPLAY #include "gdk/gdkprivate.h" // gdk_progclass @@ -39,40 +40,43 @@ // Yuck this is really BOTH site and platform dependent // so we should use some other strategy! #ifdef __SUN__ - #define DEFAULT_XRESOURCE_DIR "/usr/openwin/lib/app-defaults" + #define DEFAULT_XRESOURCE_DIR wxT("/usr/openwin/lib/app-defaults") #else - #define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults" + #define DEFAULT_XRESOURCE_DIR wxT("/usr/lib/X11/app-defaults") #endif //----------------------------------------------------------------------------- // glabal data (data.cpp) //----------------------------------------------------------------------------- -extern wxList wxResourceCache; +extern wxResourceCache *wxTheResourceCache; extern XrmDatabase wxResourceDatabase; //----------------------------------------------------------------------------- // utility functions for get/write resources //----------------------------------------------------------------------------- -static char *GetResourcePath(char *buf, char *name, bool create) +static wxChar *GetResourcePath(wxChar *buf, wxChar *name, bool create) { - if (create && FileExists(name)) { - strcpy(buf, name); - return buf; // Exists so ... + if (create && FileExists(name)) + { + wxStrcpy(buf, name); + return buf; // Exists so ... } - if (*name == '/') - strcpy(buf, name); - else { - // Put in standard place for resource files if not absolute - strcpy(buf, DEFAULT_XRESOURCE_DIR); - strcat(buf, "/"); - strcat(buf, FileNameFromPath(name)); + if (*name == wxT('/')) + wxStrcpy(buf, name); + else + { + // Put in standard place for resource files if not absolute + wxStrcpy(buf, DEFAULT_XRESOURCE_DIR); + wxStrcat(buf, wxT("/")); + wxStrcat(buf, FileNameFromPath(name)); } - if (create) { - // Touch the file to create it - FILE *fd = fopen(buf, "w"); - if (fd) fclose(fd); + if (create) + { + // Touch the file to create it + FILE *fd = fopen(wxConvCurrent->cWX2MB(buf), "w"); + if (fd) fclose(fd); } return buf; } @@ -80,114 +84,134 @@ static char *GetResourcePath(char *buf, char *name, bool create) // Read $HOME for what it says is home, if not // read $USER or $LOGNAME for user name else determine // the Real User, then determine the Real home dir. -static char *GetIniFile(char *dest, const char *filename) +static wxChar *GetIniFile(wxChar *dest, const wxChar *filename) { - char *home = NULL; - if (filename && wxIsAbsolutePath(filename)) + const wxChar *home = (const wxChar *) NULL; + if (filename && wxIsAbsolutePath(filename)) { - strcpy(dest, filename); - } + wxStrcpy(dest, filename); + } else { - if ((home = wxGetUserHome(wxString())) != NULL) + if ((home = wxGetUserHome(wxString())) != NULL) { - strcpy(dest, home); - if (dest[strlen(dest) - 1] != '/') strcat(dest, "/"); - if (filename == NULL) - { - if ((filename = getenv("XENVIRONMENT")) == NULL) filename = ".Xdefaults"; - } - else - if (*filename != '.') strcat(dest, "."); - strcat(dest, filename); + wxStrcpy(dest, home); + if (dest[wxStrlen(dest) - 1] != wxT('/')) wxStrcat(dest, wxT("/")); + if (filename == NULL) + { + if ((filename = wxGetenv(wxT("XENVIRONMENT"))) == NULL) filename = wxT(".Xdefaults"); + } + else + if (*filename != wxT('.')) wxStrcat(dest, wxT(".")); + wxStrcat(dest, filename); } - else + else { - dest[0] = '\0'; + dest[0] = wxT('\0'); } } return dest; } -static void wxXMergeDatabases(void) +static void wxXMergeDatabases() { XrmDatabase homeDB, serverDB, applicationDB; - char filenamebuf[1024]; + wxChar filenamebuf[1024]; - char *filename = &filenamebuf[0]; - char *environment; + wxChar *filename = &filenamebuf[0]; + wxChar *environment; char *classname = gdk_progclass; // Robert Roebling ?? char name[256]; (void)strcpy(name, "/usr/lib/X11/app-defaults/"); (void)strcat(name, classname ? classname : "wxWindows"); - // Get application defaults file, if any + // Get application defaults file, if any if ((applicationDB = XrmGetFileDatabase(name))) - (void)XrmMergeDatabases(applicationDB, &wxResourceDatabase); + (void)XrmMergeDatabases(applicationDB, &wxResourceDatabase); // Merge server defaults, created by xrdb, loaded as a property of the root // window when the server initializes and loaded into the display // structure on XOpenDisplay; // if not defined, use .Xdefaults - if (XResourceManagerString(GDK_DISPLAY()) != NULL) { - serverDB = XrmGetStringDatabase(XResourceManagerString(GDK_DISPLAY())); - } else { - (void)GetIniFile(filename, NULL); - serverDB = XrmGetFileDatabase(filename); + if (XResourceManagerString(GDK_DISPLAY()) != NULL) + { + serverDB = XrmGetStringDatabase(XResourceManagerString(GDK_DISPLAY())); + } + else + { + (void)GetIniFile(filename, (wxChar *) NULL); + serverDB = XrmGetFileDatabase(wxConvCurrent->cWX2MB(filename)); } if (serverDB) - XrmMergeDatabases(serverDB, &wxResourceDatabase); + XrmMergeDatabases(serverDB, &wxResourceDatabase); // Open XENVIRONMENT file, or if not defined, the .Xdefaults, // and merge into existing database - if ((environment = getenv("XENVIRONMENT")) == NULL) { - size_t len; - environment = GetIniFile(filename, NULL); - len = strlen(environment); + if ((environment = wxGetenv(wxT("XENVIRONMENT"))) == NULL) + { + size_t len; +#if wxUSE_UNICODE + char hostbuf[1024]; +#endif + environment = GetIniFile(filename, (const wxChar *) NULL); + len = wxStrlen(environment); #if !defined(SVR4) || defined(__sgi) - (void)gethostname(environment + len, 1024 - len); +#if wxUSE_UNICODE + (void)gethostname(hostbuf, 1024 - len); +#else + (void)gethostname(environment + len, 1024 - len); +#endif #else - (void)sysinfo(SI_HOSTNAME, environment + len, 1024 - len); +#if wxUSE_UNICODE + (void)sysinfo(SI_HOSTNAME, hostbuf, 1024 - len); +#else + (void)sysinfo(SI_HOSTNAME, environment + len, 1024 - len); +#endif +#endif +#if wxUSE_UNICODE + wxStrcat(environment, wxConvCurrent->cMB2WX(hostbuf)); #endif } - if ((homeDB = XrmGetFileDatabase(environment))) - XrmMergeDatabases(homeDB, &wxResourceDatabase); + if ((homeDB = XrmGetFileDatabase(wxConvCurrent->cWX2MB(environment)))) + XrmMergeDatabases(homeDB, &wxResourceDatabase); } //----------------------------------------------------------------------------- // called on application exit //----------------------------------------------------------------------------- -void wxFlushResources(void) +void wxFlushResources() { - char nameBuffer[512]; + wxChar nameBuffer[512]; - wxNode *node = wxResourceCache.First(); + wxNode *node = wxTheResourceCache->First(); while (node) { - char *file = node->key.string; - // If file doesn't exist, create it first. - (void)GetResourcePath(nameBuffer, file, TRUE); - - XrmDatabase database = (XrmDatabase)node->Data(); - XrmPutFileDatabase(database, nameBuffer); - XrmDestroyDatabase(database); - wxNode *next = node->Next(); - delete node; - node = next; + wxString str = node->GetKeyString(); + wxChar *file = WXSTRINGCAST str; + // If file doesn't exist, create it first. + (void)GetResourcePath(nameBuffer, file, TRUE); + + XrmDatabase database = (XrmDatabase)node->Data(); + XrmPutFileDatabase(database, wxConvCurrent->cWX2MB(nameBuffer)); + XrmDestroyDatabase(database); + wxNode *next = node->Next(); +// delete node; + node = next; } } -void wxDeleteResources(const char *file) +void wxDeleteResources(const wxChar *file) { - char buffer[500]; + wxLogTrace(wxTraceResAlloc, wxT("Delete: Number = %d"), wxTheResourceCache->Number()); + wxChar buffer[500]; (void)GetIniFile(buffer, file); - wxNode *node = wxResourceCache.Find(buffer); + wxNode *node = wxTheResourceCache->Find(buffer); if (node) { - XrmDatabase database = (XrmDatabase)node->Data(); - XrmDestroyDatabase(database); - delete node; + XrmDatabase database = (XrmDatabase)node->Data(); + XrmDestroyDatabase(database); +// delete node; } } @@ -197,25 +221,26 @@ void wxDeleteResources(const char *file) bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file ) { - char buffer[500]; + wxChar buffer[500]; if (!entry) return FALSE; (void)GetIniFile(buffer, file); XrmDatabase database; - wxNode *node = wxResourceCache.Find(buffer); + wxNode *node = wxTheResourceCache->Find(buffer); if (node) - database = (XrmDatabase)node->Data(); + database = (XrmDatabase)node->Data(); else { - database = XrmGetFileDatabase(buffer); - wxResourceCache.Append(buffer, (wxObject *)database); + database = XrmGetFileDatabase(wxConvCurrent->cWX2MB(buffer)); + wxLogTrace(wxTraceResAlloc, wxT("Write: Number = %d"), wxTheResourceCache->Number()); + wxTheResourceCache->Append(buffer, (wxObject *)database); } char resName[300]; - strcpy(resName, !section.IsNull() ? WXSTRINGCAST section : "wxWindows"); + strcpy(resName, !section.IsNull() ? wxMBSTRINGCAST section.mb_str() : "wxWindows"); strcat(resName, "."); - strcat(resName, entry); - XrmPutStringResource(&database, resName, value); + strcat(resName, entry.mb_str()); + XrmPutStringResource(&database, resName, value.mb_str()); return TRUE; }; @@ -243,90 +268,101 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value, bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file ) { if (!wxResourceDatabase) - wxXMergeDatabases(); + wxXMergeDatabases(); XrmDatabase database; - if (file) { - char buffer[500]; - // Is this right? Trying to get it to look in the user's - // home directory instead of current directory -- JACS - (void)GetIniFile(buffer, file); - - wxNode *node = wxResourceCache.Find(buffer); - if (node) - database = (XrmDatabase)node->Data(); - else { - database = XrmGetFileDatabase(buffer); - wxResourceCache.Append(buffer, (wxObject *)database); - } + if (!file.IsEmpty()) + { + wxChar buffer[500]; + // Is this right? Trying to get it to look in the user's + // home directory instead of current directory -- JACS + (void)GetIniFile(buffer, file); + + wxNode *node = (wxNode*) NULL; /* suppress egcs warning */ + node = wxTheResourceCache->Find(buffer); + if (node) + { + database = (XrmDatabase)node->Data(); + } + else + { + database = XrmGetFileDatabase(wxConvCurrent->cWX2MB(buffer)); + wxLogTrace(wxTraceResAlloc, wxT("Get: Number = %d"), wxTheResourceCache->Number()); + wxTheResourceCache->Append(buffer, (wxObject *)database); + } } else - database = wxResourceDatabase; + database = wxResourceDatabase; XrmValue xvalue; char *str_type[20]; char buf[150]; - strcpy(buf, section); + strcpy(buf, section.mb_str()); strcat(buf, "."); - strcat(buf, entry); + strcat(buf, entry.mb_str()); bool success = XrmGetResource(database, buf, "*", str_type, &xvalue); // Try different combinations of upper/lower case, just in case... - if (!success) { - buf[0] = (isupper(buf[0]) ? tolower(buf[0]) : toupper(buf[0])); - success = XrmGetResource(database, buf, "*", str_type, &xvalue); + if (!success) + { + buf[0] = (isupper(buf[0]) ? tolower(buf[0]) : toupper(buf[0])); + success = XrmGetResource(database, buf, "*", str_type, &xvalue); } - if (success) { - if (*value) - delete[] *value; - *value = new char[xvalue.size + 1]; - strncpy(*value, xvalue.addr, (int)xvalue.size); - return TRUE; + if (success) + { + if (*value) + delete[] *value; + *value = new char[xvalue.size + 1]; + strncpy(*value, xvalue.addr, (int)xvalue.size); + return TRUE; } return FALSE; }; bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file ) { - char *s = NULL; + char *s = (char *) NULL; bool succ = wxGetResource(section, entry, &s, file); - if (succ) { - *value = (float)strtod(s, NULL); - delete[]s; - return TRUE; + if (succ) + { + *value = (float)strtod(s, (char **) NULL); + delete[]s; + return TRUE; } else - return FALSE; + return FALSE; }; bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file ) { - char *s = NULL; + char *s = (char *) NULL; bool succ = wxGetResource(section, entry, &s, file); - if (succ) { - *value = strtol(s, NULL, 10); - delete[]s; - return TRUE; + if (succ) + { + *value = strtol(s, (char **) NULL, 10); + delete[]s; + return TRUE; } else - return FALSE; + return FALSE; }; bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file ) { - char *s = NULL; + char *s = (char *) NULL; bool succ = wxGetResource(section, entry, &s, file); - if (succ) { - // Handle True, False here - // True, Yes, Enables, Set or Activated - if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A') - *value = TRUE; - // False, No, Disabled, Reset, Cleared, Deactivated - else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C') - *value = FALSE; - // Handle as Integer - else - *value = (int)strtol(s, NULL, 10); - delete[]s; - return TRUE; + if (succ) + { + // Handle True, False here + // True, Yes, Enables, Set or Activated + if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A') + *value = TRUE; + // False, No, Disabled, Reset, Cleared, Deactivated + else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C') + *value = FALSE; + // Handle as Integer + else + *value = (int)strtol(s, (char **) NULL, 10); + delete[]s; + return TRUE; } else - return FALSE; + return FALSE; };