X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2fa61e833ffe9789ef3d3327157e17101a4a2ce..55dc8e189d622e010451e45bcc181dad67cd8ca1:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 611d02bf16..ae645105e1 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -1,17 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// 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/intl.h" -#include "wx/log.h" +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" +#endif + +#include "wx/apptrait.h" #include "wx/process.h" @@ -21,14 +28,12 @@ #include #include #include +#include // for WNOHANG #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 @@ -51,11 +56,14 @@ 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. */ @@ -64,15 +72,50 @@ bool wxSetDetectableAutoRepeat( bool flag ) { Bool result; XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result ); - return result; /* TRUE if keyboard hardware supports this mode */ + return result; /* true if keyboard hardware supports this mode */ } #else bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) { - return FALSE; + return false; } #endif +// 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; +} + + // ---------------------------------------------------------------------------- // display characterstics // ---------------------------------------------------------------------------- @@ -112,44 +155,108 @@ void wxGetMousePosition( int* x, int* y ) bool wxColourDisplay() { - return TRUE; + return true; } int wxDisplayDepth() { - return gdk_window_get_visual( wxGetRootWindow()->window )->depth; + return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth; } -int wxGetOsVersion(int *majorVsn, int *minorVsn) +wxWindow* wxFindWindowAtPoint(const wxPoint& pt) { - if (majorVsn) *majorVsn = GTK_MAJOR_VERSION; - if (minorVsn) *minorVsn = GTK_MINOR_VERSION; - - return wxGTK; + return wxGenericFindWindowAtPoint(pt); } -wxWindow* wxFindWindowAtPoint(const wxPoint& pt) +#if !wxUSE_UNICODE + +wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc) { - return wxGenericFindWindowAtPoint(pt); + wxCharBuffer buf; + if ( enc == wxFONTENCODING_UTF8 ) + { + // no need for conversion at all, but do check that we have a valid + // UTF-8 string because passing invalid UTF-8 to GTK+ is going to + // result in a GTK+ error message and, especially, loss of data which + // was supposed to be shown in the GUI + if ( wxConvUTF8.ToWChar(NULL, 0, s, s.length()) == wxCONV_FAILED ) + { + // warn the programmer that something is probably wrong in his code + // + // NB: don't include the string in output because chances are that + // this invalid UTF-8 string could result in more errors itself + // if the application shows logs in the GUI and so we get into + // an infinite loop + wxLogDebug(_T("Invalid UTF-8 string in wxConvertToGTK()")); + + // but still try to show at least something on the screen + wxMBConvUTF8 utf8permissive(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL); + wxWCharBuffer wbuf(utf8permissive.cMB2WC(s)); + buf = wxConvUTF8.cWC2MB(wbuf); + } + else // valid UTF-8 string, no need to convert + { + buf = wxCharBuffer(s); + } + } + else // !UTF-8 + { + wxWCharBuffer wbuf; + if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT ) + { + wbuf = wxConvUI->cMB2WC(s); + } + else // another encoding, use generic conversion class + { + wbuf = wxCSConv(enc).cMB2WC(s); + } + + if ( wbuf ) + buf = wxConvUTF8.cWC2MB(wbuf); + } + + return buf; } +#endif // !wxUSE_UNICODE // ---------------------------------------------------------------------------- // subprocess routines // ---------------------------------------------------------------------------- -static void GTK_EndProcessDetector(gpointer data, gint source, - GdkInputCondition WXUNUSED(condition) ) +extern "C" { +static +void GTK_EndProcessDetector(gpointer data, gint source, + GdkInputCondition WXUNUSED(condition) ) { 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); + + // don't call us again! gdk_input_remove(proc_data->tag); - // This has to come after gdk_input_remove() or we will - // occasionally receive multiple callbacks with corrupt data - // pointers. (KB) wxHandleProcessTermination(proc_data); } +} int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) { @@ -161,3 +268,18 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) return tag; } + + +// ---------------------------------------------------------------------------- +// wxPlatformInfo-related +// ---------------------------------------------------------------------------- + +wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const +{ + if ( verMaj ) + *verMaj = gtk_major_version; + if ( verMin ) + *verMin = gtk_minor_version; + + return wxPORT_GTK; +}