some very minor changes

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

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 07ca4f5658c010913bc3d4f0fb841a24466382ac..331b2e9cea37f4a10e05835ac29e5a24e8270209 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -30,6 +30,11 @@
 #include <netdb.h>
 #include <signal.h>
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xresource.h>
+
+#include "gdk/gdkx.h"        // GDK_DISPLAY
 
 #ifdef __SVR4__
   #include <sys/systeminfo.h>
@@ -37,7 +42,11 @@
 
 #ifdef __SOLARIS__
 // somehow missing from sys/wait.h but in the system's docs
-pid_t wait4(pid_t pid, int *statusp, int options, struct rusage *rusage);   
+extern "C"
+{
+   pid_t wait4(pid_t pid, int *statusp, int options, struct rusage
+               *rusage);
+}
 #endif
 
 //------------------------------------------------------------------------
@@ -46,42 +55,45 @@ pid_t wait4(pid_t pid, int *statusp, int options, struct rusage *rusage);
 
 void wxBell(void)
 {
-  gdk_beep();
-};
+    gdk_beep();
+}
 
 void wxSleep(int nSecs)
 {
-  sleep(nSecs);
-};
+    sleep(nSecs);
+}
 
 int wxKill(long pid, int sig)
 {
-  return kill(pid, sig);
-};
+    return kill(pid, sig);
+}
 
 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 )
 {
-  wxFAIL_MSG( "GetMousePosition not yet implemented" );
-  if (x) *x = 0;
-  if (y) *y = 0;
-};
+    Window       dumw;
+    int          dumi;
+    unsigned int dumu;
+    
+    XQueryPointer( GDK_DISPLAY(),GDK_ROOT_WINDOW(),
+                   &dumw,&dumw,x,y,&dumi,&dumi,&dumu );
+}
 
 bool wxColourDisplay(void)
 {
-  wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
-  return TRUE;
+    wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
+    return TRUE;
 }
 
 int wxDisplayDepth(void)
 {
-  wxFAIL_MSG( "wxDisplayDepth always returns 8" );
-  return 8;
+    wxFAIL_MSG( "wxDisplayDepth always returns 8" );
+    return 8;
 }
 
 //------------------------------------------------------------------------
@@ -90,34 +102,40 @@ int wxDisplayDepth(void)
 
 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 )
 {
-  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)
+       {
             return ptr;
-        if ((ptr = getenv("USER")) != NULL
-        || (ptr = getenv("LOGNAME")) != NULL) {
+       }
+        if ((ptr = getenv("USER")) != NULL || (ptr = getenv("LOGNAME")) != NULL) 
+       {
             who = getpwnam(ptr);
         }
         // We now make sure the the user exists!
         if (who == NULL)
+       {
             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
@@ -143,15 +161,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)
     {
-       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
-       return FALSE;
+        return FALSE;
     return TRUE;
 #endif
 }
@@ -194,7 +212,7 @@ void wxDebugMsg( const char *format, ... )
   vfprintf( stderr, format, ap );
   fflush( stderr );
   va_end(ap);
-};
+}
 
 void wxError( const wxString &msg, const wxString &title )
 {
@@ -202,7 +220,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" );
-};
+}
 
 void wxFatalError( const wxString &msg, const wxString &title )
 {
@@ -211,7 +229,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()
-};
+}
 
 //------------------------------------------------------------------------
 // directory routines
@@ -219,11 +237,11 @@ void wxFatalError( const wxString &msg, const wxString &title )
 
 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
@@ -262,7 +280,7 @@ static void GTK_EndProcessDetector(gpointer data, gint source,
     delete proc_data;
   else
     proc_data->pid = 0;
-};
+}
 
 long wxExecute( char **argv, bool sync, wxProcess *process )
 {
@@ -291,6 +309,14 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
     else if (pid == 0) {
         // 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);
@@ -325,7 +351,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
       //     failed!
       return pid;
     }
-};
+}
 
 long wxExecute( const wxString& command, bool sync, wxProcess *process )
 {
@@ -347,4 +373,4 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process )
     delete [] tmp;
 
     return lRc;
-};
+}