X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8eaaeb23796c69ea0f67cbd48fc5f667d9823d0..528a5e8f92e938407ee2c33b29e519af064e6608:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 1e0d4dccc1..1144d39c3a 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -7,12 +7,18 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/utils.h" -#include "wx/string.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" +#endif #include "wx/apptrait.h" -#include "wx/intl.h" -#include "wx/log.h" #include "wx/process.h" @@ -28,9 +34,6 @@ #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 @@ -44,6 +47,12 @@ #undef explicit #endif // HAVE_X11_XKBLIB_H + +#if wxUSE_DETECT_SM + #include "X11/Xlib.h" + #include "X11/SM/SMlib.h" +#endif + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -53,11 +62,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. */ @@ -66,15 +78,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 // ---------------------------------------------------------------------------- @@ -114,44 +161,77 @@ 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; } -wxToolkitInfo *wxGUIAppTraits::GetToolkitInfo() +wxWindow* wxFindWindowAtPoint(const wxPoint& pt) { - 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 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 // ---------------------------------------------------------------------------- -extern "C" +extern "C" { +static void GTK_EndProcessDetector(gpointer data, gint source, GdkInputCondition WXUNUSED(condition) ) { @@ -182,6 +262,7 @@ void GTK_EndProcessDetector(gpointer data, gint source, wxHandleProcessTermination(proc_data); } +} int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) { @@ -193,3 +274,74 @@ 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; +} + +#if wxUSE_DETECT_SM +static wxString GetSM() +{ + class Dpy + { + public: + Dpy() { m_dpy = XOpenDisplay(NULL); } + ~Dpy() { if ( m_dpy ) XCloseDisplay(m_dpy); } + + operator Display *() const { return m_dpy; } + private: + Display *m_dpy; + } dpy; + + if ( !dpy ) + return wxEmptyString; + + char *client_id; + SmcConn smc_conn = SmcOpenConnection(NULL, NULL, + 999, 999, + 0 /* mask */, NULL /* callbacks */, + NULL, &client_id, + 0, NULL); + + if ( !smc_conn ) + return wxEmptyString; + + char *vendor = SmcVendor(smc_conn); + wxString ret = wxString::FromAscii( vendor ); + free(vendor); + + SmcCloseConnection(smc_conn, 0, NULL); + free(client_id); + + return ret; +} +#endif // wxUSE_DETECT_SM + +wxString wxGUIAppTraits::GetDesktopEnvironment() const +{ +#if wxUSE_DETECT_SM + const wxString SM = GetSM(); + + if (SM == wxT("GnomeSM")) + return wxT("GNOME"); + + if (SM == wxT("KDE")) + return wxT("KDE"); +#endif // wxUSE_DETECT_SM + + return wxEmptyString; +} + + +