No change

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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 7568f13c88bdbea196311864151f52842ebf57d3..493e7d51c3b05cc176a670d065d60e283e0a81a0 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -36,9 +36,11 @@
 #include "wx/msgdlg.h"
 #include "wx/frame.h"
 #include "wx/scrolwin.h"
 #include "wx/msgdlg.h"
 #include "wx/frame.h"
 #include "wx/scrolwin.h"

+#include "wx/scrolbar.h"

 #include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"

+#include "wx/univ/renderer.h"

 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"


@@ -59,7 +61,9 @@
 // ----------------------------------------------------------------------------
 
 extern wxHashTable *wxWidgetHashTable;
 // ----------------------------------------------------------------------------
 
 extern wxHashTable *wxWidgetHashTable;

+extern wxHashTable *wxClientWidgetHashTable;

 static wxWindow* g_captureWindow = NULL;
 static wxWindow* g_captureWindow = NULL;

+static GC g_eraseGC;

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -97,7 +101,11 @@ void wxWindowX11::Init()
     InitBase();
 
     // X11-specific
     InitBase();
 
     // X11-specific

-    m_mainWidget = (WXWindow) 0;
+    m_mainWindow = (WXWindow) 0;
+    m_clientWindow = (WXWindow) 0;
+    m_insertIntoMain = FALSE;
+    m_updateNcArea = FALSE;
+    

     m_winCaptured = FALSE;
     m_needsInputFocus = FALSE;
     m_isShown = TRUE;
     m_winCaptured = FALSE;
     m_needsInputFocus = FALSE;
     m_isShown = TRUE;


@@ -139,7 +147,14 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
     m_foregroundColour = *wxBLACK;
     m_foregroundColour.CalcPixel( (WXColormap) cm ); 
 
     m_foregroundColour = *wxBLACK;
     m_foregroundColour.CalcPixel( (WXColormap) cm ); 
 

-    Window xparent = (Window) parent->GetMainWindow();
+    Window xparent = (Window) parent->GetClientWindow();
+    
+    // Add window's own scrollbars to main window, not to client window
+    if (parent->GetInsertIntoMain())
+    {
+        // wxLogDebug( "Inserted into main: %s", GetName().c_str() );
+        xparent = (Window) parent->GetMainWindow();
+    }

     
     wxSize size2(size);
     if (size2.x == -1)
     
     wxSize size2(size);
     if (size2.x == -1)


@@ -153,63 +168,165 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
     if (pos2.y == -1)
        pos2.y = 0;
     
     if (pos2.y == -1)
        pos2.y = 0;
     

-#if !wxUSE_NANOX
+#if wxUSE_TWO_WINDOWS
+    bool need_two_windows = 
+        ((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
+#else
+    bool need_two_windows = FALSE;
+#endif
+
+#if wxUSE_NANOX
+    long xattributes = 0;
+#else

     XSetWindowAttributes xattributes;
     XSetWindowAttributes xattributes;

+    long xattributes_mask = 0;

     
     

-    long xattributes_mask =
-        CWBorderPixel | CWBackPixel;
-        
+    xattributes_mask |= CWBackPixel;

     xattributes.background_pixel = m_backgroundColour.GetPixel();
     xattributes.background_pixel = m_backgroundColour.GetPixel();

+    
+    xattributes_mask |= CWBorderPixel;

     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
     
     xattributes_mask |= CWEventMask;
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
     
     xattributes_mask |= CWEventMask;

-    xattributes.event_mask = 
-        ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
-        ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
-        KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
-        PropertyChangeMask | VisibilityChangeMask ;
-
-    if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ))
+#endif
+    
+    if (need_two_windows)

     {
     {

-        xattributes_mask |= CWBitGravity;
-        xattributes.bit_gravity = StaticGravity;
-    }
-
-    Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
-       0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#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());
+    
+        Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
+                                    0, 0, InputOutput, xvisual, backColor, foreColor);
+        XSelectInput( xdisplay, xwindow,
+          GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+          ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+          KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+                      PropertyChangeMask );
+        

 #else
 #else

+        // Normal X11
+        xattributes.event_mask = 
+            ExposureMask | StructureNotifyMask | ColormapChangeMask;
+
+        Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
+            0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+
+#endif
+        
+        XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+    
+        m_mainWindow = (WXWindow) xwindow;
+        wxAddWindowToTable( xwindow, (wxWindow*) this );
+    
+        XMapWindow( xdisplay, xwindow );

 
 

-    int extraFlags = GR_EVENT_MASK_CLOSE_REQ;
+#if !wxUSE_NANOX    
+        xattributes.event_mask = 
+            ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+            ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+            KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+            PropertyChangeMask | VisibilityChangeMask ;

 
 

-    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());
+        if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ))
+        {
+            xattributes_mask |= CWBitGravity;
+            xattributes.bit_gravity = StaticGravity;
+        }
+#endif
+        
+        if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER))
+        {
+            pos2.x = 2;
+            pos2.y = 2;
+            size2.x -= 4;
+            size2.y -= 4;
+        } else
+        if (HasFlag( wxSIMPLE_BORDER ))
+        {
+            pos2.x = 1;
+            pos2.y = 1;
+            size2.x -= 2;
+            size2.y -= 2;
+        } else
+        {
+            pos2.x = 0;
+            pos2.y = 0;
+        }
+#if wxUSE_NANOX        
+        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, pos2.x, pos2.y, size2.x, size2.y, 
+        xwindow = XCreateWindowWithColor( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y, 

                                     0, 0, InputOutput, xvisual, backColor, foreColor);
                                     0, 0, InputOutput, xvisual, backColor, foreColor);

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

 #endif
 #endif

+        
+        XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+    
+        m_clientWindow = (WXWindow) xwindow;
+        wxAddClientWindowToTable( xwindow, (wxWindow*) this );
+        
+        XMapWindow( xdisplay, xwindow );
+    }
+    else
+    {
+        // wxLogDebug( "No two windows needed %s", GetName().c_str() );
+#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());

     
     

-    m_mainWidget = (WXWindow) xwindow;
+        Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
+                                    0, 0, InputOutput, xvisual, backColor, foreColor);
+        XSelectInput( xdisplay, xwindow,
+          GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+          ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+          KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+                      PropertyChangeMask );
+        
+#else
+        xattributes.event_mask = 
+            ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+            ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+            KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+            PropertyChangeMask | VisibilityChangeMask ;
+
+        if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ))
+        {
+            xattributes_mask |= CWBitGravity;
+            xattributes.bit_gravity = NorthWestGravity;
+        }

 
 

-    wxAddWindowToTable( xwindow, (wxWindow*) this );
+        Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
+            0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#endif
+        
+        XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+    
+        m_mainWindow = (WXWindow) xwindow;
+        m_clientWindow = m_mainWindow;
+        wxAddWindowToTable( xwindow, (wxWindow*) this );
+        
+        XMapWindow( xdisplay, xwindow );
+    }

 
     // Is a subwindow, so map immediately
     m_isShown = TRUE;
 
     // Is a subwindow, so map immediately
     m_isShown = TRUE;

-    XMapWindow( xdisplay, xwindow );

 
     // Without this, the cursor may not be restored properly (e.g. in splitter
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     // Without this, the cursor may not be restored properly (e.g. in splitter
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

-    
-    // Set background to None which will prevent X11 from clearing the
-    // background comletely.
-    XSetWindowBackgroundPixmap( xdisplay, xwindow, None );

 
     // Don't call this, it can have nasty repercussions for composite controls,
     // for example
 
     // Don't call this, it can have nasty repercussions for composite controls,
     // for example


@@ -226,22 +343,25 @@ wxWindowX11::~wxWindowX11()
     
     m_isBeingDeleted = TRUE;
     
     
     m_isBeingDeleted = TRUE;
     

-    // X11-specific actions first
-    Window xwindow = (Window) m_mainWidget;
-

     if (m_parent)
         m_parent->RemoveChild( this );
 
     DestroyChildren();
 
     if (m_parent)
         m_parent->RemoveChild( this );
 
     DestroyChildren();
 

-    // Destroy the window
-    if (xwindow)
+    if (m_clientWindow != m_mainWindow)

     {
     {

-        XSelectInput( wxGlobalDisplay(), xwindow, NoEventMask);
-        wxDeleteWindowFromTable( xwindow );
+        // Destroy the cleint window
+        Window xwindow = (Window) m_clientWindow;
+        wxDeleteClientWindowFromTable( xwindow );

         XDestroyWindow( wxGlobalDisplay(), xwindow );
         XDestroyWindow( wxGlobalDisplay(), xwindow );

-        m_mainWidget = NULL;
+        m_clientWindow = NULL;

     }
     }

+        
+    // Destroy the window
+    Window xwindow = (Window) m_mainWindow;
+    wxDeleteWindowFromTable( xwindow );
+    XDestroyWindow( wxGlobalDisplay(), xwindow );
+    m_mainWindow = NULL;

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


@@ -250,7 +370,7 @@ wxWindowX11::~wxWindowX11()
 
 void wxWindowX11::SetFocus()
 {
 
 void wxWindowX11::SetFocus()
 {

-    Window xwindow = (Window) GetMainWindow();
+    Window xwindow = (Window) m_clientWindow;

     
     wxCHECK_RET( xwindow, wxT("invalid window") );
     
     
     wxCHECK_RET( xwindow, wxT("invalid window") );
     


@@ -285,6 +405,10 @@ wxWindow *wxWindowBase::FindFocus()
     if (xfocus)
     {
         wxWindow *win = wxGetWindowFromTable( xfocus );
     if (xfocus)
     {
         wxWindow *win = wxGetWindowFromTable( xfocus );

+        if (!win)
+        {
+            win = wxGetClientWindowFromTable( xfocus );
+        }

 
         return win;
     }
 
         return win;
     }


@@ -292,19 +416,6 @@ wxWindow *wxWindowBase::FindFocus()
     return NULL;
 }
 
     return NULL;
 }
 

-wxWindow *wxWindowX11::GetFocusWidget()
-{
-   wxWindow *win = (wxWindow*) this;
-   while (!win->IsTopLevel())
-   {
-       win = win->GetParent();
-       if (!win)
-           return (wxWindow*) NULL;
-   }
-   
-   return win;
-}
-

 // Enabling/disabling handled by event loop, and not sending events
 // if disabled.
 bool wxWindowX11::Enable(bool enable)
 // Enabling/disabling handled by event loop, and not sending events
 // if disabled.
 bool wxWindowX11::Enable(bool enable)


@@ -319,18 +430,17 @@ bool wxWindowX11::Show(bool show)
 {
     wxWindowBase::Show(show);
 
 {
     wxWindowBase::Show(show);
 

-    Window xwin = (Window) GetXWindow();
-    Display *xdisp = (Display*) GetXDisplay();
+    Window xwindow = (Window) m_mainWindow;
+    Display *xdisp = wxGlobalDisplay();

     if (show)
     {
         // wxLogDebug( "Mapping window of type %s", GetName().c_str() );
     if (show)
     {
         // wxLogDebug( "Mapping window of type %s", GetName().c_str() );

-        XMapWindow(xdisp, xwin);
-        XSync(xdisp, False);
+        XMapWindow(xdisp, xwindow);

     }
     else
     {
         // wxLogDebug( "Unmapping window of type %s", GetName().c_str() );
     }
     else
     {
         // wxLogDebug( "Unmapping window of type %s", GetName().c_str() );

-        XUnmapWindow(xdisp, xwin);
+        XUnmapWindow(xdisp, xwindow);

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -339,15 +449,15 @@ bool wxWindowX11::Show(bool show)
 // Raise the window to the top of the Z order
 void wxWindowX11::Raise()
 {
 // Raise the window to the top of the Z order
 void wxWindowX11::Raise()
 {

-    if (m_mainWidget)
-        XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWidget );
+    if (m_mainWindow)
+        XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWindow );

 }
 
 // Lower the window to the bottom of the Z order
 void wxWindowX11::Lower()
 {
 }
 
 // Lower the window to the bottom of the Z order
 void wxWindowX11::Lower()
 {

-    if (m_mainWidget)
-        XLowerWindow( wxGlobalDisplay(), (Window) m_mainWidget );
+    if (m_mainWindow)
+        XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow );

 }
 
 void wxWindowX11::DoCaptureMouse()
 }
 
 void wxWindowX11::DoCaptureMouse()


@@ -365,7 +475,7 @@ void wxWindowX11::DoCaptureMouse()
     if (m_winCaptured)
         return;
 
     if (m_winCaptured)
         return;
 

-    Window xwindow = (Window) GetMainWindow();
+    Window xwindow = (Window) m_clientWindow;

 
     wxCHECK_RET( xwindow, wxT("invalid window") );
     
 
     wxCHECK_RET( xwindow, wxT("invalid window") );
     


@@ -395,44 +505,6 @@ void wxWindowX11::DoCaptureMouse()
             return;
         }
 
             return;
         }
 

-        // wxLogDebug("Grabbed pointer in %s", GetName().c_str() );
-
-#if 0
-        res = XGrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
-            (Window) GetMainWindow(),
-            FALSE,
-            ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
-               GrabModeAsync,
-               GrabModeAsync,
-            None,
-            None);
-       
-        if (res != GrabSuccess)
-        {
-            wxLogDebug("Failed to grab mouse buttons.");
-            XUngrabPointer(wxGlobalDisplay(), CurrentTime);
-            return;
-        }
-#endif
-
-#if 0
-        res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(),
-            ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask,
-            FALSE,
-            GrabModeAsync,
-               GrabModeAsync,
-            CurrentTime);
-
-        if (res != GrabSuccess)
-        {
-            wxLogDebug("Failed to grab keyboard.");
-            XUngrabPointer(wxGlobalDisplay(), CurrentTime);
-            XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
-                (Window) GetMainWindow());
-            return;
-        }
-#endif
-       

         m_winCaptured = TRUE;
     }
 }
         m_winCaptured = TRUE;
     }
 }


@@ -444,15 +516,11 @@ void wxWindowX11::DoReleaseMouse()
     if ( !m_winCaptured )
         return;
 
     if ( !m_winCaptured )
         return;
 

-    Window xwindow = (Window) GetMainWindow();
+    Window xwindow = (Window) m_clientWindow;

 
     if (xwindow)
     {
         XUngrabPointer( wxGlobalDisplay(), CurrentTime );
 
     if (xwindow)
     {
         XUngrabPointer( wxGlobalDisplay(), CurrentTime );

-#if 0
-        XUngrabButton( wxGlobalDisplay(), AnyButton, AnyModifier, xwindow);
-        XUngrabKeyboard( wxGlobalDisplay(), CurrentTime );
-#endif

     }
     
     // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() );
     }
     
     // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() );


@@ -479,7 +547,7 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    Window xwindow = (Window) GetMainWindow();
+    Window xwindow = (Window) m_clientWindow;

 
     wxCHECK_MSG( xwindow, FALSE, wxT("invalid window") );
     
 
     wxCHECK_MSG( xwindow, FALSE, wxT("invalid window") );
     


@@ -499,7 +567,7 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor)
 // Coordinates relative to the window
 void wxWindowX11::WarpPointer (int x, int y)
 {
 // Coordinates relative to the window
 void wxWindowX11::WarpPointer (int x, int y)
 {

-    Window xwindow = (Window) GetMainWindow();
+    Window xwindow = (Window) m_clientWindow;

 
     wxCHECK_RET( xwindow, wxT("invalid window") );
     
 
     wxCHECK_RET( xwindow, wxT("invalid window") );
     


@@ -532,7 +600,7 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
         m_clearRegion.Intersect( 0, 0, cw, ch );
     }
     
         m_clearRegion.Intersect( 0, 0, cw, ch );
     }
     

-    Window xwindow = (Window) GetMainWindow();
+    Window xwindow = (Window) GetClientWindow();

 
     wxCHECK_RET( xwindow, wxT("invalid window") );
 
 
     wxCHECK_RET( xwindow, wxT("invalid window") );
 


@@ -560,9 +628,13 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
         GetClientSize( &cw, &ch );
     }
     
         GetClientSize( &cw, &ch );
     }
     

+#if wxUSE_TWO_WINDOWS
+    wxPoint offset( 0,0 );
+#else

     wxPoint offset = GetClientAreaOrigin();
     s_x += offset.x;
     s_y += offset.y;
     wxPoint offset = GetClientAreaOrigin();
     s_x += offset.x;
     s_y += offset.y;

+#endif

         
     int w = cw - abs(dx);
     int h = ch - abs(dy);
         
     int w = cw - abs(dx);
     int h = ch - abs(dy);


@@ -644,7 +716,7 @@ bool wxWindowX11::PreResize()
 // Get total size
 void wxWindowX11::DoGetSize(int *x, int *y) const
 {
 // Get total size
 void wxWindowX11::DoGetSize(int *x, int *y) const
 {

-    Window xwindow = (Window) GetMainWindow();
+    Window xwindow = (Window) m_mainWindow;

 
     wxCHECK_RET( xwindow, wxT("invalid window") );
     
 
     wxCHECK_RET( xwindow, wxT("invalid window") );
     


@@ -663,7 +735,7 @@ void wxWindowX11::DoGetSize(int *x, int *y) const
 
 void wxWindowX11::DoGetPosition(int *x, int *y) const
 {
 
 void wxWindowX11::DoGetPosition(int *x, int *y) const
 {

-    Window window = (Window) m_mainWidget;
+    Window window = (Window) m_mainWindow;

     if (window)
     {
         //XSync(wxGlobalDisplay(), False);
     if (window)
     {
         //XSync(wxGlobalDisplay(), False);


@@ -692,7 +764,7 @@ void wxWindowX11::DoScreenToClient(int *x, int *y) const
 {
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
 {
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));

-    Window thisWindow = (Window) m_mainWidget;
+    Window thisWindow = (Window) m_clientWindow;

 
     Window childWindow;
     int xx = *x;
 
     Window childWindow;
     int xx = *x;


@@ -704,7 +776,7 @@ void wxWindowX11::DoClientToScreen(int *x, int *y) const
 {
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
 {
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));

-    Window thisWindow = (Window) m_mainWidget;
+    Window thisWindow = (Window) m_clientWindow;

 
     Window childWindow;
     int xx = *x;
 
     Window childWindow;
     int xx = *x;


@@ -716,11 +788,10 @@ void wxWindowX11::DoClientToScreen(int *x, int *y) const
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 void wxWindowX11::DoGetClientSize(int *x, int *y) const
 {
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 void wxWindowX11::DoGetClientSize(int *x, int *y) const
 {

-    Window window = (Window) m_mainWidget;
+    Window window = (Window) m_mainWindow;

 
     if (window)
     {
 
     if (window)
     {

-        //XSync(wxGlobalDisplay(), False);  // Is this really a good idea?

         XWindowAttributes attr;
         Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );
         wxASSERT(status);
         XWindowAttributes attr;
         Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );
         wxASSERT(status);


@@ -735,7 +806,9 @@ void wxWindowX11::DoGetClientSize(int *x, int *y) const
 
 void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 
 void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

-    Window xwindow = (Window) GetMainWindow();
+    //    wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height);
+    
+    Window xwindow = (Window) m_mainWindow;

 
     wxCHECK_RET( xwindow, wxT("invalid window") );
 
 
     wxCHECK_RET( xwindow, wxT("invalid window") );
 


@@ -747,8 +820,7 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     int new_y = attr.y;
     int new_w = attr.width;
     int new_h = attr.height;
     int new_y = attr.y;
     int new_w = attr.width;
     int new_h = attr.height;

-            
-
+    

     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
         int yy = 0;
     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
         int yy = 0;


@@ -779,34 +851,29 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
 void wxWindowX11::DoSetClientSize(int width, int height)
 {
 
 void wxWindowX11::DoSetClientSize(int width, int height)
 {

-    Window xwindow = (Window) GetMainWindow();
+    //    wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height);
+    
+    Window xwindow = (Window) m_mainWindow;

 
     wxCHECK_RET( xwindow, wxT("invalid window") );
 
 
     wxCHECK_RET( xwindow, wxT("invalid window") );
 

-#if 1
-

     XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
     XResizeWindow( wxGlobalDisplay(), xwindow, width, height );

-
-#else
-
-    XWindowAttributes attr;
-    Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
-    wxCHECK_RET( status, wxT("invalid window attributes") );
+    
+    if (m_mainWindow != m_clientWindow)
+    {
+        xwindow = (Window) m_clientWindow;

         
         

-    int new_x = attr.x;
-    int new_y = attr.y;
-    int new_w = attr.width;
-    int new_h = attr.height;
-            
-    if (width != -1)
-        new_w = width;
+        wxWindow *window = (wxWindow*) this;
+        wxRenderer *renderer = window->GetRenderer();
+        if (renderer)
+        {
+            wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
+            width -= border.x + border.width;
+            height -= border.y + border.height;
+        }

         
         

-    if (height != -1)
-        new_h = height;
-    
-    DoMoveWindow( new_x, new_y, new_w, new_h );
-    
-#endif
+        XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
+    }

 }
 
 // For implementation purposes - sometimes decorations make the client area
 }
 
 // For implementation purposes - sometimes decorations make the client area


@@ -816,6 +883,66 @@ wxPoint wxWindowX11::GetClientAreaOrigin() const
     return wxPoint(0, 0);
 }
 
     return wxPoint(0, 0);
 }
 

+void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
+{
+    Window xwindow = (Window) m_mainWindow;
+
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+#if !wxUSE_NANOX
+
+    XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, width, height );
+    if (m_mainWindow != m_clientWindow)
+    {
+        xwindow = (Window) m_clientWindow;
+        
+        wxWindow *window = (wxWindow*) this;
+        wxRenderer *renderer = window->GetRenderer();
+        if (renderer)
+        {
+            wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
+            x = border.x;
+            y = border.y;
+            width -= border.x + border.width;
+            height -= border.y + border.height;
+        }
+        else
+        {
+            x = 0;
+            y = 0;
+        }
+        
+        wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
+        if (sb && sb->IsShown())
+        {
+            wxSize size = sb->GetSize();
+            height -= size.y;
+        }
+        sb = window->GetScrollbar( wxVERTICAL );
+        if (sb && sb->IsShown())
+        {
+            wxSize size = sb->GetSize();
+            width -= size.x;
+        }
+        
+        XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, wxMax(1, width), wxMax(1, height) );
+    }
+    
+#else    
+
+    XWindowChanges windowChanges;
+    windowChanges.x = x;
+    windowChanges.y = y;
+    windowChanges.width = width;
+    windowChanges.height = height;
+    windowChanges.stack_mode = 0;
+    int valueMask = CWX | CWY | CWWidth | CWHeight;
+
+    XConfigureWindow( wxGlobalDisplay(), xwindow, valueMask, &windowChanges );
+    
+#endif
+}
+

 void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
 {
     m_minWidth = minW;
 void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
 {
     m_minWidth = minW;


@@ -846,48 +973,7 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW,
         sizeHints.height_inc = incH;
     }
 
         sizeHints.height_inc = incH;
     }
 

-    XSetWMNormalHints(wxGlobalDisplay(), (Window) GetMainWindow(), & sizeHints);
-#endif
-}
-
-void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
-{
-    Window xwindow = (Window) GetMainWindow();
-
-    wxCHECK_RET( xwindow, wxT("invalid window") );
-
-#if !wxUSE_NANOX
-
-    XWindowAttributes attr;
-    Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
-    wxCHECK_RET( status, wxT("invalid window attributes") );
-    
-    if (attr.width == width && attr.height == height)
-    {
-        XMoveWindow( wxGlobalDisplay(), xwindow, x, y );
-        return;
-    }
-    
-    if (attr.x == x && attr.y == y)
-    {
-        XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
-        return;
-    }
-    
-    XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, width, height );
-    
-#else    
-
-    XWindowChanges windowChanges;
-    windowChanges.x = x;
-    windowChanges.y = y;
-    windowChanges.width = width;
-    windowChanges.height = height;
-    windowChanges.stack_mode = 0;
-    int valueMask = CWX | CWY | CWWidth | CWHeight;
-
-    XConfigureWindow( wxGlobalDisplay(), xwindow, valueMask, &windowChanges );
-    
+    XSetWMNormalHints(wxGlobalDisplay(), (Window) m_mainWindow, &sizeHints );

 #endif
 }
 
 #endif
 }
 


@@ -899,7 +985,7 @@ int wxWindowX11::GetCharHeight() const
 {
     wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
 
 {
     wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
 

-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay());

 
     int direction, ascent, descent;
     XCharStruct overall;
 
     int direction, ascent, descent;
     XCharStruct overall;


@@ -914,7 +1000,7 @@ int wxWindowX11::GetCharWidth() const
 {
     wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
 
 {
     wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
 

-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay());

 
     int direction, ascent, descent;
     XCharStruct overall;
 
     int direction, ascent, descent;
     XCharStruct overall;


@@ -934,7 +1020,7 @@ void wxWindowX11::GetTextExtent(const wxString& string,
 
     wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
 
 
     wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
 

-    WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, GetXDisplay());
+    WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, wxGlobalDisplay());

 
     int direction, ascent, descent2;
     XCharStruct overall;
 
     int direction, ascent, descent2;
     XCharStruct overall;


@@ -1002,9 +1088,16 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
 
 void wxWindowX11::Update()
 {
 
 void wxWindowX11::Update()
 {

+    if (m_updateNcArea)
+    {
+        // wxLogDebug("wxWindowX11::UpdateNC: %s", GetClassInfo()->GetClassName());
+        // Send nc paint events.
+        SendNcPaintEvents();
+    }
+        

     if (!m_updateRegion.IsEmpty())
     {
     if (!m_updateRegion.IsEmpty())
     {

-        //        wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName());
+        // wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName());

         // Actually send erase events.
         SendEraseEvents();
         
         // Actually send erase events.
         SendEraseEvents();
         


@@ -1015,37 +1108,35 @@ void wxWindowX11::Update()
 
 void wxWindowX11::Clear()
 {
 
 void wxWindowX11::Clear()
 {

-    wxClientDC dc((wxWindow*) this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
+//    wxClientDC dc((wxWindow*) this);
+//    wxBrush brush(GetBackgroundColour(), wxSOLID);
+//    dc.SetBackground(brush);
+//    dc.Clear();

 }
 
 void wxWindowX11::SendEraseEvents()
 {
     if (m_clearRegion.IsEmpty()) return;
     
 }
 
 void wxWindowX11::SendEraseEvents()
 {
     if (m_clearRegion.IsEmpty()) return;
     

-    wxWindowDC dc( (wxWindow*)this );
+    wxClientDC dc( (wxWindow*)this );

     dc.SetClippingRegion( m_clearRegion );
     
     wxEraseEvent erase_event( GetId(), &dc );
     erase_event.SetEventObject( this );
 
     dc.SetClippingRegion( m_clearRegion );
     
     wxEraseEvent erase_event( GetId(), &dc );
     erase_event.SetEventObject( this );
 

-    if (!GetEventHandler()->ProcessEvent(erase_event))
+    if (!GetEventHandler()->ProcessEvent(erase_event) )

     {
     {

-        Window xwindow = (Window) GetMainWindow();

         Display *xdisplay = wxGlobalDisplay();
         Display *xdisplay = wxGlobalDisplay();

-        GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
-        XSetFillStyle( xdisplay, xgc, FillSolid );
-        XSetForeground( xdisplay, xgc, m_backgroundColour.GetPixel() );
+        Window xwindow = (Window) GetClientWindow();
+        XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() );
+        

         wxRegionIterator upd( m_clearRegion );
         while (upd)
         {
         wxRegionIterator upd( m_clearRegion );
         while (upd)
         {

-            XFillRectangle( xdisplay, xwindow, xgc,
+            XFillRectangle( xdisplay, xwindow, g_eraseGC,

                             upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
             upd ++;
         }
                             upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
             upd ++;
         }

-        XFreeGC( xdisplay, xgc );

     }
     
     m_clearRegion.Clear();
     }
     
     m_clearRegion.Clear();


@@ -1053,12 +1144,10 @@ void wxWindowX11::SendEraseEvents()
 
 void wxWindowX11::SendPaintEvents()
 {
 
 void wxWindowX11::SendPaintEvents()
 {

+    //    wxLogDebug("SendPaintEvents: %s (%ld)", GetClassInfo()->GetClassName(), GetId());
+

     m_clipPaintRegion = TRUE;
     
     m_clipPaintRegion = TRUE;
     

-    wxNcPaintEvent nc_paint_event( GetId() );
-    nc_paint_event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( nc_paint_event );
-

     wxPaintEvent paint_event( GetId() );
     paint_event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( paint_event );
     wxPaintEvent paint_event( GetId() );
     paint_event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( paint_event );


@@ -1068,6 +1157,46 @@ void wxWindowX11::SendPaintEvents()
     m_clipPaintRegion = FALSE;
 }
 
     m_clipPaintRegion = FALSE;
 }
 

+void wxWindowX11::SendNcPaintEvents()
+{
+    wxWindow *window = (wxWindow*) this;
+
+    // All this for drawing the small square between the scrollbars.
+    int width = 0;
+    int height = 0;
+    int x = 0;
+    int y = 0;
+    wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
+    if (sb && sb->IsShown())
+    {
+        height = sb->GetSize().y;
+        y = sb->GetPosition().y;
+        
+        sb = window->GetScrollbar( wxVERTICAL );
+        if (sb && sb->IsShown())
+        {
+            width = sb->GetSize().x;
+            x = sb->GetPosition().x;
+
+            Display *xdisplay = wxGlobalDisplay();
+            Window xwindow = (Window) GetMainWindow();
+            Colormap cm = (Colormap) wxTheApp->GetMainColormap( wxGetDisplay() );
+            wxColour colour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+            colour.CalcPixel( (WXColormap) cm );
+            
+            XSetForeground( xdisplay, g_eraseGC, colour.GetPixel() );
+        
+            XFillRectangle( xdisplay, xwindow, g_eraseGC, x, y, width, height );
+        }
+    }
+        
+    wxNcPaintEvent nc_paint_event( GetId() );
+    nc_paint_event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( nc_paint_event );
+    
+    m_updateNcArea = FALSE;
+}
+

 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------


@@ -1140,28 +1269,53 @@ void wxDeleteWindowFromTable(Window w)
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// add/remove window from the table
+// function which maintain the global hash table mapping client widgets

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// ----------------------------------------------------------------------------
-// X11-specific accessors
-// ----------------------------------------------------------------------------
+bool wxAddClientWindowToTable(Window w, wxWindow *win)
+{
+    wxWindow *oldItem = NULL;
+    if ((oldItem = (wxWindow *)wxClientWidgetHashTable->Get ((long) w)))
+    {
+        wxLogDebug("Client window table clash: new window is %ld, %s",
+                   (long)w, win->GetClassInfo()->GetClassName());
+        return FALSE;
+    }
+
+    wxClientWidgetHashTable->Put((long) w, win);

 
 

-// Get the underlying X window
-WXWindow wxWindowX11::GetXWindow() const
+    wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",
+               w, win, win->GetClassInfo()->GetClassName());
+
+    return TRUE;
+}
+
+wxWindow *wxGetClientWindowFromTable(Window w)

 {
 {

-    return GetMainWindow();
+    return (wxWindow *)wxClientWidgetHashTable->Get((long) w);

 }
 
 }
 

-// Get the underlying X display
-WXDisplay *wxWindowX11::GetXDisplay() const
+void wxDeleteClientWindowFromTable(Window w)

 {
 {

-    return wxGetDisplay();
+    wxClientWidgetHashTable->Delete((long)w);

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// add/remove window from the table
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// X11-specific accessors
+// ----------------------------------------------------------------------------
+

 WXWindow wxWindowX11::GetMainWindow() const
 {
 WXWindow wxWindowX11::GetMainWindow() const
 {

-    return m_mainWidget;
+    return m_mainWindow;
+}
+
+WXWindow wxWindowX11::GetClientWindow() const
+{
+    return m_clientWindow;

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


@@ -1343,19 +1497,10 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col)
 
     m_backgroundColour.CalcPixel( (WXColormap) cm );
     
 
     m_backgroundColour.CalcPixel( (WXColormap) cm );
     

-    if (!GetMainWindow())
-        return FALSE;
-
-/*
-    XSetWindowAttributes attrib;
-    attrib.background_pixel = colour.GetPixel();
-
-    XChangeWindowAttributes(wxGlobalDisplay(),
-        (Window) GetMainWindow(),
-        CWBackPixel,
-        & attrib);
-*/
-
+    // We don't set the background colour as we paint
+    // the background ourselves.
+    // XSetWindowBackground( xdisplay, (Window) m_clientWindow, m_backgroundColour.GetPixel() );
+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -1421,3 +1566,38 @@ wxPoint wxGetMousePosition()
 
 int wxNoOptimize::ms_count = 0;
 
 
 int wxNoOptimize::ms_count = 0;
 

+
+// ----------------------------------------------------------------------------
+// wxDCModule
+// ----------------------------------------------------------------------------
+
+class wxWinModule : public wxModule
+{
+public:
+    bool OnInit();
+    void OnExit();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxWinModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule)
+
+bool wxWinModule::OnInit()
+{
+    Display *xdisplay = wxGlobalDisplay();
+    int xscreen = DefaultScreen( xdisplay );
+    Window xroot = RootWindow( xdisplay, xscreen );
+    g_eraseGC = XCreateGC( xdisplay, xroot, 0, NULL );
+    XSetFillStyle( xdisplay, g_eraseGC, FillSolid );
+    
+    return TRUE;
+}
+
+void wxWinModule::OnExit()
+{
+    Display *xdisplay = wxGlobalDisplay();
+    XFreeGC( xdisplay, g_eraseGC );
+}
+
+