#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 <gtk/gtk.h>
+#ifdef GDK_WINDOWING_WIN32
+#include <gdk/gdkwin32.h>
+#endif
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
#if wxDEBUG_LEVEL
#include "wx/gtk/assertdlg_gtk.h"
#if wxUSE_STACKWALKER
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <sys/wait.h> // for WNOHANG
+#ifdef __UNIX__
#include <unistd.h>
-
-#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 <X11/SM/SMlib.h>
+
+ #include "wx/unix/utilsx11.h"
#endif
+#include "wx/gtk/private/gtk2-compat.h"
+
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
//----------------------------------------------------------------------------
// 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 )
{
if (height) *height = gdk_screen_height_mm();
}
-void wxGetMousePosition( int* x, int* y )
-{
- gdk_window_get_pointer( NULL, x, y, NULL );
-}
-
bool wxColourDisplay()
{
return true;
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)
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
{
// 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
+
+#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
#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<wxEndProcessData *>(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
#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;
}
-#if wxUSE_INTL
-void wxGUIAppTraits::SetLocale()
-{
- gtk_set_locale();
- wxUpdateLocaleIsUtf8();
-}
-#endif
+#ifdef __UNIX__
#if wxDEBUG_LEVEL && wxUSE_STACKWALKER
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<StackDump*>(p);
+ // skip over frames up to including wxOnAssert()
+ dump->ProcessFrames(6);
}
#endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER
bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
{
#if wxDEBUG_LEVEL
- // 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());
+ // 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;
-#else // !wxDEBUG_LEVEL
- // this function is never called in this case
- wxUnusedVar(msg);
- return false;
-#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
+ return wxAppTraitsBase::ShowAssertDialog(msg);
}
+#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() )
{
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()
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__
+#ifdef __UNIX__
wxString
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");
+ 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);
+ // 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;
+ // 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]));
+ 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__
projects / wxWidgets.git / blobdiff