X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d8e0096cd998ef0c3c282fec593d4ccd12e3eb4..319faba717040fd0af134f4a36fba3f0b8e284ab:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index a8d0888c7c..5ba11b4e02 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -21,11 +21,21 @@ #include "wx/apptrait.h" #include "wx/process.h" #include "wx/sysopt.h" +#ifdef __UNIX__ #include "wx/unix/execute.h" +#endif #include "wx/gtk/private/timer.h" #include "wx/evtloop.h" +#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 @@ -37,19 +47,18 @@ #include #include #include -#include // for WNOHANG +#ifdef __UNIX__ #include - -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkx.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 //----------------------------------------------------------------------------- @@ -59,23 +68,22 @@ extern GtkWidget *wxGetRootWindow(); //---------------------------------------------------------------------------- // misc. //---------------------------------------------------------------------------- -#ifndef __EMX__ -// on OS/2, we use the wxBell from wxBase library void wxBell() { gdk_beep(); } -#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 ) { @@ -91,7 +99,7 @@ void wxDisplaySizeMM( int *width, int *height ) void wxGetMousePosition( int* x, int* y ) { - gdk_window_get_pointer( NULL, x, y, NULL ); + gdk_window_get_pointer(gtk_widget_get_root_window(wxGetRootWindow()), x, y, NULL); } bool wxColourDisplay() @@ -101,7 +109,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) @@ -117,7 +125,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 { @@ -162,7 +170,9 @@ const gchar *wx_pango_version_check (int major, int minor, int micro) // 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 +#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 @@ -181,40 +191,38 @@ const gchar *wx_pango_version_check (int major, int minor, int micro) #endif } - // ---------------------------------------------------------------------------- // subprocess routines // ---------------------------------------------------------------------------- +#ifdef __UNIX__ + extern "C" { -static -void GTK_EndProcessDetector(gpointer data, gint source, - GdkInputCondition WXUNUSED(condition)) +static gboolean EndProcessDetector(GIOChannel* source, GIOCondition, void* data) { wxEndProcessData * const proc_data = static_cast(data); // child exited, end waiting - close(source); - - // don't call us again! - gdk_input_remove(proc_data->tag); + close(g_io_channel_unix_get_fd(source)); 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); } - +#endif // __UNIX__ // ---------------------------------------------------------------------------- // wxPlatformInfo-related @@ -242,17 +250,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; @@ -292,14 +290,20 @@ wxEventLoopBase *wxGUIAppTraits::CreateEventLoop() } -#if wxUSE_INTL +#if wxUSE_INTL && defined(__UNIX__) void wxGUIAppTraits::SetLocale() { +#ifdef __WXGTK3__ + setlocale(LC_ALL, ""); +#else gtk_set_locale(); +#endif wxUpdateLocaleIsUtf8(); } #endif +#ifdef __UNIX__ + #if wxDEBUG_LEVEL && wxUSE_STACKWALKER // private helper class @@ -312,41 +316,26 @@ 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(7); } #endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER @@ -365,20 +354,15 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg) 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... + // save the current stack ow... StackDump dump(GTK_ASSERT_DIALOG(dialog)); - dump.SaveStack(maxLines); + 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), - (GtkAssertDialogStackFrameCallback)get_stackframe_callback, + get_stackframe_callback, &dump ); #endif // wxUSE_STACKWALKER @@ -410,6 +394,10 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg) return wxAppTraitsBase::ShowAssertDialog(msg); } +#endif // __UNIX__ + +#if defined(__UNIX__) || defined(__OS2__) + wxString wxGUIAppTraits::GetDesktopEnvironment() const { wxString de = wxSystemOptions::GetOption(wxT("gtk.desktop")); @@ -428,7 +416,7 @@ wxString wxGUIAppTraits::GetDesktopEnvironment() const return de; } -#ifdef __WXGTK26__ +#endif // __UNIX__ || __OS2__ // see the hack below in wxCmdLineParser::GetUsageString(). // TODO: replace this hack with a g_option_group_get_entries() @@ -475,7 +463,7 @@ wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt) return wxT(" ") + ret; } -#endif // __WXGTK26__ +#ifdef __UNIX__ wxString wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, @@ -483,47 +471,38 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, { wxString usage; -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) + // 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.32 is the + // latest one at the time of this writing) + if (glib_check_version(2,33,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); + 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); - wxUnusedVar(desc); -#endif // __WXGTK26__ return usage; } +#endif // __UNIX__