Version 0.4 of wxPython for MSW.

[wxWidgets.git] / src / gtk1 / utilsgtk.cpp

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 3ff9803dd4f77c168c9507dc68c0ce327e83a4b6..019945847062e454c18c184a9505b266da856485 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -26,6 +26,8 @@
 #include <pwd.h>
 #include <errno.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <errno.h>
 #include <netdb.h>

+#include <signal.h>
+

 
 #ifdef __SVR4__
 #include <sys/systeminfo.h>
 
 #ifdef __SVR4__
 #include <sys/systeminfo.h>


@@ -40,24 +42,55 @@ void wxBell(void)
   gdk_beep();
 };
 
   gdk_beep();
 };
 

+void wxSleep(int nSecs)
+{
+  sleep(nSecs);
+};
+
+int wxKill(long pid, int sig)
+{
+  return kill(pid, sig);
+};
+
+void wxDisplaySize( int *width, int *height )
+{
+  if (width) *width = gdk_screen_width();
+  if (height) *height = gdk_screen_height();
+}
+
+void wxGetMousePosition( int* x, int* y )
+{
+  wxFAIL_MSG( "GetMousePosition not yet implemented" );
+  if (x) *x = 0;
+  if (y) *y = 0;
+};
+
+bool wxColourDisplay(void)
+{
+  wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
+  return TRUE;
+}
+
+int wxDisplayDepth(void)
+{
+  wxFAIL_MSG( "wxDisplayDepth always returns 8" );
+  return 8;
+}
+

 //------------------------------------------------------------------------
 // user and home routines
 //------------------------------------------------------------------------
 
 //------------------------------------------------------------------------
 // user and home routines
 //------------------------------------------------------------------------
 

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

 {
 {

-  wxString tmp = wxGetUserHome( wxString() );
-  if (tmp.IsNull())
-    strcpy( wxBuffer, "/" );
-  else
-    strcpy( wxBuffer, tmp );
-  if (dest) strcpy( dest, WXSTRINGCAST tmp );
-  return wxBuffer;
+  *home = wxGetUserHome( wxString() );
+  if (home->IsNull()) *home = "/";
+  return *home;

 };
 
 char *wxGetUserHome( const wxString &user )
 {
 };
 
 char *wxGetUserHome( const wxString &user )
 {

-  struct passwd *who = NULL;
+  struct passwd *who = (struct passwd *) NULL;

 
   if (user.IsNull() || (user== "")) 
   {
 
   if (user.IsNull() || (user== "")) 
   {


@@ -167,169 +200,56 @@ bool wxDirExists( const wxString& dir )
 };
 
 //------------------------------------------------------------------------
 };
 
 //------------------------------------------------------------------------

-// wild character routines
+// subprocess routines

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

-bool wxIsWild( const wxString& pattern )
+typedef struct {
+  gint pid, tag;
+  wxProcess *process;
+} wxEndProcessData;
+
+static void GTK_EndProcessDetector(gpointer data, gint source,
+                                   GdkInputCondition WXUNUSED(condition) )

 {
 {

-  wxString tmp = pattern;
-  char *pat = WXSTRINGCAST(tmp);
-    while (*pat) {
-       switch (*pat++) {
-       case '?': case '*': case '[': case '{':
-           return TRUE;
-       case '\\':
-           if (!*pat++)
-               return FALSE;
-       }
-    }
-    return FALSE;
-};
+  wxEndProcessData *proc_data = (wxEndProcessData *)data;
+  int pid;

 
 

+  pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);

 
 

-bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
-{
-  wxString tmp1 = pat;
-  char *pattern = WXSTRINGCAST(tmp1);
-  wxString tmp2 = text;
-  char *str = WXSTRINGCAST(tmp2);
-    char c;
-    char *cp;
-    bool done = FALSE, ret_code, ok;
-    // Below is for vi fans
-    const char OB = '{', CB = '}';
-
-    // dot_special means '.' only matches '.'
-    if (dot_special && *str == '.' && *pattern != *str)
-       return FALSE;
+  /* wait4 is not part of any standard, use at own risk 
+   * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
+   * --- offer@sgi.com */
+#if !defined(__sgi)
+  wait4(proc_data->pid, NULL, 0, NULL);
+#else
+  wait3((int *) NULL, 0, (rusage *) NULL);
+#endif

 
 

-    while ((*pattern != '\0') && (!done)
-    && (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {
-       switch (*pattern) {
-       case '\\':
-           pattern++;
-           if (*pattern != '\0')
-               pattern++;
-           break;
-       case '*':
-           pattern++;
-           ret_code = FALSE;
-           while ((*str!='\0')
-           && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
-               /*loop*/;
-           if (ret_code) {
-               while (*str != '\0')
-                   str++;
-               while (*pattern != '\0')
-                   pattern++;
-           }
-           break;
-       case '[':
-           pattern++;
-         repeat:
-           if ((*pattern == '\0') || (*pattern == ']')) {
-               done = TRUE;
-               break;
-           }
-           if (*pattern == '\\') {
-               pattern++;
-               if (*pattern == '\0') {
-                   done = TRUE;
-                   break;
-               }
-           }
-           if (*(pattern + 1) == '-') {
-               c = *pattern;
-               pattern += 2;
-               if (*pattern == ']') {
-                   done = TRUE;
-                   break;
-               }
-               if (*pattern == '\\') {
-                   pattern++;
-                   if (*pattern == '\0') {
-                       done = TRUE;
-                       break;
-                   }
-               }
-               if ((*str < c) || (*str > *pattern)) {
-                   pattern++;
-                   goto repeat;
-               }
-           } else if (*pattern != *str) {
-               pattern++;
-               goto repeat;
-           }
-           pattern++;
-           while ((*pattern != ']') && (*pattern != '\0')) {
-               if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
-                   pattern++;
-               pattern++;
-           }
-           if (*pattern != '\0') {
-               pattern++, str++;
-           }
-           break;
-       case '?':
-           pattern++;
-           str++;
-           break;
-       case OB:
-           pattern++;
-           while ((*pattern != CB) && (*pattern != '\0')) {
-               cp = str;
-               ok = TRUE;
-               while (ok && (*cp != '\0') && (*pattern != '\0')
-               &&  (*pattern != ',') && (*pattern != CB)) {
-                   if (*pattern == '\\')
-                       pattern++;
-                   ok = (*pattern++ == *cp++);
-               }
-               if (*pattern == '\0') {
-                   ok = FALSE;
-                   done = TRUE;
-                   break;
-               } else if (ok) {
-                   str = cp;
-                   while ((*pattern != CB) && (*pattern != '\0')) {
-                       if (*++pattern == '\\') {
-                           if (*++pattern == CB)
-                               pattern++;
-                       }
-                   }
-               } else {
-                   while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
-                       if (*++pattern == '\\') {
-                            if (*++pattern == CB || *pattern == ',')
-                               pattern++;
-                       }
-                   }
-               }
-               if (*pattern != '\0')
-                   pattern++;
-           }
-           break;
-       default:
-           if (*str == *pattern) {
-               str++, pattern++;
-           } else {
-               done = TRUE;
-           }
-       }
-    }
-    while (*pattern == '*')
-       pattern++;
-    return ((*str == '\0') && (*pattern == '\0'));
-};
+  close(source);
+  gdk_input_remove(proc_data->tag);

 
 

-//------------------------------------------------------------------------
-// subprocess routines
-//------------------------------------------------------------------------
+  if (proc_data->process)
+    proc_data->process->OnTerminate(proc_data->pid);
+
+  if (proc_data->pid > 0)
+    delete proc_data;
+  else
+    proc_data->pid = 0;
+};

 
 

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

 {
 {

+    wxEndProcessData *data = new wxEndProcessData;
+    int end_proc_detect[2];
+

     if (*argv == NULL)
     if (*argv == NULL)

-       return FALSE;
+       return 0;
+
+    /* Create pipes */
+    if (pipe(end_proc_detect) == -1) {
+      perror("pipe failed");
+      return 0;
+    }

 
     /* fork the process */
 #if defined(sun) || defined(__ultrix) || defined(__bsdi__)
 
     /* fork the process */
 #if defined(sun) || defined(__ultrix) || defined(__bsdi__)


@@ -339,8 +259,11 @@ long wxExecute( char **argv, bool Async )
 #endif
     if (pid == -1) {
        perror ("fork failed");
 #endif
     if (pid == -1) {
        perror ("fork failed");

-       return FALSE;
+       return 0;

     } else if (pid == 0) {
     } else if (pid == 0) {

+        /* Close fd not useful */
+        close(end_proc_detect[0]); // close reading side
+

        /* child */
 #ifdef _AIX
        execvp ((const char *)*argv, (const char **)argv);
        /* child */
 #ifdef _AIX
        execvp ((const char *)*argv, (const char **)argv);


@@ -355,39 +278,26 @@ long wxExecute( char **argv, bool Async )
        _exit (-1);
     }
 
        _exit (-1);
     }
 

-    // Code below is NOT really acceptable!
-    // One should NEVER use wait under X
-    // Ideas? A Sleep idle callback?
-    // WARNING: WARNING: WARNING: WARNING:
-    // The CODE BELOW IS BAD BAD BAD BAD!
-    if (Async) {
-       int status;
-/*
-       wxSleep(2);             // Give a little time
-*/
-#if !defined(DG) && \
-    !defined(__AIX__) && \
-    !defined(__xlC__) && \
-    !defined(__SVR4__) && \
-    !defined(__SUN__) && \
-    !defined(__ALPHA__) && \
-    !defined(__SGI__) && \
-    !defined(__HPUX__) && \
-    !defined(__SUNPRO_CC) && \
-    !defined(__FreeBSD__)
-        while (wait((union wait*)&status) != pid)
-#else
-       while (wait(&status) != pid)
-#endif
-      {};
-/*
-           wxSleep(3); // 3 sec?
-*/
-    };
-    return TRUE;
+    close(end_proc_detect[1]); // close writing side
+    data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ,
+                              GTK_EndProcessDetector, (gpointer)data);
+    data->pid = pid;
+    if (!sync) {
+      data->process = process;
+    } else {
+      data->process = (wxProcess *) NULL;
+      data->pid = -(data->pid);
+
+      while (data->pid != 0)
+        wxYield();
+
+      delete data;
+    }
+
+    return pid;

 };
 
 };
 

-long wxExecute( const wxString& command, bool Async )
+long wxExecute( const wxString& command, bool sync, wxProcess *process )

 {
     if (command.IsNull() || command == "") return FALSE;
 
 {
     if (command.IsNull() || command == "") return FALSE;
 


@@ -399,8 +309,9 @@ long wxExecute( const wxString& command, bool Async )
     strncpy (tmp, command, sizeof(tmp) / sizeof(char) - 1);
     tmp[sizeof (tmp) / sizeof (char) - 1] = '\0';
     argv[argc++] = strtok (tmp, IFS);
     strncpy (tmp, command, sizeof(tmp) / sizeof(char) - 1);
     tmp[sizeof (tmp) / sizeof (char) - 1] = '\0';
     argv[argc++] = strtok (tmp, IFS);

-    while ((argv[argc++] = strtok(NULL, IFS)) != NULL)
+    while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL)

        /* loop */ ;
        /* loop */ ;

-    return wxExecute(argv, Async);
+    return wxExecute(argv, sync, process);

 };
 
 };
 

+