Typo fix for GetSizer.

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 101ef8e4462d2daa0514e94cf4ba417b65bca757..d3a09042d0f0dde28b7cc5477063fef308ecf30a 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -39,7 +39,9 @@
     #include "wx/statusbr.h"
 #endif //WX_PRECOMP
 
     #include "wx/statusbr.h"
 #endif //WX_PRECOMP
 

+#include "wx/settings.h"

 #include "wx/x11/private.h"
 #include "wx/x11/private.h"

+#include "X11/Xutil.h"

 
 bool wxMWMIsRunning(Window w);
 
 
 bool wxMWMIsRunning(Window w);
 


@@ -59,6 +61,8 @@ void wxTopLevelWindowX11::Init()
     m_fsStyle = 0;
     m_fsIsMaximized = FALSE;
     m_fsIsShowing = FALSE;
     m_fsStyle = 0;
     m_fsIsMaximized = FALSE;
     m_fsIsShowing = FALSE;

+    
+    m_focusWidget = NULL;

 }
 
 bool wxTopLevelWindowX11::Create(wxWindow *parent,
 }
 
 bool wxTopLevelWindowX11::Create(wxWindow *parent,


@@ -88,46 +92,116 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     int xscreen = DefaultScreen( xdisplay );
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Window xparent = RootWindow( xdisplay, xscreen );
     int xscreen = DefaultScreen( xdisplay );
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Window xparent = RootWindow( xdisplay, xscreen );

+    Colormap cm = DefaultColormap( xdisplay, xscreen );
+    
+    if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
+        m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
+    else
+        m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+    m_backgroundColour.CalcPixel( (WXColormap) cm );
+    m_hasBgCol = 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 !wxUSE_NANOX

     XSetWindowAttributes xattributes;
     XSizeHints size_hints;
     XSetWindowAttributes xattributes;
     XSizeHints size_hints;

-    XWMHints wm_hints;

     
     long xattributes_mask =
         CWOverrideRedirect |
         CWBorderPixel | CWBackPixel;
     
     long xattributes_mask =
         CWOverrideRedirect |
         CWBorderPixel | CWBackPixel;

-    xattributes.background_pixel = BlackPixel( xdisplay, xscreen );
+
+    xattributes.background_pixel = m_backgroundColour.GetPixel();

     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );

+
+    // TODO: if we want no border, caption etc.,
+    // I think we set this to True to remove decorations
+    // No. RR.

     xattributes.override_redirect = False;
     xattributes.override_redirect = False;

+#endif

     
     

-    Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y, 
-       0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
-    m_mainWidget = (WXWindow) xwindow;
+#if wxUSE_NANOX
+    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());

     
     

-    XSelectInput( xdisplay, xwindow,
-        ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
-        ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
-        KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
-        PropertyChangeMask );
+    Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
+                                    0, 0, InputOutput, xvisual, backColor, foreColor);
+#else
+    Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
+                                    0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#endif
+    m_mainWidget = (WXWindow) xwindow;

 
 

-    wxAddWindowToTable( xwindow, (wxWindow*) this );
-    
-    XSetTransientForHint( xdisplay, xwindow, xparent );
+    int extraFlags = 0;
+#if wxUSE_NANOX
+    extraFlags |= GR_EVENT_MASK_CLOSE_REQ;
+#endif
+
+    XSelectInput( xdisplay, xwindow,
+                  extraFlags |
+                  ExposureMask |
+                  KeyPressMask |
+                  KeyReleaseMask |
+                  ButtonPressMask |
+                  ButtonReleaseMask |
+                  ButtonMotionMask |
+                  EnterWindowMask |
+                  LeaveWindowMask |
+                  PointerMotionMask |
+                  KeymapStateMask |
+                  FocusChangeMask |
+                  ColormapChangeMask |
+                  StructureNotifyMask |
+                  PropertyChangeMask
+                  );

     
     

-    size_hints.flags = PSize;
-    size_hints.width = size.x;
-    size_hints.height = size.y;
+    wxAddWindowToTable( xwindow, (wxWindow*) this );
+
+    // Set background to None which will prevent X11 from clearing the
+    // background completely.
+    XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+
+#if !wxUSE_NANOX
+    if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
+    {
+        if (GetParent() && GetParent()->GetMainWindow())
+        {
+             Window xparentwindow = (Window) GetParent()->GetMainWindow();
+             XSetTransientForHint( xdisplay, xwindow, xparentwindow );
+        }
+    }
+
+    size_hints.flags = PSize | PPosition;
+    size_hints.x = pos2.x;
+    size_hints.y = pos2.y;
+    size_hints.width = size2.x;
+    size_hints.height = size2.y;

     XSetWMNormalHints( xdisplay, xwindow, &size_hints);
     
     XSetWMNormalHints( xdisplay, xwindow, &size_hints);
     

+    XWMHints wm_hints;

     wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */;
     wm_hints.input = True;
     wm_hints.initial_state = NormalState;
     XSetWMHints( xdisplay, xwindow, &wm_hints);
     wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */;
     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);
     
 
     SetTitle(title);
     


@@ -241,6 +315,8 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
 
     if (icon.Ok() && GetMainWindow())
     {
 
     if (icon.Ok() && GetMainWindow())
     {

+#if wxUSE_NANOX
+#else

         XWMHints *wmHints = XAllocWMHints();
         wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();
 
         XWMHints *wmHints = XAllocWMHints();
         wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();
 


@@ -249,11 +325,12 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
         if (icon.GetMask())
         {
             wmHints->flags |= IconMaskHint;
         if (icon.GetMask())
         {
             wmHints->flags |= IconMaskHint;

-            wmHints->icon_mask = (Pixmap) icon.GetMask()->GetPixmap();
+            wmHints->icon_mask = (Pixmap) icon.GetMask()->GetBitmap();

         }
 
         XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);
         XFree(wmHints);
         }
 
         XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);
         XFree(wmHints);

+#endif

     }
 }
 
     }
 }
 


@@ -315,6 +392,69 @@ struct MwmHints {
 // given wxWindows style
 bool wxSetWMDecorations(Window w, long style)
 {
 // given wxWindows style
 bool wxSetWMDecorations(Window w, long style)
 {

+#if wxUSE_NANOX
+    GR_WM_PROPERTIES wmProp;
+
+    wmProp.flags = 0;
+    wmProp.props = 0;
+
+    if (style & wxRESIZE_BORDER)
+    {
+        wmProp.props |= GR_WM_PROPS_APPFRAME ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    if (style & wxSYSTEM_MENU)
+    {
+        wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    if ((style & wxCAPTION) ||
+        (style & wxTINY_CAPTION_HORIZ) ||
+        (style & wxTINY_CAPTION_VERT))
+    {
+        wmProp.props |= GR_WM_PROPS_CAPTION ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+
+        // 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 & wxTHICK_FRAME)
+    {
+        wmProp.props |= GR_WM_PROPS_APPFRAME ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    if (style & wxSIMPLE_BORDER)
+    {
+        wmProp.props |= GR_WM_PROPS_BORDER ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    if (style & wxMINIMIZE_BOX)
+    {
+    }
+
+    if (style & wxMAXIMIZE_BOX)
+    {
+        wmProp.props |= GR_WM_PROPS_MAXIMIZE ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    if (((style & wxBORDER) != wxBORDER) && ((style & wxTHICK_FRAME) != wxTHICK_FRAME)
+        && ((style & wxRESIZE_BORDER) != wxRESIZE_BORDER))
+    {
+        wmProp.props |= GR_WM_PROPS_NODECORATE ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    GrSetWMProperties(w, & wmProp);
+    
+#else

     if (!wxMWMIsRunning(w))
         return FALSE;
 
     if (!wxMWMIsRunning(w))
         return FALSE;
 


@@ -325,12 +465,14 @@ bool wxSetWMDecorations(Window w, long style)
 
     if (style & wxRESIZE_BORDER)
     {
 
     if (style & wxRESIZE_BORDER)
     {

+        // wxLogDebug("MWM_DECOR_RESIZEH");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_RESIZEH;
     }
 
     if (style & wxSYSTEM_MENU)
     {
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_RESIZEH;
     }
 
     if (style & wxSYSTEM_MENU)
     {

+        // wxLogDebug("MWM_DECOR_MENU");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MENU;
     }
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MENU;
     }


@@ -339,30 +481,28 @@ bool wxSetWMDecorations(Window w, long style)
         (style & wxTINY_CAPTION_HORIZ) ||
         (style & wxTINY_CAPTION_VERT))
     {
         (style & wxTINY_CAPTION_HORIZ) ||
         (style & wxTINY_CAPTION_VERT))
     {

+        // wxLogDebug("MWM_DECOR_TITLE");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_TITLE;
     }
 
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_TITLE;
     }
 

-    if (style & wxTHICK_FRAME)
-    {
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_BORDER;
-    }
-
-    if (style & wxTHICK_FRAME)
+    if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION))

     {
     {

+        // wxLogDebug("MWM_DECOR_BORDER");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_BORDER;
     }
 
     if (style & wxMINIMIZE_BOX)
     {
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_BORDER;
     }
 
     if (style & wxMINIMIZE_BOX)
     {

+        // wxLogDebug("MWM_DECOR_MINIMIZE");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MINIMIZE;
     }
 
     if (style & wxMAXIMIZE_BOX)
     {
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MINIMIZE;
     }
 
     if (style & wxMAXIMIZE_BOX)
     {

+        // wxLogDebug("MWM_DECOR_MAXIMIZE");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MAXIMIZE;
     }
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MAXIMIZE;
     }


@@ -373,11 +513,15 @@ bool wxSetWMDecorations(Window w, long style)
                    32, PropModeReplace,
                    (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
 
                    32, PropModeReplace,
                    (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
 

+#endif

     return TRUE;
 }
 
 bool wxMWMIsRunning(Window w)
 {
     return TRUE;
 }
 
 bool wxMWMIsRunning(Window w)
 {

+#if wxUSE_NANOX
+    return FALSE;
+#else

     Display *dpy = (Display*)wxGetDisplay();
     Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False);
 
     Display *dpy = (Display*)wxGetDisplay();
     Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False);
 


@@ -395,24 +539,31 @@ bool wxMWMIsRunning(Window w)
            &type, &format, &length, &bytesafter, &ptr);
 
     return (ret == Success);
            &type, &format, &length, &bytesafter, &ptr);
 
     return (ret == Success);

+#endif

 }
     
 // For implementation purposes - sometimes decorations make the client area
 // smaller
 wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
 {
 }
     
 // 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)))
     {
        wxFrame* frame = (wxFrame*) this;
        if (frame->GetMenuBar())
            return wxPoint(0, frame->GetMenuBar()->GetSize().y);
     }
     if (this->IsKindOf(CLASSINFO(wxFrame)))
     {
        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);
     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)))
     {
        wxFrame* frame = (wxFrame*) this;
     if (this->IsKindOf(CLASSINFO(wxFrame)))
     {
        wxFrame* frame = (wxFrame*) this;


@@ -421,12 +572,13 @@ void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
        if (frame->GetStatusBar())
            (*height) -= frame->GetStatusBar()->GetSize().y;
     }
        if (frame->GetStatusBar())
            (*height) -= frame->GetStatusBar()->GetSize().y;
     }

+#endif

 }
 
 void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
 {
 }
 
 void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
 {

-    // TODO - take menubar and status line into account

     wxWindowX11::DoSetClientSize(width, height);
     wxWindowX11::DoSetClientSize(width, height);

+

 #if 0
     if (!GetMainWindow())
         return;
 #if 0
     if (!GetMainWindow())
         return;


@@ -448,3 +600,87 @@ void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
         valueMask, & windowChanges);
 #endif
 }
         valueMask, & windowChanges);
 #endif
 }

+
+void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    // wxLogDebug( "Setting pos: %d, %d", x, y );
+    wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
+
+    wxPoint pt = GetPosition();
+    // wxLogDebug( "After, pos: %d, %d", pt.x, pt.y );
+#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;
+
+    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))
+    {
+        windowChanges.height = height /* -m_borderSize*2*/;
+        valueMask |= CWHeight;
+    }
+
+    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)
+    {
+        int offsetX = 0;
+        int offsetY = 0;
+       
+#if !wxUSE_NANOX
+        // wxLogDebug("Translating...");
+        Window childWindow;
+        XTranslateCoordinates(wxGlobalDisplay(), window, XDefaultRootWindow(wxGlobalDisplay()),
+                                 0, 0, & offsetX, & offsetY, & childWindow);
+
+        // wxLogDebug("Offset: %d, %d", offsetX, offsetY);
+#endif
+       
+        XWindowAttributes attr;
+        Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
+        wxASSERT(status);
+        
+        if (status)
+        {
+            *x = attr.x + offsetX;
+            *y = attr.y + offsetY;
+        }
+    }
+}