wxComboBox included (removed dependency on wxUSE_COMBOBOX which was never

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 3de7efc8bcfa316edc293ddea70bd1ecd45dd274..28d35e2adc6373c11a8181a77264ea69714937f4 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -2,7 +2,6 @@
 // Name:        utils.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        utils.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

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


@@ -31,53 +30,71 @@
 #include <netdb.h>
 #include <signal.h>
 
 #include <netdb.h>
 #include <signal.h>
 

+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gtk/gtkfeatures.h"
+#include "gdk/gdkx.h"

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

+#ifdef __SOLARIS__
+// somehow missing from sys/wait.h but in the system's docs
+extern "C"
+{
+   pid_t wait4(pid_t pid, int *statusp, int options, struct rusage
+               *rusage);
+}
+#endif
+

 //------------------------------------------------------------------------
 // misc.
 //------------------------------------------------------------------------
 
 void wxBell(void)
 {
 //------------------------------------------------------------------------
 // misc.
 //------------------------------------------------------------------------
 
 void wxBell(void)
 {

-  gdk_beep();
-};
+    gdk_beep();
+}

 
 void wxSleep(int nSecs)
 {
 
 void wxSleep(int nSecs)
 {

-  sleep(nSecs);
-};
+    sleep(nSecs);
+}

 
 int wxKill(long pid, int sig)
 {
 
 int wxKill(long pid, int sig)
 {

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

 
 void wxDisplaySize( int *width, int *height )
 {
 
 void wxDisplaySize( int *width, int *height )
 {

-  if (width) *width = gdk_screen_width();
-  if (height) *height = gdk_screen_height();
+    if (width) *width = gdk_screen_width();
+    if (height) *height = gdk_screen_height();

 }
 
 void wxGetMousePosition( int* x, int* y )
 {
 }
 
 void wxGetMousePosition( int* x, int* y )
 {

-  wxFAIL_MSG( "GetMousePosition not yet implemented" );
-  if (x) *x = 0;
-  if (y) *y = 0;
-};
+    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
+}

 
 bool wxColourDisplay(void)
 {
 
 bool wxColourDisplay(void)
 {

-  wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
-  return TRUE;
+    return TRUE;

 }
 
 int wxDisplayDepth(void)
 {
 }
 
 int wxDisplayDepth(void)
 {

-  wxFAIL_MSG( "wxDisplayDepth always returns 8" );
-  return 8;
+    return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth;
+}
+
+int wxGetOsVersion(int *majorVsn, int *minorVsn)
+{
+  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
+  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
+  
+  return wxGTK;

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


@@ -86,34 +103,41 @@ int wxDisplayDepth(void)
 
 const char* wxGetHomeDir( wxString *home  )
 {
 
 const char* wxGetHomeDir( wxString *home  )
 {

-  *home = wxGetUserHome( wxString() );
-  if (home->IsNull()) *home = "/";
-  return *home;
-};
+    *home = wxGetUserHome( wxString() );
+    if (home->IsNull()) *home = "/";
+    return *home;
+}

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

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

 
 

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

         register char *ptr;
 
         if ((ptr = getenv("HOME")) != NULL)
         register char *ptr;
 
         if ((ptr = getenv("HOME")) != NULL)

+       {

             return ptr;
             return ptr;

-        if ((ptr = getenv("USER")) != NULL
-        || (ptr = getenv("LOGNAME")) != NULL) {
+       }
+        if ((ptr = getenv("USER")) != NULL || (ptr = getenv("LOGNAME")) != NULL) 
+       {

             who = getpwnam(ptr);
         }
             who = getpwnam(ptr);
         }

-        // We now make sure the the user exists!
+       
+        /* We now make sure the the user exists! */

         if (who == NULL)
         if (who == NULL)

+       {

             who = getpwuid(getuid());
             who = getpwuid(getuid());

-  }
-  else
-    who = getpwnam (user);
+       }
+    }
+    else
+    {
+      who = getpwnam (user);
+    }

 
 

-  return who ? who->pw_dir : (char*)NULL;
-};
+    return who ? who->pw_dir : (char*)NULL;
+}

 
 //------------------------------------------------------------------------
 // id routines
 
 //------------------------------------------------------------------------
 // id routines


@@ -139,15 +163,15 @@ bool wxGetHostName(char *buf, int sz)
     // strncpy(buf, (h=gethostbyname(name))!=NULL ? h->h_name : name, sz-1);
     if((unsigned)sz > strlen(name)+strlen(domain)+1)
     {
     // strncpy(buf, (h=gethostbyname(name))!=NULL ? h->h_name : name, sz-1);
     if((unsigned)sz > strlen(name)+strlen(domain)+1)
     {

-       strcpy(buf, name);
-       if(strcmp(domain,"(none)") == 0) // standalone machine
-       {
-         strcat(buf,".");
-         strcat(buf,domain);
-       }
+        strcpy(buf, name);
+        if(strcmp(domain,"(none)") == 0) // standalone machine
+        {
+            strcat(buf,".");
+            strcat(buf,domain);
+        }

     }
     else
     }
     else

-       return FALSE;
+        return FALSE;

     return TRUE;
 #endif
 }
     return TRUE;
 #endif
 }


@@ -190,7 +214,7 @@ void wxDebugMsg( const char *format, ... )
   vfprintf( stderr, format, ap );
   fflush( stderr );
   va_end(ap);
   vfprintf( stderr, format, ap );
   fflush( stderr );
   va_end(ap);

-};
+}

 
 void wxError( const wxString &msg, const wxString &title )
 {
 
 void wxError( const wxString &msg, const wxString &title )
 {


@@ -198,7 +222,7 @@ void wxError( const wxString &msg, const wxString &title )
   if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
   if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
   fprintf( stderr, ".\n" );
   if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
   if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
   fprintf( stderr, ".\n" );

-};
+}

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


@@ -207,7 +231,7 @@ void wxFatalError( const wxString &msg, const wxString &title )
   if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
   fprintf( stderr, ".\n" );
   exit(3); // the same exit code as for abort()
   if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
   fprintf( stderr, ".\n" );
   exit(3); // the same exit code as for abort()

-};
+}

 
 //------------------------------------------------------------------------
 // directory routines
 
 //------------------------------------------------------------------------
 // directory routines


@@ -215,11 +239,11 @@ void wxFatalError( const wxString &msg, const wxString &title )
 
 bool wxDirExists( const wxString& dir )
 {
 
 bool wxDirExists( const wxString& dir )
 {

-  char buf[500];
-  strcpy( buf, WXSTRINGCAST(dir) );
-  struct stat sbuf;
-  return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
-};
+    char buf[500];
+    strcpy( buf, WXSTRINGCAST(dir) );
+    struct stat sbuf;
+    return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
+}

 
 //------------------------------------------------------------------------
 // subprocess routines
 
 //------------------------------------------------------------------------
 // subprocess routines


@@ -227,38 +251,38 @@ bool wxDirExists( const wxString& dir )
 
 struct wxEndProcessData
 {
 
 struct wxEndProcessData
 {

-  gint pid, tag;
-  wxProcess *process;
+    gint pid, tag;
+    wxProcess *process;

 };
 
 static void GTK_EndProcessDetector(gpointer data, gint source,
                                    GdkInputCondition WXUNUSED(condition) )
 {
 };
 
 static void GTK_EndProcessDetector(gpointer data, gint source,
                                    GdkInputCondition WXUNUSED(condition) )
 {

-  wxEndProcessData *proc_data = (wxEndProcessData *)data;
-  int pid;
+    wxEndProcessData *proc_data = (wxEndProcessData *)data;
+    int pid;

 
 

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

 
 

-  /* 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 */
+    /* 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)
 #if !defined(__sgi)

-  wait4(proc_data->pid, NULL, 0, NULL);
+    wait4(proc_data->pid, (int*) NULL, 0, (rusage *) NULL);

 #else
 #else

-  wait3((int *) NULL, 0, (rusage *) NULL);
+    wait3((int *) NULL, 0, (rusage *) NULL);

 #endif
 
 #endif
 

-  close(source);
-  gdk_input_remove(proc_data->tag);
+    close(source);
+    gdk_input_remove(proc_data->tag);

 
 

-  if (proc_data->process)
-    proc_data->process->OnTerminate(proc_data->pid);
+    if (proc_data->process)
+        proc_data->process->OnTerminate(proc_data->pid);

 
 

-  if (proc_data->pid > 0)
-    delete proc_data;
-  else
-    proc_data->pid = 0;
-};
+    if (proc_data->pid > 0)
+        delete proc_data;
+    else
+        proc_data->pid = 0;
+}

 
 long wxExecute( char **argv, bool sync, wxProcess *process )
 {
 
 long wxExecute( char **argv, bool sync, wxProcess *process )
 {


@@ -268,8 +292,9 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
     wxCHECK_MSG( *argv, 0, "can't exec empty command" );
 
     /* Create pipes */
     wxCHECK_MSG( *argv, 0, "can't exec empty command" );
 
     /* Create pipes */

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

       return 0;
     }
 
       return 0;
     }
 


@@ -279,14 +304,23 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
 #else
     pid_t pid = fork();
 #endif
 #else
     pid_t pid = fork();
 #endif

-    if (pid == -1) {
-        // error
-        wxLogSysError(_("Fork failed"));
+    if (pid == -1) 
+    {
+        wxLogSysError( "Fork failed" );

         return 0;
     }
         return 0;
     }

-    else if (pid == 0) {
+    else if (pid == 0) 
+    {

         // we're in child
         close(end_proc_detect[0]); // close reading side
         // we're in child
         close(end_proc_detect[0]); // close reading side

+       // 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 sub-
+       // process, the "right thing to do" is to start an xterm executing
+       // it.
+       close(STDIN_FILENO);
+       close(STDOUT_FILENO);
+       close(STDERR_FILENO);

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


@@ -294,20 +328,23 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
         execvp (*argv, argv);
 #endif
         // there is no return after successful exec()
         execvp (*argv, argv);
 #endif
         // there is no return after successful exec()

-        wxLogSysError(_("Can't execute '%s'"), *argv);
+        wxLogSysError( "Can't execute '%s'", *argv);

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

-    else {
+    else 
+    {

       // we're in parent
       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;
       // we're in parent
       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) {
+      if (!sync) 
+      {

         data->process = process;
       }
         data->process = process;
       }

-      else {
+      else 
+      {

         data->process = (wxProcess *) NULL;
         data->pid = -(data->pid);
 
         data->process = (wxProcess *) NULL;
         data->pid = -(data->pid);
 


@@ -321,7 +358,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
       //     failed!
       return pid;
     }
       //     failed!
       return pid;
     }

-};
+}

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


@@ -343,4 +380,4 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process )
     delete [] tmp;
 
     return lRc;
     delete [] tmp;
 
     return lRc;

-};
+}