Commit pickers-fixes.patch added to 1472329 (Francesco Montorsi)

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index f27d96bdf88e6281eb5256cc63d9b4d1c1e9329a..f615293ba2820909c5934af7497aea4182d7fdd2 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -1,389 +1,261 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utils.cpp
+// Name:        src/gtk/utilsgtk.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

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

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

-
-//#ifdef __GNUG__
-//#pragma implementation "utils.h"
-//#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/utils.h"
 
 #include "wx/utils.h"

-#include "wx/string.h"

 
 

-#include "wx/intl.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/apptrait.h"

 
 #include "wx/process.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 <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>

+#include <sys/wait.h>   // for WNOHANG

 #include <unistd.h>
 #include <unistd.h>

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

 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"

-#include "gtk/gtkfeatures.h"

 #include "gdk/gdkx.h"
 
 #include "gdk/gdkx.h"
 

-#ifdef __SVR4__
-  #include <sys/systeminfo.h>
-#endif
+#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

 
 

-#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
+    #include "X11/XKBlib.h"

 
 

-//------------------------------------------------------------------------
-// misc.
-//------------------------------------------------------------------------
-
-void wxBell(void)
-{
-    gdk_beep();
-}
+    #undef explicit
+#endif // HAVE_X11_XKBLIB_H

 
 

-void wxSleep(int nSecs)
-{
-    sleep(nSecs);
-}
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------

 
 

-int wxKill(long pid, int sig)
-{
-    return kill(pid, sig);
-}
+extern GtkWidget *wxGetRootWindow();

 
 

-void wxDisplaySize( int *width, int *height )
-{
-    if (width) *width = gdk_screen_width();
-    if (height) *height = gdk_screen_height();
-}
-
-void wxGetMousePosition( int* x, int* y )
-{
-    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
-}
-
-bool wxColourDisplay(void)
-{
-    return TRUE;
-}
+//----------------------------------------------------------------------------
+// misc.
+//----------------------------------------------------------------------------
+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library

 
 

-int wxDisplayDepth(void)
+void wxBell()

 {
 {

-    return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth;
+    gdk_beep();

 }
 }

+#endif

 
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+/* Don't synthesize KeyUp events holding down a key and producing
+   KeyDown events with autorepeat. */
+#ifdef HAVE_X11_XKBLIB_H
+bool wxSetDetectableAutoRepeat( bool flag )

 {
 {

-  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
-  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
-  
-  return wxGTK;
+    Bool result;
+    XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
+    return result;       /* true if keyboard hardware supports this mode */

 }
 }

-
-//------------------------------------------------------------------------
-// user and home routines
-//------------------------------------------------------------------------
-
-const char* wxGetHomeDir( wxString *home  )
+#else
+bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )

 {
 {

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

 }
 }

+#endif

 
 

-char *wxGetUserHome( const wxString &user )
+// Escapes string so that it is valid Pango markup XML string:
+wxString wxEscapeStringForPangoMarkup(const wxString& str)

 {
 {

-    struct passwd *who = (struct passwd *) NULL;
-
-    if (user.IsNull() || (user== ""))
+    size_t len = str.length();
+    wxString out;
+    out.Alloc(len);
+    for (size_t i = 0; i < len; i++)

     {
     {

-        register char *ptr;
-
-        if ((ptr = getenv("HOME")) != NULL)
-       {
-            return ptr;
-       }
-        if ((ptr = getenv("USER")) != NULL || (ptr = getenv("LOGNAME")) != NULL) 
-       {
-            who = getpwnam(ptr);
+        wxChar c = str[i];
+        switch (c)
+        {
+            case _T('&'):
+                out << _T("&amp;");
+                break;
+            case _T('<'):
+                out << _T("&lt;");
+                break;
+            case _T('>'):
+                out << _T("&gt;");
+                break;
+            case _T('\''):
+                out << _T("&apos;");
+                break;
+            case _T('"'):
+                out << _T("&quot;");
+                break;
+            default:
+                out << c;
+                break;

         }
         }

-       
-        /* 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;
+    return out;

 }
 
 }
 

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

 
 

-bool wxGetHostName(char *buf, int sz)
-{
-    *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;
-#endif
-}
+// ----------------------------------------------------------------------------
+// display characterstics
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

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

 }
 
 }
 

-bool wxGetUserName(char *buf, int sz)
+void wxDisplaySize( int *width, int *height )

 {
 {

-    struct passwd *who;
-    char *comma;
-
-    *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;
+    if (width) *width = gdk_screen_width();
+    if (height) *height = gdk_screen_height();

 }
 
 }
 

-//------------------------------------------------------------------------
-// error and debug output routines
-//------------------------------------------------------------------------
-
-void wxDebugMsg( const char *format, ... )
+void wxDisplaySizeMM( int *width, int *height )

 {
 {

-  va_list ap;
-  va_start( ap, format );
-  vfprintf( stderr, format, ap );
-  fflush( stderr );
-  va_end(ap);
+    if (width) *width = gdk_screen_width_mm();
+    if (height) *height = gdk_screen_height_mm();

 }
 
 }
 

-void wxError( const wxString &msg, const wxString &title )
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)

 {
 {

-  fprintf( stderr, "Error " );
-  if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
-  if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
-  fprintf( stderr, ".\n" );
+    // This is supposed to return desktop dimensions minus any window
+    // manager panels, menus, taskbars, etc.  If there is a way to do that
+    // for this platform please fix this function, otherwise it defaults
+    // to the entire desktop.
+    if (x) *x = 0;
+    if (y) *y = 0;
+    wxDisplaySize(width, height);

 }
 
 }
 

-void wxFatalError( const wxString &msg, const wxString &title )
+void wxGetMousePosition( int* x, int* y )

 {
 {

-  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()
+    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );

 }
 
 }
 

-//------------------------------------------------------------------------
-// directory routines
-//------------------------------------------------------------------------
-
-bool wxDirExists( const wxString& dir )
+bool wxColourDisplay()

 {
 {

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

 }
 
 }
 

-//------------------------------------------------------------------------
-// subprocess routines
-//------------------------------------------------------------------------
-
-struct wxEndProcessData
+int wxDisplayDepth()

 {
 {

-    gint pid, tag;
-    wxProcess *process;
-};
+    return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth;
+}

 
 

-static void GTK_EndProcessDetector(gpointer data, gint source,
-                                   GdkInputCondition WXUNUSED(condition) )
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()

 {
 {

-    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 */
-    // VZ: wait4() will be woken up by a signal, not wait3 - so it's quite
-    //     different (also, wait3() waits for any child, wait4() only for this
-    //     one)
-    int status = -1;
-#if !defined(__sgi)
-    wait4(proc_data->pid, &status, 0, (rusage *) NULL);
-#else
-    wait3(&status, 0, (rusage *) NULL);
+    static wxToolkitInfo info;
+    info.shortName = _T("gtk2");
+    info.name = _T("wxGTK");
+#ifdef __WXUNIVERSAL__
+    info.shortName << _T("univ");
+    info.name << _T("/wxUniversal");

 #endif
 #endif

-
-    close(source);
-    gdk_input_remove(proc_data->tag);
-
-    if (proc_data->process)
-        proc_data->process->OnTerminate(proc_data->pid, status);
-
-    if (proc_data->pid > 0)
-        delete proc_data;
-    else
-        proc_data->pid = 0;
+    info.versionMajor = gtk_major_version;
+    info.versionMinor = gtk_minor_version;
+    info.os = wxGTK;
+    return info;

 }
 
 }
 

-long wxExecute( char **argv, bool sync, wxProcess *process )
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

 {
 {

-    wxEndProcessData *data = new wxEndProcessData;
-    int end_proc_detect[2];
+    return wxGenericFindWindowAtPoint(pt);
+}

 
 

-    wxCHECK_MSG( *argv, 0, "can't exec empty command" );
+#if !wxUSE_UNICODE

 
 

-    /* Create pipes */
-    if (pipe(end_proc_detect) == -1) 
+wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc)
+{
+    if ( enc == wxFONTENCODING_UTF8 )

     {
     {

-      wxLogSysError( "Pipe creation failed" );
-      return 0;
+        // no need for conversion at all
+        return wxCharBuffer(s);

     }
 
     }
 

-    /* fork the process */
-#if defined(sun) || defined(__ultrix) || defined(__bsdi__)
-    pid_t pid = vfork();
-#else
-    pid_t pid = fork();
-#endif
-    if (pid == -1) 
+    wxWCharBuffer wbuf;
+    if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )

     {
     {

-        wxLogSysError( "Fork failed" );
-        return 0;
+        wbuf = wxConvUI->cMB2WC(s);

     }
     }

-    else if (pid == 0) 
+    else // another encoding, use generic conversion class

     {
     {

-        // 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);
-#else
-        execvp (*argv, argv);
-#endif
-        // there is no return after successful exec()
-        wxLogSysError( "Can't execute '%s'", *argv);
-
-        _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;
+        wbuf = wxCSConv(enc).cMB2WC(s);

     }
     }

+
+    wxCharBuffer buf;
+    if ( wbuf )
+        buf = wxConvUTF8.cWC2MB(wbuf);
+
+    return buf;

 }
 
 }
 

-long wxExecute( const wxString& command, bool sync, wxProcess *process )
+#endif // !wxUSE_UNICODE
+
+// ----------------------------------------------------------------------------
+// subprocess routines
+// ----------------------------------------------------------------------------
+
+extern "C" {
+static
+void GTK_EndProcessDetector(gpointer data, gint source,
+                            GdkInputCondition WXUNUSED(condition) )

 {
 {

-    static const char *IFS = " \t\n";
+   wxEndProcessData *proc_data = (wxEndProcessData *)data;
+
+   // has the process really terminated? unfortunately GDK (or GLib) seem to
+   // generate G_IO_HUP notification even when it simply tries to read from a
+   // closed fd and hasn't terminated at all
+   int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
+   int status = 0;
+   int rc = waitpid(pid, &status, WNOHANG);

 
 

-    wxCHECK_MSG( !command.IsEmpty(), 0, "can't exec empty command" );
+   if ( rc == 0 )
+   {
+       // no, it didn't exit yet, continue waiting
+       return;
+   }

 
 

-    int argc = 0;
-    char *argv[127];
-    char *tmp = new char[command.Len() + 1];
-    strcpy(tmp, command);
+   // set exit code to -1 if something bad happened
+   proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status)
+                                                      : -1;

 
 

-    argv[argc++] = strtok(tmp, IFS);
-    while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL)
-        /* loop */ ;
+   // child exited, end waiting
+   close(source);

 
 

-    long lRc = wxExecute(argv, sync, process);
-    
-    delete [] tmp;
+   // don't call us again!
+   gdk_input_remove(proc_data->tag);
+
+   wxHandleProcessTermination(proc_data);
+}
+}
+
+int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
+{
+    int tag = gdk_input_add(fd,
+                            GDK_INPUT_READ,
+                            GTK_EndProcessDetector,
+                            (gpointer)proc_data);

 
 

-    return lRc;
+    return tag;

 }
 }