X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/904a68b6f648fc7802b41a8d176c78394252a4b7..68f2155bb74506ee9c26afbc762543133e0ad1a9:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 6d27531b26..f615293ba2 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -1,17 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utils.cpp +// Name: src/gtk/utilsgtk.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/utils.h" -#include "wx/string.h" -#include "wx/intl.h" -#include "wx/log.h" +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" +#endif + +#include "wx/apptrait.h" #include "wx/process.h" @@ -21,14 +28,12 @@ #include #include #include +#include // for WNOHANG #include #include "glib.h" #include "gdk/gdk.h" #include "gtk/gtk.h" -#ifndef __WXGTK20__ -#include "gtk/gtkfeatures.h" -#endif #include "gdk/gdkx.h" #ifdef HAVE_X11_XKBLIB_H @@ -36,9 +41,9 @@ * 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 @@ -46,16 +51,19 @@ // data //----------------------------------------------------------------------------- -extern GtkWidget *wxRootWindow; +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. */ @@ -64,15 +72,50 @@ bool wxSetDetectableAutoRepeat( bool flag ) { Bool result; XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result ); - return result; /* TRUE if keyboard hardware supports this mode */ + return result; /* true if keyboard hardware supports this mode */ } #else bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) { - return FALSE; + 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 // ---------------------------------------------------------------------------- @@ -94,6 +137,17 @@ 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 ); @@ -101,20 +155,27 @@ void wxGetMousePosition( int* x, int* y ) bool wxColourDisplay() { - return TRUE; + return true; } int wxDisplayDepth() { - return gdk_window_get_visual( wxRootWindow->window )->depth; + return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth; } -int wxGetOsVersion(int *majorVsn, int *minorVsn) +wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() { - if (majorVsn) *majorVsn = GTK_MAJOR_VERSION; - if (minorVsn) *minorVsn = GTK_MINOR_VERSION; - - return wxGTK; + static wxToolkitInfo info; + info.shortName = _T("gtk2"); + info.name = _T("wxGTK"); +#ifdef __WXUNIVERSAL__ + info.shortName << _T("univ"); + info.name << _T("/wxUniversal"); +#endif + info.versionMajor = gtk_major_version; + info.versionMinor = gtk_minor_version; + info.os = wxGTK; + return info; } wxWindow* wxFindWindowAtPoint(const wxPoint& pt) @@ -122,23 +183,72 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) return wxGenericFindWindowAtPoint(pt); } +#if !wxUSE_UNICODE + +wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc) +{ + if ( enc == wxFONTENCODING_UTF8 ) + { + // no need for conversion at all + return wxCharBuffer(s); + } + + wxWCharBuffer wbuf; + if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT ) + { + wbuf = wxConvUI->cMB2WC(s); + } + else // another encoding, use generic conversion class + { + wbuf = wxCSConv(enc).cMB2WC(s); + } + + wxCharBuffer buf; + if ( wbuf ) + buf = wxConvUTF8.cWC2MB(wbuf); + + return buf; +} + +#endif // !wxUSE_UNICODE // ---------------------------------------------------------------------------- // subprocess routines // ---------------------------------------------------------------------------- -static void GTK_EndProcessDetector(gpointer data, gint source, - GdkInputCondition WXUNUSED(condition) ) +extern "C" { +static +void GTK_EndProcessDetector(gpointer data, gint source, + GdkInputCondition WXUNUSED(condition) ) { 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; + } + + // set exit code to -1 if something bad happened + proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status) + : -1; + + // child exited, end waiting close(source); + + // don't call us again! gdk_input_remove(proc_data->tag); - // This has to come after gdk_input_remove() or we will - // occasionally receive multiple callbacks with corrupt data - // pointers. (KB) wxHandleProcessTermination(proc_data); } +} int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) { @@ -149,4 +259,3 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) return tag; } -