compilation warning fix

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 019945847062e454c18c184a9505b266da856485..e76e3187f3a7eaa9abbad1e279097c06f6a2db73 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -1,317 +1,238 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

 // Id:          $Id$
 // 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/string.h"
 
 
 #include "wx/utils.h"
 #include "wx/string.h"
 

+#include "wx/apptrait.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 <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>
-

 
 

-#ifdef __SVR4__
-#include <sys/systeminfo.h>
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#ifndef __WXGTK20__
+#include "gtk/gtkfeatures.h"

 #endif
 #endif

+#include "gdk/gdkx.h"

 
 

-//------------------------------------------------------------------------
-// misc.
-//------------------------------------------------------------------------
+#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

 
 

-void wxBell(void)
-{
-  gdk_beep();
-};
+    #include "X11/XKBlib.h"

 
 

-void wxSleep(int nSecs)
-{
-  sleep(nSecs);
-};
+    #undef explicit
+#endif // HAVE_X11_XKBLIB_H

 
 

-int wxKill(long pid, int sig)
-{
-  return kill(pid, sig);
-};
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------

 
 

-void wxDisplaySize( int *width, int *height )
+extern GtkWidget *wxGetRootWindow();
+
+//----------------------------------------------------------------------------
+// misc.
+//----------------------------------------------------------------------------
+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library
+
+void wxBell()

 {
 {

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

 }
 }

+#endif

 
 

-void wxGetMousePosition( int* x, int* y )
+/* 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( "GetMousePosition not yet implemented" );
-  if (x) *x = 0;
-  if (y) *y = 0;
-};
-
-bool wxColourDisplay(void)
+    Bool result;
+    XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
+    return result;       /* TRUE if keyboard hardware supports this mode */
+}
+#else
+bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )

 {
 {

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

 }
 }

+#endif

 
 

-int wxDisplayDepth(void)
-{
-  wxFAIL_MSG( "wxDisplayDepth always returns 8" );
-  return 8;
+#ifdef __WXGTK20__
+// Escapes string so that it is valid Pango markup XML string:
+wxString wxEscapeStringForPangoMarkup(const wxString& str)
+{
+    size_t len = str.length();
+    wxString out;
+    out.Alloc(len);
+    for (size_t i = 0; i < len; i++)
+    {
+        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;
+        }
+    }
+    return out;

 }
 }

+#endif

 
 

-//------------------------------------------------------------------------
-// user and home routines
-//------------------------------------------------------------------------

 
 

-const char* wxGetHomeDir( wxString *home  )
-{
-  *home = wxGetUserHome( wxString() );
-  if (home->IsNull()) *home = "/";
-  return *home;
-};
+// ----------------------------------------------------------------------------
+// display characterstics
+// ----------------------------------------------------------------------------

 
 

-char *wxGetUserHome( const wxString &user )
-{
-  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
-//------------------------------------------------------------------------
-
-bool wxGetHostName(char *buf, int sz)
+void *wxGetDisplay()

 {
 {

-    *buf = '\0';
-#if defined(__SVR4__) && !defined(__sgi)
-    return (sysinfo(SI_HOSTNAME, buf, sz) != -1);
-#else /* BSD Sockets */
-    char name[255];
-    struct hostent *h;
-    // Get hostname
-    if (gethostname(name, sizeof(name)/sizeof(char)-1) == -1)
-       return FALSE;
-    // Get official full name of host
-    strncpy(buf, (h=gethostbyname(name))!=NULL ? h->h_name : name, sz-1);
-    return TRUE;
-#endif
+    return GDK_DISPLAY();

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

-  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" );
-};
+    // 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 )
-{
-  fprintf( stderr, "Error " );
-  if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
-  if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
-  fprintf( stderr, ".\n" );
-  exit(1);
-};
-
-//------------------------------------------------------------------------
-// directory routines
-//------------------------------------------------------------------------
-
-bool wxDirExists( const wxString& dir )
+void wxGetMousePosition( int* x, int* y )

 {
 {

-  char buf[500];
-  strcpy( buf, WXSTRINGCAST(dir) );
-  struct stat sbuf;
-  return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
-};
-
-//------------------------------------------------------------------------
-// subprocess routines
-//------------------------------------------------------------------------
-
-typedef struct {
-  gint pid, tag;
-  wxProcess *process;
-} wxEndProcessData;
+    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
+}

 
 

-static void GTK_EndProcessDetector(gpointer data, gint source,
-                                   GdkInputCondition WXUNUSED(condition) )
+bool wxColourDisplay()

 {
 {

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

 
 

-  pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
+int wxDisplayDepth()
+{
+    return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
+}

 
 

-  /* 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);
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+{
+    static wxToolkitInfo info;
+#ifdef __WXGTK20__
+    info.shortName = _T("gtk2");

 #else
 #else

-  wait3((int *) NULL, 0, (rusage *) NULL);
+    info.shortName = _T("gtk");
+#endif
+    info.name = _T("wxGTK");
+#ifdef __WXUNIVERSAL__
+    info.shortName << _T("univ");
+    info.name << _T("/wxUniversal");

 #endif
 #endif

+    info.versionMajor = gtk_major_version;
+    info.versionMinor = gtk_minor_version;
+    info.os = wxGTK;
+    return info;
+}

 
 

-  close(source);
-  gdk_input_remove(proc_data->tag);
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    return wxGenericFindWindowAtPoint(pt);
+}

 
 

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

 
 

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

 
 

-long wxExecute( char **argv, bool sync, wxProcess *process )
+extern "C"
+void GTK_EndProcessDetector(gpointer data, gint source,
+                            GdkInputCondition WXUNUSED(condition) )

 {
 {

-    wxEndProcessData *data = new wxEndProcessData;
-    int end_proc_detect[2];
+   wxEndProcessData *proc_data = (wxEndProcessData *)data;

 
 

-    if (*argv == NULL)
-       return 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);

 
 

-    /* Create pipes */
-    if (pipe(end_proc_detect) == -1) {
-      perror("pipe 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) {
-       perror ("fork failed");
-       return 0;
-    } else if (pid == 0) {
-        /* Close fd not useful */
-        close(end_proc_detect[0]); // close reading side
-
-       /* child */
-#ifdef _AIX
-       execvp ((const char *)*argv, (const char **)argv);
-#else
-       execvp (*argv, argv);
-#endif
-       if (errno == ENOENT)
-           wxError("command not found", *argv);
-       else
-           perror (*argv);
-       wxError("could not execute", *argv);
-       _exit (-1);
-    }
+   if ( rc == 0 )
+   {
+       // no, it didn't exit yet, continue waiting
+       return;
+   }

 
 

-    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);
+   // set exit code to -1 if something bad happened
+   proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status)
+                                                      : -1;

 
 

-      while (data->pid != 0)
-        wxYield();
+   // child exited, end waiting
+   close(source);

 
 

-      delete data;
-    }
+   // don't call us again!
+   gdk_input_remove(proc_data->tag);

 
 

-    return pid;
-};
+   wxHandleProcessTermination(proc_data);
+}

 
 

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

 {
 {

-    if (command.IsNull() || command == "") return FALSE;
-
-    int argc = 0;
-    char *argv[127];
-    char tmp[1024];
-    const char *IFS = " \t\n";
-
-    strncpy (tmp, command, sizeof(tmp) / sizeof(char) - 1);
-    tmp[sizeof (tmp) / sizeof (char) - 1] = '\0';
-    argv[argc++] = strtok (tmp, IFS);
-    while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL)
-       /* loop */ ;
-    return wxExecute(argv, sync, process);
-};
+    int tag = gdk_input_add(fd,
+                            GDK_INPUT_READ,
+                            GTK_EndProcessDetector,
+                            (gpointer)proc_data);

 
 

+    return tag;
+}