#include "wx/intl.h"
#include "wx/log.h"
+#include "wx/process.h"
+
#include <stdarg.h>
#include <dirent.h>
#include <string.h>
#include <errno.h>
#include <netdb.h>
#include <signal.h>
+#include <fcntl.h> // for O_WRONLY and friends
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xresource.h>
-
-#include "gdk/gdkx.h" // GDK_DISPLAY
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gtk/gtkfeatures.h"
+#include "gdk/gdkx.h"
#ifdef __SVR4__
#include <sys/systeminfo.h>
#endif
-#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
+// many versions of Unices have this function, but it is not defined in system
+// headers - please add your system here if it is the case for your OS.
+// SunOS (and Solaris) and DG-UX are like this.
+#if defined(__SOLARIS__) || defined(__osf__)
+ extern "C"
+ {
+ pid_t wait4(pid_t pid, int *statusp, int options,
+ struct rusage *rusage);
+ }
+
+ #define wxWait4(pid, stat, flags, rusage) wait4(pid, stat, flags, rusage)
+#elif defined(__sgi) || defined(__HPUX__)
+ // no wait4() at all on these systems
+ // TODO verify whether wait3() really works in this situation
+ #define wxWait4(pid, stat, flags, rusage) wait3(stat, flags, rusage)
+#else
+ // other Unices: assume have wait4(), although it's not standard (but
+ // Linux and FreeBSD do have it)
+ #define wxWait4(pid, stat, flags, rusage) wait4(pid, stat, flags, rusage)
+#endif // wait4()
//------------------------------------------------------------------------
// misc.
void wxGetMousePosition( int* x, int* y )
{
- Window dumw;
- int dumi;
- unsigned int dumu;
-
- XQueryPointer( GDK_DISPLAY(),GDK_ROOT_WINDOW(),
- &dumw,&dumw,x,y,&dumi,&dumi,&dumu );
+ gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
}
bool wxColourDisplay(void)
{
- wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
return TRUE;
}
int wxDisplayDepth(void)
{
- wxFAIL_MSG( "wxDisplayDepth always returns 8" );
- return 8;
+ return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth;
+}
+
+int wxGetOsVersion(int *majorVsn, int *minorVsn)
+{
+ if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
+ if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
+
+ return wxGTK;
}
//------------------------------------------------------------------------
{
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!
+
+ /* We now make sure the the user exists! */
if (who == NULL)
{
who = getpwuid(getuid());
vfprintf( stderr, format, ap );
fflush( stderr );
va_end(ap);
-};
+}
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 )
{
if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
fprintf( stderr, ".\n" );
exit(3); // the same exit code as for abort()
-};
+}
//------------------------------------------------------------------------
// directory routines
strcpy( buf, WXSTRINGCAST(dir) );
struct stat sbuf;
return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
-};
+}
//------------------------------------------------------------------------
// 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;
+ gint pid, tag;
+ wxProcess *process;
+ int exitcode;
};
static void GTK_EndProcessDetector(gpointer data, gint source,
GdkInputCondition WXUNUSED(condition) )
{
- wxEndProcessData *proc_data = (wxEndProcessData *)data;
- int pid;
+ wxEndProcessData *proc_data = (wxEndProcessData *)data;
+ int pid;
- pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->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
+ int status = 0;
+ wxWait4(pid, &status, 0, (rusage *) NULL);
- close(source);
- gdk_input_remove(proc_data->tag);
+ close(source);
+ gdk_input_remove(proc_data->tag);
- if (proc_data->process)
- proc_data->process->OnTerminate(proc_data->pid);
+ 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;
-};
+ if (proc_data->pid > 0)
+ {
+ delete proc_data;
+ }
+ else
+ {
+ // wxExecute() will know about it
+ proc_data->exitcode = status;
+
+ proc_data->pid = 0;
+ }
+}
long wxExecute( char **argv, bool sync, wxProcess *process )
{
wxCHECK_MSG( *argv, 0, "can't exec empty command" );
/* Create pipes */
- if (pipe(end_proc_detect) == -1) {
- wxLogSysError(_("Pipe creation failed"));
- return 0;
+ if (pipe(end_proc_detect) == -1)
+ {
+ wxLogSysError( _("Pipe creation failed") );
+ return 0;
}
/* fork the process */
#else
pid_t pid = fork();
#endif
- if (pid == -1) {
- // error
- wxLogSysError(_("Fork failed"));
+ if (pid == -1)
+ {
+ wxLogSysError( _("Fork failed") );
return 0;
}
- else if (pid == 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 sub-
- // process, the "right thing to do" is to start an xterm executing
- // it.
- close(STDIN_FILENO);
- close(STDOUT_FILENO);
- close(STDERR_FILENO);
+
+ // 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
#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);
+ 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);
- 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;
+ 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;
+ }
}
-};
+}
long wxExecute( const wxString& command, bool sync, wxProcess *process )
{
/* loop */ ;
long lRc = wxExecute(argv, sync, process);
-
+
delete [] tmp;
return lRc;
-};
+}
projects / wxWidgets.git / blobdiff