blind fix for wxGIFDecoder::ReadGIF

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index a280a4c189827c7c3a9a58cf340b4d653bc7b70a..1296a0f7624cf22a7ceae8a9546d8464f27ceffd 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -1,17 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Purpose:
 // Author:      Robert Roebling
 // 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/utils.h"
 #include "wx/string.h"
 


@@ -20,402 +15,168 @@
 
 #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 <fcntl.h>          // for O_WRONLY and friends

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

+#ifndef __WXGTK20__

 #include "gtk/gtkfeatures.h"
 #include "gtk/gtkfeatures.h"

+#endif

 #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"
+
+    #undef explicit
+#endif // HAVE_X11_XKBLIB_H
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------

 
 

-//------------------------------------------------------------------------
+extern GtkWidget *wxGetRootWindow();
+
+//----------------------------------------------------------------------------

 // misc.
 // misc.

-//------------------------------------------------------------------------
+//----------------------------------------------------------------------------

 
 

-void wxBell(void)
+void wxBell()

 {
     gdk_beep();
 }
 
 {
     gdk_beep();
 }
 

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

 {
 {

-    sleep(nSecs);
+    Bool result;
+    XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
+    return result;       /* TRUE if keyboard hardware supports this mode */

 }
 }

-
-int wxKill(long pid, int sig)
-{
-    return kill(pid, sig);
-}
-
-void wxDisplaySize( int *width, int *height )
+#else
+bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )

 {
 {

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

 }
 }

+#endif

 
 

-void wxGetMousePosition( int* x, int* y )
-{
-    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
-}
+// ----------------------------------------------------------------------------
+// display characterstics
+// ----------------------------------------------------------------------------

 
 

-bool wxColourDisplay(void)
+void *wxGetDisplay()

 {
 {

-    return TRUE;
+    return GDK_DISPLAY();

 }
 
 }
 

-int wxDisplayDepth(void)
+void wxDisplaySize( int *width, int *height )

 {
 {

-    return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth;
+    if (width) *width = gdk_screen_width();
+    if (height) *height = gdk_screen_height();

 }
 
 }
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+void wxDisplaySizeMM( int *width, int *height )

 {
 {

-  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
-  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
-
-  return wxGTK;
+    if (width) *width = gdk_screen_width_mm();
+    if (height) *height = gdk_screen_height_mm();

 }
 
 }
 

-//------------------------------------------------------------------------
-// user and home routines
-//------------------------------------------------------------------------
-
-const char* wxGetHomeDir( wxString *home  )
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)

 {
 {

-    *home = wxGetUserHome( wxString() );
-    if (home->IsNull()) *home = "/";
-    return *home;
+    // 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);

 }
 
 }
 

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

 }
 
 }
 

-//------------------------------------------------------------------------
-// id routines
-//------------------------------------------------------------------------
-
-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)
-{
-    struct passwd *who;
-
-    *buf = '\0';
-    if ((who = getpwuid(getuid ())) != NULL) {
-        strncpy (buf, who->pw_name, sz-1);
-        return TRUE;
-    }
-    return FALSE;

 }
 
 }
 

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

 {
 {

-    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;
+    return gdk_window_get_visual( wxGetRootWindow()->window )->depth;

 }
 
 }
 

-//------------------------------------------------------------------------
-// error and debug output routines
-//------------------------------------------------------------------------
-
-void wxDebugMsg( const char *format, ... )
+int wxGetOsVersion(int *majorVsn, int *minorVsn)

 {
 {

-  va_list ap;
-  va_start( ap, format );
-  vfprintf( stderr, format, ap );
-  fflush( stderr );
-  va_end(ap);
-}
+  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
+  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;

 
 

-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" );
+  return wxGTK;

 }
 
 }
 

-void wxFatalError( const wxString &msg, const wxString &title )
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

 {
 {

-  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()
+    return wxGenericFindWindowAtPoint(pt);

 }
 
 }
 

-//------------------------------------------------------------------------
-// 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

-//------------------------------------------------------------------------
-
-// if pid > 0, the execution is async and the data is freed in
-// GTK_EndProcessDetector, if pid < 0, the execution is synchronous and the
-// caller (wxExecute) frees the data
-struct wxEndProcessData
-{
-    gint pid, tag;
-    wxProcess *process;
-    int  exitcode;
-};
+// ----------------------------------------------------------------------------

 
 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 */
-    // 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(pid, &status, 0, (rusage *) NULL);
-#else
-    wait3(&status, 0, (rusage *) NULL);
-#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
-    {
-        // wxExecute() will know about it
-        proc_data->exitcode = status;
+   wxEndProcessData *proc_data = (wxEndProcessData *)data;

 
 

-        proc_data->pid = 0;
-    }
-}
+   // 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);

 
 

-long wxExecute( char **argv, bool sync, wxProcess *process )
-{
-    wxEndProcessData *data = new wxEndProcessData;
-    int end_proc_detect[2];
+   if ( rc == 0 )
+   {
+       // no, it didn't exit yet, continue waiting
+       return;
+   }

 
 

-    wxCHECK_MSG( *argv, 0, "can't exec empty command" );
+   // set exit code to -1 if something bad happened
+   proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status)
+                                                      : -1;

 
 

-    /* Create pipes */
-    if (pipe(end_proc_detect) == -1)
-    {
-        wxLogSysError( _("Pipe creation failed") );
-        return 0;
-    }
+   // child exited, end waiting
+   close(source);

 
 

-    /* fork the process */
-#if defined(sun) || defined(__ultrix) || defined(__bsdi__)
-    pid_t pid = vfork();
-#else
-    pid_t pid = fork();
-#endif
-    if (pid == -1)
-    {
-        wxLogSysError( _("Fork failed") );
-        return 0;
-    }
-    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 subprocess, the "right thing to do is
-        // to start an xterm executing it.
-        close(STDIN_FILENO);
-        close(STDOUT_FILENO);
-
-        // leave stderr opened, it won't do any hurm
-#if 0
-        close(STDERR_FILENO);
-
-        // some programs complain about stderr not being open, so redirect
-        // them:
-        open("/dev/null", O_RDONLY);  // stdin
-        open("/dev/null", O_WRONLY);  // stdout
-        open("/dev/null", O_WRONLY);  // stderr
-#endif
+   // don't call us again!
+   gdk_input_remove(proc_data->tag);

 
 

-#ifdef _AIX
-        execvp ((const char *)*argv, (const char **)argv);
-#else
-        execvp (*argv, argv);
-#endif
-
-        // there is no return after successful exec()
-        fprintf(stderr, _("Can't execute '%s'\n"), *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);
-        if ( sync )
-        {
-            wxASSERT_MSG( !process, "wxProcess param ignored for sync exec" );
-            data->process = NULL;
-
-            // sync execution: indicate it by negating the pid
-            data->pid = -pid;
-
-            // it will be set to 0 from GTK_EndProcessDetector
-            while (data->pid != 0)
-                wxYield();
-
-            int exitcode = data->exitcode;
-
-            delete data;
-
-            return exitcode;
-        }
-        else
-        {
-            // async execution, nothing special to do - caller will be
-            // notified about the process terminationif process != NULL, data
-            // will be deleted in GTK_EndProcessDetector
-            data->process = process;
-            data->pid = pid;
-
-            return pid;
-        }
-    }
+   wxHandleProcessTermination(proc_data);

 }
 
 }
 

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

 {
 {

-    static const char *IFS = " \t\n";
-
-    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);
+    int tag = gdk_input_add(fd,
+                            GDK_INPUT_READ,
+                            GTK_EndProcessDetector,
+                            (gpointer)proc_data);

 
 

-    argv[argc++] = strtok(tmp, IFS);
-    while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL)
-        /* loop */ ;
-
-    long lRc = wxExecute(argv, sync, process);
-
-    delete [] tmp;
-
-    return lRc;
+    return tag;

 }
 }

+