X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b827d64707b39ea779f32e216c3261ef1d861503..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/gtk/utilsgtk.cpp?ds=sidebyside diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index d255eb50e0..55c40158a5 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -21,47 +21,41 @@ #include "wx/apptrait.h" #include "wx/process.h" #include "wx/sysopt.h" -#include "wx/unix/execute.h" #include "wx/gtk/private/timer.h" #include "wx/evtloop.h" -#ifdef __WXDEBUG__ +#include +#ifdef GDK_WINDOWING_WIN32 +#include +#endif +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#if wxDEBUG_LEVEL #include "wx/gtk/assertdlg_gtk.h" #if wxUSE_STACKWALKER #include "wx/stackwalk.h" #endif // wxUSE_STACKWALKER -#endif // __WXDEBUG__ +#endif // wxDEBUG_LEVEL #include #include #include #include -#include // for WNOHANG +#ifdef __UNIX__ #include - -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkx.h" - -#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 - - #include "X11/XKBlib.h" - - #undef explicit -#endif // HAVE_X11_XKBLIB_H - +#endif #if wxUSE_DETECT_SM - #include "X11/Xlib.h" - #include "X11/SM/SMlib.h" + #include + + #include "wx/unix/utilsx11.h" #endif +#include "wx/gtk/private/gtk2-compat.h" + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -71,39 +65,22 @@ 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. */ -#ifdef HAVE_X11_XKBLIB_H -bool wxSetDetectableAutoRepeat( bool flag ) -{ - Bool result; - XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result ); - return result; /* true if keyboard hardware supports this mode */ -} -#else -bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) -{ - return false; -} -#endif // ---------------------------------------------------------------------------- -// display characterstics +// display characteristics // ---------------------------------------------------------------------------- +#ifdef GDK_WINDOWING_X11 void *wxGetDisplay() { - return GDK_DISPLAY(); + return GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(wxGetRootWindow())); } +#endif void wxDisplaySize( int *width, int *height ) { @@ -117,11 +94,6 @@ void wxDisplaySizeMM( int *width, int *height ) if (height) *height = gdk_screen_height_mm(); } -void wxGetMousePosition( int* x, int* y ) -{ - gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL ); -} - bool wxColourDisplay() { return true; @@ -129,7 +101,7 @@ bool wxColourDisplay() int wxDisplayDepth() { - return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth; + return gdk_visual_get_depth(gtk_widget_get_visual(wxGetRootWindow())); } wxWindow* wxFindWindowAtPoint(const wxPoint& pt) @@ -145,7 +117,7 @@ wxConvertToGTK(const wxString& s, wxFontEncoding enc) wxWCharBuffer wbuf; if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT ) { - wbuf = wxConvUI->cMB2WC(s.c_str()); + wbuf = wxConvUI->cMB2WC(s); } else // another encoding, use generic conversion class { @@ -186,7 +158,13 @@ wxConvertFromGTK(const wxString& s, wxFontEncoding enc) // availability of pango version major.minor.micro, nor the non-availability const gchar *wx_pango_version_check (int major, int minor, int micro) { -#ifdef PANGO_VERSION_MAJOR + // NOTE: you don't need to use this macro to check for Pango features + // added in pango-1.4 or earlier since GTK 2.4 (our minimum requirement + // for GTK lib) required pango 1.4... + +#ifdef __WXGTK3__ + return pango_version_check(major, minor, micro); +#elif defined(PANGO_VERSION_MAJOR) if (!gtk_check_version (2,11,0)) { // GTK+ 2.11 requires Pango >= 1.15.3 and pango_version_check @@ -205,41 +183,6 @@ const gchar *wx_pango_version_check (int major, int minor, int micro) #endif } - -// ---------------------------------------------------------------------------- -// subprocess routines -// ---------------------------------------------------------------------------- - -extern "C" { -static -void GTK_EndProcessDetector(gpointer data, gint source, - GdkInputCondition WXUNUSED(condition)) -{ - wxEndProcessData * const - proc_data = wx_static_cast(wxEndProcessData *, data); - - // child exited, end waiting - close(source); - - // don't call us again! - gdk_input_remove(proc_data->tag); - - wxHandleProcessTermination(proc_data); -} -} - -int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd) -{ - int tag = gdk_input_add(fd, - GDK_INPUT_READ, - GTK_EndProcessDetector, - (gpointer)proc_data); - - return tag; -} - - - // ---------------------------------------------------------------------------- // wxPlatformInfo-related // ---------------------------------------------------------------------------- @@ -266,17 +209,7 @@ wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) #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; - + wxX11Display dpy; if ( !dpy ) return wxEmptyString; @@ -290,7 +223,7 @@ static wxString GetSM() if ( !smc_conn ) { - wxLogWarning(_("Failed to connect to session manager: %s"), smerr); + wxLogDebug("Failed to connect to session manager: %s", smerr); return wxEmptyString; } @@ -316,17 +249,9 @@ wxEventLoopBase *wxGUIAppTraits::CreateEventLoop() } -#if wxUSE_INTL -void wxGUIAppTraits::SetLocale() -{ - gtk_set_locale(); - wxUpdateLocaleIsUtf8(); -} -#endif - -#ifdef __WXDEBUG__ +#ifdef __UNIX__ -#if wxUSE_STACKWALKER +#if wxDEBUG_LEVEL && wxUSE_STACKWALKER // private helper class class StackDump : public wxStackWalker @@ -338,97 +263,91 @@ 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(), + fncname.utf8_str(), + frame.GetFileName().utf8_str(), frame.GetLine()); + } } private: GtkAssertDialog *m_dlg; }; -// the callback functions must be extern "C" to comply with GTK+ declarations -extern "C" +static void get_stackframe_callback(void* p) { - void get_stackframe_callback(StackDump *dump) - { - // skip over frames up to including wxOnAssert() - dump->ProcessFrames(3); - } + StackDump* dump = static_cast(p); + // skip over frames up to including wxOnAssert() + dump->ProcessFrames(6); } -#endif // wxUSE_STACKWALKER +#endif // wxDEBUG_LEVEL && 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 wxDEBUG_LEVEL + // we can't show the dialog from another thread + if ( wxIsMainThread() ) + { + // under GTK2 we prefer to use a dialog widget written using directly + // in GTK+ as use a dialog written using wxWidgets would need the + // wxWidgets idle processing to work correctly which might not be the + // case when assert happens + 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") ); + // save the current stack ow... + StackDump dump(GTK_ASSERT_DIALOG(dialog)); + dump.SaveStack(100); // showing more than 100 frames is not very useful + + // ...but process it only if the user needs it + gtk_assert_dialog_set_backtrace_callback + ( + GTK_ASSERT_DIALOG(dialog), + 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( wxT("unexpected return code from GtkAssertDialog") ); + } + + gtk_widget_destroy(dialog); + return returnCode; } +#endif // wxDEBUG_LEVEL - gtk_widget_destroy(dialog); - return returnCode; + return wxAppTraitsBase::ShowAssertDialog(msg); } -#endif // __WXDEBUG__ +#endif // __UNIX__ + +#if defined(__UNIX__) || defined(__OS2__) wxString wxGUIAppTraits::GetDesktopEnvironment() const { - wxString de = wxSystemOptions::GetOption(_T("gtk.desktop")); + wxString de = wxSystemOptions::GetOption(wxT("gtk.desktop")); #if wxUSE_DETECT_SM if ( de.empty() ) { @@ -444,11 +363,15 @@ wxString wxGUIAppTraits::GetDesktopEnvironment() const return de; } -#ifdef __WXGTK26__ +#endif // __UNIX__ || __OS2__ + +#ifdef __UNIX__ // see the hack below in wxCmdLineParser::GetUsageString(). // TODO: replace this hack with a g_option_group_get_entries() -// call as soon as such function exists +// call as soon as such function exists; +// see http://bugzilla.gnome.org/show_bug.cgi?id=431021 for the relative +// feature request struct _GOptionGroup { gchar *name; @@ -470,40 +393,37 @@ struct _GOptionGroup GOptionErrorFunc error_func; }; +static wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt) { wxString ret; if (opt->short_name) - ret << _T("-") << opt->short_name; + ret << wxT("-") << opt->short_name; if (opt->long_name) { if (!ret.empty()) - ret << _T(", "); - ret << _T("--") << opt->long_name; + ret << wxT(", "); + ret << wxT("--") << opt->long_name; if (opt->arg_description) - ret << _T("=") << opt->arg_description; + ret << wxT("=") << opt->arg_description; } - return _T(" ") + ret; + return wxT(" ") + ret; } -#endif // __WXGTK26__ - wxString wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, wxArrayString& desc) const { wxString usage; -#ifdef __WXGTK26__ - // check whether GTK version is greater than 2.6 but also lower than 2.12 + // check whether GLib version is greater than 2.6 but also lower than 2.33 // because, as we use the undocumented _GOptionGroup struct, we don't want - // to run this code with future versions which might change it (2.11 is the + // to run this code with future versions which might change it (2.32 is the // latest one at the time of this writing) - if (!gtk_check_version(2,6,0) && - gtk_check_version(2,12,0)) + if (glib_check_version(2,33,0)) { usage << _("The following standard GTK+ options are also supported:\n"); @@ -529,11 +449,8 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, g_option_group_free (gtkOpts); } -#else - wxUnusedVar(names); - wxUnusedVar(desc); -#endif // __WXGTK26__ return usage; } +#endif // __UNIX__