X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e085304e81028d44c4670b4020662f3f0af97fd..ef00dc091740aca65dcd1861cfd09fbccbb46a89:/src/x11/toplevel.cpp

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 7ecbb7fed5..7ac9f69372 100644
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "toplevel.h"
 #endif
 
@@ -43,6 +43,8 @@
 #include "wx/x11/private.h"
 #include "X11/Xutil.h"
 
+#include "wx/unix/utilsx11.h"
+
 bool wxMWMIsRunning(Window w);
 
 // ----------------------------------------------------------------------------
@@ -61,6 +63,13 @@ void wxTopLevelWindowX11::Init()
     m_fsStyle = 0;
     m_fsIsMaximized = FALSE;
     m_fsIsShowing = FALSE;
+    
+    m_needResizeInIdle = FALSE;
+    
+    m_x = -1;
+    m_y = -1;
+    m_width = 20;
+    m_height = 20;
 }
 
 bool wxTopLevelWindowX11::Create(wxWindow *parent,
@@ -99,65 +108,135 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     m_backgroundColour.CalcPixel( (WXColormap) cm );
     m_hasBgCol = TRUE;
 	
+    m_x = pos.x;
+    if (m_x < -1)
+        m_x = 10;
+        
+    m_y = pos.y;
+    if (m_y < 0)
+        m_y = 10;
+        
+    m_width = size.x;
+    if (m_width < 0)
+        m_width = 500;
+        
+    m_height = size.y;
+    if (m_height < 0)
+        m_height = 380;
+    
+#if !wxUSE_NANOX
     XSetWindowAttributes xattributes;
-    XSizeHints size_hints;
-    XWMHints wm_hints;
     
     long xattributes_mask =
-        CWOverrideRedirect |
         CWBorderPixel | CWBackPixel;
+
     xattributes.background_pixel = m_backgroundColour.GetPixel();
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
 
-    // TODO: if we want no border, caption etc.,
-    // I think we set this to True to remove decorations
-    xattributes.override_redirect = False;
+    if (HasFlag( wxNO_BORDER ))
+    {
+        xattributes_mask |= CWOverrideRedirect;
+        xattributes.override_redirect = True;
+    }
     
-    wxSize size2(size);
-    if (size2.x == -1)
-	size2.x = 100;
-    if (size2.y == -1)
-	size2.y = 100;
-
-    wxPoint pos2(pos);
-    if (pos2.x == -1)
-	pos2.x = 100;
-    if (pos2.y == -1)
-	pos2.y = 100;
+    if (!HasFlag( wxFULL_REPAINT_ON_RESIZE ))
+    {
+        xattributes_mask |= CWBitGravity;
+        xattributes.bit_gravity = NorthWestGravity;
+    }
     
-    Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
-       0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
-    m_mainWidget = (WXWindow) xwindow;
-
-    XSelectInput( xdisplay, xwindow,
+    xattributes_mask |= CWEventMask;
+    xattributes.event_mask = 
         ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
         ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
         KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
-        PropertyChangeMask );
+        PropertyChangeMask;
+        
+    Window xwindow = XCreateWindow( xdisplay, xparent, m_x, m_y, m_width, m_height,
+                                    0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#else
+    long backColor, foreColor;
+    backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
+    foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());
+    
+    Window xwindow = XCreateWindowWithColor( xdisplay, xparent, m_x, m_y, m_width, m_height,
+                                    0, 0, InputOutput, xvisual, backColor, foreColor);
+#endif
 
+    m_mainWindow = (WXWindow) xwindow;
+    m_clientWindow = (WXWindow) xwindow;
     wxAddWindowToTable( xwindow, (wxWindow*) this );
 
+#if wxUSE_NANOX
+    XSelectInput( xdisplay, xwindow,
+                  GR_EVENT_MASK_CLOSE_REQ |
+                  ExposureMask |
+                  KeyPressMask |
+                  KeyReleaseMask |
+                  ButtonPressMask |
+                  ButtonReleaseMask |
+                  ButtonMotionMask |
+                  EnterWindowMask |
+                  LeaveWindowMask |
+                  PointerMotionMask |
+                  KeymapStateMask |
+                  FocusChangeMask |
+                  ColormapChangeMask |
+                  StructureNotifyMask |
+                  PropertyChangeMask
+                  );
+#endif
+
     // Set background to None which will prevent X11 from clearing the
     // background completely.
     XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
 
-    // Messes up window management
-    //    XSetTransientForHint( xdisplay, xwindow, xparent );
+#if !wxUSE_NANOX
+    if (HasFlag( wxSTAY_ON_TOP ))
+    {
+        Window xroot = RootWindow( xdisplay, xscreen );
+        XSetTransientForHint( xdisplay, xwindow, xroot );
+    }
+    else
+    {
+       if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
+       {
+            if (GetParent() && GetParent()->GetMainWindow())
+            {
+                Window xparentwindow = (Window) GetParent()->GetMainWindow();
+                XSetTransientForHint( xdisplay, xwindow, xparentwindow );
+            }
+        }
+    }
 
-    size_hints.flags = PSize;
-    size_hints.width = size2.x;
-    size_hints.height = size2.y;
+    XSizeHints size_hints;
+    size_hints.flags = PSize | PPosition | PWinGravity;
+    size_hints.x = m_x;
+    size_hints.y = m_y;
+    size_hints.width = m_width;
+    size_hints.height = m_height;
+    size_hints.win_gravity = NorthWestGravity;
     XSetWMNormalHints( xdisplay, xwindow, &size_hints);
     
-    wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */;
+    XWMHints wm_hints;
+    wm_hints.flags = InputHint | StateHint;
+    if (GetParent())
+    {  
+        wm_hints.flags |= WindowGroupHint;
+        wm_hints.window_group = (Window) GetParent()->GetMainWindow();
+    }
     wm_hints.input = True;
     wm_hints.initial_state = NormalState;
     XSetWMHints( xdisplay, xwindow, &wm_hints);
+
+    Atom wm_protocols[2];
+    wm_protocols[0] = XInternAtom( xdisplay, "WM_DELETE_WINDOW", False );
+    wm_protocols[1] = XInternAtom( xdisplay, "WM_TAKE_FOCUS", False );
+    XSetWMProtocols( xdisplay, xwindow, wm_protocols, 2);
+
+#endif
     
-    Atom wm_delete_window = XInternAtom( xdisplay, "WM_DELETE_WINDOW", False);
-    XSetWMProtocols( xdisplay, xwindow, &wm_delete_window, 1);
-    
-    wxSetWMDecorations((Window) GetMainWindow(), style);
+    wxSetWMDecorations( xwindow, style);
 
     SetTitle(title);
     
@@ -169,7 +248,7 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
     wxTopLevelWindows.DeleteObject(this);
 
     // If this is the last top-level window, exit.
-    if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
+    if ( wxTheApp && (wxTopLevelWindows.GetCount() == 0) )
     {
         wxTheApp->SetTopWindow(NULL);
 
@@ -181,13 +260,42 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
     }
 }
 
+void wxTopLevelWindowX11::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();
+    
+    // Do this only after the last idle event so that
+    // all windows have been updated before a new
+    // round of size events is sent
+    if (m_needResizeInIdle && !wxTheApp->Pending())
+    {
+        wxSizeEvent event( GetClientSize(), GetId() );
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event );
+        
+        m_needResizeInIdle = FALSE;
+    }
+}
+
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 showing
 // ----------------------------------------------------------------------------
 
 bool wxTopLevelWindowX11::Show(bool show)
 {
-    return wxWindowX11::Show(show);
+    if (show)
+    {
+        wxSizeEvent event(GetSize(), GetId());
+        
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+        
+        m_needResizeInIdle = FALSE;
+    }
+
+    bool ret = wxWindowX11::Show(show);
+    
+    return ret;
 }
 
 // ----------------------------------------------------------------------------
@@ -264,13 +372,12 @@ bool wxTopLevelWindowX11::ShowFullScreen(bool show, long style)
 // wxTopLevelWindowX11 misc
 // ----------------------------------------------------------------------------
 
-void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
+void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)
 {
-    // this sets m_icon
-    wxTopLevelWindowBase::SetIcon(icon);
-
     if (icon.Ok() && GetMainWindow())
     {
+#if wxUSE_NANOX
+#else
         XWMHints *wmHints = XAllocWMHints();
         wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();
 
@@ -284,29 +391,43 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
 
         XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);
         XFree(wmHints);
+#endif
     }
 }
 
+void wxTopLevelWindowX11::SetIcons(const wxIconBundle& icons )
+{
+    // this sets m_icon
+    wxTopLevelWindowBase::SetIcons( icons );
+
+    DoSetIcon( icons.GetIcon( -1 ) );
+    wxSetIconsX11( wxGlobalDisplay(), GetMainWindow(), icons );
+}
+
+bool wxTopLevelWindowX11::SetShape(const wxRegion& region)
+{
+    return wxDoSetShape( wxGlobalDisplay(),
+                         (Window)GetMainWindow(),
+                         region );
+}
+
 void wxTopLevelWindowX11::SetTitle(const wxString& title)
 {
     m_title = title;
+    
     if (GetMainWindow())
     {
+#if wxUSE_UNICODE
+        //  I wonder of e.g. Metacity takes UTF-8 here
+        XStoreName(wxGlobalDisplay(), (Window) GetMainWindow(),
+            (const char*) title.ToAscii() );
+        XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
+            (const char*) title.ToAscii() );
+#else
         XStoreName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);
         XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);
-
-        // Use this if the platform doesn't supply the above functions.
-#if 0
-        XTextProperty textProperty;
-        textProperty.value = (unsigned char*) title;
-        textProperty.encoding = XA_STRING;
-        textProperty.format = 8;
-        textProperty.nitems = 1;
-
-        XSetTextProperty(wxGlobalDisplay(), (Window) GetMainWindow(),
-            & textProperty, WM_NAME);
 #endif
     }
 }
@@ -316,12 +437,202 @@ wxString wxTopLevelWindowX11::GetTitle() const
     return m_title;
 }
 
+// For implementation purposes - sometimes decorations make the client area
+// smaller
+wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
+{
+    // wxFrame::GetClientAreaOrigin
+    // does the required calculation already.
+    return wxPoint(0, 0);
+}
+
+void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
+{
+    if (width)
+       *width = m_width;
+    if (height)
+       *height = m_height;
+}
+
+void wxTopLevelWindowX11::DoGetSize( int *width, int *height ) const
+{
+    // TODO add non-client size
+
+    if (width)
+       *width = m_width;
+    if (height)
+       *height = m_height;
+}
+
+void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
+{
+    int old_width = m_width;
+    int old_height = m_height;
+
+    m_width = width;
+    m_height = height;
+    
+    if (m_width == old_width && m_height == old_height)
+        return;
+        
+    // wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height);
+    
+#if !wxUSE_NANOX
+    XSizeHints size_hints;
+    size_hints.flags = PSize;
+    size_hints.width = width;
+    size_hints.height = height;
+    XSetWMNormalHints( wxGlobalDisplay(), (Window) GetMainWindow(), &size_hints );
+#endif
+    
+    wxWindowX11::DoSetClientSize(width, height);
+}
+
+void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    int old_x = m_x;
+    int old_y = m_y;
+    int old_width = m_width;
+    int old_height = m_height;
+
+    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_x = x;
+        
+    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_y = y;
+        
+    if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_width = width;
+        
+    if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_height = height;
+        
+    if (m_x == old_x && m_y == old_y && m_width == old_width && m_height == old_height)
+        return;
+    
+    // wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height);
+
+#if !wxUSE_NANOX    
+    XSizeHints size_hints;
+    size_hints.flags = 0;
+    size_hints.flags |= PPosition;
+    size_hints.flags |= PSize;
+    size_hints.x = m_x;
+    size_hints.y = m_y;
+    size_hints.width = m_width;
+    size_hints.height = m_height;
+    XSetWMNormalHints( wxGlobalDisplay(), (Window) GetMainWindow(), &size_hints);
+#endif
+
+    wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
+    
+#if 0
+    Display *display = wxGlobalDisplay();
+    Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
+    Window parent_window = window,
+        next_parent   = window;
+
+    // search for the parent that is child of ROOT, because the WM may
+    // reparent twice and notify only the next parent (like FVWM)
+    while (next_parent != root) {
+        Window *theChildren;
+#if wxUSE_NANOX
+        GR_COUNT n;
+#else
+        unsigned int n;
+#endif
+        parent_window = next_parent;
+        XQueryTree(display, parent_window, &root,
+            &next_parent, &theChildren, &n);
+        XFree(theChildren); // not needed
+    }
+
+    XWindowChanges windowChanges;
+    windowChanges.x = x;
+    windowChanges.y = y;
+    windowChanges.width = width;
+    windowChanges.height = height;
+    windowChanges.stack_mode = 0;
+    int valueMask = CWX | CWY | CWWidth | CWHeight;
+
+    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    {
+        valueMask |= CWX;
+    }
+    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    {
+        valueMask |= CWY;
+    }
+    if (width != -1)
+    {
+        windowChanges.width = wxMax(1, width);
+        valueMask |= CWWidth;
+    }
+    if (height != -1)
+    {
+        windowChanges.height = wxMax(1, height);
+        valueMask |= CWHeight;
+    }
+
+    XConfigureWindow( display, parent_window, valueMask, &windowChanges );
+#endif
+}
+
+void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const
+{
+    XSync(wxGlobalDisplay(), False);
+    Window window = (Window) m_mainWindow;
+    if (!window)
+        return ;
+
+    Display *display = wxGlobalDisplay();
+    Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
+    Window parent_window = window,
+        next_parent   = window;
+
+    // search for the parent that is child of ROOT, because the WM may
+    // reparent twice and notify only the next parent (like FVWM)
+    while (next_parent != root) {
+        Window *theChildren;
+#if wxUSE_NANOX
+        GR_COUNT n;
+#else
+        unsigned int n;
+#endif
+        parent_window = next_parent;
+        XQueryTree(display, parent_window, &root,
+            &next_parent, &theChildren, &n);
+        XFree(theChildren); // not needed
+    }
+#if 0
+    int xx, yy; unsigned int dummy;
+    XGetGeometry(display, parent_window, &root,
+                 &xx, &yy, &dummy, &dummy, &dummy, &dummy);
+    if (x) *x = xx;
+    if (y) *y = yy;
+#else
+    XWindowAttributes attr;
+    Status status = XGetWindowAttributes( wxGlobalDisplay(), parent_window, & attr);
+    if (status)
+    {
+        if (x) *x = attr.x;
+        if (y) *y = attr.y;
+    }
+    else
+    {
+        if (x) *x = 0;
+        if (y) *y = 0;
+    }
+#endif
+}
+
+
 #ifndef MWM_DECOR_BORDER
-/* bit definitions for MwmHints.flags */
-#define MWM_HINTS_FUNCTIONS (1L << 0)
-#define MWM_HINTS_DECORATIONS (1L << 1)
-#define MWM_HINTS_INPUT_MODE (1L << 2)
-#define MWM_HINTS_STATUS (1L << 3)
+
+#define MWM_HINTS_FUNCTIONS     (1L << 0)
+#define MWM_HINTS_DECORATIONS   (1L << 1)
+#define MWM_HINTS_INPUT_MODE    (1L << 2)
+#define MWM_HINTS_STATUS        (1L << 3)
 
 #define MWM_DECOR_ALL           (1L << 0)
 #define MWM_DECOR_BORDER        (1L << 1)
@@ -330,6 +641,22 @@ wxString wxTopLevelWindowX11::GetTitle() const
 #define MWM_DECOR_MENU          (1L << 4)
 #define MWM_DECOR_MINIMIZE      (1L << 5)
 #define MWM_DECOR_MAXIMIZE      (1L << 6)
+
+#define MWM_FUNC_ALL            (1L << 0)
+#define MWM_FUNC_RESIZE         (1L << 1)
+#define MWM_FUNC_MOVE           (1L << 2)
+#define MWM_FUNC_MINIMIZE       (1L << 3)
+#define MWM_FUNC_MAXIMIZE       (1L << 4)
+#define MWM_FUNC_CLOSE          (1L << 5)
+
+#define MWM_INPUT_MODELESS 0
+#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
+#define MWM_INPUT_SYSTEM_MODAL 2
+#define MWM_INPUT_FULL_APPLICATION_MODAL 3
+#define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
+
+#define MWM_TEAROFF_WINDOW	(1L<<0)
+
 #endif
 
 struct MwmHints {
@@ -342,233 +669,127 @@ struct MwmHints {
 #define PROP_MOTIF_WM_HINTS_ELEMENTS 5
 
 // Set the window manager decorations according to the
-// given wxWindows style
+// given wxWidgets style
 bool wxSetWMDecorations(Window w, long style)
 {
-    if (!wxMWMIsRunning(w))
-        return FALSE;
+#if wxUSE_NANOX
+    GR_WM_PROPERTIES wmProp;
 
-    Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);
-    MwmHints hints;
-    hints.flags = 0;
-    hints.decorations = 0;
+    wmProp.flags = 0;
+    wmProp.props = 0;
 
     if (style & wxRESIZE_BORDER)
     {
-	wxLogDebug("MWM_DECOR_RESIZEH");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_RESIZEH;
+        wmProp.props |= GR_WM_PROPS_APPFRAME ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 
-    if (style & wxSYSTEM_MENU)
+    if (style & wxCLOSE_BOX)
     {
-	wxLogDebug("MWM_DECOR_MENU");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MENU;
+        wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 
     if ((style & wxCAPTION) ||
         (style & wxTINY_CAPTION_HORIZ) ||
         (style & wxTINY_CAPTION_VERT))
     {
-	wxLogDebug("MWM_DECOR_TITLE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_TITLE;
-    }
+        wmProp.props |= GR_WM_PROPS_CAPTION ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
 
-    if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION))
-    {
-	wxLogDebug("MWM_DECOR_BORDER");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_BORDER;
+        // The default dialog style doesn't include any kind
+        // of border, which is a bit odd. Anyway, inclusion
+        // of a caption surely implies a border.
+        style |= wxTHICK_FRAME;
     }
 
-    if (style & wxMINIMIZE_BOX)
+    if (style & wxTHICK_FRAME)
     {
-	wxLogDebug("MWM_DECOR_MINIMIZE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MINIMIZE;
+        wmProp.props |= GR_WM_PROPS_APPFRAME ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 
-    if (style & wxMAXIMIZE_BOX)
+    if (style & wxSIMPLE_BORDER)
     {
-	wxLogDebug("MWM_DECOR_MAXIMIZE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MAXIMIZE;
+        wmProp.props |= GR_WM_PROPS_BORDER ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 
-    XChangeProperty(wxGlobalDisplay(),
-		    w,
-		    mwm_wm_hints, mwm_wm_hints,
-		    32, PropModeReplace,
-		    (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
-
-    return TRUE;
-}
-
-bool wxMWMIsRunning(Window w)
-{
-    Display *dpy = (Display*)wxGetDisplay();
-    Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False);
-
-    unsigned long length, bytesafter;
-    unsigned char value[20];
-    unsigned char *ptr = &value[0];
-    int ret, format;
-    Atom type;
-
-    type = format = length = 0;
-    value[0] = 0;
-
-    ret = XGetWindowProperty(wxGlobalDisplay(), w, motifWmInfo,
-	    0L, 2, False, motifWmInfo, 
-	    &type, &format, &length, &bytesafter, &ptr);
-
-    return (ret == Success);
-}
-    
-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
-{
-    // In fact wxFrame::GetClientAreaOrigin
-    // does the required calculation already.
-#if 0
-    if (this->IsKindOf(CLASSINFO(wxFrame)))
+    if (style & wxMINIMIZE_BOX)
     {
-	wxFrame* frame = (wxFrame*) this;
-	if (frame->GetMenuBar())
-	    return wxPoint(0, frame->GetMenuBar()->GetSize().y);
     }
-#endif
-    return wxPoint(0, 0);
-}
 
-void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
-{
-    wxWindowX11::DoGetClientSize(width, height);
-    // Done by wxTopLevelWindow
-#if 0
-    if (this->IsKindOf(CLASSINFO(wxFrame)))
+    if (style & wxMAXIMIZE_BOX)
     {
-	wxFrame* frame = (wxFrame*) this;
-	if (frame->GetMenuBar())
-	    (*height) -= frame->GetMenuBar()->GetSize().y;
-	if (frame->GetStatusBar())
-	    (*height) -= frame->GetStatusBar()->GetSize().y;
+        wmProp.props |= GR_WM_PROPS_MAXIMIZE ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
-#endif
-}
-
-void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
-{
-    wxWindowX11::DoSetClientSize(width, height);
-
-#if 0
-    if (!GetMainWindow())
-        return;
 
-    XWindowChanges windowChanges;
-    int valueMask = 0;
-
-    if (width != -1)
+    if (((style & wxBORDER) != wxBORDER) && ((style & wxTHICK_FRAME) != wxTHICK_FRAME)
+        && ((style & wxRESIZE_BORDER) != wxRESIZE_BORDER))
     {
-        windowChanges.width = width ;
-        valueMask |= CWWidth;
+        wmProp.props |= GR_WM_PROPS_NODECORATE ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
-    if (height != -1)
-    {
-        windowChanges.height = height ;
-        valueMask |= CWHeight;
-    }
-    XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
-        valueMask, & windowChanges);
-#endif
-}
-
-void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    wxString msg;
-    msg.Printf("Setting pos: %d, %d", x, y);
-    wxLogDebug(msg);
-    wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
-
-    wxPoint pt = GetPosition();
-    msg.Printf("After, pos: %d, %d", pt.x, pt.y);
-    wxLogDebug(msg);
-#if 0
-    XSync(wxGlobalDisplay(), False);
-    int w, h;
-    GetSize(& w, & h);
-    wxString msg;
-    msg.Printf("Before setting size: %d, %d", w, h);
-    wxLogDebug(msg);
-    if (!GetMainWindow())
-        return;
 
-    XWindowChanges windowChanges;
-    int valueMask = 0;
+    GrSetWMProperties(w, & wmProp);
+    
+#else
 
-    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    {
-	int yy = 0;
-        AdjustForParentClientOrigin( x, yy, sizeFlags);
-        windowChanges.x = x;
-        valueMask |= CWX;
-    }
-    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    {
-	int xx = 0;
-        AdjustForParentClientOrigin( xx, y, sizeFlags);
-        windowChanges.y = y;
-        valueMask |= CWY;
-    }
-    if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    {
-        windowChanges.width = width /* - m_borderSize*2 */;
-        valueMask |= CWWidth;
-    }
-    if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);
+    if (mwm_wm_hints == 0)
+       return FALSE;
+    
+    MwmHints hints;
+    hints.flags = MWM_HINTS_DECORATIONS | MWM_HINTS_FUNCTIONS;
+    hints.decorations = 0;
+    hints.functions = 0;
+    
+    if ((style & wxSIMPLE_BORDER) || (style & wxNO_BORDER))
     {
-        windowChanges.height = height /* -m_borderSize*2*/;
-        valueMask |= CWHeight;
+        // leave zeros
     }
-
-    XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
-		     valueMask, & windowChanges);
-    XSync(wxGlobalDisplay(), False);
-    GetSize(& w, & h);
-    msg.Printf("Tried to set to %d, %d. After setting size: %d, %d", width, height, w, h);
-    wxLogDebug(msg);
-#endif
-}
-
-void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const
-{
-    XSync(wxGlobalDisplay(), False);
-    Window window = (Window) m_mainWidget;
-    if (window)
+    else
     {
-	int offsetX = 0;
-	int offsetY = 0;
-	
-        wxLogDebug("Translating...");
-        Window childWindow;
-        XTranslateCoordinates(wxGlobalDisplay(), window, XDefaultRootWindow(wxGlobalDisplay()),
-				  0, 0, & offsetX, & offsetY, & childWindow);
-
-	wxString msg;
-	msg.Printf("Offset: %d, %d", offsetX, offsetY);
-	wxLogDebug(msg);
-	
-        XWindowAttributes attr;
-        Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
-        wxASSERT(status);
+        hints.decorations = MWM_DECOR_BORDER;
+        hints.functions = MWM_FUNC_MOVE;
+
+        if ((style & wxCAPTION) != 0)
+            hints.decorations |= MWM_DECOR_TITLE;
+            
+        if ((style & wxSYSTEM_MENU) != 0)
+            hints.decorations |= MWM_DECOR_MENU;
+        
+        if ((style & wxCLOSE_BOX) != 0)
+            hints.functions |= MWM_FUNC_CLOSE;
         
-        if (status)
+        if ((style & wxMINIMIZE_BOX) != 0)
         {
-            *x = attr.x + offsetX;
-            *y = attr.y + offsetY;
+            hints.functions |= MWM_FUNC_MINIMIZE;
+            hints.decorations |= MWM_DECOR_MINIMIZE;
+        }
+        
+        if ((style & wxMAXIMIZE_BOX) != 0)
+        {
+            hints.functions |= MWM_FUNC_MAXIMIZE;
+            hints.decorations |= MWM_DECOR_MAXIMIZE;
+        }
+        
+        if ((style & wxRESIZE_BORDER) != 0)
+        {
+            hints.functions |= MWM_FUNC_RESIZE;
+            hints.decorations |= MWM_DECOR_RESIZEH;
         }
     }
+
+    XChangeProperty(wxGlobalDisplay(),
+		    w,
+		    mwm_wm_hints, mwm_wm_hints,
+		    32, PropModeReplace,
+		    (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
+
+#endif
+    return TRUE;
 }
+
+