Better compatibility with old files when creating an image cache

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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 54f29ea892b20541b56ebb2a2abaf31072915434..fcd2ee3deac78e523f0793b868a147505322616b 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        windows.cpp
+// Name:        src/x11/window.cpp

 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:


@@ -9,6 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -17,65 +24,51 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "window.h"
+#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/panel.h"
+    #include "wx/frame.h"
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/button.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"
+    #include "wx/msgdlg.h"
+    #include "wx/scrolbar.h"
+    #include "wx/listbox.h"
+    #include "wx/scrolwin.h"
+    #include "wx/layout.h"
+    #include "wx/menuitem.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/setup.h"
-#include "wx/menu.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/panel.h"
-#include "wx/layout.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/settings.h"
-#include "wx/msgdlg.h"
-#include "wx/frame.h"
-#include "wx/scrolwin.h"
-#include "wx/module.h"
-#include "wx/menuitem.h"
-#include "wx/log.h"
+#include "wx/fontutil.h"
+#include "wx/univ/renderer.h"

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

+#include "wx/unix/utilsx11.h"
+

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

+#include "X11/Xutil.h"

 
 #include <string.h>
 
 
 #include <string.h>
 

-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-static const int SCROLL_MARGIN = 4;
-

 // ----------------------------------------------------------------------------
 // global variables for this module
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // global variables for this module
 // ----------------------------------------------------------------------------
 

-extern wxHashTable *wxWidgetHashTable;

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

-
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-static void wxCanvasRepaintProc(Widget, XtPointer, XmDrawingAreaCallbackStruct * cbs);
-static void wxCanvasInputEvent(Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs);
-static void wxCanvasMotionEvent(Widget, XButtonEvent * event);
-static void wxCanvasEnterLeave(Widget drawingArea, XtPointer clientData, XCrossingEvent * event);
-static void wxScrollBarCallback(Widget widget, XtPointer clientData,
-                                XmScrollBarCallbackStruct *cbs);
-static void wxPanelItemEventHandler(Widget    wid,
-                                    XtPointer client_data,
-                                    XEvent*   event,
-                                    Boolean  *continueToDispatch);
+static GC g_eraseGC;

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


@@ -89,11 +82,10 @@ static void wxPanelItemEventHandler(Widget    wid,
 // event tables
 // ----------------------------------------------------------------------------
 
 // event tables
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxWindowX11, wxWindowBase)
+IMPLEMENT_ABSTRACT_CLASS(wxWindowX11, wxWindowBase)

 
 BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)
 
 BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)

-    EVT_IDLE(wxWindowX11::OnIdle)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -110,303 +102,275 @@ END_EVENT_TABLE()
 
 void wxWindowX11::Init()
 {
 
 void wxWindowX11::Init()
 {

-    // generic initializations first
-    InitBase();
-
-    // Motif-specific
-    m_needsRefresh = TRUE;
-    m_mainWidget = (WXWidget) 0;
-
-    m_button1Pressed =
-    m_button2Pressed =
-    m_button3Pressed = FALSE;
-
-    m_winCaptured = FALSE;
-
-    m_isShown = TRUE;
-    m_isBeingDeleted = FALSE;
-    
-    m_hScrollBar =
-    m_vScrollBar =
-    m_borderWidget =
-    m_scrolledWindow =
-    m_drawingArea = (WXWidget) 0;
-
-    m_hScroll =
-    m_vScroll = FALSE;
-
-    m_scrollPosX =
-    m_scrollPosY = 0;
-
-    m_backingPixmap = (WXPixmap) 0;
-    m_pixmapWidth =
-    m_pixmapHeight = 0;
-
-    m_pixmapOffsetX =
-    m_pixmapOffsetY = 0;
+    // X11-specific
+    m_mainWindow = (WXWindow) 0;
+    m_clientWindow = (WXWindow) 0;
+    m_insertIntoMain = false;
+    m_updateNcArea = false;

 
 

+    m_winCaptured = false;
+    m_needsInputFocus = false;
+    m_isShown = true;

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

-    m_canAddEventHandler = FALSE;

 }
 
 // real construction (Init() must have been called before!)
 bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
 }
 
 // real construction (Init() must have been called before!)
 bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,

-                      const wxPoint& pos,
-                      const wxSize& size,
-                      long style,
-                      const wxString& name)
+                         const wxPoint& pos,
+                         const wxSize& size,
+                         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") );
+
+    // Get default border
+    wxBorder border = GetBorder(style);
+    style &= ~wxBORDER_MASK;
+    style |= border;

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

+    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 = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

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

     m_foregroundColour = *wxBLACK;
     m_foregroundColour = *wxBLACK;

+    m_foregroundColour.CalcPixel( (WXColormap) cm );

 
 

-    if (style & wxSIMPLE_BORDER)
-    {
-    } else if (style & wxSUNKEN_BORDER)
-    {
-    } else if (style & wxRAISED_BORDER)
+    Window xparent = (Window) parent->GetClientAreaWindow();
+
+    // 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->X11GetMainWindow();

     }
 
     }
 

-    // TODO: create XWindow
-
-#if 0
-    wxAddWindowToTable((Window) m_drawingArea, this);
-    wxAddWindowToTable((Window) m_scrolledWindow, this);
+    // 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);
+    if (size2.x <= 0)
+        size2.x = 20;
+    if (size2.y <= 0)
+        size2.y = 20;
+
+    wxPoint pos2(pos);
+    if (pos2.x == wxDefaultCoord)
+        pos2.x = 0;
+    if (pos2.y == wxDefaultCoord)
+        pos2.y = 0;
+
+    AdjustForParentClientOrigin(pos2.x, pos2.y);
+
+#if wxUSE_TWO_WINDOWS
+    bool need_two_windows =
+        ((( wxSUNKEN_BORDER | wxBORDER_THEME | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
+#else
+    bool need_two_windows = false;

 #endif
 
 #endif
 

-    // Without this, the cursor may not be restored properly (e.g. in splitter
-    // sample).
-    SetCursor(*wxSTANDARD_CURSOR);
-    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-    SetSize(pos.x, pos.y, size.x, size.y);
+#if wxUSE_NANOX
+    long xattributes = 0;
+#else
+    XSetWindowAttributes xattributes;
+    long xattributes_mask = 0;

 
 

-    return TRUE;
-}
+    xattributes_mask |= CWBackPixel;
+    xattributes.background_pixel = m_backgroundColour.GetPixel();

 
 

-// Destructor
-wxWindowX11::~wxWindow()
-{
-    if (g_captureWindow == this)
-       g_captureWindow = NULL;
-    
-    m_isBeingDeleted = TRUE;
-    
-    // Motif-specific actions first
-    WXWindow wMain = GetMainWindow();
-    if ( wMain )
+    xattributes_mask |= CWBorderPixel;
+    xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
+
+    xattributes_mask |= CWEventMask;
+#endif
+
+    if (need_two_windows)

     {
     {

-        // Removes event handlers
-        //DetachWidget(wMain);
-    }
+#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());

 
 

-    ClearUpdateRects();
+        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 );

 
 

-    if ( m_parent )
-        m_parent->RemoveChild( this );
+#else
+        // Normal X11
+        xattributes.event_mask =
+            ExposureMask | StructureNotifyMask | ColormapChangeMask;

 
 

-    // TODO
+        Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+            0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );

 
 

-#if 0    
-    // If m_drawingArea, we're a fully-fledged window with drawing area,
-    // scrollbars etc. (what wxCanvas used to be)
-    if ( m_drawingArea )
-    {
-        // Destroy children before destroying self
-        DestroyChildren();
+#endif

 
 

-        if (m_backingPixmap)
-            XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap);
+        XSetWindowBackgroundPixmap( xdisplay, xwindow, None );

 
 

-        Widget w = (Widget) m_drawingArea;
-        wxDeleteWindowFromTable(w);
+        m_mainWindow = (WXWindow) xwindow;
+        wxAddWindowToTable( xwindow, (wxWindow*) this );

 
 

-        if (w)
+        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 ))

         {
         {

-            XtDestroyWidget(w);
-           m_drawingArea = (WXWidget) 0;
+            xattributes_mask |= CWBitGravity;
+            xattributes.bit_gravity = StaticGravity;

         }
         }

+#endif

 
 

-        // Only if we're _really_ a canvas (not a dialog box/panel)
-        if (m_scrolledWindow)
+        if (HasFlag(wxSUNKEN_BORDER) || HasFlag(wxRAISED_BORDER) || HasFlag(wxBORDER_THEME))

         {
         {

-            wxDeleteWindowFromTable((Widget) m_scrolledWindow);
+            pos2.x = 2;
+            pos2.y = 2;
+            size2.x -= 4;
+            size2.y -= 4;

         }
         }

-
-        if (m_hScrollBar)
+        else if (HasFlag( wxSIMPLE_BORDER ))

         {
         {

-            wxDeleteWindowFromTable((Widget) m_hScrollBar);
-           XtUnmanageChild((Widget) m_hScrollBar);
+            pos2.x = 1;
+            pos2.y = 1;
+            size2.x -= 2;
+            size2.y -= 2;

         }
         }

-        if (m_vScrollBar)
+        else

         {
         {

-            wxDeleteWindowFromTable((Widget) m_vScrollBar);
-           XtUnmanageChild((Widget) m_vScrollBar);
+            pos2.x = 0;
+            pos2.y = 0;

         }
 
         }
 

-        if (m_hScrollBar)
-           XtDestroyWidget((Widget) m_hScrollBar);
-        if (m_vScrollBar)
-           XtDestroyWidget((Widget) m_vScrollBar);
+        // 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 );

 
 

-        UnmanageAndDestroy(m_scrolledWindow);
+        m_clientWindow = (WXWindow) xwindow;
+        wxAddClientWindowToTable( xwindow, (wxWindow*) this );

 
 

-        if (m_borderWidget)
+        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());
+
+        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( wxFULL_REPAINT_ON_RESIZE ))

         {
         {

-            XtDestroyWidget ((Widget) m_borderWidget);
-            m_borderWidget = (WXWidget) 0;
+            xattributes_mask |= CWBitGravity;
+            xattributes.bit_gravity = NorthWestGravity;

         }
         }

-    }
-    else // Why wasn't this here before? JACS 8/3/2000
-#endif
-        DestroyChildren();

 
 

+        Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+            0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#endif

 
 

-    // Destroy the window
-    if (GetMainWindow())
-    {
-        // TODO
-        // XtDestroyWidget((Widget) GetMainWidget());
-        SetMainWindow((WXWindow) NULL);
-    }
-}
+        XSetWindowBackgroundPixmap( xdisplay, xwindow, None );

 
 

-// ----------------------------------------------------------------------------
-// scrollbar management
-// ----------------------------------------------------------------------------
+        m_mainWindow = (WXWindow) xwindow;
+        m_clientWindow = m_mainWindow;
+        wxAddWindowToTable( xwindow, (wxWindow*) this );

 
 

-// Helper function
-void wxWindowX11::CreateScrollbar(wxOrientation orientation)
-{
-    // TODO
-#if 0
-    wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
+        XMapWindow( xdisplay, xwindow );
+    }

 
 

-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
+    // Is a subwindow, so map immediately
+    m_isShown = true;

 
 

-    // Add scrollbars if required
-    if (orientation == wxHORIZONTAL)
-    {
-        Widget hScrollBar = XtVaCreateManagedWidget ("hsb",
-            xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
-            XmNorientation, XmHORIZONTAL,
-            NULL);
-        XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-
-        XtVaSetValues (hScrollBar,
-            XmNincrement, 1,
-            XmNvalue, 0,
-            NULL);
-
-        m_hScrollBar = (WXWidget) hScrollBar;
-
-        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-        DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
-
-        XtRealizeWidget(hScrollBar);
-
-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNhorizontalScrollBar, (Widget) m_hScrollBar,
-            NULL);
-
-        m_hScroll = TRUE;
-
-        wxAddWindowToTable( hScrollBar, this );
-    }
+    // Without this, the cursor may not be restored properly (e.g. in splitter
+    // sample).
+    SetCursor(*wxSTANDARD_CURSOR);
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
 

-    if (orientation == wxVERTICAL)
-    {
-        Widget vScrollBar = XtVaCreateManagedWidget ("vsb",
-            xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
-            XmNorientation, XmVERTICAL,
-            NULL);
-        XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-
-        XtVaSetValues (vScrollBar,
-            XmNincrement, 1,
-            XmNvalue, 0,
-            NULL);
-
-        m_vScrollBar = (WXWidget) vScrollBar;
-        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-        DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
-
-        XtRealizeWidget(vScrollBar);
-
-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNverticalScrollBar, (Widget) m_vScrollBar,
-            NULL);
-
-        m_vScroll = TRUE;
-
-        wxAddWindowToTable( vScrollBar, this );
-    }
+    // Don't call this, it can have nasty repercussions for composite controls,
+    // for example
+    //    SetSize(pos.x, pos.y, size.x, size.y);

 
 

-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
-#endif
+    return true;

 }
 
 }
 

-void wxWindowX11::DestroyScrollbar(wxOrientation orientation)
+// Destructor
+wxWindowX11::~wxWindowX11()

 {
 {

-    // TODO
-#if 0
-    wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
+    SendDestroyEvent();

 
 

-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
-    // Add scrollbars if required
-    if (orientation == wxHORIZONTAL)
-    {
-        if (m_hScrollBar)
-        {
-            wxDeleteWindowFromTable((Widget)m_hScrollBar);
-            XtDestroyWidget((Widget) m_hScrollBar);
-        }
-        m_hScrollBar = (WXWidget) 0;
-        m_hScroll = FALSE;
+    if (g_captureWindow == this)
+        g_captureWindow = NULL;

 
 

-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNhorizontalScrollBar, (Widget) 0,
-            NULL);
+    DestroyChildren();

 
 

+    if (m_clientWindow != m_mainWindow)
+    {
+        // Destroy the cleint window
+        Window xwindow = (Window) m_clientWindow;
+        wxDeleteClientWindowFromTable( xwindow );
+        XDestroyWindow( wxGlobalDisplay(), xwindow );
+        m_clientWindow = NULL;

     }
 
     }
 

-    if (orientation == wxVERTICAL)
+    // Destroy the window
+    if ( m_mainWindow )

     {
     {

-        if (m_vScrollBar)
-        {
-            wxDeleteWindowFromTable((Widget)m_vScrollBar);
-            XtDestroyWidget((Widget) m_vScrollBar);
-        }
-        m_vScrollBar = (WXWidget) 0;
-        m_vScroll = FALSE;
-
-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNverticalScrollBar, (Widget) 0,
-            NULL);
-
+        Window xwindow = (Window) m_mainWindow;
+        wxDeleteWindowFromTable( xwindow );
+        XDestroyWindow( wxGlobalDisplay(), xwindow );
+        m_mainWindow = NULL;

     }
     }

-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
-#endif

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


@@ -415,145 +379,183 @@ void wxWindowX11::DestroyScrollbar(wxOrientation orientation)
 
 void wxWindowX11::SetFocus()
 {
 
 void wxWindowX11::SetFocus()
 {

-    // TODO
+    Window xwindow = (Window) m_clientWindow;
+
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+    // Don't assert; we might be trying to set the focus for a panel
+    // with only static controls, so the panel returns false from AcceptsFocus.
+    // The app should be not be expected to deal with this.
+    if (!AcceptsFocus())
+        return;
+

 #if 0
 #if 0

-    Widget wMain = (Widget) GetMainWidget();
-    XmProcessTraversal(wMain, XmTRAVERSE_CURRENT);
-    XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT);
+    if (GetName() == "scrollBar")
+    {
+        char *crash = NULL;
+        *crash = 0;
+    }

 #endif
 #endif

+
+    XWindowAttributes wa;
+    XGetWindowAttributes(wxGlobalDisplay(), xwindow, &wa);
+
+    if (wa.map_state == IsViewable)
+    {
+        wxLogTrace( wxT("focus"), wxT("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName());
+        //        XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
+        XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime );
+        m_needsInputFocus = false;
+    }
+    else
+    {
+        m_needsInputFocus = true;
+    }

 }
 
 // Get the window with the focus
 }
 
 // Get the window with the focus

-wxWindow *wxWindowBase::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()

 {
 {

-    // TODO
-    return NULL;
-#if 0
+    Window xfocus = (Window) 0;
+    int revert = 0;

 
 

-    // TODO Problems:
-    // (1) Can there be multiple focussed widgets in an application?
-    // In which case we need to find the top-level window that's
-    // currently active.
-    // (2) The widget with the focus may not be in the widget table
-    // depending on which widgets I put in the table
-    wxWindow *winFocus = (wxWindow *)NULL;
-    for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
-          node;
-          node = node->GetNext() )
+    XGetInputFocus( wxGlobalDisplay(), &xfocus, &revert);
+    if (xfocus)

     {
     {

-        wxWindow *win = node->GetData();
-
-        Widget w = XmGetFocusWidget ((Widget) win->GetTopWidget());
-
-        if (w != (Widget) NULL)
+        wxWindow *win = wxGetWindowFromTable( xfocus );
+        if (!win)

         {
         {

-            winFocus = wxGetWindowFromTable(w);
-            if ( winFocus )
-                break;
+            win = wxGetClientWindowFromTable( xfocus );

         }
         }

+
+        return win;

     }
 
     }
 

-    return winFocus;
-#endif
+    return NULL;

 }
 
 }
 

+// Enabling/disabling handled by event loop, and not sending events
+// if disabled.

 bool wxWindowX11::Enable(bool enable)
 {
     if ( !wxWindowBase::Enable(enable) )
 bool wxWindowX11::Enable(bool enable)
 {
     if ( !wxWindowBase::Enable(enable) )

-        return FALSE;
-
-    // TODO
-#if 0
-    Widget wMain = (Widget)GetMainWidget();
-    if ( wMain )
-    {
-        XtSetSensitive(wMain, enable);
-        XmUpdateDisplay(wMain);
-    }
-#endif
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindowX11::Show(bool show)
 {
 }
 
 bool wxWindowX11::Show(bool show)
 {

-    if ( !wxWindowBase::Show(show) )
-        return FALSE;
+    wxWindowBase::Show(show);

 
 

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

     if (show)
     if (show)

-        XMapWindow(xdisp, xwin);
+    {
+        // wxLogDebug( "Mapping window of type %s", GetName().c_str() );
+        XMapWindow(xdisp, xwindow);
+    }

     else
     else

-        XUnmapWindow(xdisp, xwin);
+    {
+        // wxLogDebug( "Unmapping window of type %s", GetName().c_str() );
+        XUnmapWindow(xdisp, xwindow);
+    }

 
 

-    return TRUE;
+    return true;

 }
 
 // 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()
 {

-    Window window = GetTopWindow();
-    if (window)
-        XRaiseWindow(wxGetDisplay(), window);
+    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()
 {

-    Window window = GetTopWindow();
-    if (window)
-        XLowerWindow(wxGetDisplay(), window);
+    if (m_mainWindow)
+        XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow );

 }
 
 }
 

-void wxWindowX11::SetTitle(const wxString& title)
+void wxWindowX11::SetLabel(const wxString& WXUNUSED(label))

 {
     // TODO
 {
     // TODO

-//    XtVaSetValues((Widget)GetMainWidget(), XmNtitle, title.c_str(), NULL);

 }
 
 }
 

-wxString wxWindowX11::GetTitle() const
+wxString wxWindowX11::GetLabel() const

 {
     // TODO
     return wxEmptyString;
 {
     // TODO
     return wxEmptyString;

-#if 0
-    char *title;
-    XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &title, NULL);
-
-    return wxString(title);
-#endif

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

-    g_captureWindow = this;
-    if ( m_winCaptured )
+    if ((g_captureWindow != NULL) && (g_captureWindow != this))
+    {
+        wxFAIL_MSG(wxT("Trying to capture before mouse released."));
+
+        // Core dump now
+        int *tmp = NULL;
+        (*tmp) = 1;

         return;
         return;

+    }

 
 

-    // TODO
-#if 0
-    Widget wMain = (Widget)GetMainWidget();
-    if ( wMain )
-        XtAddGrab(wMain, TRUE, FALSE);
-#endif
+    if (m_winCaptured)
+        return;
+
+    Window xwindow = (Window) m_clientWindow;
+
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+    g_captureWindow = (wxWindow*) this;
+
+    if (xwindow)
+    {
+        int res = XGrabPointer(wxGlobalDisplay(), xwindow,
+            FALSE,
+            ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
+            GrabModeAsync,
+            GrabModeAsync,
+            None,
+            None, /* cursor */ // TODO: This may need to be set to the cursor of this window
+            CurrentTime );
+
+        if (res != GrabSuccess)
+        {
+            wxString msg;
+            msg.Printf(wxT("Failed to grab pointer for window %s"), this->GetClassInfo()->GetClassName());
+            wxLogDebug(msg);
+            if (res == GrabNotViewable)
+            {
+                wxLogDebug( wxT("This is not a viewable window - perhaps not shown yet?") );
+            }

 
 

-    m_winCaptured = TRUE;
+            g_captureWindow = NULL;
+            return;
+        }
+
+        m_winCaptured = true;
+    }

 }
 
 void wxWindowX11::DoReleaseMouse()
 {
     g_captureWindow = NULL;
 }
 
 void wxWindowX11::DoReleaseMouse()
 {
     g_captureWindow = NULL;

+

     if ( !m_winCaptured )
         return;
 
     if ( !m_winCaptured )
         return;
 

-    // TODO
-#if 0
-    Widget wMain = (Widget)GetMainWidget();
-    if ( wMain )
-        XtRemoveGrab(wMain);
-#endif
+    Window xwindow = (Window) m_clientWindow;

 
 

-    m_winCaptured = FALSE;
+    if (xwindow)
+    {
+        XUngrabPointer( wxGlobalDisplay(), CurrentTime );
+    }
+
+    // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() );
+
+    m_winCaptured = false;

 }
 
 bool wxWindowX11::SetFont(const wxFont& font)
 }
 
 bool wxWindowX11::SetFont(const wxFont& font)


@@ -561,12 +563,10 @@ bool wxWindowX11::SetFont(const wxFont& font)
     if ( !wxWindowBase::SetFont(font) )
     {
         // nothing to do
     if ( !wxWindowBase::SetFont(font) )
     {
         // nothing to do

-        return FALSE;
+        return false;

     }
 
     }
 

-    ChangeFont();
-
-    return TRUE;
+    return true;

 }
 
 bool wxWindowX11::SetCursor(const wxCursor& cursor)
 }
 
 bool wxWindowX11::SetCursor(const wxCursor& cursor)


@@ -574,337 +574,152 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor)
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change

-        return FALSE;
+        return false;

     }
 
     }
 

-    wxCursor* cursor2 = NULL;
-    if (m_cursor.Ok())
-        cursor2 = & m_cursor;
+    Window xwindow = (Window) m_clientWindow;
+
+    wxCHECK_MSG( xwindow, false, wxT("invalid window") );
+
+    wxCursor cursorToUse;
+    if (m_cursor.IsOk())
+        cursorToUse = m_cursor;

     else
     else

-        cursor2 = wxSTANDARD_CURSOR;
+        cursorToUse = *wxSTANDARD_CURSOR;

 
 

-    WXDisplay *dpy = GetXDisplay();
-    WXCursor x_cursor = cursor2->GetXCursor(dpy);
+    Cursor xcursor = (Cursor) cursorToUse.GetCursor();

 
 

-    Window win = (Window) GetMainWindow();
-    XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
+    XDefineCursor( wxGlobalDisplay(), xwindow, xcursor );

 
 

-    return TRUE;
+    return true;

 }
 
 // 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 wClient = (Window) GetClientWindow();
-
-    XWarpPointer(wxGetDisplay(), None, wClient, 0, 0, 0, 0, x, y);
-}
-
-// ---------------------------------------------------------------------------
-// scrolling stuff
-// ---------------------------------------------------------------------------
-
-int wxWindowX11::GetScrollPos(int orient) const
-{
-    if (orient == wxHORIZONTAL)
-        return m_scrollPosX;
-    else
-        return m_scrollPosY;
-}
+    Window xwindow = (Window) m_clientWindow;

 
 

-// This now returns the whole range, not just the number of positions that we
-// can scroll.
-int wxWindowX11::GetScrollRange(int WXUNUSED(orient)) const
-{
-    // TODO
-    return 0;
-#if 0
-    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
-    wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
+    wxCHECK_RET( xwindow, wxT("invalid window") );

 
 

-    int range;
-    XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);
-    return range;
-#endif
+    XWarpPointer( wxGlobalDisplay(), None, xwindow, 0, 0, 0, 0, x, y);

 }
 
 }
 

-int wxWindowX11::GetScrollThumb(int orient) const
+// Does a physical scroll
+void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)

 {
 {

-    // TODO
-    return 0;
-
-#if 0
-    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
-    wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
-
-    int thumb;
-    XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
-    return thumb;
-#endif
-}
+    // No scrolling requested.
+    if ((dx == 0) && (dy == 0)) return;

 
 

-void wxWindowX11::SetScrollPos(int WXUNUSED(orient), int WXUNUSED(pos), bool WXUNUSED(refresh))
-{
-    // TODO
+    if (!m_updateRegion.IsEmpty())
+    {
+        m_updateRegion.Offset( dx, dy );

 
 

-#if 0
-    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
+        int cw = 0;
+        int ch = 0;
+        GetSize( &cw, &ch );  // GetClientSize() ??
+        m_updateRegion.Intersect( 0, 0, cw, ch );
+    }

 
 

-    if ( scrollBar )
+    if (!m_clearRegion.IsEmpty())

     {
     {

-        XtVaSetValues (scrollBar, XmNvalue, pos, NULL);
+        m_clearRegion.Offset( dx, dy );
+
+        int cw = 0;
+        int ch = 0;
+        GetSize( &cw, &ch );  // GetClientSize() ??
+        m_clearRegion.Intersect( 0, 0, cw, ch );

     }
     }

-#endif
-    SetInternalScrollPos((wxOrientation)orient, pos);
-}

 
 

-// New function that will replace some of the above.
-void wxWindowX11::SetScrollbar(int WXUNUSED(orient), int WXUNUSED(pos), int WXUNUSED(thumbVisible),
-                            int WXUNUSED(range), bool WXUNUSED(refresh))
-{
-    // TODO
-#if 0
-    int oldW, oldH;
-    GetSize(& oldW, & oldH);
+    Window xwindow = (Window) GetClientAreaWindow();

 
 

-    if (range == 0)
-        range = 1;
-    if (thumbVisible == 0)
-        thumbVisible = 1;
+    wxCHECK_RET( xwindow, wxT("invalid window") );

 
 

-    if (thumbVisible > range)
-        thumbVisible = range;
+    Display *xdisplay = wxGlobalDisplay();

 
 

-    // Save the old state to see if it changed
-    WXWidget oldScrollBar = GetScrollbar((wxOrientation)orient);
+    GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
+    XSetGraphicsExposures( xdisplay, xgc, True );

 
 

-    if (orient == wxHORIZONTAL)
-    {
-        if (thumbVisible == range)
-        {
-            if (m_hScrollBar)
-                DestroyScrollbar(wxHORIZONTAL);
-        }
-        else
-        {
-            if (!m_hScrollBar)
-                CreateScrollbar(wxHORIZONTAL);
-        }
-    }
-    if (orient == wxVERTICAL)
+    int s_x = 0;
+    int s_y = 0;
+    int cw;
+    int ch;
+    if (rect)

     {
     {

-        if (thumbVisible == range)
-        {
-            if (m_vScrollBar)
-                DestroyScrollbar(wxVERTICAL);
-        }
-        else
-        {
-            if (!m_vScrollBar)
-                CreateScrollbar(wxVERTICAL);
-        }
-    }
-    WXWidget newScrollBar =  GetScrollbar((wxOrientation)orient);
+        s_x = rect->x;
+        s_y = rect->y;

 
 

-    if (oldScrollBar != newScrollBar)
-    {
-        // This is important! Without it, scrollbars misbehave badly.
-        XtUnrealizeWidget((Widget) m_scrolledWindow);
-        XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) m_hScrollBar, (Widget) m_vScrollBar, (Widget) m_drawingArea);
-        XtRealizeWidget((Widget) m_scrolledWindow);
-        XtManageChild((Widget) m_scrolledWindow);
+        cw = rect->width;
+        ch = rect->height;

     }
     }

-
-    if (newScrollBar)
+    else

     {
     {

-        XtVaSetValues((Widget) newScrollBar,
-        XmNvalue, pos,
-        XmNminimum, 0,
-        XmNmaximum, range,
-        XmNsliderSize, thumbVisible,
-        NULL);
+        s_x = 0;
+        s_y = 0;
+        GetClientSize( &cw, &ch );

     }
 
     }
 

-    SetInternalScrollPos((wxOrientation)orient, pos);
-
-    int newW, newH;
-    GetSize(& newW, & newH);
-
-    // Adjusting scrollbars can resize the canvas accidentally
-    if (newW != oldW || newH != oldH)
-        SetSize(-1, -1, oldW, oldH);
+#if wxUSE_TWO_WINDOWS
+    wxPoint offset( 0,0 );
+#else
+    wxPoint offset = GetClientAreaOrigin();
+    s_x += offset.x;
+    s_y += offset.y;

 #endif
 #endif

-}

 
 

-// Does a physical scroll
-void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
-{
-    int x, y, w, h;
-    if (rect)
+    int w = cw - abs(dx);
+    int h = ch - abs(dy);
+
+    if ((h < 0) || (w < 0))

     {
     {

-        // Use specified rectangle
-        x = rect->x; y = rect->y; w = rect->width; h = rect->height;
+        Refresh();

     }
     else
     {
     }
     else
     {

-        // Use whole client area
-        x = 0; y = 0;
-        GetClientSize(& w, & h);
-    }
-    
-    wxNode *cnode = m_children.First();
-    while (cnode)
-    {
-        wxWindow *child = (wxWindow*) cnode->Data();
-        int sx = 0;
-        int sy = 0;
-        child->GetSize( &sx, &sy );
-        wxPoint pos( child->GetPosition() );
-        child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
-        cnode = cnode->Next();
-    }
-    
-    int x1 = (dx >= 0) ? x : x - dx;
-    int y1 = (dy >= 0) ? y : y - dy;
-    int w1 = w - abs(dx);
-    int h1 = h - abs(dy);
-    int x2 = (dx >= 0) ? x + dx : x;
-    int y2 = (dy >= 0) ? y + dy : y;
-    
-    wxClientDC dc(this);
-    
-    dc.SetLogicalFunction (wxCOPY);
-    
-    Window window = (Window) GetMainWindow();
-    Display* display = wxGetDisplay();
-    
-    XCopyArea(display, window, window, (GC) dc.GetGC(),
-        x1, y1, w1, h1, x2, y2);
-    
-    dc.SetAutoSetting(TRUE);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBrush(brush); // FIXME: needed?
-    
-    // We'll add rectangles to the list of update rectangles according to which
-    // bits we've exposed.
-    wxList updateRects;
-    
-    if (dx > 0)
-    {
-        wxRect *rect = new wxRect;
-        rect->x = x;
-        rect->y = y;
-        rect->width = dx;
-        rect->height = h;
-        
-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
-        
-        rect->x = rect->x;
-        rect->y = rect->y;
-        rect->width = rect->width;
-        rect->height = rect->height;
-        
-        updateRects.Append((wxObject*) rect);
-    }
-    else if (dx < 0)
-    {
-        wxRect *rect = new wxRect;
-        
-        rect->x = x + w + dx;
-        rect->y = y;
-        rect->width = -dx;
-        rect->height = h;
-        
-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width,
-            rect->height);
-        
-        rect->x = rect->x;
-        rect->y = rect->y;
-        rect->width = rect->width;
-        rect->height = rect->height;
-        
-        updateRects.Append((wxObject*) rect);
-    }
-    if (dy > 0)
-    {
-        wxRect *rect = new wxRect;
-        
-        rect->x = x;
-        rect->y = y;
-        rect->width = w;
-        rect->height = dy;
-        
-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
-        
-        rect->x = rect->x;
-        rect->y = rect->y;
-        rect->width = rect->width;
-        rect->height = rect->height;
-        
-        updateRects.Append((wxObject*) rect);
-    }
-    else if (dy < 0)
-    {
-        wxRect *rect = new wxRect;
-        
-        rect->x = x;
-        rect->y = y + h + dy;
-        rect->width = w;
-        rect->height = -dy;
-        
-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
-        
-        rect->x = rect->x;
-        rect->y = rect->y;
-        rect->width = rect->width;
-        rect->height = rect->height;
-        
-        updateRects.Append((wxObject*) rect);
-    }
-    dc.SetBrush(wxNullBrush);
-    
-    // Now send expose events
-    
-    wxNode* node = updateRects.First();
-    while (node)
-    {
-        wxRect* rect = (wxRect*) node->Data();
-        XExposeEvent event;
-        
-        event.type = Expose;
-        event.display = display;
-        event.send_event = True;
-        event.window = window;
-        
-        event.x = rect->x;
-        event.y = rect->y;
-        event.width = rect->width;
-        event.height = rect->height;
-        
-        event.count = 0;
-        
-        XSendEvent(display, window, False, ExposureMask, (XEvent *)&event);
-        
-        node = node->Next();
-        
+        wxRect rect;
+        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);
+
+        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 );
+
+        // 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 );
+
+        m_updateRegion.Union( rect );
+        m_clearRegion.Union( rect );

     }
     }

-    
-    // Delete the update rects
-    node = updateRects.First();
-    while (node)
+
+    XFreeGC( xdisplay, xgc );
+
+    // Move Clients, but not the scrollbars
+    // FIXME: There may be a better method to move a lot of Windows within X11
+    wxScrollBar *sbH = ((wxWindow *) this)->GetScrollbar( wxHORIZONTAL );
+    wxScrollBar *sbV = ((wxWindow *) this)->GetScrollbar( wxVERTICAL );
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+    while ( node )

     {
     {

-        wxRect* rect = (wxRect*) node->Data();
-        delete rect;
-        node = node->Next();
+        // Only propagate to non-top-level windows
+        wxWindow *win = node->GetData();
+        if ( win->GetParent() && win != sbH && win != sbV )
+        {
+            wxPoint pos = win->GetPosition();
+            // Add the delta to the old Position
+            pos.x += dx;
+            pos.y += dy;
+            win->SetPosition(pos);
+        }
+        node = node->GetNext();

     }
     }

-    
-    // TODO
-
-    // XmUpdateDisplay((Widget) GetMainWidget());

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


@@ -945,1405 +760,743 @@ void wxWindowX11::DoSetToolTip(wxToolTip * WXUNUSED(tooltip))
 
 bool wxWindowX11::PreResize()
 {
 
 bool wxWindowX11::PreResize()
 {

-    return TRUE;
+    return true;

 }
 
 // Get total size
 void wxWindowX11::DoGetSize(int *x, int *y) const
 {
 }
 
 // Get total size
 void wxWindowX11::DoGetSize(int *x, int *y) const
 {

-    // TODO
-#if 0
-    if (m_drawingArea)
+    Window xwindow = (Window) m_mainWindow;
+
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+    //XSync(wxGlobalDisplay(), False);
+
+    XWindowAttributes attr;
+    Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
+    wxASSERT(status);
+
+    if (status)

     {
     {

-        CanvasGetSize(x, y);
-        return;
+        *x = attr.width /* + 2*m_borderSize */ ;
+        *y = attr.height /* + 2*m_borderSize */ ;

     }
     }

-
-    Widget widget = (Widget) GetTopWidget();
-    Dimension xx, yy;
-    XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-    if(x) *x = xx; if(y) *y = yy;
-#endif

 }
 
 void wxWindowX11::DoGetPosition(int *x, int *y) const
 {
 }
 
 void wxWindowX11::DoGetPosition(int *x, int *y) const
 {

-    // TODO
-#if 0
-    if (m_drawingArea)
+    Window window = (Window) m_mainWindow;
+    if (window)

     {
     {

-        CanvasGetPosition(x, y);
-        return;
-    }
-    Widget widget = (Widget) GetTopWidget();
-    Position xx, yy;
-    XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
+        //XSync(wxGlobalDisplay(), False);
+        XWindowAttributes attr;
+        Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
+        wxASSERT(status);

 
 

-    // 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())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        xx -= pt.x;
-        yy -= pt.y;
-    }
+        if (status)
+        {
+            *x = attr.x;
+            *y = attr.y;

 
 

-    if(x) *x = xx; if(y) *y = yy;
-#endif
+            // 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())
+            {
+                wxPoint pt(GetParent()->GetClientAreaOrigin());
+                *x -= pt.x;
+                *y -= pt.y;
+            }
+        }
+    }

 }
 
 void wxWindowX11::DoScreenToClient(int *x, int *y) const
 {
 }
 
 void wxWindowX11::DoScreenToClient(int *x, int *y) const
 {

-    Display *display = wxGetDisplay();
+    Display *display = wxGlobalDisplay();

     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));

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

 
     Window childWindow;
 
     Window childWindow;

-    int xx = *x;
-    int yy = *y;
-    XTranslateCoordinates(display, rootWindow, thisWindow, xx, yy, x, y, &childWindow);
+    int xx = x ? *x : 0;
+    int yy = y ? *y : 0;
+    XTranslateCoordinates(display, rootWindow, thisWindow,
+                          xx, yy, x ? x : &xx, y ? y : &yy,
+                          &childWindow);

 }
 
 void wxWindowX11::DoClientToScreen(int *x, int *y) const
 {
 }
 
 void wxWindowX11::DoClientToScreen(int *x, int *y) const
 {

-    Display *display = wxGetDisplay();
+    Display *display = wxGlobalDisplay();

     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));

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

 
     Window childWindow;
 
     Window childWindow;

-    int xx = *x;
-    int yy = *y;
-    XTranslateCoordinates(display, thisWindow, rootWindow, xx, yy, x, y, &childWindow);
+    int xx = x ? *x : 0;
+    int yy = y ? *y : 0;
+    XTranslateCoordinates(display, thisWindow, rootWindow,
+                          xx, yy, x ? x : &xx, y ? y : &yy,
+                          &childWindow);

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

-    // TODO
-#if 0
-    Widget widget = (Widget) GetClientWidget();
-    Dimension xx, yy;
-    XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-    if(x) *x = xx; if(y) *y = yy;
-#endif
-}
-
-void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
-#if 0
-    // A bit of optimization to help sort out the flickers.
-    int oldX, oldY, oldW, oldH;
-    GetSize(& oldW, & oldH);
-    GetPosition(& oldX, & oldY);
+    Window window = (Window) m_mainWindow;

 
 

-    if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
-    {
-        if ( x == -1 )
-            x = oldX;
-        if ( y == -1 )
-            y = oldY;
-    }
-
-    if ( width == -1 )
-        width = oldW;
-    if ( height == -1 )
-        height = oldH;
-
-    bool nothingChanged = (x == oldX) && (y == oldY) &&
-                          (width == oldW) && (height == oldH);
-
-    if (!wxNoOptimize::CanOptimize())
+    if (window)

     {
     {

-        nothingChanged = FALSE;
-    }
+        XWindowAttributes attr;
+        Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );
+        wxASSERT(status);

 
 

-    if ( !nothingChanged )
-    {
-        if (m_drawingArea)
+        if (status)

         {
         {

-            CanvasSetSize(x, y, width, height, sizeFlags);
-            return;
+            *x = attr.width ;
+            *y = attr.height ;

         }
         }

-
-        Widget widget = (Widget) GetTopWidget();
-        if (!widget)
-            return;
-
-        bool managed = XtIsManaged( widget );
-        if (managed)
-            XtUnmanageChild(widget);
-
-        int xx = x;
-        int yy = y;
-        AdjustForParentClientOrigin(xx, yy, sizeFlags);
-
-        DoMoveWindow(xx, yy, width, height);
-
-        if (managed)
-            XtManageChild(widget);
-

     }
     }

-#endif

 }
 
 }
 

-void wxWindowX11::DoSetClientSize(int width, int height)
+void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
 {

-    // TODO
-#if 0
-    if (m_drawingArea)
-    {
-        CanvasSetClientSize(width, height);
-        return;
-    }
-
-    Widget widget = (Widget) GetTopWidget();
+    //    wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height);

 
 

-    if (width > -1)
-        XtVaSetValues(widget, XmNwidth, width, NULL);
-    if (height > -1)
-        XtVaSetValues(widget, XmNheight, height, NULL);
+    Window xwindow = (Window) m_mainWindow;

 
 

-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-    sizeEvent.SetEventObject(this);
-
-    GetEventHandler()->ProcessEvent(sizeEvent);
-#endif
-}
-
-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxWindowX11::GetClientAreaOrigin() const
-{
-    return wxPoint(0, 0);
-}
+    wxCHECK_RET( xwindow, wxT("invalid window") );

 
 

-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindowX11::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
-{
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
-    }
-}
+    XWindowAttributes attr;
+    Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
+    wxCHECK_RET( status, wxT("invalid window attributes") );

 
 

-void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
-{
-    // TODO
-#if 0
-    m_minWidth = minW;
-    m_minHeight = minH;
-    m_maxWidth = maxW;
-    m_maxHeight = maxH;
+    int new_x = attr.x;
+    int new_y = attr.y;
+    int new_w = attr.width;
+    int new_h = attr.height;

 
 

-    wxFrame *frame = wxDynamicCast(this, wxFrame);
-    if ( !frame )
+    if (x != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     {
     {

-        // TODO what about dialogs?
-        return;
+        int yy = 0;
+        AdjustForParentClientOrigin( x, yy, sizeFlags);
+        new_x = x;

     }
     }

-
-    Widget widget = (Widget) frame->GetShellWidget();
-
-    if (minW > -1)
-        XtVaSetValues(widget, XmNminWidth, minW, NULL);
-    if (minH > -1)
-        XtVaSetValues(widget, XmNminHeight, minH, NULL);
-    if (maxW > -1)
-        XtVaSetValues(widget, XmNmaxWidth, maxW, NULL);
-    if (maxH > -1)
-        XtVaSetValues(widget, XmNmaxHeight, maxH, NULL);
-    if (incW > -1)
-        XtVaSetValues(widget, XmNwidthInc, incW, NULL);
-    if (incH > -1)
-        XtVaSetValues(widget, XmNheightInc, incH, NULL);
-#endif
-}
-
-void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
-{
-    // TODO
-#if 0
-    XtVaSetValues((Widget)GetTopWidget(),
-                  XmNx, x,
-                  XmNy, y,
-                  XmNwidth, width,
-                  XmNheight, height,
-                  NULL);
-#endif
-}
-
-// ---------------------------------------------------------------------------
-// text metrics
-// ---------------------------------------------------------------------------
-
-int wxWindowX11::GetCharHeight() const
-{
-    wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
-
-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
-
-    int direction, ascent, descent;
-    XCharStruct overall;
-    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
-        &descent, &overall);
-
-    //  return (overall.ascent + overall.descent);
-    return (ascent + descent);
-}
-
-int wxWindowX11::GetCharWidth() const
-{
-    wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
-
-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
-
-    int direction, ascent, descent;
-    XCharStruct overall;
-    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
-        &descent, &overall);
-
-    return overall.width;
-}
-
-void wxWindowX11::GetTextExtent(const wxString& string,
-                             int *x, int *y,
-                             int *descent, int *externalLeading,
-                             const wxFont *theFont) const
-{
-    wxFont *fontToUse = (wxFont *)theFont;
-    if (!fontToUse)
-        fontToUse = (wxFont *) & m_font;
-
-    wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );
-    
-    WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
-
-    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, string, slen,
-                 &direction, &ascent, &descent2, &overall);
-
-    if ( x )
-        *x = (overall.width);
-    if ( y )
-        *y = (ascent + descent2);
-    if (descent)
-        *descent = descent2;
-    if (externalLeading)
-        *externalLeading = 0;
-
-}
-
-// ----------------------------------------------------------------------------
-// painting
-// ----------------------------------------------------------------------------
-
-void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
-{
-    m_needsRefresh = TRUE;
-    Display *display = wxGetDisplay();
-    Window thisWindow = (Widget) GetMainWindow();
-
-    XExposeEvent dummyEvent;
-    int width, height;
-    GetSize(&width, &height);
-
-    dummyEvent.type = Expose;
-    dummyEvent.display = display;
-    dummyEvent.send_event = True;
-    dummyEvent.window = thisWindow;
-    if (rect)
+    if (y != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     {
     {

-        dummyEvent.x = rect->x;
-        dummyEvent.y = rect->y;
-        dummyEvent.width = rect->width;
-        dummyEvent.height = rect->height;
+        int xx = 0;
+        AdjustForParentClientOrigin( xx, y, sizeFlags);
+        new_y = y;

     }
     }

-    else
+    if (width != wxDefaultCoord)

     {
     {

-        dummyEvent.x = 0;
-        dummyEvent.y = 0;
-        dummyEvent.width = width;
-        dummyEvent.height = height;
+        new_w = width;
+        if (new_w <= 0)
+            new_w = 20;

     }
     }

-    dummyEvent.count = 0;
-
-    if (eraseBack)
+    if (height != wxDefaultCoord)

     {
     {

-        wxClientDC dc(this);
-        wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID);
-        dc.SetBackground(backgroundBrush);
-        if (rect)
-            dc.Clear(*rect);
-        else
-            dc.Clear();
+        new_h = height;
+        if (new_h <= 0)
+            new_h = 20;

     }
 
     }
 

-    XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
+    DoMoveWindow( new_x, new_y, new_w, new_h );

 }
 
 }
 

-void wxWindowX11::Clear()
-{
-    wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-}
-
-void wxWindowX11::ClearUpdateRects()
+void wxWindowX11::DoSetClientSize(int width, int height)

 {
 {

-    wxRectList::Node* node = m_updateRects.GetFirst();
-    while (node)
-    {
-        wxRect* rect = node->GetData();
-        delete rect;
-        node = node->GetNext();
-    }
+    //    wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height);

 
 

-    m_updateRects.Clear();
-}
+    Window xwindow = (Window) m_mainWindow;

 
 

-void wxWindowX11::DoPaint()
-{
-    // Set an erase event first
-    wxEraseEvent eraseEvent(GetId());
-    eraseEvent.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(eraseEvent);
-    
-    wxPaintEvent event(GetId());
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
-    
-    m_needsRefresh = FALSE;
-}
+    wxCHECK_RET( xwindow, wxT("invalid window") );

 
 

-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
+    XResizeWindow( wxGlobalDisplay(), xwindow, width, height );

 
 

-// Responds to colour changes: passes event on to children.
-void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    wxWindowList::Node *node = GetChildren().GetFirst();
-    while ( node )
+    if (m_mainWindow != m_clientWindow)

     {
     {

-        // Only propagate to non-top-level windows
-        wxWindow *win = node->GetData();
-        if ( win->GetParent() )
+        xwindow = (Window) m_clientWindow;
+
+        wxWindow *window = (wxWindow*) this;
+        wxRenderer *renderer = window->GetRenderer();
+        if (renderer)

         {
         {

-            wxSysColourChangedEvent event2;
-            event.m_eventObject = win;
-            win->GetEventHandler()->ProcessEvent(event2);
+            wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
+            width -= border.x + border.width;
+            height -= border.y + border.height;

         }
 
         }
 

-        node = node->GetNext();
+        XResizeWindow( wxGlobalDisplay(), xwindow, width, height );

     }
 }
 
     }
 }
 

-void wxWindowX11::OnIdle(wxIdleEvent& WXUNUSED(event))
+void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)

 {
 {

-    // This calls the UI-update mechanism (querying windows for
-    // menu/toolbar/control state information)
-    UpdateWindowUI();
-}
+    Window xwindow = (Window) m_mainWindow;

 
 

-// ----------------------------------------------------------------------------
-// accelerators
-// ----------------------------------------------------------------------------
+    wxCHECK_RET( xwindow, wxT("invalid window") );

 
 

-bool wxWindowX11::ProcessAccelerator(wxKeyEvent& event)
-{
-    if (!m_acceleratorTable.Ok())
-        return FALSE;
+#if !wxUSE_NANOX

 
 

-    int count = m_acceleratorTable.GetCount();
-    wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries();
-    int i;
-    for (i = 0; i < count; i++)
+    XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, width, height );
+    if (m_mainWindow != m_clientWindow)

     {
     {

-        wxAcceleratorEntry* entry = & (entries[i]);
-        if (entry->MatchesEvent(event))
-        {
-            // Bingo, we have a match. Now find a control that matches the
-           // entry command id.
-
-            // Need to go up to the top of the window hierarchy, since it might
-            // be e.g. a menu item
-            wxWindow* parent = this;
-            while ( parent && !parent->IsTopLevel() )
-                parent = parent->GetParent();
-
-            if (!parent)
-                return FALSE;
-
-            wxFrame* frame = wxDynamicCast(parent, wxFrame);
-            if ( frame )
-            {
-                // Try for a menu command
-                if (frame->GetMenuBar())
-                {
-                    wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand());
-                    if (item)
-                    {
-                        wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
-                        commandEvent.SetEventObject(frame);
-
-                        // If ProcessEvent returns TRUE (it was handled), then
-                        // the calling code will skip the event handling.
-                        return frame->GetEventHandler()->ProcessEvent(commandEvent);
-                    }
-                }
-            }
-
-            // Find a child matching the command id
-            wxWindow* child = parent->FindWindow(entry->GetCommand());
-
-            // No such child
-            if (!child)
-                return FALSE;
+        xwindow = (Window) m_clientWindow;

 
 

-            // Now we process those kinds of windows that we can.
-            // For now, only buttons.
-            if ( wxDynamicCast(child, wxButton) )
-            {
-                wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
-                commandEvent.SetEventObject(child);
-                return child->GetEventHandler()->ProcessEvent(commandEvent);
-            }
-
-            return FALSE;
-        } // matches event
-    }// for
-
-    // We didn't match the key event against an accelerator.
-    return FALSE;
-}
-
-// ============================================================================
-// X11-specific stuff from here on
-// ============================================================================
+        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;
+        }

 
 

-// ----------------------------------------------------------------------------
-// function which maintain the global hash table mapping Widgets to wxWindows
-// ----------------------------------------------------------------------------
+        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;
+        }

 
 

-bool wxAddWindowToTable(Window w, wxWindow *win)
-{
-    wxWindow *oldItem = NULL;
-    if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
-    {
-        wxLogDebug("Widget table clash: new widget is %ld, %s",
-                   (long)w, win->GetClassInfo()->GetClassName());
-        return FALSE;
+        XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, wxMax(1, width), wxMax(1, height) );

     }
 
     }
 

-    wxWidgetHashTable->Put((long) w, win);
+#else

 
 

-    wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",
-               w, win, win->GetClassInfo()->GetClassName());
+    XWindowChanges windowChanges;
+    windowChanges.x = x;
+    windowChanges.y = y;
+    windowChanges.width = width;
+    windowChanges.height = height;
+    windowChanges.stack_mode = 0;
+    int valueMask = CWX | CWY | CWWidth | CWHeight;

 
 

-    return TRUE;
-}
+    XConfigureWindow( wxGlobalDisplay(), xwindow, valueMask, &windowChanges );

 
 

-wxWindow *wxGetWindowFromTable(Window w)
-{
-    return (wxWindow *)wxWidgetHashTable->Get((long) w);
+#endif

 }
 
 }
 

-void wxDeleteWindowFromTable(Window w)
+void wxWindowX11::DoSetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)

 {
 {

-    wxWidgetHashTable->Delete((long)w);
-}
-
-// ----------------------------------------------------------------------------
-// add/remove window from the table
-// ----------------------------------------------------------------------------
+    m_minWidth = minW;
+    m_minHeight = minH;
+    m_maxWidth = maxW;
+    m_maxHeight = maxH;

 
 

-// Add to hash table, add event handler
-bool wxWindowX11::AttachWidget (wxWindow* WXUNUSED(parent), WXWindow mainWidget,
-                             int x, int y, int width, int height)
-{
-    wxAddWindowToTable((Window ) mainWidget, this);
+#if !wxUSE_NANOX
+    XSizeHints sizeHints;
+    sizeHints.flags = 0;

 
 

-    // TODO
-#if 0
-    if (CanAddEventHandler())
+    if (minW > -1 && minH > -1)

     {
     {

-        XtAddEventHandler((Widget) mainWidget,
-            ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
-            False,
-            wxPanelItemEventHandler,
-            (XtPointer) this);
+        sizeHints.flags |= PMinSize;
+        sizeHints.min_width = minW;
+        sizeHints.min_height = minH;

     }
     }

-
-    if (!formWidget)
+    if (maxW > -1 && maxH > -1)

     {
     {

-        XtTranslations ptr;
-        XtOverrideTranslations ((Widget) mainWidget,
-            ptr = XtParseTranslationTable ("<Configure>: resize()"));
-        XtFree ((char *) ptr);
+        sizeHints.flags |= PMaxSize;
+        sizeHints.max_width = maxW;
+        sizeHints.max_height = maxH;

     }
     }

-
-    // Some widgets have a parent form widget, e.g. wxRadioBox
-    if (formWidget)
+    if (incW > -1 && incH > -1)

     {
     {

-        if (!wxAddWindowToTable((Widget) formWidget, this))
-            return FALSE;
-
-        XtTranslations ptr;
-        XtOverrideTranslations ((Widget) formWidget,
-            ptr = XtParseTranslationTable ("<Configure>: resize()"));
-        XtFree ((char *) ptr);
+        sizeHints.flags |= PResizeInc;
+        sizeHints.width_inc = incW;
+        sizeHints.height_inc = incH;

     }
     }

-#endif
-    if (x == -1)
-        x = 0;
-    if (y == -1)
-        y = 0;
-
-    SetSize (x, y, width, height);
-
-    return TRUE;
-}

 
 

-// Remove event handler, remove from hash table
-bool wxWindowX11::DetachWidget(WXWindow widget)
-{
-    // TODO
-#if 0
-    if (CanAddEventHandler())
-    {
-        XtRemoveEventHandler((Widget) widget,
-            ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
-            False,
-            wxPanelItemEventHandler,
-            (XtPointer)this);
-    }
+    XSetWMNormalHints(wxGlobalDisplay(), (Window) m_mainWindow, &sizeHints );

 #endif
 #endif

-
-    wxDeleteWindowFromTable((Window) widget);
-    return TRUE;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// X11-specific accessors
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+// text metrics
+// ---------------------------------------------------------------------------

 
 

-// Get the underlying X window
-WXWindow wxWindowX11::GetXWindow() const
+int wxWindowX11::GetCharHeight() const

 {
 {

-    return GetMainWindow();
-}
+    wxFont font(GetFont());
+    wxCHECK_MSG( font.IsOk(), 0, wxT("valid window font needed") );

 
 

-// Get the underlying X display
-WXDisplay *wxWindowX11::GetXDisplay() const
-{
-    return wxGetDisplay();
-}
+#if wxUSE_UNICODE
+    // There should be an easier way.
+    PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+    pango_layout_set_font_description( layout, font.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 ) );

 
 

-WXWindow wxWindowX11::GetMainWindow() const
-{
-    if (m_drawingArea)
-        return m_drawingArea;
-    else
-        return m_mainWidget;
-}
+    return h;
+#else
+    WXFontStructPtr pFontStruct = font.GetFontStruct(1.0, wxGlobalDisplay());

 
 

-WXWindow wxWindowX11::GetClientWidget() const
-{
-    if (m_drawingArea != (WXWindow) 0)
-        return m_drawingArea;
-    else
-        return GetMainWindow();
-}
+    int direction, ascent, descent;
+    XCharStruct overall;
+    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
+        &descent, &overall);

 
 

-WXWindow wxWindowX11::GetTopWindow() const
-{
-    return GetMainWindow();
+    //  return (overall.ascent + overall.descent);
+    return (ascent + descent);
+#endif

 }
 
 }
 

-WXWindow wxWindowX11::GetLabelWindow() const
+int wxWindowX11::GetCharWidth() const

 {
 {

-    return GetMainWindow();
-}
+    wxFont font(GetFont());
+    wxCHECK_MSG( font.IsOk(), 0, wxT("valid window font needed") );

 
 

-// ----------------------------------------------------------------------------
-// callbacks
-// ----------------------------------------------------------------------------
+#if wxUSE_UNICODE
+    // There should be an easier way.
+    PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+    pango_layout_set_font_description( layout, font.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 ) );

 
 

-// TODO
-#if 0
+    return w;
+#else
+    WXFontStructPtr pFontStruct = font.GetFontStruct(1.0, wxGlobalDisplay());

 
 

-// All widgets should have this as their resize proc.
-// OnSize sent to wxWindow via client data.
-void wxWidgetResizeProc(Widget w, XConfigureEvent *WXUNUSED(event), String WXUNUSED(args)[], int *WXUNUSED(num_args))
-{
-    wxWindow *win = wxGetWindowFromTable(w);
-    if (!win)
-        return;
+    int direction, ascent, descent;
+    XCharStruct overall;
+    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
+        &descent, &overall);

 
 

-    if (win->PreResize())
-    {
-        int width, height;
-        win->GetSize(&width, &height);
-        wxSizeEvent sizeEvent(wxSize(width, height), win->GetId());
-        sizeEvent.SetEventObject(win);
-        win->GetEventHandler()->ProcessEvent(sizeEvent);
-    }
+    return overall.width;
+#endif

 }
 
 }
 

-static void wxCanvasRepaintProc(Widget drawingArea,
-                                XtPointer clientData,
-                                XmDrawingAreaCallbackStruct * cbs)
+void wxWindowX11::DoGetTextExtent(const wxString& string,
+                                  int *x, int *y,
+                                  int *descent,
+                                  int *externalLeading,
+                                  const wxFont *theFont) const

 {
 {

-    if (!wxGetWindowFromTable(drawingArea))
-        return;
+    wxFont fontToUse = GetFont();
+    if (theFont) fontToUse = *theFont;

 
 

-    XEvent * event = cbs->event;
-    wxWindow * win = (wxWindow *) clientData;
+    wxCHECK_RET( fontToUse.IsOk(), wxT("invalid font") );

 
 

-    switch (event->type)
+    if (string.empty())

     {
     {

-    case Expose:
-        {
-            win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
-                               event->xexpose.width, event->xexpose.height);
-            
-            if (event -> xexpose.count == 0)
-            {
-                win->DoPaint();
-                win->ClearUpdateRects();
-            }
-            break;
-        }
+        if (x) (*x) = 0;
+        if (y) (*y) = 0;
+        return;

     }
     }

-}
-
-// Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
-static void wxCanvasEnterLeave(Widget drawingArea,
-                               XtPointer WXUNUSED(clientData),
-                               XCrossingEvent * event)
-{
-    XmDrawingAreaCallbackStruct cbs;
-    XEvent ev;
-
-    ((XCrossingEvent &) ev) = *event;

 
 

-    cbs.reason = XmCR_INPUT;
-    cbs.event = &ev;
+#if wxUSE_UNICODE
+    PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );

 
 

-    wxCanvasInputEvent(drawingArea, (XtPointer) NULL, &cbs);
-}
+    PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description;
+    pango_layout_set_font_description(layout, desc);

 
 

-// Fix to make it work under Motif 1.0 (!)
-static void wxCanvasMotionEvent (Widget WXUNUSED(drawingArea), XButtonEvent * WXUNUSED(event))
-{
-#if XmVersion <= 1000
-    XmDrawingAreaCallbackStruct cbs;
-    XEvent ev;
+    const wxCharBuffer data = wxConvUTF8.cWC2MB( string.wc_str() );
+    pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));

 
 

-    ev = *((XEvent *) event);
-    cbs.reason = XmCR_INPUT;
-    cbs.event = &ev;
+    PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;

 
 

-    wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs);
-#endif // XmVersion <= 1000
-}

 
 

-static void wxCanvasInputEvent(Widget drawingArea,
-                               XtPointer WXUNUSED(data),
-                               XmDrawingAreaCallbackStruct * cbs)
-{
-    wxWindow *canvas = wxGetWindowFromTable(drawingArea);
-    XEvent local_event;
+    PangoRectangle rect;
+    pango_layout_line_get_extents(line, NULL, &rect);

 
 

-    if (canvas==NULL)
-        return;
-
-    if (cbs->reason != XmCR_INPUT)
-        return;
-
-    local_event = *(cbs->event);    // We must keep a copy!
-
-    switch (local_event.xany.type)
+    if (x) (*x) = (wxCoord) (rect.width / PANGO_SCALE);
+    if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE);
+    if (descent)

     {
     {

-    case EnterNotify:
-    case LeaveNotify:
-    case ButtonPress:
-    case ButtonRelease:
-    case MotionNotify:
-        {
-            // FIXME: most of this mouse event code is more or less
-            // duplicated in wxTranslateMouseEvent
-            //
-            wxEventType eventType = wxEVT_NULL;
-
-            if (local_event.xany.type == EnterNotify)
-            {
-                //if (local_event.xcrossing.mode!=NotifyNormal)
-                //  return ; // Ignore grab events
-                eventType = wxEVT_ENTER_WINDOW;
-                //            canvas->GetEventHandler()->OnSetFocus();
-            }
-            else if (local_event.xany.type == LeaveNotify)
-            {
-                //if (local_event.xcrossingr.mode!=NotifyNormal)
-                //  return ; // Ignore grab events
-                eventType = wxEVT_LEAVE_WINDOW;
-                //            canvas->GetEventHandler()->OnKillFocus();
-            }
-            else if (local_event.xany.type == MotionNotify)
-            {
-                eventType = wxEVT_MOTION;
-            }
-
-            else if (local_event.xany.type == ButtonPress)
-            {
-                if (local_event.xbutton.button == Button1)
-                {
-                    eventType = wxEVT_LEFT_DOWN;
-                    canvas->SetButton1(TRUE);
-                }
-                else if (local_event.xbutton.button == Button2)
-                {
-                    eventType = wxEVT_MIDDLE_DOWN;
-                    canvas->SetButton2(TRUE);
-                }
-                else if (local_event.xbutton.button == Button3)
-                {
-                    eventType = wxEVT_RIGHT_DOWN;
-                    canvas->SetButton3(TRUE);
-                }
-            }
-            else if (local_event.xany.type == ButtonRelease)
-            {
-                if (local_event.xbutton.button == Button1)
-                {
-                    eventType = wxEVT_LEFT_UP;
-                    canvas->SetButton1(FALSE);
-                }
-                else if (local_event.xbutton.button == Button2)
-                {
-                    eventType = wxEVT_MIDDLE_UP;
-                    canvas->SetButton2(FALSE);
-                }
-                else if (local_event.xbutton.button == Button3)
-                {
-                    eventType = wxEVT_RIGHT_UP;
-                    canvas->SetButton3(FALSE);
-                }
-            }
+        // Do something about metrics here
+        (*descent) = 0;
+    }
+    if (externalLeading) (*externalLeading) = 0;  // ??

 
 

-            wxMouseEvent wxevent (eventType);
+    g_object_unref( G_OBJECT( layout ) );
+#else
+    WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, wxGlobalDisplay());

 
 

-            wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
-                || (event_left_is_down (&local_event)
-                && (eventType != wxEVT_LEFT_UP)));
-            wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
-                || (event_middle_is_down (&local_event)
-                && (eventType != wxEVT_MIDDLE_UP)));
-            wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
-                || (event_right_is_down (&local_event)
-                && (eventType != wxEVT_RIGHT_UP)));
+    int direction, ascent, descent2;
+    XCharStruct overall;
+    int slen = string.length();

 
 

-            wxevent.m_shiftDown = local_event.xbutton.state & ShiftMask;
-            wxevent.m_controlDown = local_event.xbutton.state & ControlMask;
-            wxevent.m_altDown = local_event.xbutton.state & Mod3Mask;
-            wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask;
-            wxevent.SetTimestamp(local_event.xbutton.time);
+    XTextExtents((XFontStruct*) pFontStruct, (const char*) string.c_str(), slen,
+                 &direction, &ascent, &descent2, &overall);

 
 

-           if ( eventType == wxEVT_MOTION )
-           {
-                if (local_event.xmotion.is_hint == NotifyHint)
-                {
-                    Window root, child;
-                    Display *dpy = XtDisplay (drawingArea);
-
-                    XQueryPointer (dpy, XtWindow (drawingArea),
-                        &root, &child,
-                        &local_event.xmotion.x_root,
-                        &local_event.xmotion.y_root,
-                        &local_event.xmotion.x,
-                        &local_event.xmotion.y,
-                        &local_event.xmotion.state);
-                }
-                else
-                {
-                }
-           }
+    if ( x )
+        *x = (overall.width);
+    if ( y )
+        *y = (ascent + descent2);
+    if (descent)
+        *descent = descent2;
+    if (externalLeading)
+        *externalLeading = 0;
+#endif
+}

 
 

-            // Now check if we need to translate this event into a double click
-            if (TRUE) // canvas->doubleClickAllowed)
-            {
-                if (wxevent.ButtonDown())
-                {
-                    long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay());
-
-                    // get button and time-stamp
-                    int button = 0;
-                    if (wxevent.LeftDown())
-                        button = 1;
-                    else if (wxevent.MiddleDown())
-                        button = 2;
-                    else if (wxevent.RightDown())
-                        button = 3;
-                    long ts = wxevent.GetTimestamp();
-
-                    // check, if single or double click
-                    int buttonLast = canvas->GetLastClickedButton();
-                    long lastTS = canvas->GetLastClickTime();
-                    if ( buttonLast && buttonLast == button && (ts - lastTS) < dclickTime )
-                    {
-                        // I have a dclick
-                        canvas->SetLastClick(0, ts);
-
-                        wxEventType typeDouble;
-                        if ( eventType == wxEVT_LEFT_DOWN )
-                            typeDouble = wxEVT_LEFT_DCLICK;
-                        else if ( eventType == wxEVT_MIDDLE_DOWN )
-                            typeDouble = wxEVT_MIDDLE_DCLICK;
-                        else if ( eventType == wxEVT_RIGHT_DOWN )
-                            typeDouble = wxEVT_RIGHT_DCLICK;
-                        else
-                            typeDouble = wxEVT_NULL;
-
-                        if ( typeDouble != wxEVT_NULL )
-                        {
-                            wxevent.SetEventType(typeDouble);
-                        }
-                    }
-                    else
-                    {
-                        // not fast enough or different button
-                        canvas->SetLastClick(button, ts);
-                    }
-                }
-            }
+// ----------------------------------------------------------------------------
+// painting
+// ----------------------------------------------------------------------------

 
 

-            wxevent.SetId(canvas->GetId());
-            wxevent.SetEventObject(canvas);
-            wxevent.m_x = local_event.xbutton.x;
-            wxevent.m_y = local_event.xbutton.y;
-            canvas->GetEventHandler()->ProcessEvent (wxevent);
-#if 0
-            if (eventType == wxEVT_ENTER_WINDOW ||
-                    eventType == wxEVT_LEAVE_WINDOW ||
-                    eventType == wxEVT_MOTION
-               )
-                return;
-#endif // 0
-            break;
-      }
-    case KeyPress:
+void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
+{
+    if (eraseBack)
+    {
+        if (rect)

         {
         {

-            KeySym keySym;
-#if 0
-            XComposeStatus compose;
-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, &compose);
-#endif // 0
-
-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
-            int id = wxCharCodeXToWX (keySym);
-
-            wxEventType eventType = wxEVT_CHAR;
-
-            wxKeyEvent event (eventType);
-
-            if (local_event.xkey.state & ShiftMask)
-                event.m_shiftDown = TRUE;
-            if (local_event.xkey.state & ControlMask)
-                event.m_controlDown = TRUE;
-            if (local_event.xkey.state & Mod3Mask)
-                event.m_altDown = TRUE;
-            if (local_event.xkey.state & Mod1Mask)
-                event.m_metaDown = TRUE;
-            event.SetEventObject(canvas);
-            event.m_keyCode = id;
-            event.SetTimestamp(local_event.xkey.time);
-
-            if (id > -1)
-            {
-                // Implement wxFrame::OnCharHook by checking ancestor.
-                wxWindow *parent = canvas->GetParent();
-                while (parent && !parent->IsKindOf(CLASSINFO(wxFrame)))
-                    parent = parent->GetParent();
-
-                if (parent)
-                {
-                    event.SetEventType(wxEVT_CHAR_HOOK);
-                    if (parent->GetEventHandler()->ProcessEvent(event))
-                        return;
-                }
-
-                // For simplicity, OnKeyDown is the same as OnChar
-                // TODO: filter modifier key presses from OnChar
-                event.SetEventType(wxEVT_KEY_DOWN);
-
-                // Only process OnChar if OnKeyDown didn't swallow it
-                if (!canvas->GetEventHandler()->ProcessEvent (event))
-                {
-                  event.SetEventType(wxEVT_CHAR);
-                  canvas->GetEventHandler()->ProcessEvent (event);
-        }
-            }
-            break;
+            // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+            m_clearRegion.Union( rect->x, rect->y, rect->width, rect->height );

         }
         }

-    case KeyRelease:
+        else

         {
         {

-            KeySym keySym;
-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
-            int id = wxCharCodeXToWX (keySym);
+            int height,width;
+            GetSize( &width, &height );

 
 

-            wxKeyEvent event (wxEVT_KEY_UP);
-
-            if (local_event.xkey.state & ShiftMask)
-                event.m_shiftDown = TRUE;
-            if (local_event.xkey.state & ControlMask)
-                event.m_controlDown = TRUE;
-            if (local_event.xkey.state & Mod3Mask)
-                event.m_altDown = TRUE;
-            if (local_event.xkey.state & Mod1Mask)
-                event.m_metaDown = TRUE;
-            event.SetEventObject(canvas);
-            event.m_keyCode = id;
-            event.SetTimestamp(local_event.xkey.time);
-
-            if (id > -1)
-            {
-                canvas->GetEventHandler()->ProcessEvent (event);
-            }
-            break;
-        }
-    case FocusIn:
-        {
-            if (local_event.xfocus.detail != NotifyPointer)
-            {
-                wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
-                event.SetEventObject(canvas);
-                canvas->GetEventHandler()->ProcessEvent(event);
-            }
-            break;
-        }
-    case FocusOut:
-        {
-            if (local_event.xfocus.detail != NotifyPointer)
-            {
-                wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
-                event.SetEventObject(canvas);
-                canvas->GetEventHandler()->ProcessEvent(event);
-            }
-            break;
+            // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+            m_clearRegion.Clear();
+            m_clearRegion.Union( 0, 0, width, height );

         }
         }

-    default:
-        break;
+    }
+
+    if (rect)
+    {
+         // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+         m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height );
+    }
+    else
+    {
+        int height,width;
+        GetSize( &width, &height );
+
+        // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+        m_updateRegion.Clear();
+        m_updateRegion.Union( 0, 0, width, height );

     }
 }
 
     }
 }
 

-static void wxPanelItemEventHandler(Widget    wid,
-                                    XtPointer WXUNUSED(client_data),
-                                    XEvent*   event,
-                                    Boolean  *continueToDispatch)
+void wxWindowX11::Update()

 {
 {

-    // Widget can be a label or the actual widget.
-
-    wxWindow *window = wxGetWindowFromTable(wid);
-    if (window)
+    if (m_updateNcArea)

     {
     {

-        wxMouseEvent wxevent(0);
-        if (wxTranslateMouseEvent(wxevent, window, wid, event))
-        {
-            window->GetEventHandler()->ProcessEvent(wxevent);
-        }
+        // wxLogDebug("wxWindowX11::UpdateNC: %s", GetClassInfo()->GetClassName());
+        // Send nc paint events.
+        SendNcPaintEvents();

     }
 
     }
 

-    // TODO: probably the key to allowing default behaviour to happen. Say we
-    // set a m_doDefault flag to FALSE at the start of this function. Then in
-    // e.g. wxWindowX11::OnMouseEvent we can call Default() which sets this flag to
-    // TRUE, indicating that default processing can happen. Thus, behaviour can
-    // appear to be overridden just by adding an event handler and not calling
-    // wxWindowX11::OnWhatever. ALSO, maybe we can use this instead of the current
-    // way of handling drawing area events, to simplify things.
-    *continueToDispatch = True;
+    if (!m_updateRegion.IsEmpty())
+    {
+        // wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName());
+        // Actually send erase events.
+        SendEraseEvents();
+
+        // Actually send paint events.
+        SendPaintEvents();
+    }

 }
 
 }
 

-static void wxScrollBarCallback(Widget scrollbar,
-                                XtPointer clientData,
-                                XmScrollBarCallbackStruct *cbs)
+void wxWindowX11::SendEraseEvents()

 {
 {

-    wxWindow *win = wxGetWindowFromTable(scrollbar);
-    int orientation = (int) clientData;
+    if (m_clearRegion.IsEmpty()) return;
+
+    wxClientDC dc( (wxWindow*)this );
+    dc.SetDeviceClippingRegion( m_clearRegion );
+
+    wxEraseEvent erase_event( GetId(), &dc );
+    erase_event.SetEventObject( this );

 
 

-    wxEventType eventType = wxEVT_NULL;
-    switch (cbs->reason)
+    if (!HandleWindowEvent(erase_event) )

     {
     {

-    case XmCR_INCREMENT:
-        {
-            eventType = wxEVT_SCROLLWIN_LINEDOWN;
-            break;
-        }
-    case XmCR_DECREMENT:
-        {
-            eventType = wxEVT_SCROLLWIN_LINEUP;
-            break;
-        }
-    case XmCR_DRAG:
-        {
-            eventType = wxEVT_SCROLLWIN_THUMBTRACK;
-            break;
-        }
-    case XmCR_VALUE_CHANGED:
-        {
-            eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
-            break;
-        }
-    case XmCR_PAGE_INCREMENT:
-        {
-            eventType = wxEVT_SCROLLWIN_PAGEDOWN;
-            break;
-        }
-    case XmCR_PAGE_DECREMENT:
-        {
-            eventType = wxEVT_SCROLLWIN_PAGEUP;
-            break;
-        }
-    case XmCR_TO_TOP:
-        {
-            eventType = wxEVT_SCROLLWIN_TOP;
-            break;
-        }
-    case XmCR_TO_BOTTOM:
-        {
-            eventType = wxEVT_SCROLLWIN_BOTTOM;
-            break;
-        }
-    default:
+        Display *xdisplay = wxGlobalDisplay();
+        Window xwindow = (Window) GetClientAreaWindow();
+        XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() );
+
+        wxRegionIterator upd( m_clearRegion );
+        while (upd)

         {
         {

-            // Should never get here
-            wxFAIL_MSG("Unknown scroll event.");
-            break;
+            XFillRectangle( xdisplay, xwindow, g_eraseGC,
+                            upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
+            upd ++;

         }
     }
 
         }
     }
 

-    wxScrollWinEvent event(eventType,
-                           cbs->value,
-                           ((orientation == XmHORIZONTAL) ?
-                            wxHORIZONTAL : wxVERTICAL));
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent(event);
+    m_clearRegion.Clear();

 }
 
 }
 

-// For repainting arbitrary windows
-void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
+void wxWindowX11::SendPaintEvents()

 {
 {

-    Window window;
-    Display *display;
-
-    wxWindow* win = wxGetWindowFromTable(w);
-    if (!win)
-        return;
+    //    wxLogDebug("SendPaintEvents: %s (%ld)", GetClassInfo()->GetClassName(), GetId());

 
 

-    switch(event -> type)
-    {
-    case Expose:
-        {
-            window = (Window) win -> GetXWindow();
-            display = (Display *) win -> GetXDisplay();
+    m_clipPaintRegion = true;

 
 

-            if (event -> xexpose.count == 0)
-            {
-                win->DoPaint();
+    wxPaintEvent paint_event( GetId() );
+    paint_event.SetEventObject( this );
+    HandleWindowEvent( paint_event );

 
 

-                win->ClearUpdateRects();
-            }
-            else
-            {
-                win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
-                                   event->xexpose.width, event->xexpose.height);
-            }
+    m_updateRegion.Clear();

 
 

-            break;
-        }
-    }
+    m_clipPaintRegion = false;

 }
 
 }
 

-#endif
-    // 0
-
-// ----------------------------------------------------------------------------
-// CanvaseXXXSize() functions
-// ----------------------------------------------------------------------------
-
-// SetSize, but as per old wxCanvas (with drawing widget etc.)
-void wxWindowX11::CanvasSetSize (int x, int y, int w, int h, int sizeFlags)
+void wxWindowX11::SendNcPaintEvents()

 {
 {

-    // TODO
-#if 0
-    // A bit of optimization to help sort out the flickers.
-    int oldX, oldY, oldW, oldH;
-    GetSize(& oldW, & oldH);
-    GetPosition(& oldX, & oldY);
+    wxWindow *window = (wxWindow*) this;

 
 

-    bool useOldPos = FALSE;
-    bool useOldSize = FALSE;
+    // 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;

 
 

-    if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0))
-        useOldPos = TRUE;
-    else if (x == oldX && y == oldY)
-        useOldPos = TRUE;
+        sb = window->GetScrollbar( wxVERTICAL );
+        if (sb && sb->IsShown())
+        {
+            width = sb->GetSize().x;
+            x = sb->GetPosition().x;

 
 

-    if ((w == -1) && (h == -1))
-        useOldSize = TRUE;
-    else if (w == oldW && h == oldH)
-        useOldSize = TRUE;
+            Display *xdisplay = wxGlobalDisplay();
+            Window xwindow = (Window) X11GetMainWindow();
+            Colormap cm = (Colormap) wxTheApp->GetMainColormap( wxGetDisplay() );
+            wxColour colour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+            colour.CalcPixel( (WXColormap) cm );

 
 

-    if (!wxNoOptimize::CanOptimize())
-    {
-        useOldSize = FALSE; useOldPos = FALSE;
-    }
+            XSetForeground( xdisplay, g_eraseGC, colour.GetPixel() );

 
 

-    if (useOldPos && useOldSize)
-        return;
+            XFillRectangle( xdisplay, xwindow, g_eraseGC, x, y, width, height );
+        }
+    }

 
 

-    Widget drawingArea = (Widget) m_drawingArea;
-    bool managed = XtIsManaged(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
+    wxNcPaintEvent nc_paint_event( GetId() );
+    nc_paint_event.SetEventObject( this );
+    HandleWindowEvent( nc_paint_event );

 
 

-    if (managed)
-        XtUnmanageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-    XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+    m_updateNcArea = false;
+}

 
 

-    int xx = x; int yy = y;
-    AdjustForParentClientOrigin(xx, yy, sizeFlags);
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------

 
 

-    if (!useOldPos)
+// Responds to colour changes: passes event on to children.
+void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+    while ( node )

     {
     {

-        if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        // Only propagate to non-top-level windows
+        wxWindow *win = node->GetData();
+        if ( win->GetParent() )

         {
         {

-            XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-                XmNx, xx, NULL);
+            wxSysColourChangedEvent event2;
+            event.SetEventObject(win);
+            win->HandleWindowEvent(event2);

         }
 
         }
 

-        if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        {
-            XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-                XmNy, yy, NULL);
-        }
+        node = node->GetNext();

     }
     }

+}

 
 

-    if (!useOldSize)
-    {
-
-        if (w > -1)
-        {
-            if (m_borderWidget)
-            {
-                XtVaSetValues ((Widget) m_borderWidget, XmNwidth, w, NULL);
-                short thick, margin;
-                XtVaGetValues ((Widget) m_borderWidget,
-                    XmNshadowThickness, &thick,
-                    XmNmarginWidth, &margin,
-                    NULL);
-                w -= 2 * (thick + margin);
-            }
+// See handler for InFocus case in app.cpp for details.
+wxWindow* g_GettingFocus = NULL;

 
 

-            XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
-
-            Dimension spacing;
-            Widget sbar;
-            XtVaGetValues ((Widget) m_scrolledWindow,
-                XmNspacing, &spacing,
-                XmNverticalScrollBar, &sbar,
-                NULL);
-            Dimension wsbar;
-            if (sbar)
-                XtVaGetValues (sbar, XmNwidth, &wsbar, NULL);
-            else
-                wsbar = 0;
+void wxWindowX11::OnInternalIdle()
+{
+    // Update invalidated regions.
+    Update();

 
 

-            w -= (spacing + wsbar);
+    wxWindowBase::OnInternalIdle();

 
 

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

 #if 0
 #if 0

-            XtVaSetValues(drawingArea, XmNwidth, w, NULL);
-#endif // 0
-        }
-        if (h > -1)
-        {
-            if (m_borderWidget)
-            {
-                XtVaSetValues ((Widget) m_borderWidget, XmNheight, h, NULL);
-                short thick, margin;
-                XtVaGetValues ((Widget) m_borderWidget,
-                    XmNshadowThickness, &thick,
-                    XmNmarginHeight, &margin,
-                    NULL);
-                h -= 2 * (thick + margin);
-            }
+        wxString msg;
+        msg.Printf("Setting focus for %s from OnInternalIdle\n", GetClassInfo()->GetClassName());
+        printf(msg.c_str());
+#endif
+        SetFocus();

 
 

-            XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
-
-            Dimension spacing;
-            Widget sbar;
-            XtVaGetValues ((Widget) m_scrolledWindow,
-                XmNspacing, &spacing,
-                XmNhorizontalScrollBar, &sbar,
-                NULL);
-            Dimension wsbar;
-            if (sbar)
-                XtVaGetValues (sbar, XmNheight, &wsbar, NULL);
-            else
-                wsbar = 0;
+        // If it couldn't set the focus now, there's
+        // no point in trying again.
+        m_needsInputFocus = false;
+    }
+    g_GettingFocus = NULL;
+}

 
 

-            h -= (spacing + wsbar);
+// ----------------------------------------------------------------------------
+// function which maintain the global hash table mapping Widgets to wxWidgets
+// ----------------------------------------------------------------------------

 
 

-#if 0
-            XtVaSetValues(drawingArea, XmNheight, h, NULL);
-#endif // 0
-        }
+static bool DoAddWindowToTable(wxWindowHash *hash, Window w, wxWindow *win)
+{
+    if ( !hash->insert(wxWindowHash::value_type(w, win)).second )
+    {
+        wxLogDebug( wxT("Widget table clash: new widget is 0x%08x, %s"),
+                    (unsigned int)w, win->GetClassInfo()->GetClassName());
+        return false;

     }
 
     }
 

-    if (managed)
-        XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-    XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
-#endif
-    // 0
+    wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"),
+                (unsigned int) w, win, win->GetClassInfo()->GetClassName());
+
+    return true;

 }
 
 }
 

-void wxWindowX11::CanvasSetClientSize (int w, int h)
+static inline wxWindow *DoGetWindowFromTable(wxWindowHash *hash, Window w)

 {
 {

-// TODO
-#if 0
-    Widget drawingArea = (Widget) m_drawingArea;
+    wxWindowHash::iterator i = hash->find(w);
+    return i == hash->end() ? NULL : i->second;
+}
+
+static inline void DoDeleteWindowFromTable(wxWindowHash *hash, Window w)
+{
+    wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x deleted"), (unsigned int) w);

 
 

-    XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+    hash->erase(w);
+}

 
 

-    if (w > -1)
-        XtVaSetValues(drawingArea, XmNwidth, w, NULL);
-    if (h > -1)
-        XtVaSetValues(drawingArea, XmNheight, h, NULL);
+// ----------------------------------------------------------------------------
+// public wrappers
+// ----------------------------------------------------------------------------

 
 

-    XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
-#endif // 0
+bool wxAddWindowToTable(Window w, wxWindow *win)
+{
+    return DoAddWindowToTable(wxWidgetHashTable, w, win);

 }
 
 }
 

-void wxWindowX11::CanvasGetClientSize (int *w, int *h) const
+wxWindow *wxGetWindowFromTable(Window w)

 {
 {

-// TODO
-#if 0
-    // Must return the same thing that was set via SetClientSize
-    Dimension xx, yy;
-    XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL);
-    *w = xx;
-    *h = yy;
-#endif
+    return DoGetWindowFromTable(wxWidgetHashTable, w);
+}
+
+void wxDeleteWindowFromTable(Window w)
+{
+    DoDeleteWindowFromTable(wxWidgetHashTable, w);

 }
 
 }
 

-void wxWindowX11::CanvasGetSize (int *w, int *h) const
+bool wxAddClientWindowToTable(Window w, wxWindow *win)

 {
 {

-// TODO
-#if 0
-    Dimension xx, yy;
-    if ((Widget) m_borderWidget)
-        XtVaGetValues ((Widget) m_borderWidget, XmNwidth, &xx, XmNheight, &yy, NULL);
-    else if ((Widget) m_scrolledWindow)
-        XtVaGetValues ((Widget) m_scrolledWindow, XmNwidth, &xx, XmNheight, &yy, NULL);
-    else
-        XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL);
+    return DoAddWindowToTable(wxClientWidgetHashTable, w, win);
+}

 
 

-    *w = xx;
-    *h = yy;
-#endif
+wxWindow *wxGetClientWindowFromTable(Window w)
+{
+    return DoGetWindowFromTable(wxClientWidgetHashTable, w);

 }
 
 }
 

-void wxWindowX11::CanvasGetPosition (int *x, int *y) const
+void wxDeleteClientWindowFromTable(Window w)

 {
 {

-// TODO
-#if 0
-    Position xx, yy;
-    XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL);
+    DoDeleteWindowFromTable(wxClientWidgetHashTable, w);
+}

 
 

-    // 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())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        xx -= pt.x;
-        yy -= pt.y;
-    }
+// ----------------------------------------------------------------------------
+// X11-specific accessors
+// ----------------------------------------------------------------------------

 
 

-    *x = xx;
-    *y = yy;
-#endif
+WXWindow wxWindowX11::X11GetMainWindow() const
+{
+    return m_mainWindow;
+}
+
+WXWindow wxWindowX11::GetClientAreaWindow() const
+{
+    return m_clientWindow;

 }
 
 // ----------------------------------------------------------------------------
 // TranslateXXXEvent() functions
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // TranslateXXXEvent() functions
 // ----------------------------------------------------------------------------
 

-bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent)
+bool wxTranslateMouseEvent(wxMouseEvent& wxevent,
+                           wxWindow *win,
+                           Window WXUNUSED(window),
+                           XEvent *xevent)

 {
 {

-    // TODO
-#if 0
-    switch (xevent->xany.type)
+    switch (XEventGetType(xevent))

     {
     {

-        case EnterNotify:  // never received here - yes ? MB
-        case LeaveNotify:  // never received here - yes ? MB
+        case EnterNotify:
+        case LeaveNotify:

         case ButtonPress:
         case ButtonRelease:
         case MotionNotify:
         {
             wxEventType eventType = wxEVT_NULL;
 
         case ButtonPress:
         case ButtonRelease:
         case MotionNotify:
         {
             wxEventType eventType = wxEVT_NULL;
 

-            // FIXME: this is never true I think - MB
-            //
-            if (xevent->xany.type == LeaveNotify)
+            if (XEventGetType(xevent) == EnterNotify)
+            {
+                //if (local_event.xcrossing.mode!=NotifyNormal)
+                //  return ; // Ignore grab events
+                eventType = wxEVT_ENTER_WINDOW;
+                //            canvas->GetEventHandler()->OnSetFocus();
+            }
+            else if (XEventGetType(xevent) == LeaveNotify)

             {
             {

-                win->SetButton1(FALSE);
-                win->SetButton2(FALSE);
-                win->SetButton3(FALSE);
-                return FALSE;
+                //if (local_event.xcrossingr.mode!=NotifyNormal)
+                //  return ; // Ignore grab events
+                eventType = wxEVT_LEAVE_WINDOW;
+                //            canvas->GetEventHandler()->OnKillFocus();

             }
             }

-            else if (xevent->xany.type == MotionNotify)
+            else if (XEventGetType(xevent) == MotionNotify)

             {
                 eventType = wxEVT_MOTION;
             }
             {
                 eventType = wxEVT_MOTION;
             }

-            else if (xevent->xany.type == ButtonPress)
+            else if (XEventGetType(xevent) == ButtonPress)

             {
             {

-                wxevent.SetTimestamp(xevent->xbutton.time);
+                wxevent.SetTimestamp(XButtonEventGetTime(xevent));

                 int button = 0;
                 int button = 0;

-                if (xevent->xbutton.button == Button1)
+                if (XButtonEventLChanged(xevent))

                 {
                     eventType = wxEVT_LEFT_DOWN;
                 {
                     eventType = wxEVT_LEFT_DOWN;

-                    win->SetButton1(TRUE);

                     button = 1;
                 }
                     button = 1;
                 }

-                else if (xevent->xbutton.button == Button2)
+                else if (XButtonEventMChanged(xevent))

                 {
                     eventType = wxEVT_MIDDLE_DOWN;
                 {
                     eventType = wxEVT_MIDDLE_DOWN;

-                    win->SetButton2(TRUE);

                     button = 2;
                 }
                     button = 2;
                 }

-                else if (xevent->xbutton.button == Button3)
+                else if (XButtonEventRChanged(xevent))

                 {
                     eventType = wxEVT_RIGHT_DOWN;
                 {
                     eventType = wxEVT_RIGHT_DOWN;

-                    win->SetButton3(TRUE);

                     button = 3;
                 }
                     button = 3;
                 }

+                else if ( xevent->xbutton.button == Button4 ||
+                            xevent->xbutton.button == Button5 )
+                {
+                    // this is the same value as used under wxMSW
+                    static const int WHEEL_DELTA = 120;
+
+                    eventType = wxEVT_MOUSEWHEEL;
+                    button = xevent->xbutton.button;
+
+                    wxevent.m_linesPerAction = 3;
+                    wxevent.m_wheelDelta = WHEEL_DELTA;
+
+                    // Button 4 means mousewheel up, 5 means down
+                    wxevent.m_wheelRotation = button == Button4 ? WHEEL_DELTA
+                                                                : -WHEEL_DELTA;
+                }

 
                 // check for a double click
 
                 // check for a double click

-                //
-                long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay());
+                // TODO: where can we get this value from?
+                //long dclickTime = XtGetMultiClickTime(wxGlobalDisplay());
+                long dclickTime = 200;

                 long ts = wxevent.GetTimestamp();
 
                 int buttonLast = win->GetLastClickedButton();
                 long ts = wxevent.GetTimestamp();
 
                 int buttonLast = win->GetLastClickedButton();


@@ -2365,80 +1518,59 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
                     win->SetLastClick(button, ts);
                 }
             }
                     win->SetLastClick(button, ts);
                 }
             }

-            else if (xevent->xany.type == ButtonRelease)
+            else if (XEventGetType(xevent) == ButtonRelease)

             {
             {

-                if (xevent->xbutton.button == Button1)
+                if (XButtonEventLChanged(xevent))

                 {
                     eventType = wxEVT_LEFT_UP;
                 {
                     eventType = wxEVT_LEFT_UP;

-                    win->SetButton1(FALSE);

                 }
                 }

-                else if (xevent->xbutton.button == Button2)
+                else if (XButtonEventMChanged(xevent))

                 {
                     eventType = wxEVT_MIDDLE_UP;
                 {
                     eventType = wxEVT_MIDDLE_UP;

-                    win->SetButton2(FALSE);

                 }
                 }

-                else if (xevent->xbutton.button == Button3)
+                else if (XButtonEventRChanged(xevent))

                 {
                     eventType = wxEVT_RIGHT_UP;
                 {
                     eventType = wxEVT_RIGHT_UP;

-                    win->SetButton3(FALSE);

                 }
                 }

-                else return FALSE;
+                else return false;

             }
             else
             {
             }
             else
             {

-                return FALSE;
+                return false;

             }
 
             wxevent.SetEventType(eventType);
 
             }
 
             wxevent.SetEventType(eventType);
 

-            Position x1, y1;
-            XtVaGetValues(widget, XmNx, &x1, XmNy, &y1, NULL);
-
-            int x2, y2;
-            win->GetPosition(&x2, &y2);
-
-            // The button x/y must be translated to wxWindows
-            // window space - the widget might be a label or button,
-            // within a form.
-            int dx = 0;
-            int dy = 0;
-            if (widget != (Widget)win->GetMainWidget())
-            {
-                dx = x1;
-                dy = y1;
-            }
-
-            wxevent.m_x = xevent->xbutton.x + dx;
-            wxevent.m_y = xevent->xbutton.y + dy;
+            wxevent.m_x = XButtonEventGetX(xevent);
+            wxevent.m_y = XButtonEventGetY(xevent);

 
             wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
 
             wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)

-                || (event_left_is_down (xevent)
+                || (XButtonEventLIsDown(xevent)

                 && (eventType != wxEVT_LEFT_UP)));
             wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
                 && (eventType != wxEVT_LEFT_UP)));
             wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)

-                || (event_middle_is_down (xevent)
+                || (XButtonEventMIsDown(xevent)

                 && (eventType != wxEVT_MIDDLE_UP)));
             wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
                 && (eventType != wxEVT_MIDDLE_UP)));
             wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)

-                || (event_right_is_down (xevent)
+                || (XButtonEventRIsDown (xevent)

                 && (eventType != wxEVT_RIGHT_UP)));
 
                 && (eventType != wxEVT_RIGHT_UP)));
 

-            wxevent.m_shiftDown = xevent->xbutton.state & ShiftMask;
-            wxevent.m_controlDown = xevent->xbutton.state & ControlMask;
-            wxevent.m_altDown = xevent->xbutton.state & Mod3Mask;
-            wxevent.m_metaDown = xevent->xbutton.state & Mod1Mask;
+            wxevent.m_shiftDown = XButtonEventShiftIsDown(xevent);
+            wxevent.m_controlDown = XButtonEventCtrlIsDown(xevent);
+            wxevent.m_altDown = XButtonEventAltIsDown(xevent);
+            wxevent.m_metaDown = XButtonEventMetaIsDown(xevent);

 
             wxevent.SetId(win->GetId());
             wxevent.SetEventObject(win);
 
 
             wxevent.SetId(win->GetId());
             wxevent.SetEventObject(win);
 

-            return TRUE;
+            return true;

         }
     }
         }
     }

-#endif
-    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 (xevent->xany.type)
+    switch (XEventGetType(xevent))

     {
     case KeyPress:
     case KeyRelease:
     {
     case KeyPress:
     case KeyRelease:


@@ -2448,217 +1580,61 @@ 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';
+            }

 
 

-            if (xevent->xkey.state & ShiftMask)
-                wxevent.m_shiftDown = TRUE;
-            if (xevent->xkey.state & ControlMask)
-                wxevent.m_controlDown = TRUE;
-            if (xevent->xkey.state & Mod3Mask)
-                wxevent.m_altDown = TRUE;
-            if (xevent->xkey.state & Mod1Mask)
-                wxevent.m_metaDown = TRUE;
+            wxevent.m_shiftDown = XKeyEventShiftIsDown(xevent);
+            wxevent.m_controlDown = XKeyEventCtrlIsDown(xevent);
+            wxevent.m_altDown = XKeyEventAltIsDown(xevent);
+            wxevent.m_metaDown = XKeyEventMetaIsDown(xevent);

             wxevent.SetEventObject(win);
             wxevent.m_keyCode = id;
             wxevent.SetEventObject(win);
             wxevent.m_keyCode = id;

-            wxevent.SetTimestamp(xevent->xkey.time);
+            wxevent.SetTimestamp(XKeyEventGetTime(xevent));

 
 

-            wxevent.m_x = xevent->xbutton.x;
-            wxevent.m_y = xevent->xbutton.y;
+            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;
     }

-    return FALSE;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 // Colour stuff
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // Colour stuff
 // ----------------------------------------------------------------------------
 

-#if 0
-
-#define YAllocColor XAllocColor
-XColor g_itemColors[5];
-int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
-{
-    int result;
-    static XmColorProc colorProc;
-
-    result = wxNO_COLORS;
-
-    if (back)
-    {
-        g_itemColors[0].red = (((long) back->Red ()) << 8);
-        g_itemColors[0].green = (((long) back->Green ()) << 8);
-        g_itemColors[0].blue = (((long) back->Blue ()) << 8);
-        g_itemColors[0].flags = DoRed | DoGreen | DoBlue;
-        if (colorProc == (XmColorProc) NULL)
-        {
-            // Get a ptr to the actual function
-            colorProc = XmSetColorCalculation ((XmColorProc) NULL);
-            // And set it back to motif.
-            XmSetColorCalculation (colorProc);
-        }
-        (*colorProc) (&g_itemColors[wxBACK_INDEX],
-            &g_itemColors[wxFORE_INDEX],
-            &g_itemColors[wxSELE_INDEX],
-            &g_itemColors[wxTOPS_INDEX],
-            &g_itemColors[wxBOTS_INDEX]);
-        result = wxBACK_COLORS;
-    }
-    if (fore)
-    {
-        g_itemColors[wxFORE_INDEX].red = (((long) fore->Red ()) << 8);
-        g_itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8);
-        g_itemColors[wxFORE_INDEX].blue = (((long) fore->Blue ()) << 8);
-        g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue;
-        if (result == wxNO_COLORS)
-            result = wxFORE_COLORS;
-    }
-
-    Display *dpy = display;
-    Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy);
-
-    if (back)
-    {
-        /* 5 Colours to allocate */
-        for (int i = 0; i < 5; i++)
-            if (!YAllocColor (dpy, cmap, &g_itemColors[i]))
-                result = wxNO_COLORS;
-    }
-    else if (fore)
-    {
-        /* Only 1 colour to allocate */
-        if (!YAllocColor (dpy, cmap, &g_itemColors[wxFORE_INDEX]))
-            result = wxNO_COLORS;
-    }
-
-    return (result);
-
-}
-#endif
-
-// Changes the foreground and background colours to be derived from the current
-// background colour. To change the foreground colour, you must call
-// SetForegroundColour explicitly.
-void wxWindowX11::ChangeBackgroundColour()
-{
-    // TODO
-#if 0
-    WXWidget mainWidget = GetMainWidget();
-    if ( mainWidget )
-        DoChangeBackgroundColour(mainWidget, m_backgroundColour);
-#endif
-}
-
-void wxWindowX11::ChangeForegroundColour()
-{
-    // TODO
-#if 0
-    WXWidget mainWidget = GetMainWidget();
-    if ( mainWidget )
-        DoChangeForegroundColour(mainWidget, m_foregroundColour);
-    if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
-        DoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
-#endif
-}
-
-// Change a widget's foreground and background colours.
-void wxWindowX11::DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour)
+bool wxWindowX11::SetBackgroundColour(const wxColour& col)

 {
 {

-    // TODO
-#if 0
-    // When should we specify the foreground, if it's calculated
-    // by wxComputeColours?
-    // Solution: say we start with the default (computed) foreground colour.
-    // If we call SetForegroundColour explicitly for a control or window,
-    // then the foreground is changed.
-    // Therefore SetBackgroundColour computes the foreground colour, and
-    // SetForegroundColour changes the foreground colour. The ordering is
-    // important.
-
-    Widget w = (Widget)widget;
-    XtVaSetValues(
-                  w,
-                  XmNforeground, foregroundColour.AllocColour(XtDisplay(w)),
-                  NULL
-                 );
-#endif
-}
+    wxWindowBase::SetBackgroundColour(col);

 
 

-void wxWindowX11::DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour)
-{
-    // TODO
-#if 0
-    wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
-        (wxColour*) NULL);
-
-    XtVaSetValues ((Widget) widget,
-        XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
-        XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
-        XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
-        XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
-        NULL);
-
-    if (changeArmColour)
-        XtVaSetValues ((Widget) widget,
-        XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
-        NULL);
-#endif
-}
+    Display *xdisplay = (Display*) wxGlobalDisplay();
+    int xscreen = DefaultScreen( xdisplay );
+    Colormap cm = DefaultColormap( xdisplay, xscreen );

 
 

-bool wxWindowX11::SetBackgroundColour(const wxColour& col)
-{
-    if ( !wxWindowBase::SetBackgroundColour(col) )
-        return FALSE;
+    m_backgroundColour.CalcPixel( (WXColormap) cm );

 
 

-    ChangeBackgroundColour();
+    // 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;

 }
 
 bool wxWindowX11::SetForegroundColour(const wxColour& col)
 {
     if ( !wxWindowBase::SetForegroundColour(col) )
 }
 
 bool wxWindowX11::SetForegroundColour(const wxColour& col)
 {
     if ( !wxWindowBase::SetForegroundColour(col) )

-        return FALSE;
-
-    ChangeForegroundColour();
-
-    return TRUE;
-}
-
-void wxWindowX11::ChangeFont(bool keepOriginalSize)
-{
-    // TODO
-#if 0
-    // Note that this causes the widget to be resized back
-    // to its original size! We therefore have to set the size
-    // back again. TODO: a better way in Motif?
-    Widget w = (Widget) GetLabelWidget(); // Usually the main widget
-    if (w && m_font.Ok())
-    {
-        int width, height, width1, height1;
-        GetSize(& width, & height);
-
-        // lesstif 0.87 hangs here
-#ifndef LESSTIF_VERSION
-        XtVaSetValues (w,
-            XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay(w)),
-            NULL);
-#endif
+        return false;

 
 

-        GetSize(& width1, & height1);
-        if (keepOriginalSize && (width != width1 || height != height1))
-        {
-            SetSize(-1, -1, width, height);
-        }
-    }
-#endif
+    return true;

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


@@ -2667,9 +1643,7 @@ void wxWindowX11::ChangeFont(bool keepOriginalSize)
 
 wxWindow *wxGetActiveWindow()
 {
 
 wxWindow *wxGetActiveWindow()
 {

-    // TODO
-    wxFAIL_MSG("Not implemented");
-    return NULL;
+    return wxGetTopLevelParent(wxWindow::FindFocus());

 }
 
 /* static */
 }
 
 /* static */


@@ -2683,24 +1657,61 @@ wxWindow *wxWindowBase::GetCapture()
 // position.
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
 // position.
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {

-    return wxFindWindowAtPoint(wxGetMousePosition());
+    pt = wxGetMousePosition();
+    return wxFindWindowAtPoint(pt);

 }
 
 }
 

-// Get the current mouse position.
-wxPoint wxGetMousePosition()
+void wxGetMouseState(int& rootX, int& rootY, unsigned& maskReturn)

 {
 {

-    Display *display = (Display*) wxGetDisplay();
+#if wxUSE_NANOX
+    /* TODO */
+    rootX = rootY = 0;
+    maskReturn = 0;
+#else
+    Display *display = wxGlobalDisplay();

     Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
     Window rootReturn, childReturn;
     Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
     Window rootReturn, childReturn;

-    int rootX, rootY, winX, winY;
-    unsigned int maskReturn;
+    int winX, winY;

 
     XQueryPointer (display,
 
     XQueryPointer (display,

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

                    &childReturn,
                    &rootX, &rootY, &winX, &winY, &maskReturn);
                    &childReturn,
                    &rootX, &rootY, &winX, &winY, &maskReturn);

-    return wxPoint(rootX, rootY);
+#endif
+}
+
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
+{
+    int x, y;
+    unsigned mask;
+
+    wxGetMouseState(x, y, mask);
+    return wxPoint(x, y);
+}
+
+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    int x, y;
+    unsigned mask;
+
+    wxGetMouseState(x, y, mask);
+
+    ms.SetX(x);
+    ms.SetY(y);
+
+    ms.SetLeftDown(mask & Button1Mask);
+    ms.SetMiddleDown(mask & Button2Mask);
+    ms.SetRightDown(mask & Button3Mask);
+
+    ms.SetControlDown(mask & ControlMask);
+    ms.SetShiftDown(mask & ShiftMask);
+    ms.SetAltDown(mask & Mod3Mask);
+    ms.SetMetaDown(mask & Mod1Mask);
+
+    return ms;

 }
 
 
 }
 
 


@@ -2710,3 +1721,51 @@ wxPoint wxGetMousePosition()
 
 int wxNoOptimize::ms_count = 0;
 
 
 int wxNoOptimize::ms_count = 0;
 

+
+// ----------------------------------------------------------------------------
+// wxDCModule
+// ----------------------------------------------------------------------------
+
+class wxWinModule : public wxModule
+{
+public:
+    wxWinModule()
+    {
+        // we must be cleaned up before the display is closed
+        AddDependency(wxClassInfo::FindClass(wxT("wxX11DisplayModule")));
+    }
+
+    virtual bool OnInit();
+    virtual void OnExit();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxWinModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule)
+
+bool wxWinModule::OnInit()
+{
+    Display *xdisplay = wxGlobalDisplay();
+    if ( !xdisplay )
+    {
+        // This module may be linked into a console program when using
+        // monolithic library and in this case it's perfectly normal not to
+        // have a display, so just return without doing anything and avoid
+        // crashing below.
+        return true;
+    }
+
+    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 );
+}