//... => /* ... */

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 3de7efc8bcfa316edc293ddea70bd1ecd45dd274..5f563ac295e73b4ac21ca1f461226ed38d4d3101 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -2,345 +2,124 @@
 // 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
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:           wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-//#ifdef __GNUG__
-//#pragma implementation "utils.h"
-//#endif
-

 #include "wx/utils.h"
 #include "wx/string.h"
 
 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
 #include "wx/string.h"
 
 #include "wx/intl.h"
 #include "wx/log.h"
 

+#include "wx/process.h"
+
+#include "wx/unix/execute.h"
+

 #include <stdarg.h>
 #include <stdarg.h>

-#include <dirent.h>

 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>

-#include <sys/wait.h>
-#include <pwd.h>
-#include <errno.h>
-#include <netdb.h>
-#include <signal.h>
-

 
 

-#ifdef __SVR4__
-  #include <sys/systeminfo.h>
-#endif
-
-//------------------------------------------------------------------------
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gtk/gtkfeatures.h"
+#include "gdk/gdkx.h"
+
+#ifdef HAVE_X11_XKBLIB_H
+    /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with
+     * field named "explicit" - which is, of course, an error for a C++
+     * compiler. To be on the safe side, just redefine it everywhere. */
+    #define explicit __wx_explicit
+  
+    #include "X11/XKBlib.h"
+  
+    #undef explicit
+#endif // HAVE_X11_XKBLIB_H
+
+// ----------------------------------------------------------------------------

 // misc.
 // misc.

-//------------------------------------------------------------------------
-
-void wxBell(void)
-{
-  gdk_beep();
-};
+// ----------------------------------------------------------------------------

 
 

-void wxSleep(int nSecs)
+void wxBell()

 {
 {

-  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();
+    gdk_beep();

 }
 
 }
 

-void wxGetMousePosition( int* x, int* y )
-{
-  wxFAIL_MSG( "GetMousePosition not yet implemented" );
-  if (x) *x = 0;
-  if (y) *y = 0;
-};
-
-bool wxColourDisplay(void)
+/* Don't synthesize KeyUp events holding down a key and producing
+   KeyDown events with autorepeat. */
+#ifdef HAVE_X11_XKBLIB_H
+bool wxSetDetectableAutoRepeat( bool flag )

 {
 {

-  wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
-  return TRUE;
+    Bool result;
+    XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
+    return result;       /* TRUE if keyboard hardware supports this mode */

 }
 }

-
-int wxDisplayDepth(void)
+#else
+bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )

 {
 {

-  wxFAIL_MSG( "wxDisplayDepth always returns 8" );
-  return 8;
+    return FALSE;

 }
 }

+#endif

 
 

-//------------------------------------------------------------------------
-// user and home routines
-//------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// display characterstics
+// ----------------------------------------------------------------------------

 
 

-const char* wxGetHomeDir( wxString *home  )
+void wxDisplaySize( int *width, int *height )

 {
 {

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

 
 

-char *wxGetUserHome( const wxString &user )
+void wxGetMousePosition( int* x, int* y )

 {
 {

-  struct passwd *who = (struct passwd *) NULL;
-
-  if (user.IsNull() || (user== ""))
-  {
-        register char *ptr;
-
-        if ((ptr = getenv("HOME")) != NULL)
-            return ptr;
-        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);
-
-  return who ? who->pw_dir : (char*)NULL;
-};
-
-//------------------------------------------------------------------------
-// id routines
-//------------------------------------------------------------------------
+    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
+}

 
 

-bool wxGetHostName(char *buf, int sz)
+bool wxColourDisplay()

 {
 {

-    *buf = '\0';
-#if defined(__SVR4__) && !defined(__sgi)
-    //KB: does this return the fully qualified host.domain name?
-    return (sysinfo(SI_HOSTNAME, buf, sz) != -1);
-#else /* BSD Sockets */
-    char name[255], domain[255];
-    //struct hostent *h;
-    // Get hostname
-    if (gethostname(name, sizeof(name)/sizeof(char)-1) == -1)
-        return FALSE;
-    if (getdomainname(domain, sizeof(domain)/sizeof(char)-1) == -1)
-        return FALSE;
-    // Get official full name of host
-    // doesn't return the full qualified name, replaced by following
-    // code (KB)
-    // 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);
-       }
-    }
-    else
-       return FALSE;

     return TRUE;
     return TRUE;

-#endif

 }
 
 }
 

-bool wxGetUserId(char *buf, int sz)
+int wxDisplayDepth()

 {
 {

-    struct passwd *who;
-
-    *buf = '\0';
-    if ((who = getpwuid(getuid ())) != NULL) {
-        strncpy (buf, who->pw_name, sz-1);
-        return TRUE;
-    }
-    return FALSE;
+    return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth;

 }
 
 }
 

-bool wxGetUserName(char *buf, int sz)
+int wxGetOsVersion(int *majorVsn, int *minorVsn)

 {
 {

-    struct passwd *who;
-    char *comma;
+  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
+  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;

 
 

-    *buf = '\0';
-    if ((who = getpwuid (getuid ())) != NULL) {
-       comma = strchr(who->pw_gecos,'c');
-       if(comma) *comma = '\0'; // cut off non-name comment fields
-       strncpy (buf, who->pw_gecos, sz - 1);
-        return TRUE;
-    }
-    return FALSE;
+  return wxGTK;

 }
 
 }
 

-//------------------------------------------------------------------------
-// error and debug output routines
-//------------------------------------------------------------------------
-
-void wxDebugMsg( const char *format, ... )
-{
-  va_list ap;
-  va_start( ap, format );
-  vfprintf( stderr, format, ap );
-  fflush( stderr );
-  va_end(ap);
-};
-
-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" );
-};
-
-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" );
-  exit(3); // the same exit code as for abort()
-};
-
-//------------------------------------------------------------------------
-// directory routines
-//------------------------------------------------------------------------
-
-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);
-};
-
-//------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // subprocess routines
 // subprocess routines

-//------------------------------------------------------------------------
-
-struct wxEndProcessData
-{
-  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;
-
-  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 */
-#if !defined(__sgi)
-  wait4(proc_data->pid, NULL, 0, NULL);
-#else
-  wait3((int *) NULL, 0, (rusage *) NULL);
-#endif
-
-  close(source);
-  gdk_input_remove(proc_data->tag);
-
-  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 sync, wxProcess *process )
-{
-    wxEndProcessData *data = new wxEndProcessData;
-    int end_proc_detect[2];
-
-    wxCHECK_MSG( *argv, 0, "can't exec empty command" );
+    wxEndProcessData *proc_data = (wxEndProcessData *)data;

 
 

-    /* Create pipes */
-    if (pipe(end_proc_detect) == -1) {
-      wxLogSysError(_("Pipe creation failed"));
-      return 0;
-    }
-
-    /* fork the process */
-#if defined(sun) || defined(__ultrix) || defined(__bsdi__)
-    pid_t pid = vfork();
-#else
-    pid_t pid = fork();
-#endif
-    if (pid == -1) {
-        // error
-        wxLogSysError(_("Fork failed"));
-        return 0;
-    }
-    else if (pid == 0) {
-        // we're in child
-        close(end_proc_detect[0]); // close reading side
-
-#ifdef _AIX
-        execvp ((const char *)*argv, (const char **)argv);
-#else
-        execvp (*argv, argv);
-#endif
-        // there is no return after successful exec()
-        wxLogSysError(_("Can't execute '%s'"), *argv);
+    wxHandleProcessTermination(proc_data);

 
 

-        _exit(-1);
-    }
-    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;
-      if (!sync) {
-        data->process = process;
-      }
-      else {
-        data->process = (wxProcess *) NULL;
-        data->pid = -(data->pid);
-
-        while (data->pid != 0)
-          wxYield();
-
-        delete data;
-      }
-
-      // @@@ our return value indicates success even if execvp() in the child
-      //     failed!
-      return pid;
-    }
-};
+    close(source);
+    gdk_input_remove(proc_data->tag);
+}

 
 

-long wxExecute( const wxString& command, bool sync, wxProcess *process )
+int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)

 {
 {

-    static const char *IFS = " \t\n";
+    int tag = gdk_input_add(fd,
+                            GDK_INPUT_READ,
+                            GTK_EndProcessDetector,
+                            (gpointer)proc_data);

 
 

-    wxCHECK_MSG( !command.IsEmpty(), 0, "can't exec empty command" );
-
-    int argc = 0;
-    char *argv[127];
-    char *tmp = new char[command.Len() + 1];
-    strcpy(tmp, command);
-
-    argv[argc++] = strtok(tmp, IFS);
-    while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL)
-        /* loop */ ;
-
-    long lRc = wxExecute(argv, sync, process);
-    
-    delete [] tmp;
+    return tag;
+}

 
 

-    return lRc;
-};