X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84fff0b395adcfecd09dd65389ba7c1c47dd7eee..917b3d40f2da1f02a81cbe385118a504072c401c:/src/common/wxchar.cpp diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index 1307daaf50..db8b5d651e 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -24,6 +24,9 @@ #pragma hdrstop #endif +#define _ISOC9X_SOURCE 1 // to get vsscanf() +#define _BSD_SOURCE 1 // to still get strdup() + #include #include #include @@ -36,9 +39,21 @@ #include "wx/hash.h" #endif -size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n) +#if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H) +#include +#include +#include +#include +#endif + +#if wxUSE_WCHAR_T +size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n) { if (buf) { + if (!n || !*psz) { + if (n) *buf = _T('\0'); + return 0; + } return mbstowcs(buf, psz, n); } @@ -54,9 +69,14 @@ size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n) #endif // GNU } -size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n) +size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n) { if (buf) { + if (!n || !*pwz) { + // glibc2.1 chokes on null input + if (n) *buf = '\0'; + return 0; + } return wcstombs(buf, pwz, n); } @@ -71,9 +91,62 @@ size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n) return wcstombs((char *) NULL, pwz, 0); #endif // GNU } +#endif + +bool WXDLLEXPORT wxOKlibc() +{ +#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) + // GNU libc uses UTF-8 even when it shouldn't + wchar_t res; + if ((MB_CUR_MAX == 2) && + (wxMB2WC(&res, "\xdd\xa5", 1)>0) && + (res==0x765)) { + // this is UTF-8 allright, check whether that's what we want + char *cur_locale = setlocale(LC_ALL, NULL); + if ((strlen(cur_locale) < 4) || + (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8"))) { + // nope, don't use libc conversion + return FALSE; + } + } +#endif + return TRUE; +} + +#ifndef HAVE_WCSLEN +size_t WXDLLEXPORT wcslen(const wchar_t *s) +{ + size_t len = 0; + while (s[len]) len++; + return len; +} +#endif + +#if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H) +inline WORD wxMSW_ctype(wxChar ch) +{ + WORD ret; + GetStringTypeEx(LOCALE_USER_DEFAULT, CT_CTYPE1, &ch, 1, &ret); + return ret; +} + +WXDLLEXPORT int wxIsalnum(wxChar ch) { return IsCharAlphaNumeric(ch); } +WXDLLEXPORT int wxIsalpha(wxChar ch) { return IsCharAlpha(ch); } +WXDLLEXPORT int wxIsctrl(wxChar ch) { return wxMSW_ctype(ch) & C1_CNTRL; } +WXDLLEXPORT int wxIsdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_DIGIT; } +WXDLLEXPORT int wxIsgraph(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_PUNCT|C1_ALPHA); } +WXDLLEXPORT int wxIslower(wxChar ch) { return IsCharLower(ch); } +WXDLLEXPORT int wxIsprint(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_SPACE|C1_PUNCT|C1_ALPHA); } +WXDLLEXPORT int wxIspunct(wxChar ch) { return wxMSW_ctype(ch) & C1_PUNCT; } +WXDLLEXPORT int wxIsspace(wxChar ch) { return wxMSW_ctype(ch) & C1_SPACE; } +WXDLLEXPORT int wxIsupper(wxChar ch) { return IsCharUpper(ch); } +WXDLLEXPORT int wxIsxdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_XDIGIT; } +WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch)); } +WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); } +#endif #ifndef wxStrdup -wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz) +WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz) { size_t size = (wxStrlen(psz) + 1) * sizeof(wxChar); wxChar *ret = (wxChar *) malloc(size); @@ -82,8 +155,20 @@ wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz) } #endif +#ifndef wxStricmp +int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2) +{ + register wxChar c1, c2; + do { + c1 = wxTolower(*psz1++); + c2 = wxTolower(*psz2++); + } while ( c1 && (c1 == c2) ); + return c1 - c2; +} +#endif + #ifndef wxStrtok -wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr) +WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr) { if (!psz) psz = *save_ptr; psz += wxStrspn(psz, delim); @@ -103,14 +188,160 @@ wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt #endif #ifndef wxSetlocale -wxChar * WXDLLEXPORT wxSetlocale(int category, const wxChar *locale) +WXDLLEXPORT wxChar * wxSetlocale(int category, const wxChar *locale) { - setlocale(category, wxConv_libc.cWX2MB(locale)); + setlocale(category, wxConvLibc.cWX2MB(locale)); // FIXME return (wxChar *)NULL; } #endif +#ifdef wxNEED_WX_STRING_H +WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src) +{ + wxChar *ret = dest; + while (*dest) dest++; + while ((*dest++ = *src++)); + return ret; +} + +WXDLLEXPORT wxChar * wxStrchr(const wxChar *s, wxChar c) +{ + while (*s && *s != c) s++; + return (*s) ? (wxChar *)s : (wxChar *)NULL; +} + +WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2) +{ + while ((*s1 == *s2) && *s1) s1++, s2++; + if ((wxUChar)*s1 < (wxUChar)*s2) return -1; + if ((wxUChar)*s1 > (wxUChar)*s2) return 1; + return 0; +} + +WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src) +{ + wxChar *ret = dest; + while ((*dest++ = *src++)); + return ret; +} + +WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n) +{ + wxChar *ret = dest; + while (*dest) dest++; + while (n && (*dest++ = *src++)) n--; + return ret; +} + +WXDLLEXPORT int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n) +{ + while (n && (*s1 == *s2) && *s1) n--, s1++, s2++; + if (n) { + if ((wxUChar)*s1 < (wxUChar)*s2) return -1; + if ((wxUChar)*s1 > (wxUChar)*s2) return 1; + } + return 0; +} + +WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n) +{ + wxChar *ret = dest; + while (n && (*dest++ = *src++)) n--; + while (n) *dest++=0, n--; // the docs specify padding with zeroes + return ret; +} + +WXDLLEXPORT wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept) +{ + while (*s && !wxStrchr(accept, *s)) s++; + return (*s) ? (wxChar *)s : (wxChar *)NULL; +} + +WXDLLEXPORT wxChar * wxStrrchr(const wxChar *s, wxChar c) +{ + wxChar *ret = (wxChar *)NULL; + while (*s) { + if (*s == c) ret = (wxChar *)s; + s++; + } + return ret; +} + +WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept) +{ + size_t len = 0; + while (wxStrchr(accept, *s++)) len++; + return len; +} + +WXDLLEXPORT wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle) +{ + wxChar *fnd; + while ((fnd = wxStrchr(haystack, *needle))) { + if (!wxStrcmp(fnd, needle)) return fnd; + haystack = fnd + 1; + } + return (wxChar *)NULL; +} + +WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr) +{ + const wxChar *start = nptr; + + // FIXME: only correct for C locale + while (wxIsspace(*nptr)) nptr++; + if (*nptr == _T('+') || *nptr == _T('-')) nptr++; + while (wxIsdigit(*nptr)) nptr++; + if (*nptr == _T('.')) { + nptr++; + while (wxIsdigit(*nptr)) nptr++; + } + if (*nptr == _T('E') || *nptr == _T('e')) { + nptr++; + if (*nptr == _T('+') || *nptr == _T('-')) nptr++; + while (wxIsdigit(*nptr)) nptr++; + } + + wxString data(nptr, nptr-start); + wxWX2MBbuf dat = data.mb_str(wxConvLibc); + char *rdat = MBSTRINGCAST dat; + double ret = strtod(dat, &rdat); + + if (endptr) *endptr = (wxChar *)(start + (rdat - (const char *)dat)); + + return ret; +} + +WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base) +{ + const wxChar *start = nptr; + + // FIXME: only correct for C locale + while (wxIsspace(*nptr)) nptr++; + if (*nptr == _T('+') || *nptr == _T('-')) nptr++; + if (((base == 0) || (base == 16)) && + (nptr[0] == _T('0') && nptr[1] == _T('x'))) { + nptr += 2; + base = 16; + } + else if ((base == 0) && (nptr[0] == _T('0'))) base = 8; + else if (base == 0) base = 10; + + while ((wxIsdigit(*nptr) && (*nptr - _T('0') < base)) || + (wxIsalpha(*nptr) && (wxToupper(*nptr) - _T('A') + 10 < base))) nptr++; + + wxString data(nptr, nptr-start); + wxWX2MBbuf dat = data.mb_str(wxConvLibc); + char *rdat = MBSTRINGCAST dat; + long int ret = strtol(dat, &rdat, base); + + if (endptr) *endptr = (wxChar *)(start + (rdat - (const char *)dat)); + + return ret; +} +#endif + #ifdef wxNEED_WX_STDIO_H int WXDLLEXPORT wxPrintf(const wxChar *fmt, ...) { @@ -137,12 +368,12 @@ int WXDLLEXPORT wxFprintf(FILE *stream, const wxChar *fmt, ...) int ret; va_start(argptr, fmt); - ret = wxFvprintf(stream, fmt, argptr); + ret = wxVfprintf(stream, fmt, argptr); va_end(argptr); return ret; } -int WXDLLEXPORT wxFvprintf(FILE *stream, const wxChar *fmt, va_list argptr) +int WXDLLEXPORT wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr) { wxString str; str.PrintfV(fmt,argptr); @@ -170,24 +401,44 @@ int WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr) wxStrcpy(buf,str.c_str()); return str.Len(); } + +int WXDLLEXPORT wxSscanf(const wxChar *buf, const wxChar *fmt, ...) +{ + va_list argptr; + int ret; + + va_start(argptr, fmt); + ret = wxVsscanf(buf, fmt, argptr); + va_end(argptr); + return ret; +} + +int WXDLLEXPORT wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr) +{ + int ret; + // this will work only for numeric conversion! Strings will not be converted correctly + // hopefully this is all we'll need + ret = vsscanf(wxConvLibc.cWX2MB(buf), wxConvLibc.cWX2MB(fmt), argptr); + return ret; +} #endif #ifndef wxAtof double WXDLLEXPORT wxAtof(const wxChar *psz) { - return atof(wxConv_libc.cWX2MB(psz)); + return atof(wxConvLibc.cWX2MB(psz)); } #endif #ifdef wxNEED_WX_STDLIB_H int WXDLLEXPORT wxAtoi(const wxChar *psz) { - return atoi(wxConv_libc.cWX2MB(psz)); + return atoi(wxConvLibc.cWX2MB(psz)); } long WXDLLEXPORT wxAtol(const wxChar *psz) { - return atol(wxConv_libc.cWX2MB(psz)); + return atol(wxConvLibc.cWX2MB(psz)); } wxChar * WXDLLEXPORT wxGetenv(const wxChar *name) @@ -197,7 +448,7 @@ wxChar * WXDLLEXPORT wxGetenv(const wxChar *name) wxObject *data = env.Get(name); if (!data) { // nope, retrieve it, - const char *val = getenv(wxConv_libc.cWX2MB(name)); + const char *val = getenv(wxConvLibc.cWX2MB(name)); if (!val) return (wxChar *)NULL; // convert it, data = (wxObject *)new wxString(val); @@ -210,7 +461,7 @@ wxChar * WXDLLEXPORT wxGetenv(const wxChar *name) int WXDLLEXPORT wxSystem(const wxChar *psz) { - return system(wxConv_libc.cWX2MB(psz)); + return system(wxConvLibc.cWX2MB(psz)); } #endif