/////////////////////////////////////////////////////////////////////////////
-// Name: wxchar.cpp
+// Name: src/common/wxchar.cpp
// Purpose: wxChar implementation
// Author: Ove Kåven
-// Modified by:
+// Modified by: Ron Lee
// Created: 09/04/99
// RCS-ID: $Id$
-// Copyright: (c) wxWindows copyright
-// Licence: wxWindows license
+// Copyright: (c) wxWidgets copyright
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "wxchar.h"
-#endif
-
// ===========================================================================
// headers, declarations, constants
// ===========================================================================
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <locale.h>
+
+#ifndef __WXWINCE__
#include <time.h>
+#include <locale.h>
+#else
+#include "wx/msw/wince/time.h"
+#endif
#ifndef WX_PRECOMP
#include "wx/defs.h"
#include <winnt.h>
#endif
+#if defined(__MWERKS__) && __MSL__ >= 0x6000
+namespace std {}
+using namespace std ;
+#endif
+
+#ifdef __WXMAC__
+ #include "wx/mac/private.h"
+#endif
+
#if wxUSE_WCHAR_T
size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
{
+ // assume that we have mbsrtowcs() too if we have wcsrtombs()
+#ifdef HAVE_WCSRTOMBS
+ mbstate_t mbstate;
+ memset(&mbstate, 0, sizeof(mbstate_t));
+#endif
+
if (buf) {
if (!n || !*psz) {
if (n) *buf = wxT('\0');
return 0;
}
- return mbstowcs(buf, psz, n);
+#ifdef HAVE_WCSRTOMBS
+ return mbsrtowcs(buf, &psz, n, &mbstate);
+#else
+ return wxMbstowcs(buf, psz, n);
+#endif
}
- // assume that we have mbsrtowcs() too if we have wcsrtombs()
+ // note that we rely on common (and required by Unix98 but unfortunately not
+ // C99) extension which allows to call mbs(r)towcs() with NULL output pointer
+ // to just get the size of the needed buffer -- this is needed as otherwise
+ // we have no idea about how much space we need and if the CRT doesn't
+ // support it (the only currently known example being Metrowerks, see
+ // wx/wxchar.h) we don't use its mbstowcs() at all
#ifdef HAVE_WCSRTOMBS
- mbstate_t mbstate;
return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
-#else // !GNU libc
- return mbstowcs((wchar_t *) NULL, psz, 0);
-#endif // GNU
+#else
+ return wxMbstowcs((wchar_t *) NULL, psz, 0);
+#endif
}
size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
{
+#ifdef HAVE_WCSRTOMBS
+ mbstate_t mbstate;
+ memset(&mbstate, 0, sizeof(mbstate_t));
+#endif
+
if (buf) {
if (!n || !*pwz) {
// glibc2.1 chokes on null input
if (n) *buf = '\0';
return 0;
}
- return wcstombs(buf, pwz, n);
+#ifdef HAVE_WCSRTOMBS
+ return wcsrtombs(buf, &pwz, n, &mbstate);
+#else
+ return wxWcstombs(buf, pwz, n);
+#endif
}
-#if HAVE_WCSRTOMBS
- mbstate_t mbstate;
+#ifdef HAVE_WCSRTOMBS
return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
-#else // !GNU libc
- return wcstombs((char *) NULL, pwz, 0);
-#endif // GNU
+#else
+ return wxWcstombs((char *) NULL, pwz, 0);
+#endif
}
#endif // wxUSE_WCHAR_T
bool WXDLLEXPORT wxOKlibc()
{
-#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__)
+#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) && !defined(__WINE__)
// glibc 2.0 uses UTF-8 even when it shouldn't
wchar_t res = 0;
if ((MB_CUR_MAX == 2) &&
(strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
(strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
// nope, don't use libc conversion
- return FALSE;
+ return false;
}
}
#endif
- return TRUE;
+ return true;
}
-#ifndef HAVE_WCSLEN
-size_t WXDLLEXPORT wcslen(const wchar_t *s)
-{
- size_t len = 0;
- while (s[len]) len++;
- return len;
-}
-#endif
-
// ============================================================================
// printf() functions business
// ============================================================================
+// special test mode: define all functions below even if we don't really need
+// them to be able to test them
+#ifdef wxTEST_PRINTF
+ #undef wxFprintf
+ #undef wxPrintf
+ #undef wxSprintf
+ #undef wxVfprintf
+ #undef wxVsprintf
+ #undef wxVprintf
+ #undef wxVsnprintf_
+ #undef wxSnprintf_
+
+ #define wxNEED_WPRINTF
+
+ int wxVfprintf( FILE *stream, const wxChar *format, va_list argptr );
+#endif
+
// ----------------------------------------------------------------------------
// implement [v]snprintf() if the system doesn't provide a safe one
// ----------------------------------------------------------------------------
// number of characters in the buffer so far, must be less than lenMax
size_t lenCur = 0;
- for (size_t n = 0; format[n]; n++)
+ for ( size_t n = 0; ; n++ )
{
- if (format[n] == wxT('%')) {
+ const wxChar chCur = format[n];
+
+ if ( chCur == wxT('%') )
+ {
static char s_szFlags[256] = "%";
size_t flagofs = 1;
- bool adj_left = FALSE,
- in_prec = FALSE,
- prec_dot = FALSE,
- done = FALSE;
+ bool adj_left = false,
+ in_prec = false,
+ prec_dot = false,
+ done = false;
int ilen = 0;
size_t min_width = 0,
max_width = wxSTRING_MAXLEN;
- do {
+ do
+ {
#define CHECK_PREC \
if (in_prec && !prec_dot) \
{ \
s_szFlags[flagofs++] = '.'; \
- prec_dot = TRUE; \
+ prec_dot = true; \
}
#define APPEND_CH(ch) \
- if ( lenCur == lenMax ) \
- return -1; \
- \
- buf[lenCur++] = ch
-
-#define APPEND_STR(s) \
- for ( const char *p = s; *p; p++ ) \
{ \
- APPEND_CH((wchar_t)(*p)); \
+ if ( lenCur == lenMax ) \
+ return -1; \
+ \
+ buf[lenCur++] = ch; \
}
-#define APPEND_WSTR(s) \
- for ( const wchar_t *p = s; *p; p++ ) \
+#define APPEND_STR(s) \
{ \
- APPEND_CH(*p); \
+ for ( const wxChar *p = s; *p; p++ ) \
+ { \
+ APPEND_CH(*p); \
+ } \
}
- switch (format[++n]) {
+ // what follows '%'?
+ const wxChar ch = format[++n];
+ switch ( ch )
+ {
case wxT('\0'):
APPEND_CH(_T('\0'));
- done = TRUE;
+ done = true;
break;
case wxT('%'):
APPEND_CH(_T('%'));
- done = TRUE;
+ done = true;
break;
case wxT('#'):
case wxT('+'):
case wxT('\''):
CHECK_PREC
- s_szFlags[flagofs++] = format[n];
+ s_szFlags[flagofs++] = ch;
break;
case wxT('-'):
CHECK_PREC
- adj_left = TRUE;
- s_szFlags[flagofs++] = format[n];
+ adj_left = true;
+ s_szFlags[flagofs++] = ch;
break;
case wxT('.'):
CHECK_PREC
- in_prec = TRUE;
- prec_dot = FALSE;
+ in_prec = true;
+ prec_dot = false;
max_width = 0;
- // dot will be auto-added to s_szFlags if non-negative number follows
+ // dot will be auto-added to s_szFlags if non-negative
+ // number follows
break;
case wxT('h'):
ilen = -1;
CHECK_PREC
- s_szFlags[flagofs++] = format[n];
+ s_szFlags[flagofs++] = ch;
break;
case wxT('l'):
ilen = 1;
CHECK_PREC
- s_szFlags[flagofs++] = format[n];
+ s_szFlags[flagofs++] = ch;
break;
case wxT('q'):
case wxT('L'):
ilen = 2;
CHECK_PREC
- s_szFlags[flagofs++] = format[n];
+ s_szFlags[flagofs++] = ch;
break;
case wxT('Z'):
ilen = 3;
CHECK_PREC
- s_szFlags[flagofs++] = format[n];
+ s_szFlags[flagofs++] = ch;
break;
case wxT('*'):
{
int len = va_arg(argptr, int);
- if (in_prec) {
+ if (in_prec)
+ {
if (len<0) break;
CHECK_PREC
max_width = len;
- } else {
- if (len<0) {
+ }
+ else
+ {
+ if (len<0)
+ {
adj_left = !adj_left;
s_szFlags[flagofs++] = '-';
len = -len;
{
int len = 0;
CHECK_PREC
- while ((format[n]>=wxT('0')) && (format[n]<=wxT('9'))) {
- s_szFlags[flagofs++] = format[n];
- len = len*10 + (format[n] - wxT('0'));
- n++;
- }
- if (in_prec) max_width = len;
- else min_width = len;
+ while ( (format[n] >= wxT('0')) &&
+ (format[n] <= wxT('9')) )
+ {
+ s_szFlags[flagofs++] = format[n];
+ len = len*10 + (format[n] - wxT('0'));
+ n++;
+ }
+
+ if (in_prec)
+ max_width = len;
+ else
+ min_width = len;
+
n--; // the main loop pre-increments n again
}
break;
case wxT('x'):
case wxT('X'):
CHECK_PREC
- s_szFlags[flagofs++] = format[n];
+ s_szFlags[flagofs++] = ch;
s_szFlags[flagofs] = '\0';
- if (ilen == 0 ) {
+ if (ilen == 0 )
+ {
int val = va_arg(argptr, int);
::sprintf(szScratch, s_szFlags, val);
}
- else if (ilen == -1) {
- short int val = va_arg(argptr, short int);
+ else if (ilen == -1)
+ {
+ // NB: 'short int' value passed through '...'
+ // is promoted to 'int', so we have to get
+ // an int from stack even if we need a short
+ short int val = (short int) va_arg(argptr, int);
::sprintf(szScratch, s_szFlags, val);
}
- else if (ilen == 1) {
+ else if (ilen == 1)
+ {
long int val = va_arg(argptr, long int);
::sprintf(szScratch, s_szFlags, val);
}
- else if (ilen == 2) {
+ else if (ilen == 2)
+ {
#if SIZEOF_LONG_LONG
long long int val = va_arg(argptr, long long int);
::sprintf(szScratch, s_szFlags, val);
-#else
+#else // !long long
long int val = va_arg(argptr, long int);
::sprintf(szScratch, s_szFlags, val);
-#endif
+#endif // long long/!long long
}
- else if (ilen == 3) {
+ else if (ilen == 3)
+ {
size_t val = va_arg(argptr, size_t);
::sprintf(szScratch, s_szFlags, val);
}
- APPEND_STR(szScratch);
+ {
+ const wxMB2WXbuf tmp =
+ wxConvLibc.cMB2WX(szScratch);
+ APPEND_STR(tmp);
+ }
- done = TRUE;
+ done = true;
break;
case wxT('e'):
case wxT('g'):
case wxT('G'):
CHECK_PREC
- s_szFlags[flagofs++] = format[n];
+ s_szFlags[flagofs++] = ch;
s_szFlags[flagofs] = '\0';
- if (ilen == 2) {
+ if (ilen == 2)
+ {
long double val = va_arg(argptr, long double);
::sprintf(szScratch, s_szFlags, val);
- } else {
+ }
+ else
+ {
double val = va_arg(argptr, double);
::sprintf(szScratch, s_szFlags, val);
}
- APPEND_STR(szScratch);
+ {
+ const wxMB2WXbuf tmp =
+ wxConvLibc.cMB2WX(szScratch);
+ APPEND_STR(tmp);
+ }
- done = TRUE;
+ done = true;
break;
case wxT('p'):
{
void *val = va_arg(argptr, void *);
CHECK_PREC
- s_szFlags[flagofs++] = format[n];
+ s_szFlags[flagofs++] = ch;
s_szFlags[flagofs] = '\0';
::sprintf(szScratch, s_szFlags, val);
- APPEND_STR(szScratch);
+ const wxMB2WXbuf tmp =
+ wxConvLibc.cMB2WX(szScratch);
+ APPEND_STR(tmp);
- done = TRUE;
+ done = true;
}
break;
case wxT('c'):
{
- wxChar val = va_arg(argptr, int);
- // we don't need to honor padding here, do we?
+ int val = va_arg(argptr, int);
+#if wxUSE_UNICODE
+ if (ilen == -1)
+ {
+ const char buf[2] = { val, 0 };
+ val = wxString(buf, wxConvLibc)[0u];
+ }
+#elif wxUSE_WCHAR_T
+ if (ilen == 1)
+ {
+ const wchar_t buf[2] = { val, 0 };
+ val = wxString(buf, wxConvLibc)[0u];
+ }
+#endif
+ size_t i;
+
+ if (!adj_left)
+ for (i = 1; i < min_width; i++)
+ APPEND_CH(_T(' '));
+
APPEND_CH(val);
- done = TRUE;
+ if (adj_left)
+ for (i = 1; i < min_width; i++)
+ APPEND_CH(_T(' '));
+
+ done = true;
}
break;
case wxT('s'):
- if (ilen == -1) {
- // wx extension: we'll let %hs mean non-Unicode strings
- char *val = va_arg(argptr, char *);
+ {
+ const wxChar *val = NULL;
#if wxUSE_UNICODE
- // ASCII->Unicode constructor handles max_width right
- wxString s(val, wxConvLibc, max_width);
-#else
- size_t len = wxSTRING_MAXLEN;
- if (val) {
- for (len = 0; val[len] && (len<max_width); len++);
- } else val = wxT("(null)");
- wxString s(val, len);
+ wxString s;
+
+ if (ilen == -1)
+ {
+ // wx extension: we'll let %hs mean non-Unicode
+ // strings
+ char *v = va_arg(argptr, char *);
+
+ if (v)
+ val = s = wxString(v, wxConvLibc);
+ }
+ else
+#elif wxUSE_WCHAR_T
+ wxString s;
+
+ if (ilen == 1)
+ {
+ // %ls means Unicode strings
+ wchar_t *v = va_arg(argptr, wchar_t *);
+
+ if (v)
+ val = s = wxString(v, wxConvLibc);
+ }
+ else
#endif
- if (s.Len() < min_width)
- s.Pad(min_width - s.Len(), wxT(' '), adj_left);
-
- APPEND_WSTR(s);
- } else {
- wxChar *val = va_arg(argptr, wxChar *);
- size_t len = wxSTRING_MAXLEN;
- if (val) {
- for (len = 0; val[len] && (len<max_width); len++);
- } else val = wxT("(null)");
- wxString s(val, len);
- if (s.Len() < min_width)
- s.Pad(min_width - s.Len(), wxT(' '), adj_left);
-
- APPEND_WSTR(s);
+ {
+ val = va_arg(argptr, wxChar *);
+ }
+
+ size_t len = 0;
+
+ if (val)
+ {
+ for ( len = 0;
+ val[len] && (len < max_width);
+ len++ )
+ ;
+ }
+ else if (max_width >= 6)
+ {
+ val = wxT("(null)");
+ len = 6;
+ }
+ else
+ {
+ val = wxEmptyString;
+ len = 0;
+ }
+
+ size_t i;
+
+ if (!adj_left)
+ for (i = len; i < min_width; i++)
+ APPEND_CH(_T(' '));
+
+ for (i = 0; i < len; i++)
+ APPEND_CH(val[i]);
+
+ if (adj_left)
+ for (i = len; i < min_width; i++)
+ APPEND_CH(_T(' '));
+
+ done = true;
}
- done = TRUE;
break;
case wxT('n'):
- if (ilen == 0) {
+ if (ilen == 0)
+ {
int *val = va_arg(argptr, int *);
*val = lenCur;
}
- else if (ilen == -1) {
+ else if (ilen == -1)
+ {
short int *val = va_arg(argptr, short int *);
*val = lenCur;
}
- else if (ilen >= 1) {
+ else if (ilen >= 1)
+ {
long int *val = va_arg(argptr, long int *);
*val = lenCur;
}
- done = TRUE;
+ done = true;
break;
default:
- if (wxIsalpha(format[n]))
- // probably some flag not taken care of here yet
- s_szFlags[flagofs++] = format[n];
- else {
- // bad format
- APPEND_CH(_T('%')); // just to pass the glibc tst-printf.c
- n--;
- done = TRUE;
- }
+ // bad format, leave unchanged
+ APPEND_CH(_T('%'));
+ APPEND_CH(ch);
+ done = true;
break;
}
- } while (!done);
+ }
+ while (!done);
}
else
{
- APPEND_CH(format[n]);
+ APPEND_CH(chCur);
}
+
+ // terminating NUL?
+ if ( !chCur )
+ break;
}
return lenCur;
}
#endif // wxSnprintf_
+#if defined(__DMC__)
+ /* Digital Mars adds count to _stprintf (C99) so convert */
+ #if wxUSE_UNICODE
+ int wxSprintf (wchar_t * __RESTRICT s, const wchar_t * __RESTRICT format, ... )
+ {
+ va_list arglist;
+
+ va_start( arglist, format );
+ int iLen = swprintf ( s, -1, format, arglist );
+ va_end( arglist );
+ return iLen ;
+ }
+
+ #endif // wxUSE_UNICODE
+
+#endif //__DMC__
+
// ----------------------------------------------------------------------------
// implement the standard IO functions for wide char if libc doesn't have them
// ----------------------------------------------------------------------------
-#ifndef HAVE_FPUTWC
-
+#ifdef wxNEED_FPUTS
int wxFputs(const wchar_t *ws, FILE *stream)
{
// counting the number of wide characters written isn't worth the trouble,
// simply distinguish between ok and error
return fputs(wxConvLibc.cWC2MB(ws), stream) == -1 ? -1 : 0;
}
+#endif // wxNEED_FPUTS
+
+#ifdef wxNEED_PUTS
+int wxPuts(const wxChar *ws)
+{
+ int rc = wxFputs(ws, stdout);
+ if ( rc != -1 )
+ {
+ if ( wxFputs(L"\n", stdout) == -1 )
+ return -1;
+
+ rc++;
+ }
+
+ return rc;
+}
+#endif // wxNEED_PUTS
+#ifdef wxNEED_PUTC
int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream)
{
wchar_t ws[2] = { wc, L'\0' };
return wxFputs(ws, stream);
}
-
-#endif // HAVE_FPUTWC
+#endif // wxNEED_PUTC
// NB: we only implement va_list functions here, the ones taking ... are
// defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse
#ifdef wxNEED_WPRINTF
// TODO: implement the scanf() functions
-int vwscanf(const wchar_t *format, va_list argptr)
+int vwscanf(const wxChar *format, va_list argptr)
{
wxFAIL_MSG( _T("TODO") );
return -1;
}
-int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
+int vswscanf(const wxChar *ws, const wxChar *format, va_list argptr)
{
- wxFAIL_MSG( _T("TODO") );
-
- return -1;
+ // The best we can do without proper Unicode support in glibc is to
+ // convert the strings into MB representation and run ANSI version
+ // of the function. This doesn't work with %c and %s because of difference
+ // in size of char and wchar_t, though.
+
+ wxCHECK_MSG( wxStrstr(format, _T("%s")) == NULL, -1,
+ _T("incomplete vswscanf implementation doesn't allow %s") );
+ wxCHECK_MSG( wxStrstr(format, _T("%c")) == NULL, -1,
+ _T("incomplete vswscanf implementation doesn't allow %c") );
+
+ va_list argcopy;
+ wxVaCopy(argcopy, argptr);
+ return vsscanf(wxConvLibc.cWX2MB(ws), wxConvLibc.cWX2MB(format), argcopy);
}
-int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr)
+int vfwscanf(FILE *stream, const wxChar *format, va_list argptr)
{
wxFAIL_MSG( _T("TODO") );
#define vswprintf wxVsnprintf_
-int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr)
+int vfwprintf(FILE *stream, const wxChar *format, va_list argptr)
{
wxString s;
int rc = s.PrintfV(format, argptr);
if ( rc != -1 )
{
// we can't do much better without Unicode support in libc...
- if ( fprintf(stream, s.mb_str()) == -1 )
+ if ( fprintf(stream, "%s", (const char*)s.mb_str() ) == -1 )
return -1;
}
return rc;
}
-int vwprintf(const wchar_t *format, va_list argptr)
+int vwprintf(const wxChar *format, va_list argptr)
{
return wxVfprintf(stdout, format, argptr);
}
So to use native functions in order to get our semantics we must do the
following translations in Unicode mode (nothing to do in ANSI mode):
- wxWindows specifier POSIX specifier
+ wxWidgets specifier POSIX specifier
----------------------------------------
%hc, %C, %hC %c
ch == _T('0') || ch == _T(' ') || ch == _T('#');
}
- void SkipDigits(const wxChar **ppc)
+ void SkipDigits(const wxChar **ptpc)
{
- while ( **ppc >= _T('0') && **ppc <= _T('9') )
- CopyFmtChar(*(*ppc)++);
+ while ( **ptpc >= _T('0') && **ptpc <= _T('9') )
+ CopyFmtChar(*(*ptpc)++);
}
// the translated format
// precision?
if ( *format == _T('.') )
{
- SkipDigits(&format);
+ CopyFmtChar(*format++);
+ if ( *format == _T('*') )
+ CopyFmtChar(*format++);
+ else
+ SkipDigits(&format);
}
// next we can have a size modifier
case _T('c'):
case _T('s'):
// %c -> %lc but %hc stays %hc and %lc is still %lc
- switch ( size )
- {
- case Default:
- InsertFmtChar(_T('l'));
- break;
-
- case Short:
- CopyFmtChar(_T('h'));
- break;
-
- case Long:
- ;
- }
+ if ( size == Default)
+ InsertFmtChar(_T('l'));
// fall through
default:
// nothing special to do
+ if ( size != Default )
+ CopyFmtChar(*(format - 1));
CopyFmtChar(*format++);
}
}
#define wxFormatConverter(x) (x)
#endif // wxNEED_PRINTF_CONVERSION/!wxNEED_PRINTF_CONVERSION
+#ifdef __WXDEBUG__
+// For testing the format converter
+wxString wxConvertFormat(const wxChar *format)
+{
+ return wxString(wxFormatConverter(format));
+}
+#endif
+
// ----------------------------------------------------------------------------
// wxPrintf(), wxScanf() and relatives
// ----------------------------------------------------------------------------
#if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF)
-int wxScanf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2
+int wxScanf( const wxChar *format, ... )
{
va_list argptr;
va_start(argptr, format);
return ret;
}
-int wxSscanf( const wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
+int wxSscanf( const wxChar *str, const wxChar *format, ... )
{
va_list argptr;
va_start(argptr, format);
return ret;
}
-int wxFscanf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
+int wxFscanf( FILE *stream, const wxChar *format, ... )
{
va_list argptr;
va_start(argptr, format);
-
int ret = vfwscanf(stream, wxFormatConverter(format), argptr);
va_end(argptr);
return ret;
}
-int wxPrintf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2
+int wxPrintf( const wxChar *format, ... )
{
va_list argptr;
va_start(argptr, format);
-
+
int ret = vwprintf( wxFormatConverter(format), argptr );
va_end(argptr);
}
#ifndef wxSnprintf
-int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_4
+int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... )
{
va_list argptr;
va_start(argptr, format);
}
#endif // wxSnprintf
-int wxSprintf( wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
+int wxSprintf( wxChar *str, const wxChar *format, ... )
{
va_list argptr;
va_start(argptr, format);
- // callers of wxSprintf() deserve what they get
- int ret = vswprintf( str, UINT_MAX, wxFormatConverter(format), argptr );
+ // note that wxString::FormatV() uses wxVsnprintf(), not wxSprintf(), so
+ // it's safe to implement this one in terms of it
+ wxString s(wxString::FormatV(format, argptr));
+ wxStrcpy(str, s);
va_end(argptr);
- return ret;
+ return s.length();
}
-int wxFprintf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3
+int wxFprintf( FILE *stream, const wxChar *format, ... )
{
va_list argptr;
va_start( argptr, format );
int wxVsprintf( wxChar *str, const wxChar *format, va_list argptr )
{
// same as for wxSprintf()
- return vswprintf(str, UINT_MAX, wxFormatConverter(format), argptr);
+ return vswprintf(str, INT_MAX / 4, wxFormatConverter(format), argptr);
}
#endif // wxNEED_PRINTF_CONVERSION
+#if wxUSE_WCHAR_T
+
// ----------------------------------------------------------------------------
// ctype.h stuff (currently unused)
// ----------------------------------------------------------------------------
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 wxIscntrl(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 wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
#endif
-#ifndef wxStrdup
-WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz)
+#ifdef wxNEED_WX_MBSTOWCS
+
+WXDLLEXPORT size_t wxMbstowcs (wchar_t * out, const char * in, size_t outlen)
+{
+ if (!out)
+ {
+ size_t outsize = 0;
+ while(*in++)
+ outsize++;
+ return outsize;
+ }
+
+ const char* origin = in;
+
+ while (outlen-- && *in)
+ {
+ *out++ = (wchar_t) *in++;
+ }
+
+ *out = '\0';
+
+ return in - origin;
+}
+
+WXDLLEXPORT size_t wxWcstombs (char * out, const wchar_t * in, size_t outlen)
+{
+ if (!out)
+ {
+ size_t outsize = 0;
+ while(*in++)
+ outsize++;
+ return outsize;
+ }
+
+ const wchar_t* origin = in;
+
+ while (outlen-- && *in)
+ {
+ *out++ = (char) *in++;
+ }
+
+ *out = '\0';
+
+ return in - origin;
+}
+
+#endif // wxNEED_WX_MBSTOWCS
+
+#if defined(wxNEED_WX_CTYPE_H)
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#define cfalnumset CFCharacterSetGetPredefined(kCFCharacterSetAlphaNumeric)
+#define cfalphaset CFCharacterSetGetPredefined(kCFCharacterSetLetter)
+#define cfcntrlset CFCharacterSetGetPredefined(kCFCharacterSetControl)
+#define cfdigitset CFCharacterSetGetPredefined(kCFCharacterSetDecimalDigit)
+//CFCharacterSetRef cfgraphset = kCFCharacterSetControl && !' '
+#define cflowerset CFCharacterSetGetPredefined(kCFCharacterSetLowercaseLetter)
+//CFCharacterSetRef cfprintset = !kCFCharacterSetControl
+#define cfpunctset CFCharacterSetGetPredefined(kCFCharacterSetPunctuation)
+#define cfspaceset CFCharacterSetGetPredefined(kCFCharacterSetWhitespaceAndNewline)
+#define cfupperset CFCharacterSetGetPredefined(kCFCharacterSetUppercaseLetter)
+
+WXDLLEXPORT int wxIsalnum(wxChar ch) { return CFCharacterSetIsCharacterMember(cfalnumset, ch); }
+WXDLLEXPORT int wxIsalpha(wxChar ch) { return CFCharacterSetIsCharacterMember(cfalphaset, ch); }
+WXDLLEXPORT int wxIscntrl(wxChar ch) { return CFCharacterSetIsCharacterMember(cfcntrlset, ch); }
+WXDLLEXPORT int wxIsdigit(wxChar ch) { return CFCharacterSetIsCharacterMember(cfdigitset, ch); }
+WXDLLEXPORT int wxIsgraph(wxChar ch) { return !CFCharacterSetIsCharacterMember(cfcntrlset, ch) && ch != ' '; }
+WXDLLEXPORT int wxIslower(wxChar ch) { return CFCharacterSetIsCharacterMember(cflowerset, ch); }
+WXDLLEXPORT int wxIsprint(wxChar ch) { return !CFCharacterSetIsCharacterMember(cfcntrlset, ch); }
+WXDLLEXPORT int wxIspunct(wxChar ch) { return CFCharacterSetIsCharacterMember(cfpunctset, ch); }
+WXDLLEXPORT int wxIsspace(wxChar ch) { return CFCharacterSetIsCharacterMember(cfspaceset, ch); }
+WXDLLEXPORT int wxIsupper(wxChar ch) { return CFCharacterSetIsCharacterMember(cfupperset, ch); }
+WXDLLEXPORT int wxIsxdigit(wxChar ch) { return wxIsdigit(ch) || (ch>='a' && ch<='f') || (ch>='A' && ch<='F'); }
+WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)tolower((char)(ch)); }
+WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)toupper((char)(ch)); }
+
+#endif // wxNEED_WX_CTYPE_H
+
+#ifndef wxStrdupA
+
+WXDLLEXPORT char *wxStrdupA(const char *s)
{
- size_t size = (wxStrlen(psz) + 1) * sizeof(wxChar);
- wxChar *ret = (wxChar *) malloc(size);
- memcpy(ret, psz, size);
+ return strcpy((char *)malloc(strlen(s) + 1), s);
+}
+
+#endif // wxStrdupA
+
+#ifndef wxStrdupW
+
+WXDLLEXPORT wchar_t * wxStrdupW(const wchar_t *pwz)
+{
+ size_t size = (wxWcslen(pwz) + 1) * sizeof(wchar_t);
+ wchar_t *ret = (wchar_t *) malloc(size);
+ memcpy(ret, pwz, size);
return ret;
}
-#endif
+
+#endif // wxStrdupW
#ifndef wxStricmp
int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
#ifndef wxStricmp
int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n)
{
- register wxChar c1, c2;
+ // initialize the variables just to suppress stupid gcc warning
+ register wxChar c1 = 0, c2 = 0;
while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++;
if (n) {
if (c1 < c2) return -1;
}
#endif
-#ifndef wxStrtok
-WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
+#ifndef wxSetlocale
+WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale)
{
- if (!psz) psz = *save_ptr;
- psz += wxStrspn(psz, delim);
- if (!*psz) {
- *save_ptr = (wxChar *)NULL;
- return (wxChar *)NULL;
- }
- wxChar *ret = psz;
- psz = wxStrpbrk(psz, delim);
- if (!psz) *save_ptr = (wxChar*)NULL;
- else {
- *psz = wxT('\0');
- *save_ptr = psz + 1;
- }
- return ret;
+ char *localeOld = setlocale(category, wxConvLibc.cWX2MB(locale));
+
+ return wxWCharBuffer(wxConvLibc.cMB2WC(localeOld));
}
#endif
-#ifndef wxSetlocale
-WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale)
+#if wxUSE_WCHAR_T && !defined(HAVE_WCSLEN)
+WXDLLEXPORT size_t wxWcslen(const wchar_t *s)
{
- char *localeOld = setlocale(category, wxConvLocal.cWX2MB(locale));
+ size_t n = 0;
+ while ( *s++ )
+ n++;
- return wxWCharBuffer(wxConvLocal.cMB2WC(localeOld));
+ return n;
}
#endif
// ----------------------------------------------------------------------------
#ifdef wxNEED_WX_STRING_H
+
+// RN: These need to be c externed for the regex lib
+#ifdef __cplusplus
+extern "C" {
+#endif
+
WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src)
{
wxChar *ret = dest;
return ret;
}
+WXDLLEXPORT size_t wxStrlen_(const wxChar *s)
+{
+ size_t n = 0;
+ while ( *s++ )
+ n++;
+
+ return n;
+}
+
+
WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n)
{
wxChar *ret = dest;
WXDLLEXPORT const wxChar *wxStrstr(const wxChar *haystack, const wxChar *needle)
{
- wxCHECK_RET( needle, NULL, _T("NULL argument in wxStrstr") );
+ wxASSERT_MSG( needle != NULL, _T("NULL argument in wxStrstr") );
// VZ: this is not exactly the most efficient string search algorithm...
return NULL;
}
+#ifdef __cplusplus
+}
+#endif
+
WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
{
const wxChar *start = nptr;
}
wxString data(nptr, nptr-start);
- wxWX2MBbuf dat = data.mb_str(wxConvLocal);
+ wxWX2MBbuf dat = data.mb_str(wxConvLibc);
char *rdat = wxMBSTRINGCAST dat;
double ret = strtod(dat, &rdat);
while ((wxIsdigit(*nptr) && (*nptr - wxT('0') < base)) ||
(wxIsalpha(*nptr) && (wxToupper(*nptr) - wxT('A') + 10 < base))) nptr++;
- wxString data(nptr, nptr-start);
- wxWX2MBbuf dat = data.mb_str(wxConvLocal);
+ wxString data(start, nptr-start);
+ wxWX2MBbuf dat = data.mb_str(wxConvLibc);
char *rdat = wxMBSTRINGCAST dat;
long int ret = strtol(dat, &rdat, base);
return ret;
}
+
+WXDLLEXPORT unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base)
+{
+ return (unsigned long int) wxStrtol(nptr, endptr, base);
+}
+
#endif // wxNEED_WX_STRING_H
#ifdef wxNEED_WX_STDIO_H
#ifndef wxAtof
double WXDLLEXPORT wxAtof(const wxChar *psz)
{
- return atof(wxConvLocal.cWX2MB(psz));
+#ifdef __WXWINCE__
+ double d;
+ wxString str(psz);
+ if (str.ToDouble(& d))
+ return d;
+
+ return 0.0;
+#else
+ return atof(wxConvLibc.cWX2MB(psz));
+#endif
}
#endif
#ifdef wxNEED_WX_STDLIB_H
int WXDLLEXPORT wxAtoi(const wxChar *psz)
{
- return atoi(wxConvLocal.cWX2MB(psz));
+ return atoi(wxConvLibc.cWX2MB(psz));
}
long WXDLLEXPORT wxAtol(const wxChar *psz)
{
- return atol(wxConvLocal.cWX2MB(psz));
+ return atol(wxConvLibc.cWX2MB(psz));
}
wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
{
- static wxHashTable env;
-
- // check if we already have stored the converted env var
- wxObject *data = env.Get(name);
- if (!data)
- {
- // nope, retrieve it,
#if wxUSE_UNICODE
- wxCharBuffer buffer = wxConvLocal.cWX2MB(name);
- // printf( "buffer %s\n", (const char*) buffer );
- const char *val = getenv( (const char *)buffer );
+ // NB: buffer returned by getenv() is allowed to be overwritten next
+ // time getenv() is called, so it is OK to use static string
+ // buffer to hold the data.
+ static wxWCharBuffer value((wxChar*)NULL);
+ value = wxConvLibc.cMB2WX(getenv(wxConvLibc.cWX2MB(name)));
+ return value.data();
#else
- const char *val = getenv( name );
+ return getenv(name);
#endif
+}
- if (!val) return (wxChar *)NULL;
- // printf( "home %s\n", val );
+int WXDLLEXPORT wxSystem(const wxChar *psz)
+{
+ return system(wxConvLibc.cWX2MB(psz));
+}
- // convert it,
-#ifdef wxUSE_UNICODE
- data = (wxObject *)new wxString(val, wxConvLocal);
-#else
- data = (wxObject *)new wxString(val);
-#endif
+#endif // wxNEED_WX_STDLIB_H
- // and store it
- env.Put(name, data);
- }
- // return converted env var
- return (wxChar *)((wxString *)data)->c_str();
+#ifdef wxNEED_WX_TIME_H
+WXDLLEXPORT size_t
+wxStrftime(wxChar *s, size_t maxsize, const wxChar *fmt, const struct tm *tm)
+{
+ if ( !maxsize )
+ return 0;
+
+ wxCharBuffer buf(maxsize);
+
+ wxCharBuffer bufFmt(wxConvLibc.cWX2MB(fmt));
+ if ( !bufFmt )
+ return 0;
+
+ size_t ret = strftime(buf.data(), maxsize, bufFmt, tm);
+ if ( !ret )
+ return 0;
+
+ wxWCharBuffer wbuf = wxConvLibc.cMB2WX(buf);
+ if ( !wbuf )
+ return 0;
+
+ wxStrncpy(s, wbuf, maxsize);
+ return wxStrlen(s);
}
+#endif // wxNEED_WX_TIME_H
-int WXDLLEXPORT wxSystem(const wxChar *psz)
+#ifndef wxCtime
+WXDLLEXPORT wxChar *wxCtime(const time_t *timep)
{
- return system(wxConvLocal.cWX2MB(psz));
+ // normally the string is 26 chars but give one more in case some broken
+ // DOS compiler decides to use "\r\n" instead of "\n" at the end
+ static wxChar buf[27];
+
+ // ctime() is guaranteed to return a string containing only ASCII
+ // characters, as its format is always the same for any locale
+ wxStrncpy(buf, wxString::FromAscii(ctime(timep)), WXSIZEOF(buf));
+ buf[WXSIZEOF(buf) - 1] = _T('\0');
+
+ return buf;
}
+#endif // wxCtime
-#endif
+#endif // wxUSE_WCHAR_T
-#ifdef wxNEED_WX_TIME_H
-WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm)
+// ----------------------------------------------------------------------------
+// functions which we may need even if !wxUSE_WCHAR_T
+// ----------------------------------------------------------------------------
+
+#ifndef wxStrtok
+
+WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
{
- if (!max) return 0;
+ if (!psz)
+ {
+ psz = *save_ptr;
+ if ( !psz )
+ return NULL;
+ }
+
+ psz += wxStrspn(psz, delim);
+ if (!*psz)
+ {
+ *save_ptr = (wxChar *)NULL;
+ return (wxChar *)NULL;
+ }
- char *buf = (char *)malloc(max);
- size_t ret = strftime(buf, max, wxConvLocal.cWX2MB(fmt), tm);
- if (ret)
+ wxChar *ret = psz;
+ psz = wxStrpbrk(psz, delim);
+ if (!psz)
{
- wxStrcpy(s, wxConvLocal.cMB2WX(buf));
- free(buf);
- return wxStrlen(s);
+ *save_ptr = (wxChar*)NULL;
}
else
{
- free(buf);
- *s = 0;
- return 0;
- }
+ *psz = wxT('\0');
+ *save_ptr = psz + 1;
+ }
+
+ return ret;
+}
+
+#endif // wxStrtok
+
+// ----------------------------------------------------------------------------
+// missing C RTL functions
+// ----------------------------------------------------------------------------
+
+#ifdef wxNEED_STRDUP
+
+char *strdup(const char *s)
+{
+ char *dest = (char*) malloc( strlen( s ) + 1 ) ;
+ if ( dest )
+ strcpy( dest , s ) ;
+ return dest ;
+}
+#endif // wxNEED_STRDUP
+
+#if defined(__WXWINCE__) && (_WIN32_WCE <= 211)
+
+void *calloc( size_t num, size_t size )
+{
+ void** ptr = (void **)malloc(num * size);
+ memset( ptr, 0, num * size);
+ return ptr;
+}
+
+#endif // __WXWINCE__ <= 211
+
+#ifdef __WXWINCE__
+
+int wxRemove(const wxChar *path)
+{
+ return ::DeleteFile(path) == 0;
}
+
#endif
projects / wxWidgets.git / blobdiff