X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d17d68f470c31f7c145b095eb1a3e0c2f581f30..180db9083613b9b6eca8451ee19553c6581f5505:/src/gtk/utilsgtk.cpp?ds=sidebyside diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index ea023f37e2..1296a0f762 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -1,377 +1,182 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utils.cpp +// Name: src/gtk/utilsgtk.cpp // 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/intl.h" #include "wx/log.h" +#include "wx/process.h" + +#include "wx/unix/execute.h" + #include -#include #include #include #include +#include // for WNOHANG #include -#include -#include -#include -#include -#include - -#include -#include -#include #include "glib.h" #include "gdk/gdk.h" #include "gtk/gtk.h" +#ifndef __WXGTK20__ +#include "gtk/gtkfeatures.h" +#endif #include "gdk/gdkx.h" -#ifdef __SVR4__ - #include -#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. -//------------------------------------------------------------------------ +//---------------------------------------------------------------------------- -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 -void wxDisplaySize( int *width, int *height ) -{ - if (width) *width = gdk_screen_width(); - if (height) *height = gdk_screen_height(); -} +// ---------------------------------------------------------------------------- +// display characterstics +// ---------------------------------------------------------------------------- -void wxGetMousePosition( int* x, int* y ) +void *wxGetDisplay() { - Window dumw; - int dumi; - unsigned int dumu; - - XQueryPointer( GDK_DISPLAY(),GDK_ROOT_WINDOW(), - &dumw,&dumw,x,y,&dumi,&dumi,&dumu ); + return GDK_DISPLAY(); } -bool wxColourDisplay(void) +void wxDisplaySize( int *width, int *height ) { - return TRUE; + if (width) *width = gdk_screen_width(); + if (height) *height = gdk_screen_height(); } -int wxDisplayDepth(void) +void wxDisplaySizeMM( int *width, int *height ) { - return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth; + 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; -#endif } -bool wxGetUserId(char *buf, int sz) +int wxDisplayDepth() { - struct passwd *who; - - *buf = '\0'; - if ((who = getpwuid(getuid ())) != NULL) { - strncpy (buf, who->pw_name, sz-1); - return TRUE; - } - return FALSE; + return gdk_window_get_visual( wxGetRootWindow()->window )->depth; } -bool wxGetUserName(char *buf, int sz) +int wxGetOsVersion(int *majorVsn, int *minorVsn) { - 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 (majorVsn) *majorVsn = GTK_MAJOR_VERSION; + if (minorVsn) *minorVsn = GTK_MINOR_VERSION; -//------------------------------------------------------------------------ -// 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); + return wxGTK; } -void wxError( 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" ); + return wxGenericFindWindowAtPoint(pt); } -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 -//------------------------------------------------------------------------ - -struct wxEndProcessData -{ - gint pid, tag; - wxProcess *process; -}; +// ---------------------------------------------------------------------------- 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); + wxEndProcessData *proc_data = (wxEndProcessData *)data; - /* 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 - - close(source); - gdk_input_remove(proc_data->tag); - - if (proc_data->process) - proc_data->process->OnTerminate(proc_data->pid); + // 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); - if (proc_data->pid > 0) - delete proc_data; - else - proc_data->pid = 0; -} + if ( rc == 0 ) + { + // no, it didn't exit yet, continue waiting + return; + } -long wxExecute( char **argv, bool sync, wxProcess *process ) -{ - wxEndProcessData *data = new wxEndProcessData; - int end_proc_detect[2]; + // set exit code to -1 if something bad happened + proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status) + : -1; - wxCHECK_MSG( *argv, 0, "can't exec empty command" ); + // child exited, end waiting + close(source); - /* Create pipes */ - if (pipe(end_proc_detect) == -1) { - wxLogSysError(_("Pipe creation failed")); - return 0; - } + // don't call us again! + gdk_input_remove(proc_data->tag); - /* fork the process */ -#if defined(sun) || defined(__ultrix) || defined(__bsdi__) - pid_t pid = vfork(); -#else - pid_t pid = fork(); -#endif - if (pid == -1) { - // error - 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 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; - } + 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; } +