Move wxControl::GetCompositeControlsDefaultAttributes() from MSW to common.

[wxWidgets.git] / src / x11 / utils.cpp

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index ae71bbe8fc797a3c0fed38612cfb1aea96209859..ffc6805717632501877a0413574939f19a0b6641 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -34,6 +34,8 @@
 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"

+#include "wx/generic/private/timer.h"
+#include "wx/evtloop.h"

 
 #include <ctype.h>
 #include <stdarg.h>
 
 #include <ctype.h>
 #include <stdarg.h>


@@ -81,22 +83,12 @@ void wxFlushEvents()
     // ??
 }
 
     // ??
 }
 

-bool wxCheckForInterrupt(wxWindow *wnd)
+bool wxCheckForInterrupt(wxWindow *WXUNUSED(wnd))

 {
     wxFAIL_MSG(wxT("wxCheckForInterrupt not yet implemented."));
     return false;
 }
 
 {
     wxFAIL_MSG(wxT("wxCheckForInterrupt not yet implemented."));
     return false;
 }
 

-// ----------------------------------------------------------------------------
-// wxExecute stuff
-// ----------------------------------------------------------------------------
-
-int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
-{
-    // TODO
-    return 0;
-}
-

 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------


@@ -111,15 +103,24 @@ void wxBell()
 }
 #endif
 
 }
 #endif
 

-wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
+{
+    // get X protocol version
+    Display *display = wxGlobalDisplay();
+    if (display)
+    {
+        if ( verMaj )
+            *verMaj = ProtocolVersion (display);
+        if ( verMin )
+            *verMin = ProtocolRevision (display);
+    }
+
+    return wxPORT_X11;
+}
+
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()

 {
 {

-    static wxToolkitInfo info;
-    info.shortName = _T("x11univ");
-    info.name = _T("wxX11");
-    info.versionMajor = 0;
-    info.versionMinor = 0;
-    info.os = wxX11;
-    return info;
+    return new wxEventLoop;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -181,51 +182,57 @@ void wxDisplaySizeMM(int *width, int *height)
         *height = DisplayHeightMM(dpy, DefaultScreen (dpy));
 }
 
         *height = DisplayHeightMM(dpy, DefaultScreen (dpy));
 }
 

-void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

 {
 {

-    // 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);
+    return wxGenericFindWindowAtPoint(pt);

 }
 
 
 // Configurable display in wxX11 and wxMotif
 }
 
 
 // Configurable display in wxX11 and wxMotif

-static WXDisplay *gs_currentDisplay = NULL;
+static Display *gs_currentDisplay = NULL;

 static wxString gs_displayName;
 
 WXDisplay *wxGetDisplay()
 {
 static wxString gs_displayName;
 
 WXDisplay *wxGetDisplay()
 {

-    if (gs_currentDisplay)
-        return gs_currentDisplay;
-    return wxApp::GetDisplay();
+    return (WXDisplay *)gs_currentDisplay;

 }
 
 }
 

-bool wxSetDisplay(const wxString& display_name)
+// close the current display
+void wxCloseDisplay()

 {
 {

-    gs_displayName = display_name;
-
-    if ( display_name.empty() )
+    if ( gs_currentDisplay )

     {
     {

-        gs_currentDisplay = NULL;
+        if ( XCloseDisplay(gs_currentDisplay) != 0 )
+        {
+            wxLogWarning(_("Failed to close the display \"%s\""),
+                         gs_displayName.c_str());
+        }

 
 

-        return true;
+        gs_currentDisplay = NULL;
+        gs_displayName.clear();

     }
     }

-    else
-    {
-        Display* display = XOpenDisplay((char*) display_name.c_str());
+}

 
 

-        if (display)
-        {
-            gs_currentDisplay = (WXDisplay*) display;
-            return true;
-        }
-        else
-            return false;
+bool wxSetDisplay(const wxString& displayName)
+{
+    Display *dpy = XOpenDisplay
+                   (
+                    displayName.empty() ? NULL
+                                        : (const char *)displayName.mb_str()
+                   );
+
+    if ( !dpy )
+    {
+        wxLogError(_("Failed to open display \"%s\"."), displayName.c_str());
+        return false;

     }
     }

+
+    wxCloseDisplay();
+
+    gs_currentDisplay = dpy;
+    gs_displayName = displayName;
+
+    return true;

 }
 
 wxString wxGetDisplayName()
 }
 
 wxString wxGetDisplayName()


@@ -233,10 +240,20 @@ wxString wxGetDisplayName()
     return gs_displayName;
 }
 
     return gs_displayName;
 }
 

-wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+#include "wx/module.h"
+
+// the module responsible for closing the X11 display at the program end
+class wxX11DisplayModule : public wxModule

 {
 {

-    return wxGenericFindWindowAtPoint(pt);
-}
+public:
+    virtual bool OnInit() { return true; }
+    virtual void OnExit() { wxCloseDisplay(); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxX11DisplayModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxX11DisplayModule, wxModule)

 
 // ----------------------------------------------------------------------------
 // Some colour manipulation routines
 
 // ----------------------------------------------------------------------------
 // Some colour manipulation routines


@@ -353,7 +370,6 @@ void wxAllocColor(Display *d,Colormap cmp,XColor *xc)
     }
 }
 
     }
 }
 

-#ifdef __WXDEBUG__

 wxString wxGetXEventName(XEvent& event)
 {
 #if wxUSE_NANOX
 wxString wxGetXEventName(XEvent& event)
 {
 #if wxUSE_NANOX


@@ -361,7 +377,7 @@ wxString wxGetXEventName(XEvent& event)
     return str;
 #else
     int type = event.xany.type;
     return str;
 #else
     int type = event.xany.type;

-    static char* event_name[] = {
+    static const char* event_name[] = {

         "", "unknown(-)",                                         // 0-1
         "KeyPress", "KeyRelease", "ButtonPress", "ButtonRelease", // 2-5
         "MotionNotify", "EnterNotify", "LeaveNotify", "FocusIn",  // 6-9
         "", "unknown(-)",                                         // 0-1
         "KeyPress", "KeyRelease", "ButtonPress", "ButtonRelease", // 2-5
         "MotionNotify", "EnterNotify", "LeaveNotify", "FocusIn",  // 6-9


@@ -378,7 +394,6 @@ wxString wxGetXEventName(XEvent& event)
         return wxString::FromAscii(event_name[type]);
 #endif
 }
         return wxString::FromAscii(event_name[type]);
 #endif
 }

-#endif

 
 bool wxWindowIsVisible(Window win)
 {
 
 bool wxWindowIsVisible(Window win)
 {