X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d774f9161c7f63060fbdfdcbcd3d60bf2fa65262..459c6f2a8a01632660d1725a9a4a28a8008c5c62:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index c50a21629c..e8d6cf9b44 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -19,17 +19,22 @@ #endif #include "wx/apptrait.h" - #include "wx/process.h" - +#include "wx/sysopt.h" #include "wx/unix/execute.h" -#ifdef __WXDEBUG__ +#include "wx/gtk/private/timer.h" +#include "wx/evtloop.h" + +#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 @@ -38,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 //----------------------------------------------------------------------------- @@ -78,57 +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 - -// 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 // ---------------------------------------------------------------------------- @@ -150,20 +88,9 @@ void wxDisplaySizeMM( int *width, int *height ) if (height) *height = gdk_screen_height_mm(); } -void wxClientDisplayRect(int *x, int *y, int *width, int *height) -{ - // This is supposed to return desktop dimensions minus any window - // manager panels, menus, taskbars, etc. If there is a way to do that - // for this platform please fix this function, otherwise it defaults - // to the entire desktop. - if (x) *x = 0; - if (y) *y = 0; - wxDisplaySize(width, 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() @@ -173,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) @@ -183,16 +110,17 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) #if !wxUSE_UNICODE -wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc) +WXDLLIMPEXP_CORE wxCharBuffer +wxConvertToGTK(const wxString& s, wxFontEncoding enc) { wxWCharBuffer wbuf; if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT ) { - wbuf = wxConvUI->cMB2WC(s); + wbuf = wxConvUI->cMB2WC(s.c_str()); } else // another encoding, use generic conversion class { - wbuf = wxCSConv(enc).cMB2WC(s); + wbuf = wxCSConv(enc).cMB2WC(s.c_str()); } if ( !wbuf && !s.empty() ) @@ -203,17 +131,18 @@ wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc) // 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); + wbuf = wxCSConv(wxFONTENCODING_ISO8859_1).cMB2WC(s.c_str()); } return wxConvUTF8.cWC2MB(wbuf); } -wxCharBuffer wxConvertFromGTK(const wxString& s, wxFontEncoding enc) +WXDLLIMPEXP_CORE wxCharBuffer +wxConvertFromGTK(const wxString& s, wxFontEncoding enc) { // this conversion should never fail as GTK+ always uses UTF-8 internally // so there are no complications here - const wxWCharBuffer wbuf(wxConvUTF8.cMB2WC(s)); + const wxWCharBuffer wbuf(wxConvUTF8.cMB2WC(s.c_str())); if ( enc == wxFONTENCODING_SYSTEM ) return wxConvUI->cWC2MB(wbuf); @@ -222,52 +151,63 @@ wxCharBuffer wxConvertFromGTK(const wxString& s, wxFontEncoding enc) #endif // !wxUSE_UNICODE +// Returns NULL if version is certainly greater or equal than major.minor.micro +// Returns string describing the error if version is lower than +// major.minor.micro OR it cannot be determined and one should not rely on the +// 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)) + { + // GTK+ 2.11 requires Pango >= 1.15.3 and pango_version_check + // was added in Pango 1.15.2 thus we know for sure the pango lib we're + // using has the pango_version_check function: + return pango_version_check (major, minor, micro); + } + + return "can't check"; +#else // !PANGO_VERSION_MAJOR + wxUnusedVar(major); + wxUnusedVar(minor); + wxUnusedVar(micro); + + return "too old headers"; +#endif +} + + // ---------------------------------------------------------------------------- // subprocess routines // ---------------------------------------------------------------------------- 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 ) - { - // no, it didn't exit yet, continue waiting - return; - } + wxEndProcessData * const + proc_data = static_cast(data); - // set exit code to -1 if something bad happened - proc_data->exitcode = rc != -1 && 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 wxAddProcessCallback(wxEndProcessData *proc_data, int fd) +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); } @@ -286,32 +226,35 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const return wxPORT_GTK; } -#if wxUSE_DETECT_SM -static wxString GetSM() +#if wxUSE_TIMER + +wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) { - class Dpy - { - public: - Dpy() { m_dpy = XOpenDisplay(NULL); } - ~Dpy() { if ( m_dpy ) XCloseDisplay(m_dpy); } + return new wxGTKTimerImpl(timer); +} - operator Display *() const { return m_dpy; } - private: - Display *m_dpy; - } dpy; +#endif // wxUSE_TIMER +#if wxUSE_DETECT_SM +static wxString GetSM() +{ + wxX11Display dpy; if ( !dpy ) return wxEmptyString; + char smerr[256]; char *client_id; SmcConn smc_conn = SmcOpenConnection(NULL, NULL, 999, 999, 0 /* mask */, NULL /* callbacks */, NULL, &client_id, - 0, NULL); + WXSIZEOF(smerr), smerr); if ( !smc_conn ) + { + wxLogDebug("Failed to connect to session manager: %s", smerr); return wxEmptyString; + } char *vendor = SmcVendor(smc_conn); wxString ret = wxString::FromAscii( vendor ); @@ -329,14 +272,21 @@ static wxString GetSM() // wxGUIAppTraits //----------------------------------------------------------------------------- +wxEventLoopBase *wxGUIAppTraits::CreateEventLoop() +{ + return new wxEventLoop(); +} + + +#if wxUSE_INTL void wxGUIAppTraits::SetLocale() { gtk_set_locale(); + wxUpdateLocaleIsUtf8(); } +#endif -#ifdef __WXDEBUG__ - -#if wxUSE_STACKWALKER +#if wxDEBUG_LEVEL && wxUSE_STACKWALKER // private helper class class StackDump : public wxStackWalker @@ -375,81 +325,183 @@ 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(wxT("gtk.desktop")); #if wxUSE_DETECT_SM - const wxString SM = GetSM(); - - if (SM == wxT("GnomeSM")) - return wxT("GNOME"); + if ( de.empty() ) + { + static const wxString s_SM = GetSM(); - if (SM == wxT("KDE")) - return wxT("KDE"); + if (s_SM == wxT("GnomeSM")) + de = wxT("GNOME"); + else if (s_SM == wxT("KDE")) + de = wxT("KDE"); + } #endif // wxUSE_DETECT_SM - return wxEmptyString; + return de; +} + +#ifdef __WXGTK26__ + +// 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; +// see http://bugzilla.gnome.org/show_bug.cgi?id=431021 for the relative +// feature request +struct _GOptionGroup +{ + gchar *name; + gchar *description; + gchar *help_description; + + GDestroyNotify destroy_notify; + gpointer user_data; + + GTranslateFunc translate_func; + GDestroyNotify translate_notify; + gpointer translate_data; + + GOptionEntry *entries; + gint n_entries; + + GOptionParseFunc pre_parse_func; + GOptionParseFunc post_parse_func; + GOptionErrorFunc error_func; +}; + +wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt) +{ + wxString ret; + + if (opt->short_name) + ret << wxT("-") << opt->short_name; + if (opt->long_name) + { + if (!ret.empty()) + ret << wxT(", "); + ret << wxT("--") << opt->long_name; + + if (opt->arg_description) + ret << wxT("=") << opt->arg_description; + } + + return wxT(" ") + ret; } +#endif // __WXGTK26__ + +wxString +wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, + wxArrayString& desc) const +{ + wxString usage; +#ifdef __WXGTK26__ + if (!gtk_check_version(2,6,0)) + { + // since GTK>=2.6, we can use the glib_check_version() symbol... + + // 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"); + + // 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); + + // WARNING: here we access the internals of GOptionGroup: + GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries; + unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries; + wxArrayString namesOptions, descOptions; + + for ( size_t n = 0; n < n_entries; n++ ) + { + if ( entries[n].flags & G_OPTION_FLAG_HIDDEN ) + continue; // skip + + names.push_back(wxGetNameFromGtkOptionEntry(&entries[n])); + + const gchar * const entryDesc = entries[n].description; + desc.push_back(wxString(entryDesc)); + } + + g_option_group_free (gtkOpts); + } + } +#else + wxUnusedVar(names); + wxUnusedVar(desc); +#endif // __WXGTK26__ + + return usage; +}