X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6045e08ed5218ad303ee1f3cb70dd2ad621b322..fd128b0c3ab84380d782e45bfa98f181a848df27:/src/gtk1/utilsgtk.cpp diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index a280a4c189..1675dfe547 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -4,14 +4,9 @@ // 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" @@ -20,18 +15,13 @@ #include "wx/process.h" +#include "wx/unix/execute.h" + #include -#include #include #include #include #include -#include -#include -#include -#include -#include -#include // for O_WRONLY and friends #include "glib.h" #include "gdk/gdk.h" @@ -39,37 +29,48 @@ #include "gtk/gtkfeatures.h" #include "gdk/gdkx.h" -#ifdef __SVR4__ - #include -#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 - -//------------------------------------------------------------------------ +#ifdef HAVE_X11_XKBLIB_H + #ifdef __HPUX__ + /* under HP-UX XKBlib.h defines structures with field named "explicit" - + * which is, of course, an error for a C++ compiler */ + #define explicit __wx_explicit + #endif + + #include "X11/XKBlib.h" + + #ifdef __HPUX__ + #undef explicit + #endif // __HPUX__ +#endif // HAVE_X11_XKBLIB_H + +// ---------------------------------------------------------------------------- // misc. -//------------------------------------------------------------------------ +// ---------------------------------------------------------------------------- -void wxBell(void) +void wxBell() { 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) +#else +bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) { - return kill(pid, sig); + return FALSE; } +#endif + +// ---------------------------------------------------------------------------- +// display characterstics +// ---------------------------------------------------------------------------- void wxDisplaySize( int *width, int *height ) { @@ -82,12 +83,12 @@ void wxGetMousePosition( int* x, int* y ) gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL ); } -bool wxColourDisplay(void) +bool wxColourDisplay() { return TRUE; } -int wxDisplayDepth(void) +int wxDisplayDepth() { return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth; } @@ -100,322 +101,28 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn) return wxGTK; } -//------------------------------------------------------------------------ -// user and home routines -//------------------------------------------------------------------------ - -const char* wxGetHomeDir( wxString *home ) -{ - *home = wxGetUserHome( wxString() ); - if (home->IsNull()) *home = "/"; - return *home; -} - -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) -{ - *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 -} - -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) -{ - 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; -} - -//------------------------------------------------------------------------ -// 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 -//------------------------------------------------------------------------ - -// 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) ) { 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 + wxHandleProcessTermination(proc_data); 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; - - proc_data->pid = 0; - } } -long wxExecute( char **argv, bool sync, wxProcess *process ) +int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) { - wxEndProcessData *data = new wxEndProcessData; - int end_proc_detect[2]; - - wxCHECK_MSG( *argv, 0, "can't exec empty command" ); - - /* 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) - { - wxLogSysError( _("Fork failed") ); - return 0; - } - else if (pid == 0) - { - // we're in child - close(end_proc_detect[0]); // close reading side + int tag = gdk_input_add(fd, + GDK_INPUT_READ, + GTK_EndProcessDetector, + (gpointer)proc_data); - // 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() - 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; - } - } + return tag; } -long wxExecute( const wxString& command, bool sync, wxProcess *process ) -{ - 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); - - argv[argc++] = strtok(tmp, IFS); - while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL) - /* loop */ ; - - long lRc = wxExecute(argv, sync, process); - - delete [] tmp; - - return lRc; -}