X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d043598b7e6baae2e0a472a4133b8d60f0f45ec..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/gtk/utilsgtk.cpp?ds=inline diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index f557d87d97..e8d6cf9b44 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -26,12 +26,15 @@ #include "wx/gtk/private/timer.h" #include "wx/evtloop.h" -#ifdef __WXDEBUG__ +#include +#include + +#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 @@ -40,26 +43,10 @@ #include // for WNOHANG #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 - - #if wxUSE_DETECT_SM - #include "X11/Xlib.h" - #include "X11/SM/SMlib.h" + #include + + #include "wx/unix/utilsx11.h" #endif //----------------------------------------------------------------------------- @@ -80,22 +67,6 @@ void wxBell() } #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 // ---------------------------------------------------------------------------- @@ -119,7 +90,7 @@ void wxDisplaySizeMM( int *width, int *height ) void wxGetMousePosition( int* x, int* y ) { - gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL ); + gdk_window_get_pointer( NULL, x, y, NULL ); } bool wxColourDisplay() @@ -129,7 +100,7 @@ bool wxColourDisplay() int wxDisplayDepth() { - return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth; + return gtk_widget_get_visual(wxGetRootWindow())->depth; } wxWindow* wxFindWindowAtPoint(const wxPoint& pt) @@ -186,6 +157,10 @@ 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) { + // 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 PANGO_VERSION_MAJOR if (!gtk_check_version (2,11,0)) { @@ -211,59 +186,28 @@ const gchar *wx_pango_version_check (int major, int minor, int micro) // ---------------------------------------------------------------------------- extern "C" { -static -void GTK_EndProcessDetector(gpointer data, gint source, - GdkInputCondition WXUNUSED(condition) ) +static gboolean EndProcessDetector(GIOChannel* source, GIOCondition, void* 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 ) - { - // This can only happen if the child application closes our dummy - // pipe that is used to monitor its lifetime; in that case, our - // best bet is to pretend the process did terminate, because - // otherwise wxExecute() would hang indefinitely - // (OnExceptionWaiting() won't be called again, the descriptor - // is closed now). - wxLogDebug("Child process (PID %i) still alive, even though notification was received that it terminated.", pid); - } - else if ( rc == -1 ) - { - // As above, if waitpid() fails, the best we can do is to log the - // error and pretend the child terminated: - wxLogSysError(_("Failed to check child process' status")); - } + wxEndProcessData * const + proc_data = static_cast(data); - // set exit code to -1 if something bad happened - proc_data->exitcode = (rc > 0 && WIFEXITED(status)) - ? WEXITSTATUS(status) - : -1; + // child exited, end waiting + close(g_io_channel_unix_get_fd(source)); - // child exited, end waiting - close(source); + wxHandleProcessTermination(proc_data); - // don't call us again! - gdk_input_remove(proc_data->tag); - - wxHandleProcessTermination(proc_data); + // don't call us again! + return false; } } int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd) { - int tag = gdk_input_add(fd, - GDK_INPUT_READ, - GTK_EndProcessDetector, - (gpointer)proc_data); - - return tag; + GIOChannel* channel = g_io_channel_unix_new(fd); + GIOCondition cond = GIOCondition(G_IO_IN | G_IO_HUP | G_IO_ERR); + unsigned id = g_io_add_watch(channel, cond, EndProcessDetector, proc_data); + g_io_channel_unref(channel); + return int(id); } @@ -294,17 +238,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; @@ -318,7 +252,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; } @@ -352,9 +286,7 @@ void wxGUIAppTraits::SetLocale() } #endif -#ifdef __WXDEBUG__ - -#if wxUSE_STACKWALKER +#if wxDEBUG_LEVEL && wxUSE_STACKWALKER // private helper class class StackDump : public wxStackWalker @@ -393,70 +325,72 @@ 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(3); } -#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__ - 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() ) { @@ -476,7 +410,9 @@ wxString wxGUIAppTraits::GetDesktopEnvironment() const // 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; @@ -503,18 +439,18 @@ 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__ @@ -526,36 +462,40 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, wxString usage; #ifdef __WXGTK26__ - // check whether GTK version is greater than 2.6 but also lower than 2.12 - // 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 - // latest one at the time of this writing) - if (!gtk_check_version(2,6,0) && - gtk_check_version(2,12,0)) + if (!gtk_check_version(2,6,0)) { - usage << _("The following standard GTK+ options are also supported:\n"); + // since GTK>=2.6, we can use the glib_check_version() symbol... - // passing true here means that the function can open the default - // display while parsing (not really used here anyhow) - GOptionGroup *gtkOpts = gtk_get_option_group(true); + // check whether GLib version is greater than 2.6 but also lower than 2.19 + // because, as we use the undocumented _GOptionGroup struct, we don't want + // to run this code with future versions which might change it (2.19 is the + // latest one at the time of this writing) + if (!glib_check_version(2,6,0) && glib_check_version(2,20,0)) + { + usage << _("The following standard GTK+ options are also supported:\n"); - // WARNING: here we access the internals of GOptionGroup: - GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries; - unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries; - wxArrayString namesOptions, descOptions; + // passing true here means that the function can open the default + // display while parsing (not really used here anyhow) + GOptionGroup *gtkOpts = gtk_get_option_group(true); - for ( size_t n = 0; n < n_entries; n++ ) - { - if ( entries[n].flags & G_OPTION_FLAG_HIDDEN ) - continue; // skip + // WARNING: here we access the internals of GOptionGroup: + GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries; + unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries; + wxArrayString namesOptions, descOptions; - names.push_back(wxGetNameFromGtkOptionEntry(&entries[n])); + for ( size_t n = 0; n < n_entries; n++ ) + { + if ( entries[n].flags & G_OPTION_FLAG_HIDDEN ) + continue; // skip - const gchar * const entryDesc = entries[n].description; - desc.push_back(wxString(entryDesc)); - } + names.push_back(wxGetNameFromGtkOptionEntry(&entries[n])); - g_option_group_free (gtkOpts); + const gchar * const entryDesc = entries[n].description; + desc.push_back(wxString(entryDesc)); + } + + g_option_group_free (gtkOpts); + } } #else wxUnusedVar(names);