X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/279338910fbf9be5229ec2ece0a896c71cc004f4..7706daf38b2be342f2f5650f37f57ad7b4b3dccb:/src/gtk1/utilsgtk.cpp diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index dddd561bcc..e76e3187f3 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -1,15 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utils.cpp +// Name: src/gtk/utilsgtk.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/utils.h" #include "wx/string.h" +#include "wx/apptrait.h" #include "wx/intl.h" #include "wx/log.h" @@ -18,46 +22,48 @@ #include "wx/unix/execute.h" #include -#include #include #include #include +#include // for WNOHANG #include -#include -#include -#include -#include -#include -#include // for O_WRONLY and friends - -#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 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 */ + /* 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 - #endif - - #include "X11/XKBlib.h" - - #ifdef __HPUX__ + + #include "X11/XKBlib.h" + #undef explicit - #endif // __HPUX__ #endif // HAVE_X11_XKBLIB_H -// ---------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern GtkWidget *wxGetRootWindow(); + +//---------------------------------------------------------------------------- // misc. -// ---------------------------------------------------------------------------- +//---------------------------------------------------------------------------- +#ifndef __EMX__ +// on OS/2, we use the wxBell from wxBase library void wxBell() { gdk_beep(); } +#endif /* Don't synthesize KeyUp events holding down a key and producing KeyDown events with autorepeat. */ @@ -75,16 +81,75 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) } #endif +#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("&"); + break; + case _T('<'): + out << _T("<"); + break; + case _T('>'): + out << _T(">"); + break; + case _T('\''): + out << _T("'"); + break; + case _T('"'): + out << _T("""); + break; + default: + out << c; + break; + } + } + return out; +} +#endif + + // ---------------------------------------------------------------------------- // display characterstics // ---------------------------------------------------------------------------- +void *wxGetDisplay() +{ + return GDK_DISPLAY(); +} + void wxDisplaySize( int *width, int *height ) { if (width) *width = gdk_screen_width(); if (height) *height = gdk_screen_height(); } +void wxDisplaySizeMM( int *width, int *height ) +{ + if (width) *width = gdk_screen_width_mm(); + if (height) *height = gdk_screen_height_mm(); +} + +void wxClientDisplayRect(int *x, int *y, int *width, int *height) +{ + // 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 wxGetMousePosition( int* x, int* y ) { gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL ); @@ -97,30 +162,68 @@ bool wxColourDisplay() int wxDisplayDepth() { - return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth; + return gdk_window_get_visual( wxGetRootWindow()->window )->depth; } -int wxGetOsVersion(int *majorVsn, int *minorVsn) +wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() { - if (majorVsn) *majorVsn = GTK_MAJOR_VERSION; - if (minorVsn) *minorVsn = GTK_MINOR_VERSION; + static wxToolkitInfo info; +#ifdef __WXGTK20__ + info.shortName = _T("gtk2"); +#else + info.shortName = _T("gtk"); +#endif + info.name = _T("wxGTK"); +#ifdef __WXUNIVERSAL__ + info.shortName << _T("univ"); + info.name << _T("/wxUniversal"); +#endif + info.versionMajor = gtk_major_version; + info.versionMinor = gtk_minor_version; + info.os = wxGTK; + return info; +} - return wxGTK; +wxWindow* wxFindWindowAtPoint(const wxPoint& pt) +{ + return wxGenericFindWindowAtPoint(pt); } + // ---------------------------------------------------------------------------- // subprocess routines // ---------------------------------------------------------------------------- -static void GTK_EndProcessDetector(gpointer data, gint source, - GdkInputCondition WXUNUSED(condition) ) +extern "C" +void GTK_EndProcessDetector(gpointer data, gint source, + GdkInputCondition WXUNUSED(condition) ) { - wxEndProcessData *proc_data = (wxEndProcessData *)data; + wxEndProcessData *proc_data = (wxEndProcessData *)data; + + // 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 ( rc == 0 ) + { + // no, it didn't exit yet, continue waiting + return; + } + + // set exit code to -1 if something bad happened + proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status) + : -1; + + // child exited, end waiting + close(source); - wxHandleProcessTermination(proc_data); + // don't call us again! + gdk_input_remove(proc_data->tag); - close(source); - gdk_input_remove(proc_data->tag); + wxHandleProcessTermination(proc_data); } int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)