Digital Mars fixes

[wxWidgets.git] / src / gtk / utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 1a65822ba32a040141c6bc1177850fad8a3c2ff2..ed16a667e05a5a39051ff00c95785c42720b43eb 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -15,10 +15,10 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"

-#include "wx/log.h"

 
 #include "wx/process.h"
 
 
 #include "wx/process.h"
 


@@ -47,6 +47,12 @@
     #undef explicit
 #endif // HAVE_X11_XKBLIB_H
 
     #undef explicit
 #endif // HAVE_X11_XKBLIB_H
 

+
+#if wxUSE_DETECT_SM
+    #include "X11/Xlib.h"
+    #include "X11/SM/SMlib.h"
+#endif
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -163,21 +169,6 @@ int wxDisplayDepth()
     return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth;
 }
 
     return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth;
 }
 

-wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
-{
-    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)
 {
     return wxGenericFindWindowAtPoint(pt);
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);


@@ -187,25 +178,48 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 
 wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc)
 {
 
 wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc)
 {

+    wxCharBuffer buf;

     if ( enc == wxFONTENCODING_UTF8 )
     {
     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);
+        // no need for conversion at all, but do check that we have a valid
+        // UTF-8 string because passing invalid UTF-8 to GTK+ is going to
+        // result in a GTK+ error message and, especially, loss of data which
+        // was supposed to be shown in the GUI
+        if ( wxConvUTF8.ToWChar(NULL, 0, s, s.length()) == wxCONV_FAILED )
+        {
+            // warn the programmer that something is probably wrong in his code
+            //
+            // NB: don't include the string in output because chances are that
+            //     this invalid UTF-8 string could result in more errors itself
+            //     if the application shows logs in the GUI and so we get into
+            //     an infinite loop
+            wxLogDebug(_T("Invalid UTF-8 string in wxConvertToGTK()"));
+
+            // but still try to show at least something on the screen
+            wxMBConvUTF8 utf8permissive(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
+            wxWCharBuffer wbuf(utf8permissive.cMB2WC(s));
+            buf = wxConvUTF8.cWC2MB(wbuf);
+        }
+        else // valid UTF-8 string, no need to convert
+        {
+            buf = wxCharBuffer(s);
+        }

     }
     }

-    else // another encoding, use generic conversion class
+    else // !UTF-8

     {
     {

-        wbuf = wxCSConv(enc).cMB2WC(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);
+        if ( wbuf )
+            buf = wxConvUTF8.cWC2MB(wbuf);
+    }

 
     return buf;
 }
 
     return buf;
 }


@@ -259,3 +273,64 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 
     return tag;
 }
 
     return tag;
 }

+
+
+
+// ----------------------------------------------------------------------------
+// wxPlatformInfo-related
+// ----------------------------------------------------------------------------
+
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
+{
+    if ( verMaj )
+        *verMaj = gtk_major_version;
+    if ( verMin )
+        *verMin = gtk_minor_version;
+
+    return wxPORT_GTK;
+}
+
+#if wxUSE_DETECT_SM
+static wxString GetSM()
+{
+       Display     *dpy;
+       SmcConn     smc_conn;
+       char        *vendor;
+       char        *client_id_ret;
+       dpy = XOpenDisplay(NULL);
+
+       smc_conn = SmcOpenConnection(NULL, NULL,
+                                    999, 999,
+                                    0 /* mask */, NULL /* callbacks */,
+                                    NULL, &client_id_ret, 0, NULL);
+
+       vendor = SmcVendor(smc_conn);
+    wxString ret = wxString::FromAscii( vendor );
+       free(vendor);
+
+       SmcCloseConnection(smc_conn, 0, NULL);
+       free(client_id_ret);
+
+       XCloseDisplay(dpy);
+    
+    return ret;
+}
+#endif
+
+wxString wxGUIAppTraits::GetDesktopEnvironment() const
+{
+#if wxUSE_DETECT_SM
+    wxString SM = GetSM();
+    
+    if (SM == wxT("GnomeSM"))
+        return wxT("GNOME");
+        
+    if (SM == wxT("KDE"))
+        return wxT("KDE");
+#endif
+
+    return wxEmptyString;
+}
+
+
+