Fixed filename in wxOSX-Cocoa's file dialog using extension of wrong file type.

[wxWidgets.git] / src / unix / utilsx11.cpp

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index f6627e6e69b51d904d5fdcb1935208f4791017bf..63a320083168db6360deb8099877a9cc91ac3aac 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/unix/utilsx11.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/unix/utilsx11.cpp

-// Purpose:     Miscellaneous X11 functions
+// Purpose:     Miscellaneous X11 functions (for wxCore)

 // Author:      Mattia Barbon, Vaclav Slavik, Robert Roebling
 // Modified by:
 // Created:     25.03.02
 // Author:      Mattia Barbon, Vaclav Slavik, Robert Roebling
 // Modified by:
 // Created:     25.03.02


@@ -24,6 +24,7 @@
 #endif
 
 #include "wx/iconbndl.h"
 #endif
 
 #include "wx/iconbndl.h"

+#include "wx/apptrait.h"

 
 #ifdef __VMS
 #pragma message disable nosimpint
 
 #ifdef __VMS
 #pragma message disable nosimpint


@@ -41,7 +42,6 @@
 #endif
 
 // Various X11 Atoms used in this file:
 #endif
 
 // Various X11 Atoms used in this file:

-static Atom _NET_WM_ICON = 0;

 static Atom _NET_WM_STATE = 0;
 static Atom _NET_WM_STATE_FULLSCREEN = 0;
 static Atom _NET_WM_STATE_STAYS_ON_TOP = 0;
 static Atom _NET_WM_STATE = 0;
 static Atom _NET_WM_STATE_FULLSCREEN = 0;
 static Atom _NET_WM_STATE_STAYS_ON_TOP = 0;


@@ -106,31 +106,35 @@ private:
 // Setting icons for window manager:
 // ----------------------------------------------------------------------------
 
 // Setting icons for window manager:
 // ----------------------------------------------------------------------------
 

-void wxSetIconsX11( WXDisplay* display, WXWindow window,
-                    const wxIconBundle& ib )
+#if wxUSE_IMAGE && !wxUSE_NANOX
+
+static Atom _NET_WM_ICON = 0;
+
+void
+wxSetIconsX11(WXDisplay* display, WXWindow window, const wxIconBundle& ib)

 {
 {

-#if !wxUSE_NANOX

     size_t size = 0;
     size_t size = 0;

-    size_t i, max = ib.m_icons.GetCount();

 
 

-    for( i = 0; i < max; ++i )
-        if( ib.m_icons[i].Ok() )
-            size += 2 + ib.m_icons[i].GetWidth() * ib.m_icons[i].GetHeight();
+    const size_t numIcons = ib.GetIconCount();
+    for ( size_t i = 0; i < numIcons; ++i )
+    {
+        const wxIcon icon = ib.GetIconByIndex(i);
+
+        size += 2 + icon.GetWidth() * icon.GetHeight();
+    }

 
     wxMAKE_ATOM(_NET_WM_ICON, (Display*)display);
 
 
     wxMAKE_ATOM(_NET_WM_ICON, (Display*)display);
 

-    if( size > 0 )
+    if ( size > 0 )

     {
     {

-//       The code below is correct for 64-bit machines also.
-//       wxUint32* data = new wxUint32[size];
-//       wxUint32* ptr = data;

         unsigned long* data = new unsigned long[size];
         unsigned long* ptr = data;
 
         unsigned long* data = new unsigned long[size];
         unsigned long* ptr = data;
 

-        for( i = 0; i < max; ++i )
+        for ( size_t i = 0; i < numIcons; ++i )

         {
         {

-            const wxImage image = ib.m_icons[i].ConvertToImage();
-            int width = image.GetWidth(), height = image.GetHeight();
+            const wxImage image = ib.GetIconByIndex(i).ConvertToImage();
+            int width = image.GetWidth(),
+                height = image.GetHeight();

             unsigned char* imageData = image.GetData();
             unsigned char* imageDataEnd = imageData + ( width * height * 3 );
             bool hasMask = image.HasMask();
             unsigned char* imageData = image.GetData();
             unsigned char* imageDataEnd = imageData + ( width * height * 3 );
             bool hasMask = image.HasMask();


@@ -153,7 +157,8 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
             *ptr++ = width;
             *ptr++ = height;
 
             *ptr++ = width;
             *ptr++ = height;
 

-            while( imageData < imageDataEnd ) {
+            while ( imageData < imageDataEnd )
+            {

                 r = imageData[0];
                 g = imageData[1];
                 b = imageData[2];
                 r = imageData[0];
                 g = imageData[1];
                 b = imageData[2];


@@ -182,9 +187,9 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
                          WindowCast(window),
                          _NET_WM_ICON );
     }
                          WindowCast(window),
                          _NET_WM_ICON );
     }

-#endif // !wxUSE_NANOX

 }
 
 }
 

+#endif // wxUSE_IMAGE && !wxUSE_NANOX

 
 // ----------------------------------------------------------------------------
 // Fullscreen mode:
 
 // ----------------------------------------------------------------------------
 // Fullscreen mode:


@@ -378,20 +383,20 @@ static bool wxKwinRunning(Display *display, Window rootWnd)
 {
     wxMAKE_ATOM(KWIN_RUNNING, display);
 
 {
     wxMAKE_ATOM(KWIN_RUNNING, display);
 

-    long *data;
+    unsigned char* data;

     Atom type;
     int format;
     unsigned long nitems, after;
     if (XGetWindowProperty(display, rootWnd,
                            KWIN_RUNNING, 0, 1, False, KWIN_RUNNING,
                            &type, &format, &nitems, &after,
     Atom type;
     int format;
     unsigned long nitems, after;
     if (XGetWindowProperty(display, rootWnd,
                            KWIN_RUNNING, 0, 1, False, KWIN_RUNNING,
                            &type, &format, &nitems, &after,

-                           (unsigned char**)&data) != Success)
+                           &data) != Success)

     {
         return false;
     }
 
     bool retval = (type == KWIN_RUNNING &&
     {
         return false;
     }
 
     bool retval = (type == KWIN_RUNNING &&

-                   nitems == 1 && data && data[0] == 1);
+                   nitems == 1 && data && ((long*)data)[0] == 1);

     XFree(data);
     return retval;
 }
     XFree(data);
     return retval;
 }


@@ -473,8 +478,8 @@ wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
     wxMAKE_ATOM(_NET_WM_STATE_FULLSCREEN, disp);
     if (wxQueryWMspecSupport(disp, root, _NET_WM_STATE_FULLSCREEN))
     {
     wxMAKE_ATOM(_NET_WM_STATE_FULLSCREEN, disp);
     if (wxQueryWMspecSupport(disp, root, _NET_WM_STATE_FULLSCREEN))
     {

-        wxLogTrace(_T("fullscreen"),
-                   _T("detected _NET_WM_STATE_FULLSCREEN support"));
+        wxLogTrace(wxT("fullscreen"),
+                   wxT("detected _NET_WM_STATE_FULLSCREEN support"));

         return wxX11_FS_WMSPEC;
     }
 
         return wxX11_FS_WMSPEC;
     }
 


@@ -482,12 +487,12 @@ wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
     // kwin doesn't understand any other method:
     if (wxKwinRunning(disp, root))
     {
     // kwin doesn't understand any other method:
     if (wxKwinRunning(disp, root))
     {

-        wxLogTrace(_T("fullscreen"), _T("detected kwin"));
+        wxLogTrace(wxT("fullscreen"), wxT("detected kwin"));

         return wxX11_FS_KDE;
     }
 
     // finally, fall back to ICCCM heuristic method:
         return wxX11_FS_KDE;
     }
 
     // finally, fall back to ICCCM heuristic method:

-    wxLogTrace(_T("fullscreen"), _T("unknown WM, using _WIN_LAYER"));
+    wxLogTrace(wxT("fullscreen"), wxT("unknown WM, using _WIN_LAYER"));

     return wxX11_FS_GENERIC;
 }
 
     return wxX11_FS_GENERIC;
 }
 


@@ -532,7 +537,7 @@ void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow,
 
 // FIXME what about tables??
 
 
 // FIXME what about tables??
 

-int wxCharCodeXToWX(KeySym keySym)
+int wxCharCodeXToWX(WXKeySym keySym)

 {
     int id;
     switch (keySym)
 {
     int id;
     switch (keySym)


@@ -712,9 +717,9 @@ int wxCharCodeXToWX(KeySym keySym)
     return id;
 }
 
     return id;
 }
 

-KeySym wxCharCodeWXToX(int id)
+WXKeySym wxCharCodeWXToX(int id)

 {
 {

-    KeySym keySym;
+    WXKeySym keySym;

 
     switch (id)
     {
 
     switch (id)
     {


@@ -818,7 +823,7 @@ bool wxGetKeyState(wxKeyCode key)
     if ( IsModifierKey(iKey) )  // If iKey is a modifier key, use a different method
     {
         XModifierKeymap *map = XGetModifierMapping(pDisplay);
     if ( IsModifierKey(iKey) )  // If iKey is a modifier key, use a different method
     {
         XModifierKeymap *map = XGetModifierMapping(pDisplay);

-        wxCHECK_MSG( map, false, _T("failed to get X11 modifiers map") );
+        wxCHECK_MSG( map, false, wxT("failed to get X11 modifiers map") );

 
         for (int i = 0; i < 8; ++i)
         {
 
         for (int i = 0; i < 8; ++i)
         {


@@ -844,4 +849,80 @@ bool wxGetKeyState(wxKeyCode key)
     return key_vector[keyCode >> 3] & (1 << (keyCode & 7));
 }
 
     return key_vector[keyCode >> 3] & (1 << (keyCode & 7));
 }
 

+// ----------------------------------------------------------------------------
+// Launch document with default app
+// ----------------------------------------------------------------------------
+
+bool wxLaunchDefaultApplication(const wxString& document, int flags)
+{
+    wxUnusedVar(flags);
+
+    // Our best best is to use xdg-open from freedesktop.org cross-desktop
+    // compatibility suite xdg-utils
+    // (see http://portland.freedesktop.org/wiki/) -- this is installed on
+    // most modern distributions and may be tweaked by them to handle
+    // distribution specifics.
+    wxString path, xdg_open;
+    if ( wxGetEnv("PATH", &path) &&
+         wxFindFileInPath(&xdg_open, path, "xdg-open") )
+    {
+        if ( wxExecute(xdg_open + " " + document) )
+            return true;
+    }
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// Launch default browser
+// ----------------------------------------------------------------------------
+
+bool wxDoLaunchDefaultBrowser(const wxString& url, int flags)
+{
+    wxUnusedVar(flags);
+
+    // Our best best is to use xdg-open from freedesktop.org cross-desktop
+    // compatibility suite xdg-utils
+    // (see http://portland.freedesktop.org/wiki/) -- this is installed on
+    // most modern distributions and may be tweaked by them to handle
+    // distribution specifics. Only if that fails, try to find the right
+    // browser ourselves.
+    wxString path, xdg_open;
+    if ( wxGetEnv("PATH", &path) &&
+         wxFindFileInPath(&xdg_open, path, "xdg-open") )
+    {
+        if ( wxExecute(xdg_open + " " + url) )
+            return true;
+    }
+
+    wxString desktop = wxTheApp->GetTraits()->GetDesktopEnvironment();
+
+    // GNOME and KDE desktops have some applications which should be always installed
+    // together with their main parts, which give us the
+    if (desktop == wxT("GNOME"))
+    {
+        wxArrayString errors;
+        wxArrayString output;
+
+        // gconf will tell us the path of the application to use as browser
+        long res = wxExecute( wxT("gconftool-2 --get /desktop/gnome/applications/browser/exec"),
+                              output, errors, wxEXEC_NODISABLE );
+        if (res >= 0 && errors.GetCount() == 0)
+        {
+            wxString cmd = output[0];
+            cmd << wxT(' ') << url;
+            if (wxExecute(cmd))
+                return true;
+        }
+    }
+    else if (desktop == wxT("KDE"))
+    {
+        // kfmclient directly opens the given URL
+        if (wxExecute(wxT("kfmclient openURL ") + url))
+            return true;
+    }
+
+    return false;
+}
+

 #endif // __WXX11__ || __WXGTK__ || __WXMOTIF__
 #endif // __WXX11__ || __WXGTK__ || __WXMOTIF__