X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/527343602e91d60c65fb7589a6ddcf4683930c78..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/unix/utilsx11.cpp?ds=sidebyside

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 67e641c3cb..63a3200831 100644
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
@@ -24,6 +24,7 @@
 #endif
 
 #include "wx/iconbndl.h"
+#include "wx/apptrait.h"
 
 #ifdef __VMS
 #pragma message disable nosimpint
@@ -41,7 +42,6 @@
 #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;
@@ -106,10 +106,13 @@ private:
 // Setting icons for window manager:
 // ----------------------------------------------------------------------------
 
+#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;
 
     const size_t numIcons = ib.GetIconCount();
@@ -184,9 +187,9 @@ wxSetIconsX11(WXDisplay* display, WXWindow window, const wxIconBundle& ib)
                          WindowCast(window),
                          _NET_WM_ICON );
     }
-#endif // !wxUSE_NANOX
 }
 
+#endif // wxUSE_IMAGE && !wxUSE_NANOX
 
 // ----------------------------------------------------------------------------
 // Fullscreen mode:
@@ -380,20 +383,20 @@ static bool wxKwinRunning(Display *display, Window rootWnd)
 {
     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,
-                           (unsigned char**)&data) != Success)
+                           &data) != Success)
     {
         return false;
     }
 
     bool retval = (type == KWIN_RUNNING &&
-                   nitems == 1 && data && data[0] == 1);
+                   nitems == 1 && data && ((long*)data)[0] == 1);
     XFree(data);
     return retval;
 }
@@ -475,8 +478,8 @@ wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
     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;
     }
 
@@ -484,12 +487,12 @@ wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
     // 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:
-    wxLogTrace(_T("fullscreen"), _T("unknown WM, using _WIN_LAYER"));
+    wxLogTrace(wxT("fullscreen"), wxT("unknown WM, using _WIN_LAYER"));
     return wxX11_FS_GENERIC;
 }
 
@@ -534,7 +537,7 @@ void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow,
 
 // FIXME what about tables??
 
-int wxCharCodeXToWX(KeySym keySym)
+int wxCharCodeXToWX(WXKeySym keySym)
 {
     int id;
     switch (keySym)
@@ -714,9 +717,9 @@ int wxCharCodeXToWX(KeySym keySym)
     return id;
 }
 
-KeySym wxCharCodeWXToX(int id)
+WXKeySym wxCharCodeWXToX(int id)
 {
-    KeySym keySym;
+    WXKeySym keySym;
 
     switch (id)
     {
@@ -820,7 +823,7 @@ bool wxGetKeyState(wxKeyCode key)
     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)
         {
@@ -846,4 +849,80 @@ bool wxGetKeyState(wxKeyCode key)
     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__