X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88bbc3329bce2066d39e8feb49f3332c30dcfcc4..c0da0dbabf2d3cf8e1a76a2c82608822d15d0625:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index ed16a667e0..72757f441b 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -24,6 +24,13 @@ #include "wx/unix/execute.h" +#ifdef __WXDEBUG__ + #include "wx/gtk/assertdlg_gtk.h" + #if wxUSE_STACKWALKER + #include "wx/stackwalk.h" + #endif // wxUSE_STACKWALKER +#endif // __WXDEBUG__ + #include #include #include @@ -178,50 +185,28 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc) { - wxCharBuffer buf; - if ( enc == wxFONTENCODING_UTF8 ) + wxWCharBuffer wbuf; + if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT ) { - // 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); - } + wbuf = wxConvUI->cMB2WC(s); } - else // !UTF-8 + else // another encoding, use generic conversion class { - 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); - } + wbuf = wxCSConv(enc).cMB2WC(s); + } - if ( wbuf ) - buf = wxConvUTF8.cWC2MB(wbuf); + if ( !wbuf && !s.empty() ) + { + // conversion failed, but we still want to show something to the user + // even if it's going to be wrong it is better than nothing + // + // we choose ISO8859-1 here arbitrarily, it's just the most common + // encoding probably and, also importantly here, conversion from it + // never fails as it's done internally by wxCSConv + wbuf = wxCSConv(wxFONTENCODING_ISO8859_1).cMB2WC(s); } - return buf; + return wxConvUTF8.cWC2MB(wbuf); } #endif // !wxUSE_UNICODE @@ -293,41 +278,159 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const #if wxUSE_DETECT_SM static wxString GetSM() { - Display *dpy; - SmcConn smc_conn; - char *vendor; - char *client_id_ret; - dpy = XOpenDisplay(NULL); - - smc_conn = SmcOpenConnection(NULL, NULL, - 999, 999, - 0 /* mask */, NULL /* callbacks */, - NULL, &client_id_ret, 0, NULL); - - vendor = SmcVendor(smc_conn); + 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); + free(vendor); - SmcCloseConnection(smc_conn, 0, NULL); - free(client_id_ret); + SmcCloseConnection(smc_conn, 0, NULL); + free(client_id); - XCloseDisplay(dpy); - return ret; } -#endif +#endif // wxUSE_DETECT_SM + + +//----------------------------------------------------------------------------- +// wxGUIAppTraits +//----------------------------------------------------------------------------- + +#ifdef __WXDEBUG__ + +#if wxUSE_STACKWALKER + +// private helper class +class StackDump : public wxStackWalker +{ +public: + StackDump(GtkAssertDialog *dlg) { m_dlg=dlg; } + +protected: + virtual void OnStackFrame(const wxStackFrame& frame) + { + wxString fncname = frame.GetName(); + wxString fncargs = fncname; + + size_t n = fncname.find(wxT('(')); + if (n != wxString::npos) + { + // remove arguments from function name + fncname.erase(n); + + // remove function name and brackets from arguments + fncargs = fncargs.substr(n+1, fncargs.length()-n-2); + } + else + fncargs = wxEmptyString; + + // append this stack frame's info in the dialog + if (!frame.GetFileName().empty() || !fncname.empty()) + gtk_assert_dialog_append_stack_frame(m_dlg, + fncname.mb_str(), + fncargs.mb_str(), + frame.GetFileName().mb_str(), + frame.GetLine()); + } + +private: + GtkAssertDialog *m_dlg; +}; + +// the callback functions must be extern "C" to comply with GTK+ declarations +extern "C" +{ + void get_stackframe_callback(StackDump *dump) + { + // skip over frames up to including wxOnAssert() + dump->ProcessFrames(3); + } +} + +#endif // wxUSE_STACKWALKER + +bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg) +{ + // under GTK2 we prefer to use a dialog widget written using directly GTK+; + // in fact we cannot use a dialog written using wxWidgets: it would need + // the wxWidgets idle processing to work correctly! + GtkWidget *dialog = gtk_assert_dialog_new(); + gtk_assert_dialog_set_message(GTK_ASSERT_DIALOG(dialog), msg.mb_str()); + +#if wxUSE_STACKWALKER + // don't show more than maxLines or we could get a dialog too tall to be + // shown on screen: 20 should be ok everywhere as even with 15 pixel high + // characters it is still only 300 pixels... + static const int maxLines = 20; + + // save current stack frame... + StackDump dump(GTK_ASSERT_DIALOG(dialog)); + dump.SaveStack(maxLines); + + // ...but process it only if the user needs it + gtk_assert_dialog_set_backtrace_callback(GTK_ASSERT_DIALOG(dialog), + (GtkAssertDialogStackFrameCallback)get_stackframe_callback, + &dump); +#endif // wxUSE_STACKWALKER + + gint result = gtk_dialog_run(GTK_DIALOG (dialog)); + bool returnCode = false; + switch (result) + { + case GTK_ASSERT_DIALOG_STOP: + wxTrap(); + break; + case GTK_ASSERT_DIALOG_CONTINUE: + // nothing to do + break; + case GTK_ASSERT_DIALOG_CONTINUE_SUPPRESSING: + // no more asserts + returnCode = true; + break; + + default: + wxFAIL_MSG( _T("unexpected return code from GtkAssertDialog") ); + } + + gtk_widget_destroy(dialog); + return returnCode; +} + +#endif // __WXDEBUG__ wxString wxGUIAppTraits::GetDesktopEnvironment() const { #if wxUSE_DETECT_SM - wxString SM = GetSM(); - + const wxString SM = GetSM(); + if (SM == wxT("GnomeSM")) return wxT("GNOME"); - + if (SM == wxT("KDE")) return wxT("KDE"); -#endif +#endif // wxUSE_DETECT_SM return wxEmptyString; }