don't give error messages if ws2_32.dll is not available in wxGetHostName()

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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 05a8a767f9fa662f7cf4ba53c43d4815f65b949d..f84025ee9b54172a76fc394d855a2cae4c1f1447 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "window.h"
 #endif
 
     #pragma implementation "window.h"
 #endif
 


@@ -36,9 +36,13 @@
 #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/fontutil.h"
+#include "wx/univ/renderer.h"
+#include "wx/hash.h"

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


@@ -59,7 +63,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


@@ -93,15 +99,15 @@ END_EVENT_TABLE()
 
 void wxWindowX11::Init()
 {
 
 void wxWindowX11::Init()
 {

-    // generic initializations first
-    InitBase();
-

     // X11-specific
     // 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;

-    m_isBeingDeleted = FALSE;

     m_lastTS = 0;
     m_lastButton = 0;
 }
     m_lastTS = 0;
     m_lastButton = 0;
 }


@@ -113,101 +119,213 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
                       long style,
                       const wxString& name)
 {
                       long style,
                       const wxString& name)
 {

-    wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" );
+    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );

 
     CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
 
     parent->AddChild(this);
 
 
     CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
 
     parent->AddChild(this);
 

-    int w = size.GetWidth();
-    int h = size.GetHeight();
-    int x = size.GetX();
-    int y = size.GetY();
-    if (w == -1) w = 20;
-    if (h == -1) h = 20;
-    if (x == -1) x = 0;
-    if (y == -1) y = 0;
-

     Display *xdisplay = (Display*) wxGlobalDisplay();
     int xscreen = DefaultScreen( xdisplay );
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Colormap cm = DefaultColormap( xdisplay, xscreen );
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     Display *xdisplay = (Display*) wxGlobalDisplay();
     int xscreen = DefaultScreen( xdisplay );
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Colormap cm = DefaultColormap( xdisplay, xscreen );
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

-    m_backgroundColour.CalcPixel( (WXColormap) cm ); 
-    
+    m_backgroundColour.CalcPixel( (WXColormap) cm );
+

     m_foregroundColour = *wxBLACK;
     m_foregroundColour = *wxBLACK;

-    m_foregroundColour.CalcPixel( (WXColormap) cm ); 
+    m_foregroundColour.CalcPixel( (WXColormap) cm );

 
 

-    Window xparent = (Window) parent->GetMainWindow();
+    Window xparent = (Window) parent->GetClientAreaWindow();

 
 

-#if !wxUSE_NANOX
-    XSetWindowAttributes xattributes;
-    
-    long xattributes_mask =
-        CWEventMask |
-        CWBorderPixel | CWBackPixel;
-        
-    xattributes.background_pixel = m_backgroundColour.GetPixel();
-    xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
-    
-    xattributes.event_mask = 
-        ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
-        ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
-        KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
-        PropertyChangeMask;
-#endif
-    
+    // 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();
+    }
+
+    // Size (not including the border) must be nonzero (or a Value error results)!
+    // Note: The Xlib manual doesn't mention this restriction of XCreateWindow.

     wxSize size2(size);
     wxSize size2(size);

-    if (size2.x == -1)
-       size2.x = 20;
-    if (size2.y == -1)
-       size2.y = 20;
+    if (size2.x <= 0)
+        size2.x = 20;
+    if (size2.y <= 0)
+        size2.y = 20;

 
     wxPoint pos2(pos);
     if (pos2.x == -1)
 
     wxPoint pos2(pos);
     if (pos2.x == -1)

-       pos2.x = 0;
+        pos2.x = 0;

     if (pos2.y == -1)
     if (pos2.y == -1)

-       pos2.y = 0;
-    
+        pos2.y = 0;
+
+#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;
+    long xattributes_mask = 0;
+
+    xattributes_mask |= CWBackPixel;
+    xattributes.background_pixel = m_backgroundColour.GetPixel();
+
+    xattributes_mask |= CWBorderPixel;
+    xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
+
+    xattributes_mask |= CWEventMask;
+#endif
+
+    if (need_two_windows)
+    {
+#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
+        // 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 );
+
+#if !wxUSE_NANOX
+        xattributes.event_mask =
+            ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+            ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+            KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+            PropertyChangeMask | VisibilityChangeMask ;
+
+        if (!HasFlag( wxFULL_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;
+        }
+
+        // Make again sure the size is nonzero.
+        if (size2.x <= 0)
+            size2.x = 1;
+        if (size2.y <= 0)
+            size2.y = 1;
+
+#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());
+
+        xwindow = XCreateWindowWithColor( xdisplay, xwindow, 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
+        xwindow = XCreateWindow( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y,
+            0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#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
 #if wxUSE_NANOX

-    int extraFlags = GR_EVENT_MASK_CLOSE_REQ;
+        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());

 
 

-    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, 
+        Window xwindow = XCreateWindowWithColor( xdisplay, xparent, 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
 
 #else

+        xattributes.event_mask =
+            ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+            ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+            KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+            PropertyChangeMask | VisibilityChangeMask ;

 
 

-    Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
-       0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+        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 );

 #endif
 #endif

-    
-    m_mainWidget = (WXWindow) xwindow;

 
 

-    wxAddWindowToTable( xwindow, (wxWindow*) this );
+        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


@@ -219,27 +337,29 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
 // Destructor
 wxWindowX11::~wxWindowX11()
 {
 // Destructor
 wxWindowX11::~wxWindowX11()
 {

+    SendDestroyEvent();
+

     if (g_captureWindow == this)
     if (g_captureWindow == this)

-       g_captureWindow = NULL;
-    
-    m_isBeingDeleted = TRUE;
-    
-    // X11-specific actions first
-    Window xwindow = (Window) m_mainWidget;
+        g_captureWindow = NULL;

 
 

-    if (m_parent)
-        m_parent->RemoveChild( this );
+    m_isBeingDeleted = TRUE;

 
     DestroyChildren();
 
 
     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;

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


@@ -248,13 +368,25 @@ 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") );
 

+    wxCHECK_RET( AcceptsFocus(), wxT("set focus on window that doesn't accept the focus") );
+
+#if 0
+    if (GetName() == "scrollBar")
+    {
+        char *crash = NULL;
+        *crash = 0;
+    }
+#endif
+

     if (wxWindowIsVisible(xwindow))
     {
     if (wxWindowIsVisible(xwindow))
     {

-        XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
+        wxLogTrace( _T("focus"), _T("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName());
+        //        XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
+        XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime );

         m_needsInputFocus = FALSE;
     }
     else
         m_needsInputFocus = FALSE;
     }
     else


@@ -273,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;
     }


@@ -280,26 +416,13 @@ 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)
 {
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
 // Enabling/disabling handled by event loop, and not sending events
 // if disabled.
 bool wxWindowX11::Enable(bool enable)
 {
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;

-   
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -307,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;


@@ -327,36 +449,36 @@ 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()
 {
     if ((g_captureWindow != NULL) && (g_captureWindow != this))
     {
 }
 
 void wxWindowX11::DoCaptureMouse()
 {
     if ((g_captureWindow != NULL) && (g_captureWindow != this))
     {

-        wxASSERT_MSG(FALSE, "Trying to capture before mouse released.");
+        wxASSERT_MSG(FALSE, wxT("Trying to capture before mouse released."));

 
         // Core dump now
         int *tmp = NULL;
         (*tmp) = 1;
         return;
     }
 
         // Core dump now
         int *tmp = NULL;
         (*tmp) = 1;
         return;
     }

-    
+

     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") );

-    
+

     g_captureWindow = (wxWindow*) this;
 
     if (xwindow)
     g_captureWindow = (wxWindow*) this;
 
     if (xwindow)


@@ -365,7 +487,7 @@ void wxWindowX11::DoCaptureMouse()
             FALSE,
             ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
             GrabModeAsync,
             FALSE,
             ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
             GrabModeAsync,

-               GrabModeAsync,
+            GrabModeAsync,

             None,
             None, /* cursor */ // TODO: This may need to be set to the cursor of this window
             CurrentTime );
             None,
             None, /* cursor */ // TODO: This may need to be set to the cursor of this window
             CurrentTime );


@@ -373,54 +495,15 @@ void wxWindowX11::DoCaptureMouse()
         if (res != GrabSuccess)
         {
             wxString msg;
         if (res != GrabSuccess)
         {
             wxString msg;

-            msg.Printf("Failed to grab pointer for window %s", this->GetClassInfo()->GetClassName());
+            msg.Printf(wxT("Failed to grab pointer for window %s"), this->GetClassInfo()->GetClassName());

             wxLogDebug(msg);
             if (res == GrabNotViewable)
             wxLogDebug(msg);
             if (res == GrabNotViewable)

-            {
-                wxLogDebug("This is not a viewable window - perhaps not shown yet?");
-            }
-            g_captureWindow = NULL;
-            return;
-        }
-
-        // wxLogDebug("Grabbed pointer in %s", GetName().c_str() );
+                wxLogDebug( wxT("This is not a viewable window - perhaps not shown yet?") );

 
 

-#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);
+            g_captureWindow = NULL;

             return;
         }
             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;
     }
 }


@@ -428,21 +511,17 @@ void wxWindowX11::DoCaptureMouse()
 void wxWindowX11::DoReleaseMouse()
 {
     g_captureWindow = NULL;
 void wxWindowX11::DoReleaseMouse()
 {
     g_captureWindow = NULL;

-    
+

     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() );
 
     m_winCaptured = FALSE;
     // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() );
 
     m_winCaptured = FALSE;


@@ -467,10 +546,10 @@ 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") );

-    
+

     wxCursor cursorToUse;
     if (m_cursor.Ok())
         cursorToUse = m_cursor;
     wxCursor cursorToUse;
     if (m_cursor.Ok())
         cursorToUse = m_cursor;


@@ -487,10 +566,10 @@ 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") );

-    
+

     XWarpPointer( wxGlobalDisplay(), None, xwindow, 0, 0, 0, 0, x, y);
 }
 
     XWarpPointer( wxGlobalDisplay(), None, xwindow, 0, 0, 0, 0, x, y);
 }
 


@@ -499,28 +578,28 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
     // No scrolling requested.
     if ((dx == 0) && (dy == 0)) return;
 {
     // No scrolling requested.
     if ((dx == 0) && (dy == 0)) return;

-    
+

     if (!m_updateRegion.IsEmpty())
     {
         m_updateRegion.Offset( dx, dy );
     if (!m_updateRegion.IsEmpty())
     {
         m_updateRegion.Offset( dx, dy );

-        
+

         int cw = 0;
         int ch = 0;
         GetSize( &cw, &ch );  // GetClientSize() ??
         m_updateRegion.Intersect( 0, 0, cw, ch );
     }
         int cw = 0;
         int ch = 0;
         GetSize( &cw, &ch );  // GetClientSize() ??
         m_updateRegion.Intersect( 0, 0, cw, ch );
     }

-    
+

     if (!m_clearRegion.IsEmpty())
     {
         m_clearRegion.Offset( dx, dy );
     if (!m_clearRegion.IsEmpty())
     {
         m_clearRegion.Offset( dx, dy );

-        
+

         int cw = 0;
         int ch = 0;
         GetSize( &cw, &ch );  // GetClientSize() ??
         m_clearRegion.Intersect( 0, 0, cw, ch );
     }
         int cw = 0;
         int ch = 0;
         GetSize( &cw, &ch );  // GetClientSize() ??
         m_clearRegion.Intersect( 0, 0, cw, ch );
     }

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

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


@@ -537,7 +616,7 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
     {
         s_x = rect->x;
         s_y = rect->y;
     {
         s_x = rect->x;
         s_y = rect->y;

-        
+

         cw = rect->width;
         ch = rect->height;
     }
         cw = rect->width;
         ch = rect->height;
     }


@@ -547,14 +626,18 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
         s_y = 0;
         GetClientSize( &cw, &ch );
     }
         s_y = 0;
         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);

-        
+

     if ((h < 0) || (w < 0))
     {
         Refresh();
     if ((h < 0) || (w < 0))
     {
         Refresh();


@@ -562,21 +645,21 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
     else
     {
         wxRect rect;
     else
     {
         wxRect rect;

-        if (dx < 0) rect.x = cw+dx; else rect.x = s_x;
-        if (dy < 0) rect.y = ch+dy; else rect.y = s_y;
+        if (dx < 0) rect.x = cw+dx + offset.x; else rect.x = s_x;
+        if (dy < 0) rect.y = ch+dy + offset.y; else rect.y = s_y;

         if (dy != 0) rect.width = cw; else rect.width = abs(dx);
         if (dx != 0) rect.height = ch; else rect.height = abs(dy);
         if (dy != 0) rect.width = cw; else rect.width = abs(dx);
         if (dx != 0) rect.height = ch; else rect.height = abs(dy);

-    
+

         int d_x = s_x;
         int d_y = s_y;
         int d_x = s_x;
         int d_y = s_y;

-        
+

         if (dx < 0) s_x += -dx;
         if (dy < 0) s_y += -dy;
         if (dx > 0) d_x = dx + offset.x;
         if (dy > 0) d_y = dy + offset.y;
 
         XCopyArea( xdisplay, xwindow, xwindow, xgc, s_x, s_y, w, h, d_x, d_y );
         if (dx < 0) s_x += -dx;
         if (dy < 0) s_y += -dy;
         if (dx > 0) d_x = dx + offset.x;
         if (dy > 0) d_y = dy + offset.y;
 
         XCopyArea( xdisplay, xwindow, xwindow, xgc, s_x, s_y, w, h, d_x, d_y );

-        
+

         // wxLogDebug( "Copy: s_x %d s_y %d w %d h %d d_x %d d_y %d", s_x, s_y, w, h, d_x, d_y );
 
         // wxLogDebug( "Update: %d %d %d %d", rect.x, rect.y, rect.width, rect.height );
         // wxLogDebug( "Copy: s_x %d s_y %d w %d h %d d_x %d d_y %d", s_x, s_y, w, h, d_x, d_y );
 
         // wxLogDebug( "Update: %d %d %d %d", rect.x, rect.y, rect.width, rect.height );


@@ -584,7 +667,7 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
         m_updateRegion.Union( rect );
         m_clearRegion.Union( rect );
     }
         m_updateRegion.Union( rect );
         m_clearRegion.Union( rect );
     }

-    
+

     XFreeGC( xdisplay, xgc );
 }
 
     XFreeGC( xdisplay, xgc );
 }
 


@@ -632,16 +715,16 @@ 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") );

-    
-    XSync(wxGlobalDisplay(), False);
+
+    //XSync(wxGlobalDisplay(), False);

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

-        
+

     if (status)
     {
         *x = attr.width /* + 2*m_borderSize */ ;
     if (status)
     {
         *x = attr.width /* + 2*m_borderSize */ ;


@@ -651,19 +734,19 @@ 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)
     {
     if (window)
     {

-        XSync(wxGlobalDisplay(), False);
+        //XSync(wxGlobalDisplay(), False);

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

-        
+

         if (status)
         {
             *x = attr.x;
             *y = attr.y;
         if (status)
         {
             *x = attr.x;
             *y = attr.y;

-            
+

             // We may be faking the client origin. So a window that's really at (0, 30)
             // may appear (to wxWin apps) to be at (0, 0).
             if (GetParent())
             // We may be faking the client origin. So a window that's really at (0, 30)
             // may appear (to wxWin apps) to be at (0, 0).
             if (GetParent())


@@ -680,7 +763,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;


@@ -692,7 +775,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;


@@ -704,15 +787,14 @@ 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);

-        
+

         if (status)
         {
             *x = attr.width ;
         if (status)
         {
             *x = attr.width ;


@@ -723,19 +805,20 @@ 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") );
 
     XWindowAttributes attr;
     Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
     wxCHECK_RET( status, wxT("invalid window attributes") );
 
     wxCHECK_RET( xwindow, wxT("invalid window") );
 
     XWindowAttributes attr;
     Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
     wxCHECK_RET( status, wxT("invalid window attributes") );

-        
+

     int new_x = attr.x;
     int new_y = attr.y;
     int new_w = attr.width;
     int new_h = attr.height;
     int new_x = attr.x;
     int new_y = attr.y;
     int new_w = attr.width;
     int new_h = attr.height;

-            

 
     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
 
     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {


@@ -761,32 +844,35 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         if (new_h <= 0)
             new_h = 20;
     }
         if (new_h <= 0)
             new_h = 20;
     }

-    
+

     DoMoveWindow( new_x, new_y, new_w, new_h );
 }
 
 void wxWindowX11::DoSetClientSize(int width, int height)
 {
     DoMoveWindow( new_x, new_y, new_w, new_h );
 }
 
 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") );
 

-    XWindowAttributes attr;
-    Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
-    wxCHECK_RET( status, wxT("invalid window attributes") );
-        
-    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;
-        
-    if (height != -1)
-        new_h = height;
-    
-    DoMoveWindow( new_x, new_y, new_w, new_h );
+    XResizeWindow( wxGlobalDisplay(), xwindow, 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) );
+            width -= border.x + border.width;
+            height -= border.y + border.height;
+        }
+
+        XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
+    }

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


@@ -796,6 +882,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;


@@ -806,7 +952,7 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW,
 #if !wxUSE_NANOX
     XSizeHints sizeHints;
     sizeHints.flags = 0;
 #if !wxUSE_NANOX
     XSizeHints sizeHints;
     sizeHints.flags = 0;

-    
+

     if (minW > -1 && minH > -1)
     {
         sizeHints.flags |= PMinSize;
     if (minW > -1 && minH > -1)
     {
         sizeHints.flags |= PMinSize;


@@ -826,36 +972,30 @@ 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);
+    XSetWMNormalHints(wxGlobalDisplay(), (Window) m_mainWindow, &sizeHints );

 #endif
 }
 
 #endif
 }
 

-void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
-{
-    Window xwindow = (Window) GetMainWindow();
-
-    wxCHECK_RET( xwindow, wxT("invalid window") );
-
-    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 );
-}
-

 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------
 
 int wxWindowX11::GetCharHeight() const
 {
 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------
 
 int wxWindowX11::GetCharHeight() const
 {

-    wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
-
-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+    wxCHECK_MSG( m_font.Ok(), 0, wxT("valid window font needed") );
+
+#if wxUSE_UNICODE
+    // There should be an easier way.
+    PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+    pango_layout_set_font_description( layout, GetFont().GetNativeFontInfo()->description );
+    pango_layout_set_text(layout, "H", 1 );
+    int w,h;
+    pango_layout_get_pixel_size(layout, &w, &h);
+    g_object_unref( G_OBJECT( layout ) );
+
+    return h;
+#else
+    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay());

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


@@ -864,13 +1004,25 @@ int wxWindowX11::GetCharHeight() const
 
     //  return (overall.ascent + overall.descent);
     return (ascent + descent);
 
     //  return (overall.ascent + overall.descent);
     return (ascent + descent);

+#endif

 }
 
 int wxWindowX11::GetCharWidth() const
 {
 }
 
 int wxWindowX11::GetCharWidth() const
 {

-    wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
-
-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+    wxCHECK_MSG( m_font.Ok(), 0, wxT("valid window font needed") );
+
+#if wxUSE_UNICODE
+    // There should be an easier way.
+    PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+    pango_layout_set_font_description( layout, GetFont().GetNativeFontInfo()->description );
+    pango_layout_set_text(layout, "H", 1 );
+    int w,h;
+    pango_layout_get_pixel_size(layout, &w, &h);
+    g_object_unref( G_OBJECT( layout ) );
+
+    return w;
+#else
+    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay());

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


@@ -878,6 +1030,7 @@ int wxWindowX11::GetCharWidth() const
         &descent, &overall);
 
     return overall.width;
         &descent, &overall);
 
     return overall.width;

+#endif

 }
 
 void wxWindowX11::GetTextExtent(const wxString& string,
 }
 
 void wxWindowX11::GetTextExtent(const wxString& string,


@@ -890,18 +1043,45 @@ 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());
+    if (string.IsEmpty())
+    {
+        if (x) (*x) = 0;
+        if (y) (*y) = 0;
+        return;
+    }
+
+#if wxUSE_UNICODE
+    PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+
+    PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description;
+    pango_layout_set_font_description(layout, desc);
+
+    const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
+    pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+
+    PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
+
+
+    PangoRectangle rect;
+    pango_layout_line_get_extents(line, NULL, &rect);
+
+    if (x) (*x) = (wxCoord) (rect.width / PANGO_SCALE);
+    if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE);
+    if (descent)
+    {
+        // Do something about metrics here
+        (*descent) = 0;
+    }
+    if (externalLeading) (*externalLeading) = 0;  // ??
+
+    g_object_unref( G_OBJECT( layout ) );
+#else
+    WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, wxGlobalDisplay());

 
     int direction, ascent, descent2;
     XCharStruct overall;
     int slen = string.Len();
 
 
     int direction, ascent, descent2;
     XCharStruct overall;
     int slen = string.Len();
 

-#if 0
-    if (use16)
-        XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
-        &ascent, &descent2, &overall);
-#endif
-

     XTextExtents((XFontStruct*) pFontStruct, (char*) string.c_str(), slen,
                  &direction, &ascent, &descent2, &overall);
 
     XTextExtents((XFontStruct*) pFontStruct, (char*) string.c_str(), slen,
                  &direction, &ascent, &descent2, &overall);
 


@@ -913,7 +1093,7 @@ void wxWindowX11::GetTextExtent(const wxString& string,
         *descent = descent2;
     if (externalLeading)
         *externalLeading = 0;
         *descent = descent2;
     if (externalLeading)
         *externalLeading = 0;

-
+#endif

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


@@ -933,7 +1113,7 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
         {
             int height,width;
             GetSize( &width, &height );
         {
             int height,width;
             GetSize( &width, &height );

-            
+

             // Schedule for later Updating in ::Update() or ::OnInternalIdle().
             m_clearRegion.Clear();
             m_clearRegion.Union( 0, 0, width, height );
             // Schedule for later Updating in ::Update() or ::OnInternalIdle().
             m_clearRegion.Clear();
             m_clearRegion.Union( 0, 0, width, height );


@@ -949,7 +1129,7 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
     {
         int height,width;
         GetSize( &width, &height );
     {
         int height,width;
         GetSize( &width, &height );

-            
+

         // Schedule for later Updating in ::Update() or ::OnInternalIdle().
         m_updateRegion.Clear();
         m_updateRegion.Union( 0, 0, width, height );
         // Schedule for later Updating in ::Update() or ::OnInternalIdle().
         m_updateRegion.Clear();
         m_updateRegion.Union( 0, 0, width, height );


@@ -958,76 +1138,107 @@ 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());

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

-        
+

         // Actually send paint events.
         SendPaintEvents();
     }
 }
 
         // Actually send paint events.
         SendPaintEvents();
     }
 }
 

-void wxWindowX11::Clear()
-{
-    wxClientDC dc((wxWindow*) this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-}
-

 void wxWindowX11::SendEraseEvents()
 {
 void wxWindowX11::SendEraseEvents()
 {

-    if (!m_clearRegion.IsEmpty())
+    if (m_clearRegion.IsEmpty()) return;
+
+    wxClientDC dc( (wxWindow*)this );
+    dc.SetClippingRegion( m_clearRegion );
+
+    wxEraseEvent erase_event( GetId(), &dc );
+    erase_event.SetEventObject( this );
+
+    if (!GetEventHandler()->ProcessEvent(erase_event) )

     {
     {

-        m_clipPaintRegion = TRUE;
-
-        wxWindowDC dc( (wxWindow*)this );
-        dc.SetClippingRegion( m_clearRegion );
-        
-        wxEraseEvent erase_event( GetId(), &dc );
-        erase_event.SetEventObject( this );
-    
-        if (!GetEventHandler()->ProcessEvent(erase_event))
+        Display *xdisplay = wxGlobalDisplay();
+        Window xwindow = (Window) GetClientAreaWindow();
+        XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() );
+
+        wxRegionIterator upd( m_clearRegion );
+        while (upd)

         {
         {

-            Window xwindow = (Window) GetMainWindow();
-            Display *xdisplay = wxGlobalDisplay();
-            GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
-            XSetFillStyle( xdisplay, xgc, FillSolid );
-            XSetForeground( xdisplay, xgc, m_backgroundColour.GetPixel() );
-            wxRegionIterator upd( m_clearRegion );
-            while (upd)
-            {
-                XFillRectangle( xdisplay, xwindow, xgc,
-                                upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
-                upd ++;
-            }
-            XFreeGC( xdisplay, xgc );
+            XFillRectangle( xdisplay, xwindow, g_eraseGC,
+                            upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
+            upd ++;

         }
         }

-        m_clearRegion.Clear();
-
-        m_clipPaintRegion = FALSE;

     }
     }

-}

 
 

+    m_clearRegion.Clear();
+}

 
 void wxWindowX11::SendPaintEvents()
 {
 
 void wxWindowX11::SendPaintEvents()
 {

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

 
 

-    wxNcPaintEvent nc_paint_event( GetId() );
-    nc_paint_event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( nc_paint_event );
+    m_clipPaintRegion = TRUE;

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

-    
+

     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
 // ----------------------------------------------------------------------------


@@ -1035,7 +1246,7 @@ void wxWindowX11::SendPaintEvents()
 // Responds to colour changes: passes event on to children.
 void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes: passes event on to children.
 void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
         // Only propagate to non-top-level windows
     while ( node )
     {
         // Only propagate to non-top-level windows


@@ -1051,18 +1262,34 @@ void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
     }
 }
 
     }
 }
 

+// See handler for InFocus case in app.cpp for details.
+wxWindow* g_GettingFocus = NULL;
+

 void wxWindowX11::OnInternalIdle()
 {
     // Update invalidated regions.
     Update();
 void wxWindowX11::OnInternalIdle()
 {
     // Update invalidated regions.
     Update();

-    
+

     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)

-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate((wxWindow*) this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

 
     // Set the input focus if couldn't do it before
     if (m_needsInputFocus)
 
     // Set the input focus if couldn't do it before
     if (m_needsInputFocus)

-       SetFocus();
+    {
+#if 0
+        wxString msg;
+        msg.Printf("Setting focus for %s from OnInternalIdle\n", GetClassInfo()->GetClassName());
+        printf(msg.c_str());
+#endif
+        SetFocus();
+
+        // If it couldn't set the focus now, there's
+        // no point in trying again.
+        m_needsInputFocus = FALSE;
+    }
+    g_GettingFocus = NULL;

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


@@ -1074,15 +1301,15 @@ bool wxAddWindowToTable(Window w, wxWindow *win)
     wxWindow *oldItem = NULL;
     if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
     {
     wxWindow *oldItem = NULL;
     if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
     {

-        wxLogDebug("Widget table clash: new widget is %ld, %s",
-                   (long)w, win->GetClassInfo()->GetClassName());
+        wxLogDebug( wxT("Widget table clash: new widget is %ld, %s"),
+                    (long)w, win->GetClassInfo()->GetClassName());

         return FALSE;
     }
 
     wxWidgetHashTable->Put((long) w, win);
 
         return FALSE;
     }
 
     wxWidgetHashTable->Put((long) w, win);
 

-    wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",
-               w, win, win->GetClassInfo()->GetClassName());
+    wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"),
+                (unsigned int) w, win, win->GetClassInfo()->GetClassName());

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -1098,28 +1325,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( wxT("Client window table clash: new window is %ld, %s"),
+                    (long)w, win->GetClassInfo()->GetClassName());
+        return FALSE;
+    }
+
+    wxClientWidgetHashTable->Put((long) w, win);
+
+    wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"),
+                (unsigned int) w, win, win->GetClassInfo()->GetClassName());
+
+    return TRUE;
+}

 
 

-// Get the underlying X window
-WXWindow wxWindowX11::GetXWindow() const
+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::GetClientAreaWindow() const
+{
+    return m_clientWindow;

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


@@ -1251,7 +1503,7 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window,
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent)
+bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent, bool isAscii)

 {
     switch (XEventGetType(xevent))
     {
 {
     switch (XEventGetType(xevent))
     {


@@ -1263,6 +1515,14 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win
             KeySym keySym;
             (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
             int id = wxCharCodeXToWX (keySym);
             KeySym keySym;
             (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
             int id = wxCharCodeXToWX (keySym);

+            // id may be WXK_xxx code - these are outside ASCII range, so we
+            // can't just use toupper() on id.
+            // Only change this if we want the raw key that was pressed,
+            // and don't change it if we want an ASCII value.
+            if (!isAscii && (id >= 'a' && id <= 'z'))
+            {
+                id = id + 'A' - 'a';
+            }

 
             wxevent.m_shiftDown = XKeyEventShiftIsDown(xevent);
             wxevent.m_controlDown = XKeyEventCtrlIsDown(xevent);
 
             wxevent.m_shiftDown = XKeyEventShiftIsDown(xevent);
             wxevent.m_controlDown = XKeyEventCtrlIsDown(xevent);


@@ -1275,11 +1535,7 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win
             wxevent.m_x = XKeyEventGetX(xevent);
             wxevent.m_y = XKeyEventGetY(xevent);
 
             wxevent.m_x = XKeyEventGetX(xevent);
             wxevent.m_y = XKeyEventGetY(xevent);
 

-            if (id > -1)
-                return TRUE;
-            else
-                return FALSE;
-            break;
+            return id > -1;

         }
     default:
         break;
         }
     default:
         break;


@@ -1300,19 +1556,10 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col)
     Colormap cm = DefaultColormap( xdisplay, xscreen );
 
     m_backgroundColour.CalcPixel( (WXColormap) cm );
     Colormap cm = DefaultColormap( xdisplay, xscreen );
 
     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;
 }


@@ -1332,7 +1579,7 @@ bool wxWindowX11::SetForegroundColour(const wxColour& col)
 wxWindow *wxGetActiveWindow()
 {
     // TODO
 wxWindow *wxGetActiveWindow()
 {
     // TODO

-    wxFAIL_MSG("Not implemented");
+    wxFAIL_MSG(wxT("Not implemented"));

     return NULL;
 }
 
     return NULL;
 }
 


@@ -1364,8 +1611,8 @@ wxPoint wxGetMousePosition()
     unsigned int maskReturn;
 
     XQueryPointer (display,
     unsigned int maskReturn;
 
     XQueryPointer (display,

-                  rootWindow,
-                  &rootReturn,
+                   rootWindow,
+                   &rootReturn,

                    &childReturn,
                    &rootX, &rootY, &winX, &winY, &maskReturn);
     return wxPoint(rootX, rootY);
                    &childReturn,
                    &rootX, &rootY, &winX, &winY, &maskReturn);
     return wxPoint(rootX, rootY);


@@ -1379,3 +1626,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 );
+}
+
+