If we used 10% less inline functions in useless occasions,

[wxWidgets.git] / src / unix / utilsunx.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 2d3aa7ebcb03cf14d16c7f256d16e04e7bdf088a..1ecee5f029d67e35032f5b36282880162bd6d63d 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -39,8 +39,12 @@
 #include <signal.h>
 #include <fcntl.h>          // for O_WRONLY and friends
 #include <time.h>           // nanosleep() and/or usleep()
 #include <signal.h>
 #include <fcntl.h>          // for O_WRONLY and friends
 #include <time.h>           // nanosleep() and/or usleep()

+#include <ctype.h>          // isspace()

 
 

-#ifdef HAVE_UNAME
+// JACS: needed for FD_SETSIZE
+#include <sys/time.h>
+
+#if HAVE_UNAME

     #include <sys/utsname.h> // for uname()
 #endif // HAVE_UNAME
 
     #include <sys/utsname.h> // for uname()
 #endif // HAVE_UNAME
 


@@ -51,36 +55,31 @@
 // many versions of Unices have this function, but it is not defined in system
 // headers - please add your system here if it is the case for your OS.
 // SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this.
 // many versions of Unices have this function, but it is not defined in system
 // headers - please add your system here if it is the case for your OS.
 // SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this.

-#if (defined(__SUN__) && !defined(__SunOs_5_6) && \
+#if !defined(HAVE_USLEEP) && \
+    (defined(__SUN__) && !defined(__SunOs_5_6) && \

                          !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \
                          !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \

-     defined(__osf__)
+     defined(__osf__) || defined(__EMX__)

     extern "C"
     {
     extern "C"
     {

-        void usleep(unsigned long usec);
+        #ifdef __SUN__
+            int usleep(unsigned int usec);
+        #else // !Sun
+       #ifdef __EMX
+            /* I copied this from the XFree86 diffs. AV. */
+            #define INCL_DOSPROCESS
+            #include <os2.h>
+            void usleep(unsigned long delay)
+            {
+                DosSleep(delay ? (delay/1000l) : 1l);
+            }
+       #else
+           void usleep(unsigned long usec);
+       #endif
+        #endif // Sun/EMX/Something else

     };
     };

+#define HAVE_USLEEP 1

 #endif // Unices without usleep()
 
 #endif // Unices without usleep()
 

-// many versions of Unices have this function, but it is not defined in system
-// headers - please add your system here if it is the case for your OS.
-// SunOS (and Solaris) and DG-UX are like this.
-#if defined(__SOLARIS__) || defined(__osf__)
-    extern "C"
-    {
-        pid_t wait4(pid_t pid, int *statusp, int options,
-                    struct rusage *rusage);
-    }
-
-    #define wxWait4(pid, stat, flags, rusage) wait4(pid, stat, flags, rusage)
-#elif defined(__sgi) || defined(__HPUX__)
-    // no wait4() at all on these systems
-    // TODO verify whether wait3() really works in this situation
-    #define wxWait4(pid, stat, flags, rusage) wait3(stat, flags, rusage)
-#else
-    // other Unices: assume have wait4(), although it's not standard (but
-    // Linux and FreeBSD do have it)
-    #define wxWait4(pid, stat, flags, rusage) wait4(pid, stat, flags, rusage)
-#endif // wait4()
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -96,19 +95,19 @@ void wxSleep(int nSecs)
 
 void wxUsleep(unsigned long milliseconds)
 {
 
 void wxUsleep(unsigned long milliseconds)
 {

-#if defined(HAVE_NANOSLEEP)
+#if HAVE_NANOSLEEP

     timespec tmReq;
     tmReq.tv_sec = milliseconds / 1000;
     tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
 
     // we're not interested in remaining time nor in return value
     (void)nanosleep(&tmReq, (timespec *)NULL);
     timespec tmReq;
     tmReq.tv_sec = milliseconds / 1000;
     tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
 
     // we're not interested in remaining time nor in return value
     (void)nanosleep(&tmReq, (timespec *)NULL);

-#elif defined(HAVE_USLEEP)
+#elif HAVE_USLEEP

     // uncomment this if you feel brave or if you are sure that your version
     // of Solaris has a safe usleep() function but please notice that usleep()
     // is known to lead to crashes in MT programs in Solaris 2.[67] and is not
     // documented as MT-Safe
     // uncomment this if you feel brave or if you are sure that your version
     // of Solaris has a safe usleep() function but please notice that usleep()
     // is known to lead to crashes in MT programs in Solaris 2.[67] and is not
     // documented as MT-Safe

-    #if defined(__SUN__) && defined(wxUSE_THREADS)
+    #if defined(__SUN__) && wxUSE_THREADS

         #error "usleep() cannot be used in MT programs under Solaris."
     #endif // Sun
 
         #error "usleep() cannot be used in MT programs under Solaris."
     #endif // Sun
 


@@ -122,29 +121,79 @@ void wxUsleep(unsigned long milliseconds)
 // process management
 // ----------------------------------------------------------------------------
 
 // process management
 // ----------------------------------------------------------------------------
 

-int wxKill(long pid, int sig)
+int wxKill(long pid, wxSignal sig)

 {
 {

-    return kill(pid, sig);
+    return kill(pid, (int)sig);

 }
 
 }
 

+#define WXEXECUTE_NARGS   127
+

 long wxExecute( const wxString& command, bool sync, wxProcess *process )
 {
 long wxExecute( const wxString& command, bool sync, wxProcess *process )
 {

-    static const char *IFS = " \t\n";
-
-    wxCHECK_MSG( !command.IsEmpty(), 0, "can't exec empty command" );
+    wxCHECK_MSG( !command.IsEmpty(), 0, _T("can't exec empty command") );

 
     int argc = 0;
 
     int argc = 0;

-    char *argv[127];
-    char *tmp = new char[command.Len() + 1];
-    strcpy(tmp, command);
+    wxChar *argv[WXEXECUTE_NARGS];
+    wxString argument;
+    const wxChar *cptr = command.c_str();
+    wxChar quotechar = _T('\0'); // is arg quoted?
+    bool escaped = FALSE;
+
+    // split the command line in arguments
+    do
+    {
+        argument=_T("");
+        quotechar = _T('\0');
+
+        // eat leading whitespace:
+        while ( wxIsspace(*cptr) )
+            cptr++;
+
+        if ( *cptr == _T('\'') || *cptr == _T('"') )
+            quotechar = *cptr++;

 
 

-    argv[argc++] = strtok(tmp, IFS);
-    while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL)
-        /* loop */ ;
+        do
+        {
+            if ( *cptr == _T('\\') && ! escaped )
+            {
+                escaped = TRUE;
+                cptr++;
+                continue;
+            }

 
 

+            // all other characters:
+            argument += *cptr++;
+            escaped = FALSE;
+
+            // have we reached the end of the argument?
+            if ( (*cptr == quotechar && ! escaped)
+                 || (quotechar == _T('\0') && wxIsspace(*cptr))
+                 || *cptr == _T('\0') )
+            {
+                wxASSERT_MSG( argc < WXEXECUTE_NARGS,
+                              _T("too many arguments in wxExecute") );
+
+                argv[argc] = new wxChar[argument.length() + 1];
+                wxStrcpy(argv[argc], argument.c_str());
+                argc++;
+
+                // if not at end of buffer, swallow last character:
+                if(*cptr)
+                    cptr++;
+
+                break; // done with this one, start over
+            }
+        } while(*cptr);
+    } while(*cptr);
+    argv[argc] = NULL;
+
+    // do execute the command

     long lRc = wxExecute(argv, sync, process);
 
     long lRc = wxExecute(argv, sync, process);
 

-    delete [] tmp;
+    // clean up
+    argc = 0;
+    while( argv[argc] )
+        delete [] argv[argc++];

 
     return lRc;
 }
 
     return lRc;
 }


@@ -153,7 +202,7 @@ bool wxShell(const wxString& command)
 {
     wxString cmd;
     if ( !!command )
 {
     wxString cmd;
     if ( !!command )

-        cmd.Printf("xterm -e %s", command.c_str());
+        cmd.Printf(_T("xterm -e %s"), command.c_str());

     else
         cmd = command;
 
     else
         cmd = command;
 


@@ -164,13 +213,26 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {
     int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
 
 {
     int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
 

+    // waitpid is POSIX so should be available everywhere, however on older
+    // systems wait() might be used instead in a loop (until the right pid
+    // terminates)

     int status = 0;
     int status = 0;

-    wxWait4(pid, &status, 0, (rusage *) NULL);
-
-    if (proc_data->process)
-        proc_data->process->OnTerminate(proc_data->pid, status);
+    if ( waitpid(pid, &status, 0) == -1 || !WIFEXITED(status) )
+    {
+        wxLogSysError(_("Waiting for subprocess termination failed"));
+    }
+    else
+    {
+        // notify user about termination if required
+        if (proc_data->process)
+        {
+            proc_data->process->OnTerminate(proc_data->pid,
+                                            WEXITSTATUS(status));
+        }
+    }

 
 

-    if (proc_data->pid > 0)
+    // clean up
+    if ( proc_data->pid > 0 )

     {
         delete proc_data;
     }
     {
         delete proc_data;
     }


@@ -183,21 +245,39 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
     }
 }
 
     }
 }
 

-long wxExecute( char **argv, bool sync, wxProcess *process )
+long wxExecute( wxChar **argv, bool sync, wxProcess *process )

 {
 {

-    wxCHECK_MSG( *argv, 0, "can't exec empty command" );
+    wxCHECK_MSG( *argv, 0, _T("can't exec empty command") );

 
     int end_proc_detect[2];
 
     int end_proc_detect[2];

+#if wxUSE_UNICODE
+    int mb_argc = 0;
+    char *mb_argv[WXEXECUTE_NARGS];
+
+    while (argv[mb_argc]) {
+      wxWX2MBbuf mb_arg = wxConvCurrent->cWX2MB(argv[mb_argc]);
+      mb_argv[mb_argc] = strdup(mb_arg);
+      mb_argc++;
+    }
+    mb_argv[mb_argc] = (char *) NULL;
+#else
+    wxChar **mb_argv = argv;
+#endif

 
     // create pipes
     if (pipe(end_proc_detect) == -1)
     {
         wxLogSysError( _("Pipe creation failed") );
 
     // create pipes
     if (pipe(end_proc_detect) == -1)
     {
         wxLogSysError( _("Pipe creation failed") );

+#if wxUSE_UNICODE
+       mb_argc = 0;
+       while (mb_argv[mb_argc])
+         free(mb_argv[mb_argc++]);
+#endif

         return 0;
     }
 
     // fork the process
         return 0;
     }
 
     // fork the process

-#ifdef HAVE_VFORK
+#if HAVE_VFORK

     pid_t pid = vfork();
 #else
     pid_t pid = fork();
     pid_t pid = vfork();
 #else
     pid_t pid = fork();


@@ -205,6 +285,11 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
     if (pid == -1)
     {
         wxLogSysError( _("Fork failed") );
     if (pid == -1)
     {
         wxLogSysError( _("Fork failed") );

+#if wxUSE_UNICODE
+       mb_argc = 0;
+       while (mb_argv[mb_argc])
+         free(mb_argv[mb_argc++]);
+#endif

         return 0;
     }
     else if (pid == 0)
         return 0;
     }
     else if (pid == 0)


@@ -214,7 +299,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
 
         // These three lines close the open file descriptors to to avoid any
         // input/output which might block the process or irritate the user. If
 
         // These three lines close the open file descriptors to to avoid any
         // input/output which might block the process or irritate the user. If

-        // one wants proper IO for the subprocess, the "right thing to do is
+        // one wants proper IO for the subprocess, the right thing to do is

         // to start an xterm executing it.
         if (sync == 0)
         {
         // to start an xterm executing it.
         if (sync == 0)
         {


@@ -236,14 +321,10 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
         open("/dev/null", O_WRONLY);  // stderr
 #endif
 
         open("/dev/null", O_WRONLY);  // stderr
 #endif
 

-#ifdef _AIX
-        execvp ((const char *)*argv, (const char **)argv);
-#else
-        execvp (*argv, argv);
-#endif
+        execvp (*mb_argv, mb_argv);

 
         // there is no return after successful exec()
 
         // there is no return after successful exec()

-        fprintf(stderr, _("Can't execute '%s'\n"), *argv);
+        wxFprintf(stderr, _("Can't execute '%s'\n"), *argv);

 
         _exit(-1);
     }
 
         _exit(-1);
     }


@@ -255,9 +336,15 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
         wxEndProcessData *data = new wxEndProcessData;
         data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
 
         wxEndProcessData *data = new wxEndProcessData;
         data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
 

+#if wxUSE_UNICODE
+       mb_argc = 0;
+       while (mb_argv[mb_argc])
+         free(mb_argv[mb_argc++]);
+#endif
+

         if ( sync )
         {
         if ( sync )
         {

-            wxASSERT_MSG( !process, "wxProcess param ignored for sync exec" );
+            wxASSERT_MSG( !process, _T("wxProcess param ignored for sync exec") );

             data->process = NULL;
 
             // sync execution: indicate it by negating the pid
             data->process = NULL;
 
             // sync execution: indicate it by negating the pid


@@ -290,30 +377,34 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
 // file and directory functions
 // ----------------------------------------------------------------------------
 
 // file and directory functions
 // ----------------------------------------------------------------------------
 

-const char* wxGetHomeDir( wxString *home  )
+const wxChar* wxGetHomeDir( wxString *home  )

 {
     *home = wxGetUserHome( wxString() );
     if ( home->IsEmpty() )
 {
     *home = wxGetUserHome( wxString() );
     if ( home->IsEmpty() )

-        *home = "/";
+        *home = _T("/");

 
     return home->c_str();
 }
 
 
     return home->c_str();
 }
 

+#if wxUSE_UNICODE
+const wxMB2WXbuf wxGetUserHome( const wxString &user )
+#else // just for binary compatibility

 char *wxGetUserHome( const wxString &user )
 char *wxGetUserHome( const wxString &user )

+#endif

 {
     struct passwd *who = (struct passwd *) NULL;
 
 {
     struct passwd *who = (struct passwd *) NULL;
 

-    if (user.IsNull() || (user== ""))
+    if ( !user )

     {
     {

-        register char *ptr;
+        register wxChar *ptr;

 
 

-        if ((ptr = getenv("HOME")) != NULL)
+        if ((ptr = wxGetenv(_T("HOME"))) != NULL)

         {
             return ptr;
         }
         {
             return ptr;
         }

-        if ((ptr = getenv("USER")) != NULL || (ptr = getenv("LOGNAME")) != NULL)
+        if ((ptr = wxGetenv(_T("USER"))) != NULL || (ptr = wxGetenv(_T("LOGNAME"))) != NULL)

         {
         {

-            who = getpwnam(ptr);
+            who = getpwnam(wxConvCurrent->cWX2MB(ptr));

         }
 
         // We now make sure the the user exists!
         }
 
         // We now make sure the the user exists!


@@ -324,21 +415,28 @@ char *wxGetUserHome( const wxString &user )
     }
     else
     {
     }
     else
     {

-      who = getpwnam (user);
+      who = getpwnam (user.mb_str());

     }
 
     }
 

-    return who ? who->pw_dir : (char*)NULL;
+#if wxUSE_UNICODE
+    return who ? wxConvCurrent->cMB2WX(who->pw_dir) : (wxMB2WXbuf)((wxChar*)NULL);
+#else
+    return who ? who->pw_dir : ((char*)NULL);
+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// id routines
+// network and user id routines

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-bool wxGetHostName(char *buf, int sz)
+// retrieve either the hostname or FQDN depending on platform (caller must
+// check whether it's one or the other, this is why this function is for
+// private use only)
+static bool wxGetHostNameInternal(wxChar *buf, int sz)

 {
 {

-    wxCHECK_MSG( buf, FALSE, "NULL pointer in wxGetHostName" );
+    wxCHECK_MSG( buf, FALSE, _T("NULL pointer in wxGetHostNameInternal") );

 
 

-    *buf = '\0';
+    *buf = _T('\0');

 
     // we're using uname() which is POSIX instead of less standard sysinfo()
 #if defined(HAVE_UNAME)
 
     // we're using uname() which is POSIX instead of less standard sysinfo()
 #if defined(HAVE_UNAME)


@@ -346,16 +444,16 @@ bool wxGetHostName(char *buf, int sz)
     bool ok = uname(&uts) != -1;
     if ( ok )
     {
     bool ok = uname(&uts) != -1;
     if ( ok )
     {

-        strncpy(buf, uts.nodename, sz - 1);
-        buf[sz] = '\0';
+        wxStrncpy(buf, wxConvCurrent->cMB2WX(uts.nodename), sz - 1);
+        buf[sz] = _T('\0');

     }
 #elif defined(HAVE_GETHOSTNAME)
     bool ok = gethostname(buf, sz) != -1;
     }
 #elif defined(HAVE_GETHOSTNAME)
     bool ok = gethostname(buf, sz) != -1;

-#else
-    wxFAIL_MSG("don't know host name for this machibe");
+#else // no uname, no gethostname
+    wxFAIL_MSG(_T("don't know host name for this machine"));

 
     bool ok = FALSE;
 
     bool ok = FALSE;

-#endif
+#endif // uname/gethostname

 
     if ( !ok )
     {
 
     if ( !ok )
     {


@@ -365,31 +463,77 @@ bool wxGetHostName(char *buf, int sz)
     return ok;
 }
 
     return ok;
 }
 

-bool wxGetUserId(char *buf, int sz)
+bool wxGetHostName(wxChar *buf, int sz)
+{
+    bool ok = wxGetHostNameInternal(buf, sz);
+
+    if ( ok )
+    {
+        // BSD systems return the FQDN, we only want the hostname, so extract
+        // it (we consider that dots are domain separators)
+        wxChar *dot = wxStrchr(buf, _T('.'));
+        if ( dot )
+        {
+            // nuke it
+            *dot = _T('\0');
+        }
+    }
+
+    return ok;
+}
+
+bool wxGetFullHostName(wxChar *buf, int sz)
+{
+    bool ok = wxGetHostNameInternal(buf, sz);
+
+    if ( ok )
+    {
+        if ( !wxStrchr(buf, _T('.')) )
+        {
+            struct hostent *host = gethostbyname(wxConvCurrent->cWX2MB(buf));
+            if ( !host )
+            {
+                wxLogSysError(_("Cannot get the official hostname"));
+
+                ok = FALSE;
+            }
+            else
+            {
+                // the canonical name
+                wxStrncpy(buf, wxConvCurrent->cMB2WX(host->h_name), sz);
+            }
+        }
+        //else: it's already a FQDN (BSD behaves this way)
+    }
+
+    return ok;
+}
+
+bool wxGetUserId(wxChar *buf, int sz)

 {
     struct passwd *who;
 
 {
     struct passwd *who;
 

-    *buf = '\0';
+    *buf = _T('\0');

     if ((who = getpwuid(getuid ())) != NULL)
     {
     if ((who = getpwuid(getuid ())) != NULL)
     {

-        strncpy (buf, who->pw_name, sz - 1);
+        wxStrncpy (buf, wxConvCurrent->cMB2WX(who->pw_name), sz - 1);

         return TRUE;
     }
 
     return FALSE;
 }
 
         return TRUE;
     }
 
     return FALSE;
 }
 

-bool wxGetUserName(char *buf, int sz)
+bool wxGetUserName(wxChar *buf, int sz)

 {
     struct passwd *who;
     char *comma;
 
 {
     struct passwd *who;
     char *comma;
 

-    *buf = '\0';
+    *buf = _T('\0');

     if ((who = getpwuid (getuid ())) != NULL) {
        comma = strchr(who->pw_gecos, ',');
        if (comma)
            *comma = '\0'; // cut off non-name comment fields
     if ((who = getpwuid (getuid ())) != NULL) {
        comma = strchr(who->pw_gecos, ',');
        if (comma)
            *comma = '\0'; // cut off non-name comment fields

-       strncpy (buf, who->pw_gecos, sz - 1);
+       wxStrncpy (buf, wxConvCurrent->cMB2WX(who->pw_gecos), sz - 1);

        return TRUE;
     }
 
        return TRUE;
     }
 


@@ -411,29 +555,266 @@ void wxDebugMsg( const char *format, ... )
 
 void wxError( const wxString &msg, const wxString &title )
 {
 
 void wxError( const wxString &msg, const wxString &title )
 {

-  fprintf( stderr, _("Error ") );
-  if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
-  if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
-  fprintf( stderr, ".\n" );
+  wxFprintf( stderr, _("Error ") );
+  if (!title.IsNull()) wxFprintf( stderr, _T("%s "), WXSTRINGCAST(title) );
+  if (!msg.IsNull()) wxFprintf( stderr, _T(": %s"), WXSTRINGCAST(msg) );
+  wxFprintf( stderr, _T(".\n") );

 }
 
 void wxFatalError( const wxString &msg, const wxString &title )
 {
 }
 
 void wxFatalError( const wxString &msg, const wxString &title )
 {

-  fprintf( stderr, _("Error ") );
-  if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
-  if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
-  fprintf( stderr, ".\n" );
+  wxFprintf( stderr, _("Error ") );
+  if (!title.IsNull()) wxFprintf( stderr, _T("%s "), WXSTRINGCAST(title) );
+  if (!msg.IsNull()) wxFprintf( stderr, _T(": %s"), WXSTRINGCAST(msg) );
+  wxFprintf( stderr, _T(".\n") );

   exit(3); // the same exit code as for abort()
 }
 
   exit(3); // the same exit code as for abort()
 }
 

-//------------------------------------------------------------------------
-// directory routines
-//------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// font-related functions
+// ----------------------------------------------------------------------------
+
+// define the functions to create and destroy native fonts for this toolkit
+#ifdef __X__
+    static inline wxNativeFont wxLoadFont(const wxString& fontSpec)
+    {
+        return XLoadQueryFont((Display *)wxGetDisplay(), fontSpec);
+    }
+
+    static inline void wxFreeFont(wxNativeFont font)
+    {
+        XFreeFont((Display *)wxGetDisplay(), font);
+    }
+#elif defined(__WXGTK__)
+
+    #include "gdk/gdk.h"
+
+    static inline wxNativeFont wxLoadFont(const wxString& fontSpec)
+    {
+        return gdk_font_load( wxConvCurrent->cWX2MB(fontSpec) );
+    }
+
+    static inline void wxFreeFont(wxNativeFont font)
+    {
+        gdk_font_unref(font);
+    }
+#else
+    #error "Unknown GUI toolkit"
+#endif
+
+// returns TRUE if there are any fonts matching this font spec
+static bool wxTestFontSpec(const wxString& fontspec)
+{
+    wxNativeFont test = wxLoadFont(fontspec);
+    if ( test )
+    {
+        wxFreeFont(test);
+
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+// TODO encoding test logic should be moved to wxLoadQueryNearestFont()
+static wxNativeFont wxLoadQueryFont(int pointSize,
+                                    int family,
+                                    int style,
+                                    int weight,
+                                    bool WXUNUSED(underlined),
+                                    const wxString &facename,
+                                    wxFontEncoding encoding )
+{
+    wxString xfamily;
+    switch (family)
+    {
+        case wxDECORATIVE: xfamily = _T("lucida"); break;
+        case wxROMAN:      xfamily = _T("times");  break;
+        case wxMODERN:     xfamily = _T("courier"); break;
+        case wxSWISS:      xfamily = _T("helvetica"); break;
+        case wxTELETYPE:   xfamily = _T("lucidatypewriter"); break;
+        case wxSCRIPT:     xfamily = _T("utopia"); break;
+        default:           xfamily = _T("*");
+    }
+
+    wxString fontSpec;
+    if (!facename.IsEmpty())
+    {
+        fontSpec.Printf(_T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"),
+                        facename.c_str());
+
+        if ( wxTestFontSpec(fontSpec) )
+        {
+            xfamily = facename;
+        }
+        //else: no such family, use default one instead
+    }
+
+    wxString xstyle;
+    switch (style)
+    {
+        case wxITALIC:     xstyle = _T("i"); break;
+        case wxSLANT:      xstyle = _T("o"); break;
+        case wxNORMAL:     xstyle = _T("r"); break;
+        default:           xstyle = _T("*"); break;
+    }
+
+    wxString xweight;
+    switch (weight)
+    {
+        case wxBOLD:       xweight = _T("bold"); break;
+        case wxLIGHT:
+        case wxNORMAL:     xweight = _T("medium"); break;
+        default:           xweight = _T("*"); break;
+    }
+
+    wxString xregistry, xencoding;
+    if ( encoding == wxFONTENCODING_DEFAULT )
+    {
+        // use the apps default
+        encoding = wxFont::GetDefaultEncoding();
+    }

 
 

-bool wxDirExists( const wxString& dir )
+    bool test = TRUE;   // should we test for availability of encoding?
+    switch ( encoding )
+    {
+        case wxFONTENCODING_ISO8859_1:
+        case wxFONTENCODING_ISO8859_2:
+        case wxFONTENCODING_ISO8859_3:
+        case wxFONTENCODING_ISO8859_4:
+        case wxFONTENCODING_ISO8859_5:
+        case wxFONTENCODING_ISO8859_6:
+        case wxFONTENCODING_ISO8859_7:
+        case wxFONTENCODING_ISO8859_8:
+        case wxFONTENCODING_ISO8859_9:
+        case wxFONTENCODING_ISO8859_10:
+        case wxFONTENCODING_ISO8859_11:
+        case wxFONTENCODING_ISO8859_13:
+        case wxFONTENCODING_ISO8859_14:
+        case wxFONTENCODING_ISO8859_15:
+            {
+                int cp = encoding - wxFONTENCODING_ISO8859_1 + 1;
+                xregistry = _T("iso8859");
+                xencoding.Printf(_T("%d"), cp);
+            }
+            break;
+
+        case wxFONTENCODING_KOI8:
+            xregistry = _T("koi8");
+            if ( wxTestFontSpec(_T("-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1")) )
+            {
+                xencoding = _T("1");
+
+                // test passed, no need to do it once more
+                test = FALSE;
+            }
+            else
+            {
+                xencoding = _T("*");
+            }
+            break;
+
+        case wxFONTENCODING_CP1250:
+        case wxFONTENCODING_CP1251:
+        case wxFONTENCODING_CP1252:
+            {
+                int cp = encoding - wxFONTENCODING_CP1250 + 1250;
+                fontSpec.Printf(_T("-*-*-*-*-*-*-*-*-*-*-*-*-microsoft-cp%d"),
+                                cp);
+                if ( wxTestFontSpec(fontSpec) )
+                {
+                    xregistry = _T("microsoft");
+                    xencoding.Printf(_T("cp%d"), cp);
+
+                    // test passed, no need to do it once more
+                    test = FALSE;
+                }
+                else
+                {
+                    // fall back to LatinX
+                    xregistry = _T("iso8859");
+                    xencoding.Printf(_T("%d"), cp - 1249);
+                }
+            }
+            break;
+
+        case wxFONTENCODING_SYSTEM:
+        default:
+            test = FALSE;
+            xregistry =
+            xencoding = _T("*");
+    }
+
+    if ( test )
+    {
+        fontSpec.Printf(_T("-*-*-*-*-*-*-*-*-*-*-*-*-%s-%s"),
+                        xregistry.c_str(), xencoding.c_str());
+        if ( !wxTestFontSpec(fontSpec) )
+        {
+            // this encoding isn't available - what to do?
+            xregistry =
+            xencoding = _T("*");
+        }
+    }
+
+    // construct the X font spec from our data
+    fontSpec.Printf(_T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"),
+                    xfamily.c_str(), xweight.c_str(), xstyle.c_str(),
+                    pointSize, xregistry.c_str(), xencoding.c_str());
+
+    return wxLoadFont(fontSpec);
+}
+
+wxNativeFont wxLoadQueryNearestFont(int pointSize,
+                                    int family,
+                                    int style,
+                                    int weight,
+                                    bool underlined,
+                                    const wxString &facename,
+                                    wxFontEncoding encoding)

 {
 {

-    char buf[500];
-    strcpy( buf, WXSTRINGCAST(dir) );
-    struct stat sbuf;
-    return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
+    wxNativeFont font = wxLoadQueryFont( pointSize, family, style, weight,
+                                         underlined, facename, encoding );
+
+    if (!font)
+    {
+        // search up and down by stepsize 10
+        int max_size = pointSize + 20 * (1 + (pointSize/180));
+        int min_size = pointSize - 20 * (1 + (pointSize/180));
+
+        int i;
+
+        // Search for smaller size (approx.)
+        for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 )
+        {
+            font = wxLoadQueryFont(i, family, style, weight, underlined,
+                                   facename, encoding );
+        }
+
+        // Search for larger size (approx.)
+        for ( i = pointSize + 10; !font && i <= max_size; i += 10 )
+        {
+            font = wxLoadQueryFont( i, family, style, weight, underlined,
+                                    facename, encoding );
+        }
+
+        // Try default family
+        if ( !font && family != wxDEFAULT )
+        {
+            font = wxLoadQueryFont( pointSize, wxDEFAULT, style, weight,
+                                    underlined, facename, encoding );
+        }
+
+        // Bogus font
+        if ( !font )
+        {
+            font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
+                                   underlined, facename, encoding );
+        }
+    }
+
+    return font;

 }
 }

+