Crash fix under VC++

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 7929a5e6cae100b8fa8b3259d501bcc68d5fa51a..5d1ab3726cf139c4a01dbc1cccf2f29563718782 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

     #pragma implementation "app.h"
 #endif
 
     #pragma implementation "app.h"
 #endif
 


@@ -17,560 +17,710 @@
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"

-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"

 #include "wx/icon.h"
 #include "wx/icon.h"

-#include "wx/palette.h"
-#include "wx/dc.h"

 #include "wx/dialog.h"
 #include "wx/dialog.h"

-#include "wx/msgdlg.h"

 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/log.h"
 #include "wx/intl.h"

+#include "wx/evtloop.h"
+#include "wx/timer.h"
+#include "wx/filename.h"
+#include "wx/hash.h"
+
+#include "wx/univ/theme.h"
+#include "wx/univ/renderer.h"

 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 

-#if wxUSE_WX_RESOURCES
-    #include "wx/resource.h"
-#endif
-
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xresource.h>
-#include <X11/Xatom.h>
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
-

 #include "wx/x11/private.h"
 
 #include <string.h>
 
 #include "wx/x11/private.h"
 
 #include <string.h>
 

-extern char *wxBuffer;
+//------------------------------------------------------------------------
+//   global data
+//------------------------------------------------------------------------
+

 extern wxList wxPendingDelete;
 
 extern wxList wxPendingDelete;
 

-wxApp *wxTheApp = NULL;
+wxWindowHash *wxWidgetHashTable = NULL;
+wxWindowHash *wxClientWidgetHashTable = NULL;

 
 

-wxHashTable *wxWidgetHashTable = NULL;
+static bool g_showIconic = FALSE;
+static wxSize g_initialSize = wxDefaultSize;

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+// This is required for wxFocusEvent::SetWindow(). It will only
+// work for focus events which we provoke ourselves (by calling
+// SetFocus()). It will not work for those events, which X11
+// generates itself.
+static wxWindow *g_nextFocus = NULL;
+static wxWindow *g_prevFocus = NULL;

 
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
+//------------------------------------------------------------------------
+//   X11 error handling
+//------------------------------------------------------------------------

 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__

-    typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
+typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);

 
 

-    XErrorHandlerFunc gs_pfnXErrorHandler = 0;
+XErrorHandlerFunc gs_pfnXErrorHandler = 0;

 
 

-    static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
-    {
-        // just forward to the default handler for now
+static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
+{
+    // just forward to the default handler for now
+    if (gs_pfnXErrorHandler)

         return gs_pfnXErrorHandler(dpy, xevent);
         return gs_pfnXErrorHandler(dpy, xevent);

-    }
+    else
+        return 0;
+}

 #endif // __WXDEBUG__
 
 #endif // __WXDEBUG__
 

+//------------------------------------------------------------------------
+//   wxApp
+//------------------------------------------------------------------------
+

 long wxApp::sm_lastMessageTime = 0;
 long wxApp::sm_lastMessageTime = 0;

+WXDisplay *wxApp::ms_display = NULL;
+
+IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)

 
 

-bool wxApp::Initialize()
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+    EVT_IDLE(wxAppBase::OnIdle)
+END_EVENT_TABLE()
+
+bool wxApp::Initialize(int& argc, wxChar **argv)

 {
 {

-    wxBuffer = new char[BUFSIZ + 512];
+#if defined(__WXDEBUG__) && !wxUSE_NANOX
+    // install the X error handler
+    gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
+#endif // __WXDEBUG__

 
 

-    wxClassInfo::InitializeClasses();
+    wxString displayName;
+    bool syncDisplay = FALSE;

 
 

-    // GL: I'm annoyed ... I don't know where to put this and I don't want to
-    // create a module for that as it's part of the core.
-#if wxUSE_THREADS
-    wxPendingEventsLocker = new wxCriticalSection();
-#endif
+    int argcOrig = argc;
+    for ( int i = 0; i < argcOrig; i++ )
+    {
+        if (wxStrcmp( argv[i], _T("-display") ) == 0)
+        {
+            if (i < (argc - 1))
+            {
+                argv[i++] = NULL;

 
 

-    wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-    wxTheColourDatabase->Initialize();
+                displayName = argv[i];
+
+                argv[i] = NULL;
+                argc -= 2;
+            }
+        }
+        else if (wxStrcmp( argv[i], _T("-geometry") ) == 0)
+        {
+            if (i < (argc - 1))
+            {
+                argv[i++] = NULL;
+
+                int w, h;
+                if (wxSscanf(argv[i], _T("%dx%d"), &w, &h) != 2)
+                {
+                    wxLogError( _("Invalid geometry specification '%s'"),
+                                wxString(argv[i]).c_str() );
+                }
+                else
+                {
+                    g_initialSize = wxSize(w, h);
+                }
+
+                argv[i] = NULL;
+                argc -= 2;
+            }
+        }
+        else if (wxStrcmp( argv[i], _T("-sync") ) == 0)
+        {
+            syncDisplay = TRUE;

 
 

-    wxInitializeStockLists();
-    wxInitializeStockObjects();
+            argv[i] = NULL;
+            argc--;
+        }
+        else if (wxStrcmp( argv[i], _T("-iconic") ) == 0)
+        {
+            g_showIconic = TRUE;

 
 

-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
+            argv[i] = NULL;
+            argc--;
+        }
+    }

 
 

-    wxBitmap::InitStandardHandlers();
+    if ( argc != argcOrig )
+    {
+        // remove the argumens we consumed
+        for ( int i = 0; i < argc; i++ )
+        {
+            while ( !argv[i] )
+            {
+                memmove(argv + i, argv + i + 1, argcOrig - i);
+            }
+        }
+    }

 
 

-    wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
+    // X11 display stuff
+    Display *xdisplay;
+    if ( displayName.empty() )
+        xdisplay = XOpenDisplay( NULL );
+    else
+        xdisplay = XOpenDisplay( displayName.ToAscii() );
+    if (!xdisplay)
+    {
+        wxLogError( _("wxWidgets could not open display. Exiting.") );
+        return false;
+    }

 
 

-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) return FALSE;
+    if (syncDisplay)
+        XSynchronize(xdisplay, True);

 
 

-    return TRUE;
+    ms_display = (WXDisplay*) xdisplay;
+
+    XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
+
+    // Misc.
+    wxSetDetectableAutoRepeat( TRUE );
+
+    if ( !wxAppBase::Initialize(argc, argv) )
+    {
+        XCloseDisplay(xdisplay);
+
+        return false;
+    }
+
+#if wxUSE_UNICODE
+    // Glib's type system required by Pango
+    g_type_init();
+#endif
+
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
+
+    wxWidgetHashTable = new wxWindowHash;
+    wxClientWidgetHashTable = new wxWindowHash;
+
+    return true;

 }
 
 void wxApp::CleanUp()
 {
     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
 }
 
 void wxApp::CleanUp()
 {
     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;

+    delete wxClientWidgetHashTable;
+    wxClientWidgetHashTable = NULL;

 
 

-    wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
+    wxAppBase::CleanUp();
+}

 
 

-    wxDeleteStockObjects() ;
+wxApp::wxApp()
+{
+    // TODO: parse the command line
+    argc = 0;
+    argv = NULL;

 
 

-    // Destroy all GDI lists, etc.
+    m_mainColormap = (WXColormap) NULL;
+    m_topLevelWidget = (WXWindow) NULL;
+    m_maxRequestSize = 0;
+    m_showIconic = FALSE;
+    m_initialSize = wxDefaultSize;

 
 

-    wxDeleteStockLists();
+#if !wxUSE_NANOX
+    m_visualInfo = NULL;
+#endif
+}

 
 

-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
+wxApp::~wxApp()
+{
+#if !wxUSE_NANOX
+    delete m_visualInfo;
+#endif
+}

 
 

-    wxBitmap::CleanUpHandlers();
+#if !wxUSE_NANOX
+//-----------------------------------------------------------------------
+// X11 predicate function for exposure compression
+//-----------------------------------------------------------------------

 
 

-    delete[] wxBuffer;
-    wxBuffer = NULL;
+struct wxExposeInfo
+{
+    Window window;
+    Bool found_non_matching;
+};

 
 

-    wxClassInfo::CleanUpClasses();
+static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg)
+{
+    wxExposeInfo *info = (wxExposeInfo*) arg;

 
 

-    delete wxTheApp;
-    wxTheApp = NULL;
+    if (info->found_non_matching)
+       return FALSE;

 
 

-    // GL: I'm annoyed ... I don't know where to put this and I don't want to
-    // create a module for that as it's part of the core.
-#if wxUSE_THREADS
-    delete wxPendingEvents;
-    delete wxPendingEventsLocker;
-#endif
+    if (xevent->xany.type != Expose)
+    {
+        info->found_non_matching = TRUE;
+        return FALSE;
+    }

 
 

-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // At this point we want to check if there are any memory
-    // blocks that aren't part of the wxDebugContext itself,
-    // as a special case. Then when dumping we need to ignore
-    // wxDebugContext, too.
-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
+    if (xevent->xexpose.window != info->window)

     {
     {

-        wxLogDebug("There were memory leaks.\n");
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
+        info->found_non_matching = TRUE;
+        return FALSE;

     }
     }

-#endif

 
 

-    // do it as the very last thing because everything else can log messages
-    wxLog::DontCreateOnDemand();
-    // do it as the very last thing because everything else can log messages
-    delete wxLog::SetActiveTarget(NULL);
+    return TRUE;

 }
 }

+#endif
+    // wxUSE_NANOX

 
 

-int wxEntry( int argc, char *argv[] )
+//-----------------------------------------------------------------------
+// Processes an X event, returning TRUE if the event was processed.
+//-----------------------------------------------------------------------
+
+bool wxApp::ProcessXEvent(WXEvent* _event)

 {
 {

-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // This seems to be necessary since there are 'rogue'
-    // objects present at this point (perhaps global objects?)
-    // Setting a checkpoint will ignore them as far as the
-    // memory checking facility is concerned.
-    // Of course you may argue that memory allocated in globals should be
-    // checked, but this is a reasonable compromise.
-    wxDebugContext::SetCheckpoint();
+    XEvent* event = (XEvent*) _event;
+
+    wxWindow* win = NULL;
+    Window window = XEventGetWindow(event);
+#if 0
+    Window actualWindow = window;

 #endif
 
 #endif
 

-    if (!wxApp::Initialize())
-        return FALSE;
+    // Find the first wxWindow that corresponds to this event window
+    // Because we're receiving events after a window
+    // has been destroyed, assume a 1:1 match between
+    // Window and wxWindow, so if it's not in the table,
+    // it must have been destroyed.

 
 

-    if (!wxTheApp)
+    win = wxGetWindowFromTable(window);
+    if (!win)

     {
     {

-        if (!wxApp::GetInitializerFunction())
-        {
-            printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-            return 0;
-        };
+#if wxUSE_TWO_WINDOWS
+        win = wxGetClientWindowFromTable(window);
+        if (!win)
+#endif
+            return FALSE;
+    }

 
 

-        wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
-    };
+#ifdef __WXDEBUG__
+    wxString windowClass = win->GetClassInfo()->GetClassName();
+#endif

 
 

-    if (!wxTheApp)
+    switch (event->type)

     {
     {

-        printf( "wxWindows error: wxTheApp == NULL\n" );
-        return 0;
-    };
-
-    wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
-    wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
-
-    wxTheApp->argc = argc;
-    wxTheApp->argv = argv;
-
-    // GUI-specific initialization, such as creating an app context.
-    wxTheApp->OnInitGui();
+        case Expose:
+        {
+#if wxUSE_TWO_WINDOWS && !wxUSE_NANOX
+            if (event->xexpose.window != (Window)win->GetClientAreaWindow())
+            {
+                XEvent tmp_event;
+                wxExposeInfo info;
+                info.window = event->xexpose.window;
+                info.found_non_matching = FALSE;
+                while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info ))
+                {
+                    // Don't worry about optimizing redrawing the border etc.
+                }
+                win->NeedUpdateNcAreaInIdle();
+            }
+            else
+#endif
+            {
+                win->GetUpdateRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
+                                              XExposeEventGetWidth(event), XExposeEventGetHeight(event));
+                win->GetClearRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
+                                         XExposeEventGetWidth(event), XExposeEventGetHeight(event));
+
+#if !wxUSE_NANOX
+                XEvent tmp_event;
+                wxExposeInfo info;
+                info.window = event->xexpose.window;
+                info.found_non_matching = FALSE;
+                while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info ))
+                {
+                    win->GetUpdateRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y,
+                                                  tmp_event.xexpose.width, tmp_event.xexpose.height );
+
+                    win->GetClearRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y,
+                                                 tmp_event.xexpose.width, tmp_event.xexpose.height );
+                }
+#endif

 
 

-    // Here frames insert themselves automatically into wxTopLevelWindows by
-    // getting created in OnInit().
+                // This simplifies the expose and clear areas to simple
+                // rectangles.
+                win->GetUpdateRegion() = win->GetUpdateRegion().GetBox();
+                win->GetClearRegion() = win->GetClearRegion().GetBox();

 
 

-    int retValue = 0;
-    if (wxTheApp->OnInit())
-    {
-        if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
-    }
+                // If we only have one X11 window, always indicate
+                // that borders might have to be redrawn.
+                if (win->GetMainWindow() == win->GetClientAreaWindow())
+                    win->NeedUpdateNcAreaInIdle();

 
 

-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
+                // Only erase background, paint in idle time.
+                win->SendEraseEvents();

 
 

-    delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
-    // for further messages
+                // EXPERIMENT
+                //win->Update();
+            }

 
 

-    if (wxTheApp->GetTopWindow())
-    {
-        delete wxTheApp->GetTopWindow();
-        wxTheApp->SetTopWindow(NULL);
-    }
+            return TRUE;
+        }

 
 

-    wxTheApp->DeletePendingObjects();
+#if !wxUSE_NANOX
+        case GraphicsExpose:
+        {
+            wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str());

 
 

-    wxTheApp->OnExit();
+            win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                          event->xgraphicsexpose.width, event->xgraphicsexpose.height);

 
 

-    wxApp::CleanUp();
+            win->GetClearRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                         event->xgraphicsexpose.width, event->xgraphicsexpose.height);

 
 

-    return retValue;
-};
+            if (event->xgraphicsexpose.count == 0)
+            {
+                // Only erase background, paint in idle time.
+                win->SendEraseEvents();
+                // win->Update();
+            }

 
 

-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+            return TRUE;
+        }
+#endif

 
 

-wxApp::wxApp()
-{
-    m_topWindow = NULL;
-    wxTheApp = this;
-    m_className = "";
-    m_wantDebugOutput = TRUE ;
-    m_appName = "";
-    argc = 0;
-    argv = NULL;
-    m_exitOnFrameDelete = TRUE;
-    m_mainColormap = (WXColormap) NULL;
-    m_topLevelWidget = (WXWindow) NULL;
-    m_maxRequestSize = 0;
-    m_initialDisplay = (WXDisplay*) 0;
-}
+        case KeyPress:
+        {
+            if (!win->IsEnabled())
+                return FALSE;

 
 

-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
-}
+            wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
+            wxTranslateKeyEvent(keyEvent, win, window, event);

 
 

-int wxApp::MainLoop()
-{
-    m_keepGoing = TRUE;
+            // wxLogDebug( "OnKey from %s", win->GetName().c_str() );

 
 

-    /*
-    * Sit around forever waiting to process X-events. Property Change
-    * event are handled special, because they have to refer to
-    * the root window rather than to a widget. therefore we can't
-    * use an Xt-eventhandler.
-    */
+            // We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR
+            if (win->GetEventHandler()->ProcessEvent( keyEvent ))
+                return TRUE;

 
 

-    XSelectInput(wxGetDisplay(),
-        XDefaultRootWindow(wxGetDisplay()),
-        PropertyChangeMask);
+            keyEvent.SetEventType(wxEVT_CHAR);
+            // Do the translation again, retaining the ASCII
+            // code.
+            wxTranslateKeyEvent(keyEvent, win, window, event, TRUE);
+            if (win->GetEventHandler()->ProcessEvent( keyEvent ))
+                return TRUE;

 
 

-    XEvent event;
+            if ( (keyEvent.m_keyCode == WXK_TAB) &&
+                 win->GetParent() && (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
+            {
+                wxNavigationKeyEvent new_event;
+                new_event.SetEventObject( win->GetParent() );
+                /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
+                new_event.SetDirection( (keyEvent.m_keyCode == WXK_TAB) );
+                /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
+                new_event.SetWindowChange( keyEvent.ControlDown() );
+                new_event.SetCurrentFocus( win );
+                return win->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+            }

 
 

-    // Use this flag to allow breaking the loop via wxApp::ExitMainLoop()
-    while (m_keepGoing)
-    {
-        XNextEvent(wxGetDisplay(), & event);
+            return FALSE;
+        }
+        case KeyRelease:
+        {
+            if (!win->IsEnabled())
+                return FALSE;

 
 

-        ProcessXEvent((WXEvent*) & event);
+            wxKeyEvent keyEvent(wxEVT_KEY_UP);
+            wxTranslateKeyEvent(keyEvent, win, window, event);

 
 

-        if (XtPending(wxGetDisplay()) == 0)
+            return win->GetEventHandler()->ProcessEvent( keyEvent );
+        }
+        case ConfigureNotify:

         {
         {

-            if (!ProcessIdle())
-            {
-#if wxUSE_THREADS
-                // leave the main loop to give other threads a chance to
-                // perform their GUI work
-                wxMutexGuiLeave();
-                wxUsleep(20);
-                wxMutexGuiEnter();
+#if wxUSE_NANOX
+            if (event->update.utype == GR_UPDATE_SIZE)

 #endif
 #endif

+            {
+                wxTopLevelWindow *tlw = wxDynamicCast(win, wxTopLevelWindow);
+                if ( tlw )
+                {
+                    tlw->SetConfigureGeometry( XConfigureEventGetX(event), XConfigureEventGetY(event),
+                        XConfigureEventGetWidth(event), XConfigureEventGetHeight(event) );
+                }
+
+                if ( tlw && tlw->IsShown() )
+                {
+                    tlw->SetNeedResizeInIdle();
+                }
+                else
+                {
+                    wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
+                    sizeEvent.SetEventObject( win );
+
+                    return win->GetEventHandler()->ProcessEvent( sizeEvent );
+                }

             }
             }

+            return FALSE;

         }
         }

+#if !wxUSE_NANOX
+        case PropertyNotify:
+        {
+            //wxLogDebug("PropertyNotify: %s", windowClass.c_str());
+            return HandlePropertyChange(_event);
+        }
+        case ClientMessage:
+        {
+            if (!win->IsEnabled())
+                return FALSE;

 
 

-    }
-
-    return 0;
-}
+            Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);
+            Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);

 
 

-// Processes an X event.
-void wxApp::ProcessXEvent(WXEvent* _event)
-{
-    XEvent* event = (XEvent*) _event;
-    
-    if (event->type == KeyPress)
-    {
-        if (CheckForAccelerator(_event))
+            if (event->xclient.message_type == wm_protocols)
+            {
+                if ((Atom) (event->xclient.data.l[0]) == wm_delete_window)
+                {
+                    win->Close(FALSE);
+                    return TRUE;
+                }
+            }
+            return FALSE;
+        }
+#if 0
+        case DestroyNotify:

         {
         {

-            // Do nothing! We intercepted and processed the event as an
-            // accelerator.
-            return;
+            printf( "destroy from %s\n", win->GetName().c_str() );
+            break;

         }
         }

-#if 1
-        // It seemed before that this hack was redundant and
-        // key down events were being generated by wxCanvasInputEvent.
-        // But no longer - why ???
-        //
-        else if (CheckForKeyDown(_event))
+        case CreateNotify:

         {
         {

-            // We intercepted and processed the key down event
-            return;
+            printf( "create from %s\n", win->GetName().c_str() );
+            break;

         }
         }

-#endif
-        else
+        case MapRequest:

         {
         {

-            // TODO for X11 implementation -- the equivalent of XtDispatchEvent.
-            // Presumably, we need to form the wxEvents and
-            // and send them to the appropriate windows.
-            // XtDispatchEvent(event);
-            return;
+            printf( "map request from %s\n", win->GetName().c_str() );
+            break;

         }
         }

-    }
-    else if (event->type == KeyRelease)
-    {
-        // TODO: work out why we still need this !  -michael
-        //
-        if (CheckForKeyUp(_event))
+        case ResizeRequest:

         {
         {

-            // We intercepted and processed the key up event
-            return;
+            printf( "resize request from %s\n", win->GetName().c_str() );
+
+            Display *disp = (Display*) wxGetDisplay();
+            XEvent report;
+
+            //  to avoid flicker
+            report = * event;
+            while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));
+
+            wxSize sz = win->GetSize();
+            wxSizeEvent sizeEvent(sz, win->GetId());
+            sizeEvent.SetEventObject(win);
+
+            return win->GetEventHandler()->ProcessEvent( sizeEvent );

         }
         }

-        else
+#endif
+#endif
+#if wxUSE_NANOX
+        case GR_EVENT_TYPE_CLOSE_REQ:

         {
         {

-            // TODO: The X equivalent of XtDispatchEvent
-            // (see above)
-            // XtDispatchEvent(event);
-            return;
+            if (win)
+            {
+                win->Close(FALSE);
+                return TRUE;
+            }
+            return FALSE;
+            break;

         }
         }

-    }
-    else if (event->type == PropertyNotify)
-    {
-        HandlePropertyChange(_event);
-        return;
-    }
-    else if (event->type == ResizeRequest)
-    {
-    /* Terry Gitnick <terryg@scientech.com> - 1/21/98
-    * If resize event, don't resize until the last resize event for this
-    * window is recieved. Prevents flicker as windows are resized.
-        */
-        
-        Display *disp = wxGetDisplay();
-        Window win = event->xany.window;
-        XEvent report;
-        
-        //  to avoid flicker
-        report = * event;
-        while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report));
-        
-        // TODO: when implementing refresh optimization, we can use
-        // XtAddExposureToRegion to expand the window's paint region.
-        
-        // TODO: generate resize event
-        // XtDispatchEvent(event);
-    }
-    else
-    {
-        // TODO: generate all other events
-        // XtDispatchEvent(event);
-    }
-}
-
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
+#endif
+        case EnterNotify:
+        case LeaveNotify:
+        case ButtonPress:
+        case ButtonRelease:
+        case MotionNotify:
+        {
+            if (!win->IsEnabled())
+                return FALSE;
+
+            // Here we check if the top level window is
+            // disabled, which is one aspect of modality.
+            wxWindow *tlw = win;
+            while (tlw && !tlw->IsTopLevel())
+                tlw = tlw->GetParent();
+            if (tlw && !tlw->IsEnabled())
+                return FALSE;
+
+            if (event->type == ButtonPress)
+            {
+                if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
+                {
+                    // This might actually be done in wxWindow::SetFocus()
+                    // and not here. TODO.
+                    g_prevFocus = wxWindow::FindFocus();
+                    g_nextFocus = win;
+
+                    wxLogTrace( _T("focus"), _T("About to call SetFocus on %s of type %s due to button press"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+
+                    // Record the fact that this window is
+                    // getting the focus, because we'll need to
+                    // check if its parent is getting a bogus
+                    // focus and duly ignore it.
+                    // TODO: may need to have this code in SetFocus, too.
+                    extern wxWindow* g_GettingFocus;
+                    g_GettingFocus = win;
+                    win->SetFocus();
+                }
+            }

 
 

-    return event.MoreRequested();
-}
+#if !wxUSE_NANOX
+            if (event->type == LeaveNotify || event->type == EnterNotify)
+            {
+                // Throw out NotifyGrab and NotifyUngrab
+                if (event->xcrossing.mode != NotifyNormal)
+                    return FALSE;
+            }
+#endif
+            wxMouseEvent wxevent;
+            wxTranslateMouseEvent(wxevent, win, window, event);
+            return win->GetEventHandler()->ProcessEvent( wxevent );
+        }
+        case FocusIn:
+#if !wxUSE_NANOX
+            if ((event->xfocus.detail != NotifyPointer) &&
+                (event->xfocus.mode == NotifyNormal))
+#endif
+            {
+                wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+
+                extern wxWindow* g_GettingFocus;
+                if (g_GettingFocus && g_GettingFocus->GetParent() == win)
+                {
+                    // Ignore this, this can be a spurious FocusIn
+                    // caused by a child having its focus set.
+                    g_GettingFocus = NULL;
+                    wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s being deliberately ignored"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+                    return TRUE;
+                }
+                else
+                {
+                    wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
+                    focusEvent.SetEventObject(win);
+                    focusEvent.SetWindow( g_prevFocus );
+                    g_prevFocus = NULL;
+
+                    return win->GetEventHandler()->ProcessEvent(focusEvent);
+                }
+            }
+            return FALSE;

 
 

-void wxApp::ExitMainLoop()
-{
-    m_keepGoing = FALSE;
-}
+        case FocusOut:
+#if !wxUSE_NANOX
+            if ((event->xfocus.detail != NotifyPointer) &&
+                (event->xfocus.mode == NotifyNormal))
+#endif
+            {
+                wxLogTrace( _T("focus"), _T("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );

 
 

-// Is a message/event pending?
-bool wxApp::Pending()
-{
-    XFlush(wxGetDisplay());
+                wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
+                focusEvent.SetEventObject(win);
+                focusEvent.SetWindow( g_nextFocus );
+                g_nextFocus = NULL;
+                return win->GetEventHandler()->ProcessEvent(focusEvent);
+            }
+            return FALSE;

 
 

-    return (XPending(wxGetDisplay()) > 0);
-}
+#ifdef __WXDEBUG__
+        default:
+            //wxString eventName = wxGetXEventName(XEvent& event);
+            //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
+            break;
+#endif // __WXDEBUG__
+    }

 
 

-// Dispatch a message.
-void wxApp::Dispatch()
-{
-    XEvent event;
-    XNextEvent(wxGetDisplay(), & event);
-    ProcessXEvent((WXEvent*) & event);
+    return FALSE;

 }
 
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
 }
 
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.

-void wxApp::HandlePropertyChange(WXEvent *event)
+bool wxApp::HandlePropertyChange(WXEvent *event)

 {
     // by default do nothing special
     // TODO: what to do for X11
 {
     // by default do nothing special
     // TODO: what to do for X11

-    // XtDispatchEvent((XEvent*) event); /* let Motif do the work */
+    // XtDispatchEvent((XEvent*) event);
+    return FALSE;

 }
 
 }
 

-void wxApp::OnIdle(wxIdleEvent& event)
+void wxApp::WakeUpIdle()

 {
 {

-    static bool inOnIdle = FALSE;
-
-    // Avoid recursion (via ProcessEvent default case)
-    if (inOnIdle)
-        return;
-
-    inOnIdle = TRUE;
-
-    // If there are pending events, we must process them: pending events
-    // are either events to the threads other than main or events posted
-    // with wxPostEvent() functions
-    // GRG: I have moved this here so that all pending events are processed
-    //   before starting to delete any objects. This behaves better (in
-    //   particular, wrt wxPostEvent) and is coherent with wxGTK's current
-    //   behaviour. Also removed the '#if wxUSE_THREADS' around it.
-    //  Changed Mar/2000 before 2.1.14
-
-    // Flush pending events.
-    ProcessPendingEvents();
-
-    // 'Garbage' collection of windows deleted with Close().
-    DeletePendingObjects();
-
-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
-
-    // Send OnIdle events to all windows
-    bool needMore = SendIdleEvents();
+    // TODO: use wxMotif implementation?

 
 

-    if (needMore)
-        event.RequestMore(TRUE);
-
-    inOnIdle = FALSE;
-}
-
-void wxWakeUpIdle()
-{
-    // **** please implement me! ****

     // Wake up the idle handler processor, even if it is in another thread...
 }
 
 
     // Wake up the idle handler processor, even if it is in another thread...
 }
 
 

-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
+// Create display, and other initialization
+bool wxApp::OnInitGui()

 {
 {

-    bool needMore = FALSE;
+    // Eventually this line will be removed, but for
+    // now we don't want to try popping up a dialog
+    // for error messages.
+    delete wxLog::SetActiveTarget(new wxLogStderr);

 
 

-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-        node = node->GetNext();
-    }
+    if (!wxAppBase::OnInitGui())
+        return FALSE;

 
 

-    return needMore;
-}
+    GetMainColormap( wxApp::GetDisplay() );

 
 

-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
-    bool needMore = FALSE;
+    m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );

 
 

-    wxIdleEvent event;
-    event.SetEventObject(win);
-    win->ProcessEvent(event);
+#if !wxUSE_NANOX
+    m_visualInfo = new wxXVisualInfo;
+    wxFillXVisualInfo( m_visualInfo, (Display*) wxApp::GetDisplay() );
+#endif

 
 

-    if (event.MoreRequested())
-        needMore = TRUE;
+    return TRUE;
+}

 
 

-    wxNode* node = win->GetChildren().First();
-    while (node)
-    {
-        wxWindow* win = (wxWindow*) node->Data();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
+#if wxUSE_UNICODE

 
 

-        node = node->Next();
-    }
-    return needMore ;
-}
+#include <pango/pango.h>
+#include <pango/pangox.h>
+#include <pango/pangoxft.h>

 
 

-void wxApp::DeletePendingObjects()
+PangoContext* wxApp::GetPangoContext()

 {
 {

-    wxNode *node = wxPendingDelete.First();
-    while (node)
-    {
-        wxObject *obj = (wxObject *)node->Data();
-
-        delete obj;
+    static PangoContext *ret = NULL;
+    if (ret)
+        return ret;

 
 

-        if (wxPendingDelete.Member(obj))
-            delete node;
+    Display *xdisplay = (Display*) wxApp::GetDisplay();

 
 

-        // Deleting one object may have deleted other pending
-        // objects, so start from beginning of list again.
-        node = wxPendingDelete.First();
-    }
-}
-
-// Create an application context
-bool wxApp::OnInitGui()
-{
-    // TODO: parse argv and get display to pass to XOpenDisplay
-    Display* dpy = XOpenDisplay(NULL);
-    m_initialDisplay = (WXDisplay*) dpy;
-
-    if (!dpy) {
-        wxString className(wxTheApp->GetClassName());
-        wxLogError(_("wxWindows could not open display for '%s': exiting."),
-            (const char*) className);
-        exit(-1);
+#if 1
+    int xscreen = DefaultScreen(xdisplay);
+    static int use_xft = -1;
+    if (use_xft == -1)
+    {
+        wxString val = wxGetenv( L"GDK_USE_XFT" );
+        use_xft = (val == L"1");

     }
 
     }
 

-#ifdef __WXDEBUG__
-    // install the X error handler
-    gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
-#endif // __WXDEBUG__
-
-    // Do we need to create the top-level window initially?
-#if 0
-    wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
-        applicationShellWidgetClass,dpy,
-        NULL,0) ;
+    if (use_xft)
+        ret = pango_xft_get_context( xdisplay, xscreen );
+    else

 #endif
 #endif

+        ret = pango_x_get_context( xdisplay );

 
 

-    GetMainColormap(dpy);
-    m_maxRequestSize = XMaxRequestSize((Display*) dpy);
+    if (!PANGO_IS_CONTEXT(ret))
+        wxLogError( wxT("No pango context.") );

 
 

-    return TRUE;
+    return ret;

 }
 }

+#endif

 
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
 
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {


@@ -588,182 +738,117 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
     return (WXColormap) c;
 }
 
     return (WXColormap) c;
 }
 

-static Window XGetParent(Window window)
+Window wxGetWindowParent(Window window)

 {
 {

-    Window parent, root = 0;
+    wxASSERT_MSG( window, _T("invalid window") );
+
+    return (Window) 0;
+
+#ifndef __VMS
+   // VMS chokes on unreacheable code
+   Window parent, root = 0;
+#if wxUSE_NANOX
+    int noChildren = 0;
+#else

     unsigned int noChildren = 0;
     unsigned int noChildren = 0;

-    if (XQueryTree(wxGetDisplay(), window, & root, & parent,
-        NULL, & noChildren))
+#endif
+    Window* children = NULL;
+
+    // #define XQueryTree(d,w,r,p,c,nc)     GrQueryTree(w,p,c,nc)
+    int res = 1;
+#if !wxUSE_NANOX
+    res =
+#endif
+        XQueryTree((Display*) wxGetDisplay(), window, & root, & parent,
+             & children, & noChildren);
+    if (children)
+        XFree(children);
+    if (res)

         return parent;
     else
         return (Window) 0;
         return parent;
     else
         return (Window) 0;

+#endif

 }
 
 }
 

-// Returns TRUE if an accelerator has been processed
-bool wxApp::CheckForAccelerator(WXEvent* event)
+void wxApp::Exit()

 {
 {

-    XEvent* xEvent = (XEvent*) event;
-    if (xEvent->xany.type == KeyPress)
-    {
-        // Find a wxWindow for this window
-        // TODO: should get display for the window, not the current display
-        Window window = xEvent->xany.window;
-        wxWindow* win = NULL;
-
-        // Find the first wxWindow that corresponds to this event window
-        while (window && !(win = wxGetWindowFromTable(window)))
-            window = XGetParent(window);
-
-        if (!window || !win)
-            return FALSE;
-
-        wxKeyEvent keyEvent(wxEVT_CHAR);
-        wxTranslateKeyEvent(keyEvent, win, (Window) 0, xEvent);
+    wxApp::CleanUp();

 
 

-        // Now we have a wxKeyEvent and we have a wxWindow.
-        // Go up the hierarchy until we find a matching accelerator,
-        // or we get to the top.
-        while (win)
-        {
-            if (win->ProcessAccelerator(keyEvent))
-                return TRUE;
-            win = win->GetParent();
-        }
-        return FALSE;
-    }
-    return FALSE;
+    wxAppConsole::Exit();

 }
 
 }
 

-bool wxApp::CheckForKeyDown(WXEvent* event)
-{
-    XEvent* xEvent = (XEvent*) event;
-    if (xEvent->xany.type == KeyPress)
-    {
-        Window window = xEvent->xany.window;
-        wxWindow* win = NULL;
-        
-        // Find the first wxWindow that corresponds to this event window
-        while (window && !(win = wxGetWindowFromTable(window)))
-            window = XGetParent(window);
-        
-        if (!window || !win)
-            return FALSE;
-        
-        wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
-        wxTranslateKeyEvent(keyEvent, win, (Window) 0, xEvent);
-        
-        return win->ProcessEvent( keyEvent );
-    }
-    
-    return FALSE;
-}
+// Yield to other processes

 
 

-bool wxApp::CheckForKeyUp(WXEvent* event)
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

-    XEvent* xEvent = (XEvent*) event;
-    if (xEvent->xany.type == KeyRelease)
+    // Sometimes only 2 yields seem
+    // to do the trick, e.g. in the
+    // progress dialog
+    int i;
+    for (i = 0; i < 2; i++)

     {
     {

-        Window window = xEvent->xany.window;
-        wxWindow* win = NULL;
-        
-        // Find the first wxWindow that corresponds to this event window
-        while (window && !(win = wxGetWindowFromTable(window)))
-            window = XGetParent(window);
-        
-        if (!window || !win)
+        static bool s_inYield = FALSE;
+
+        if ( s_inYield )
+        {
+            if ( !onlyIfNeeded )
+            {
+                wxFAIL_MSG( wxT("wxYield called recursively" ) );
+            }
+

             return FALSE;
             return FALSE;

-        
-        wxKeyEvent keyEvent(wxEVT_KEY_UP);
-        wxTranslateKeyEvent(keyEvent, win, (Window) 0, xEvent);
-        
-        return win->ProcessEvent( keyEvent );
-    }
+        }

 
 

-    return FALSE;
-}
+        s_inYield = TRUE;

 
 

-void wxExit()
-{
-    int retValue = 0;
-    if (wxTheApp)
-        retValue = wxTheApp->OnExit();
+        // Make sure we have an event loop object,
+        // or Pending/Dispatch will fail
+        wxEventLoop* eventLoop = wxEventLoop::GetActive();
+        wxEventLoop* newEventLoop = NULL;
+        if (!eventLoop)
+        {
+            newEventLoop = new wxEventLoop;
+            wxEventLoop::SetActive(newEventLoop);
+        }

 
 

-    wxApp::CleanUp();
-    /*
-    * Exit in some platform-specific way. Not recommended that the app calls this:
-    * only for emergencies.
-    */
-    exit(retValue);
-}
+        // Call dispatch at least once so that sockets
+        // can be tested
+        wxTheApp->Dispatch();

 
 

-// Yield to other processes
+        while (wxTheApp && wxTheApp->Pending())
+            wxTheApp->Dispatch();

 
 

-bool wxApp::Yield(bool onlyIfNeeded)
-{
-    bool s_inYield = FALSE;
+#if wxUSE_TIMER
+        wxTimer::NotifyTimers();
+#endif
+        ProcessIdle();

 
 

-    if ( s_inYield )
-    {
-        if ( !onlyIfNeeded )
+        if (newEventLoop)

         {
         {

-            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+            wxEventLoop::SetActive(NULL);
+            delete newEventLoop;

         }
 
         }
 

-        return FALSE;
+        s_inYield = FALSE;

     }
 
     }
 

-    s_inYield = TRUE;
-
-    while (wxTheApp && wxTheApp->Pending())
-        wxTheApp->Dispatch();
-
-    s_inYield = FALSE;
-

     return TRUE;
 }
 
     return TRUE;
 }
 

-// TODO use XmGetPixmap (?) to get the really standard icons!
-
-// XPM hack: make the arrays const
-#define static static const
-
-#include "wx/generic/info.xpm"
-#include "wx/generic/error.xpm"
-#include "wx/generic/question.xpm"
-#include "wx/generic/warning.xpm"
-
-#undef static
+#ifdef __WXDEBUG__

 
 

-wxIcon
-wxApp::GetStdIcon(int which) const
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)

 {
 {

-    switch(which)
-    {
-        case wxICON_INFORMATION:
-            return wxIcon(info_xpm);
-
-        case wxICON_QUESTION:
-            return wxIcon(question_xpm);
-
-        case wxICON_EXCLAMATION:
-            return wxIcon(warning_xpm);
-
-        default:
-            wxFAIL_MSG("requested non existent standard icon");
-            // still fall through
-
-        case wxICON_HAND:
-            return wxIcon(error_xpm);
-    }
+    // While the GUI isn't working that well, just print out the
+    // message.
+#if 1
+    wxAppBase::OnAssert(file, line, cond, msg);
+#else
+    wxString msg2;
+    msg2.Printf("At file %s:%d: %s", file, line, msg);
+    wxLogDebug(msg2);
+#endif

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// accessors for C modules
-// ----------------------------------------------------------------------------
+#endif // __WXDEBUG__

 
 

-#if 0
-extern "C" XtAppContext wxGetAppContext()
-{
-    return (XtAppContext)wxTheApp->GetAppContext();
-}
-#endif
\ No newline at end of file