]> git.saurik.com Git - wxWidgets.git/blobdiff - src/x11/app.cpp
fix when not having precompiled headers
[wxWidgets.git] / src / x11 / app.cpp
index 8b019fdf6e64ab9c51d6ee1082329f777fefe230..dfdb22215853e237a5f920c3689aace39a689b3c 100644 (file)
     #pragma implementation "app.h"
 #endif
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/frame.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/palette.h"
-#include "wx/dc.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/evtloop.h"
+#include "wx/timer.h"
+
+#include "wx/univ/theme.h"
+#include "wx/univ/renderer.h"
+
+#define ABS(a)    (((a) < 0) ? -(a) : (a))
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
     #include "wx/resource.h"
 #endif
 
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <Xm/Xm.h>
-#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/motif/private.h"
+#include "wx/x11/private.h"
 
 #include <string.h>
 
-extern char *wxBuffer;
+//------------------------------------------------------------------------
+//   global data
+//------------------------------------------------------------------------
+
 extern wxList wxPendingDelete;
 
+wxHashTable *wxWidgetHashTable = NULL;
+wxHashTable *wxClientWidgetHashTable = NULL;
+
 wxApp *wxTheApp = NULL;
 
-wxHashTable *wxWidgetHashTable = NULL;
+// This is set within wxEntryStart -- too early on
+// to put these in wxTheApp
+static int g_newArgc = 0;
+static wxChar** g_newArgv = 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__
-    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);
-    }
+    else
+        return 0;
+}
 #endif // __WXDEBUG__
 
+//------------------------------------------------------------------------
+//   wxApp
+//------------------------------------------------------------------------
+
 long wxApp::sm_lastMessageTime = 0;
+WXDisplay *wxApp::ms_display = NULL;
+
+IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+    EVT_IDLE(wxApp::OnIdle)
+END_EVENT_TABLE()
 
 bool wxApp::Initialize()
 {
-    wxBuffer = new char[BUFSIZ + 512];
-
     wxClassInfo::InitializeClasses();
 
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
+
     // 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
@@ -109,18 +125,8 @@ bool wxApp::Initialize()
     wxInitializeResourceSystem();
 #endif
 
-    // For PostScript printing
-#if wxUSE_POSTSCRIPT
-    /* Done using wxModule now
-    wxInitializePrintSetupData();
-    wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-    wxThePrintPaperDatabase->CreateDatabase();
-    */
-#endif
-
-    wxBitmap::InitStandardHandlers();
-
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
+    wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
@@ -130,8 +136,14 @@ bool wxApp::Initialize()
 
 void wxApp::CleanUp()
 {
+    if (g_newArgv)
+        delete[] g_newArgv;
+    g_newArgv = NULL;
+
     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
+    delete wxClientWidgetHashTable;
+    wxClientWidgetHashTable = NULL;
 
     wxModule::CleanUpModules();
 
@@ -139,35 +151,18 @@ void wxApp::CleanUp()
     wxCleanUpResourceSystem();
 #endif
 
-    wxDeleteStockObjects() ;
-
-    // Destroy all GDI lists, etc.
-
-    wxDeleteStockLists();
-
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 
-#if wxUSE_POSTSCRIPT
-    /* Done using wxModule now
-    wxInitializePrintSetupData(FALSE);
-    delete wxThePrintPaperDatabase;
-    wxThePrintPaperDatabase = NULL;
-    */
-#endif
+    wxDeleteStockObjects();
 
-    wxBitmap::CleanUpHandlers();
-
-    delete[] wxBuffer;
-    wxBuffer = NULL;
-
-    wxClassInfo::CleanUpClasses();
+    wxDeleteStockLists();
 
     delete wxTheApp;
     wxTheApp = NULL;
 
-    // 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.
+    wxClassInfo::CleanUpClasses();
+
 #if wxUSE_THREADS
     delete wxPendingEvents;
     delete wxPendingEventsLocker;
@@ -180,7 +175,7 @@ void wxApp::CleanUp()
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {
-        wxLogDebug("There were memory leaks.\n");
+        wxLogDebug("There were memory leaks.");
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
@@ -192,6 +187,113 @@ void wxApp::CleanUp()
     delete wxLog::SetActiveTarget(NULL);
 }
 
+// NB: argc and argv may be changed here, pass by reference!
+int wxEntryStart( int& argc, char *argv[] )
+{
+#ifdef __WXDEBUG__
+#if !wxUSE_NANOX
+    // install the X error handler
+    gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
+#endif
+#endif // __WXDEBUG__
+
+    wxString displayName;
+    bool syncDisplay = FALSE;
+
+    // Parse the arguments.
+    // We can't use wxCmdLineParser or OnInitCmdLine and friends because
+    // we have to create the Display earlier. If we can find a way to
+    // use the wxAppBase API then I'll be quite happy to change it.
+    g_newArgv = new wxChar*[argc];
+    g_newArgc = 0;
+    int i;
+    for (i = 0; i < argc; i++)
+    {
+        wxString arg(argv[i]);
+        if (arg == wxT("-display"))
+        {
+            if (i < (argc - 1))
+            {
+                i ++;
+                displayName = argv[i];
+                continue;
+            }
+        }
+        else if (arg == wxT("-geometry"))
+        {
+            if (i < (argc - 1))
+            {
+                i ++;
+                wxString windowGeometry = argv[i];
+                int w, h;
+                if (wxSscanf(windowGeometry.c_str(), _T("%dx%d"), &w, &h) != 2)
+                {
+                    wxLogError(_("Invalid geometry specification '%s'"), windowGeometry.c_str());
+                }
+                else
+                {
+                    g_initialSize = wxSize(w, h);
+                }
+                continue;
+            }
+        }
+        else if (arg == wxT("-sync"))
+        {
+            syncDisplay = TRUE;
+            continue;
+        }
+        else if (arg == wxT("-iconic"))
+        {
+            g_showIconic = TRUE;
+
+            continue;
+        }
+
+        // Not eaten by wxWindows, so pass through
+        g_newArgv[g_newArgc] = argv[i];
+        g_newArgc ++;
+    }
+
+    Display* xdisplay = NULL;
+    if (displayName.IsEmpty())
+        xdisplay = XOpenDisplay(NULL);
+    else
+        xdisplay = XOpenDisplay((char*) displayName.c_str());
+
+    if (!xdisplay)
+    {
+        wxLogError( _("wxWindows could not open display. Exiting.") );
+        return -1;
+    }
+
+    if (syncDisplay)
+    {
+        XSynchronize(xdisplay, True);
+    }
+
+    wxApp::ms_display = (WXDisplay*) xdisplay;
+
+    XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
+
+    wxSetDetectableAutoRepeat( TRUE );
+
+    if (!wxApp::Initialize())
+        return -1;
+
+    return 0;
+}
+
+int wxEntryInitGui()
+{
+    int retValue = 0;
+
+    if ( !wxTheApp->OnInitGui() )
+        retValue = -1;
+
+    return retValue;
+}
+
+
 int wxEntry( int argc, char *argv[] )
 {
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
@@ -203,9 +305,9 @@ int wxEntry( int argc, char *argv[] )
     // checked, but this is a reasonable compromise.
     wxDebugContext::SetCheckpoint();
 #endif
-
-    if (!wxApp::Initialize())
-        return FALSE;
+    int err = wxEntryStart(argc, argv);
+    if (err)
+        return err;
 
     if (!wxTheApp)
     {
@@ -227,17 +329,33 @@ int wxEntry( int argc, char *argv[] )
     wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
     wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
 
-    wxTheApp->argc = argc;
-    wxTheApp->argv = argv;
+    // The command line may have been changed
+    // by stripping out -display etc.
+    if (g_newArgc > 0)
+    {
+        wxTheApp->argc = g_newArgc;
+        wxTheApp->argv = g_newArgv;
+    }
+    else
+    {
+        wxTheApp->argc = argc;
+        wxTheApp->argv = argv;
+    }
+    wxTheApp->m_showIconic = g_showIconic;
+    wxTheApp->m_initialSize = g_initialSize;
 
-    // GUI-specific initialization, such as creating an app context.
-    wxTheApp->OnInitGui();
+    int retValue;
+    retValue = wxEntryInitGui();
 
     // Here frames insert themselves automatically into wxTopLevelWindows by
     // getting created in OnInit().
+    if ( retValue == 0 )
+    {
+        if ( !wxTheApp->OnInit() )
+            retValue = -1;
+    }
 
-    int retValue = 0;
-    if (wxTheApp->OnInit())
+    if ( retValue == 0 )
     {
         if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
     }
@@ -278,12 +396,28 @@ wxApp::wxApp()
     argc = 0;
     argv = NULL;
     m_exitOnFrameDelete = TRUE;
-
     m_mainColormap = (WXColormap) NULL;
-    m_appContext = (WXAppContext) NULL;
-    m_topLevelWidget = (WXWidget) NULL;
+    m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
-    m_initialDisplay = (WXDisplay*) 0;
+    m_mainLoop = NULL;
+    m_showIconic = FALSE;
+    m_initialSize = wxDefaultSize;
+    
+#if !wxUSE_NANOX
+    m_visualColormap = NULL;
+    m_colorCube = NULL;
+#endif
+}
+
+wxApp::~wxApp()
+{
+#if !wxUSE_NANOX
+    if (m_colorCube)
+        free( m_colorCube );
+        
+    if (m_visualColormap)
+        delete [] (XColor*)m_visualColormap;
+#endif
 }
 
 bool wxApp::Initialized()
@@ -296,130 +430,428 @@ bool wxApp::Initialized()
 
 int wxApp::MainLoop()
 {
-    m_keepGoing = TRUE;
+    int rt;
+    m_mainLoop = new wxEventLoop;
 
-    /*
-    * 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.
-    */
+    rt = m_mainLoop->Run();
 
-    XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()),
-        XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
-        PropertyChangeMask);
+    delete m_mainLoop;
+    m_mainLoop = NULL;
+    return rt;
+}
 
-    XEvent event;
+#if !wxUSE_NANOX
+//-----------------------------------------------------------------------
+// X11 predicate function for exposure compression
+//-----------------------------------------------------------------------
 
-    // Use this flag to allow breaking the loop via wxApp::ExitMainLoop()
-    while (m_keepGoing)
-    {
-        XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &event);
+struct wxExposeInfo
+{
+    Window window;
+    Bool found_non_matching;
+};
 
-        ProcessXEvent((WXEvent*) & event);
+static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg)
+{
+    wxExposeInfo *info = (wxExposeInfo*) arg;
 
-        if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)
-        {
-            if (!ProcessIdle())
-            {
-#if wxUSE_THREADS
-                // leave the main loop to give other threads a chance to
-                // perform their GUI work
-                wxMutexGuiLeave();
-                wxUsleep(20);
-                wxMutexGuiEnter();
-#endif
-            }
-        }
+    if (info->found_non_matching)
+       return FALSE;
 
+    if (xevent->xany.type != Expose)
+    {
+        info->found_non_matching = TRUE;
+        return FALSE;
     }
 
-    return 0;
+    if (xevent->xexpose.window != info->window)
+    {
+        info->found_non_matching = TRUE;
+        return FALSE;
+    }
+
+    return TRUE;
 }
+#endif
+    // wxUSE_NANOX
+
+//-----------------------------------------------------------------------
+// Processes an X event, returning TRUE if the event was processed.
+//-----------------------------------------------------------------------
 
-// Processes an X event.
-void wxApp::ProcessXEvent(WXEvent* _event)
+bool wxApp::ProcessXEvent(WXEvent* _event)
 {
     XEvent* event = (XEvent*) _event;
 
-    if (event->type == KeyPress)
-    {
-#if 0 // def __WXDEBUG__
-        Widget widget = XtWindowToWidget(event->xany.display, event->xany.window);
-        wxLogDebug("Got key press event for 0x%08x (parent = 0x%08x)",
-                   widget, XtParent(widget));
-#endif // DEBUG
+    wxWindow* win = NULL;
+    Window window = XEventGetWindow(event);
+#if 0
+    Window actualWindow = window;
+#endif
 
-    if (CheckForAccelerator(_event))
-    {
-            // Do nothing! We intercepted and processed the event as an
-            // accelerator.
-            return;
-    }
-#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))
+    // 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.
+
+    win = wxGetWindowFromTable(window);
+    if (!win)
     {
-            // We intercepted and processed the key down event
-            return;
-    }
+#if wxUSE_TWO_WINDOWS
+        win = wxGetClientWindowFromTable(window);
+        if (!win)
 #endif
-    else
-    {
-            XtDispatchEvent(event);
-        return;
-    }
-    }
-    else if (event->type == KeyRelease)
-    {
-        // TODO: work out why we still need this !  -michael
-        //
-        if (CheckForKeyUp(_event))
-    {
-        // We intercepted and processed the key up event
-        return;
-    }
-    else
-    {
-        XtDispatchEvent(event);
-        return;
-    }
-    }
-    else if (event->type == PropertyNotify)
-    {
-        HandlePropertyChange(_event);
-        return;
+            return FALSE;
     }
-    else if (event->type == ResizeRequest)
+
+#ifdef __WXDEBUG__
+    wxString windowClass = win->GetClassInfo()->GetClassName();
+#endif
+
+    switch (event->type)
     {
-        /* 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.
-         */
+        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
 
-        Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget());
-        Window win = event->xany.window;
-        XEvent report;
+                // This simplifies the expose and clear areas to simple
+                // rectangles.
+                win->GetUpdateRegion() = win->GetUpdateRegion().GetBox();
+                win->GetClearRegion() = win->GetClearRegion().GetBox();
 
-        //  to avoid flicker
-        report = * event;
-        while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report));
+                // If we only have one X11 window, always indicate
+                // that borders might have to be redrawn.
+                if (win->GetMainWindow() == win->GetClientAreaWindow())
+                    win->NeedUpdateNcAreaInIdle();
 
-        // TODO: when implementing refresh optimization, we can use
-        // XtAddExposureToRegion to expand the window's paint region.
+                // Only erase background, paint in idle time.
+                win->SendEraseEvents();
+                // win->Update();
+            }
 
-        XtDispatchEvent(event);
-    }
-    else
-    {
-        XtDispatchEvent(event);
+            return TRUE;
+        }
+
+#if !wxUSE_NANOX
+        case GraphicsExpose:
+        {
+            printf( "GraphicExpose event\n" );
+
+            wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str(),
+                                          event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                          event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+
+            win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                          event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+
+            win->GetClearRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                         event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+
+            if (event->xgraphicsexpose.count == 0)
+            {
+                // Only erase background, paint in idle time.
+                win->SendEraseEvents();
+                // win->Update();
+            }
+
+            return TRUE;
+        }
+#endif
+
+        case KeyPress:
+        {
+            if (!win->IsEnabled())
+                return FALSE;
+
+            wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
+            wxTranslateKeyEvent(keyEvent, win, window, event);
+
+            // wxLogDebug( "OnKey from %s", win->GetName().c_str() );
+
+            // We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR
+            if (win->GetEventHandler()->ProcessEvent( keyEvent ))
+                return TRUE;
+
+            keyEvent.SetEventType(wxEVT_CHAR);
+            if (win->GetEventHandler()->ProcessEvent( keyEvent ))
+                return TRUE;
+
+            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 );
+            }
+
+            return FALSE;
+        }
+        case KeyRelease:
+        {
+            if (!win->IsEnabled())
+                return FALSE;
+
+            wxKeyEvent keyEvent(wxEVT_KEY_UP);
+            wxTranslateKeyEvent(keyEvent, win, window, event);
+
+            return win->GetEventHandler()->ProcessEvent( keyEvent );
+        }
+        case ConfigureNotify:
+        {
+#if wxUSE_NANOX
+            if (event->update.utype == GR_UPDATE_SIZE)
+#endif
+            {
+                if (win->IsTopLevel())
+                {
+                    wxTopLevelWindow *tlw = (wxTopLevelWindow*) win;
+                    tlw->SetConfigureGeometry( XConfigureEventGetX(event), XConfigureEventGetY(event),
+                        XConfigureEventGetWidth(event), XConfigureEventGetHeight(event) );
+                }
+
+                if (win->IsTopLevel() && win->IsShown())
+                {
+                    wxTopLevelWindowX11 *tlw = (wxTopLevelWindowX11 *) win;
+                    tlw->SetNeedResizeInIdle();
+                }
+                else
+                {
+                    wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
+                    sizeEvent.SetEventObject( win );
+
+                    return win->GetEventHandler()->ProcessEvent( sizeEvent );
+                }
+            }
+            return FALSE;
+            break;
+        }
+#if !wxUSE_NANOX
+        case PropertyNotify:
+        {
+            //wxLogDebug("PropertyNotify: %s", windowClass.c_str());
+            return HandlePropertyChange(_event);
+        }
+        case ClientMessage:
+        {
+            if (!win->IsEnabled())
+                return FALSE;
+
+            Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);
+            Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);
+
+            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:
+        {
+            printf( "destroy from %s\n", win->GetName().c_str() );
+            break;
+        }
+        case CreateNotify:
+        {
+            printf( "create from %s\n", win->GetName().c_str() );
+            break;
+        }
+        case MapRequest:
+        {
+            printf( "map request from %s\n", win->GetName().c_str() );
+            break;
+        }
+        case ResizeRequest:
+        {
+            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 );
+        }
+#endif
+#endif
+#if wxUSE_NANOX
+        case GR_EVENT_TYPE_CLOSE_REQ:
+        {
+            if (win)
+            {
+                win->Close(FALSE);
+                return TRUE;
+            }
+            return FALSE;
+            break;
+        }
+#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();
+                }
+            }
+
+#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;
+                break;
+            }
+        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() );
+
+                    wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
+                    focusEvent.SetEventObject(win);
+                    focusEvent.SetWindow( g_nextFocus );
+                    g_nextFocus = NULL;
+                    return win->GetEventHandler()->ProcessEvent(focusEvent);
+                }
+                return FALSE;
+                break;
+            }
+        default:
+        {
+#ifdef __WXDEBUG__
+            //wxString eventName = wxGetXEventName(XEvent& event);
+            //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
+#endif
+            return FALSE;
+            break;
+        }
     }
+    return FALSE;
 }
 
 // Returns TRUE if more time is needed.
+// Note that this duplicates wxEventLoopImpl::SendIdleEvent
+// but ProcessIdle may be needed by apps, so is kept.
 bool wxApp::ProcessIdle()
 {
     wxIdleEvent event;
@@ -431,74 +863,56 @@ bool wxApp::ProcessIdle()
 
 void wxApp::ExitMainLoop()
 {
-    m_keepGoing = FALSE;
+    if (m_mainLoop)
+        m_mainLoop->Exit(0);
 }
 
 // Is a message/event pending?
 bool wxApp::Pending()
 {
-    XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));
-
-    // Fix by Doug from STI, to prevent a stall if non-X event
-    // is found.
-    return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ;
+    return wxEventLoop::GetActive()->Pending();
 }
 
 // Dispatch a message.
 void wxApp::Dispatch()
 {
-    //    XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
-
-    XEvent event;
-    XtAppNextEvent((XtAppContext) GetAppContext(), &event);
-    ProcessXEvent((WXEvent*) & event);
+    wxEventLoop::GetActive()->Dispatch();
 }
 
 // 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
-    XtDispatchEvent((XEvent*) event); /* let Motif do the work */
+    // TODO: what to do for X11
+    // XtDispatchEvent((XEvent*) event);
+    return FALSE;
 }
 
 void wxApp::OnIdle(wxIdleEvent& event)
 {
-    static bool inOnIdle = FALSE;
+    static bool s_inOnIdle = FALSE;
 
     // Avoid recursion (via ProcessEvent default case)
-    if (inOnIdle)
+    if (s_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
+    s_inOnIdle = TRUE;
 
-    // Flush pending events.
+    // Resend in the main thread events which have been prepared in other
+    // threads
     ProcessPendingEvents();
 
-    // 'Garbage' collection of windows deleted with Close().
+    // '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();
 
     if (needMore)
         event.RequestMore(TRUE);
 
-    inOnIdle = FALSE;
+    s_inOnIdle = FALSE;
 }
 
 void wxWakeUpIdle()
@@ -532,7 +946,8 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 
     wxIdleEvent event;
     event.SetEventObject(win);
-    win->ProcessEvent(event);
+
+    win->GetEventHandler()->ProcessEvent(event);
 
     if (event.MoreRequested())
         needMore = TRUE;
@@ -546,7 +961,10 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 
         node = node->Next();
     }
-    return needMore ;
+
+    win->OnInternalIdle();
+
+    return needMore;
 }
 
 void wxApp::DeletePendingObjects()
@@ -567,46 +985,135 @@ void wxApp::DeletePendingObjects()
     }
 }
 
-// Create an application context
-bool wxApp::OnInitGui()
+static void wxCalcPrecAndShift( unsigned long mask, int *shift, int *prec )
 {
-    XtToolkitInitialize() ;
-    wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
-    Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
-        (const char*) wxTheApp->GetClassName(), NULL, 0,
-# if XtSpecificationRelease < 5
-        (Cardinal*) &argc,
-# else
-        &argc,
-# endif
-        argv);
-
-    if (!dpy) {
-        wxString className(wxTheApp->GetClassName());
-        wxLogError(_("wxWindows could not open display for '%s': exiting."),
-                   (const char*) className);
-        exit(-1);
-    }
-    m_initialDisplay = (WXDisplay*) dpy;
+  *shift = 0;
+  *prec = 0;
 
-#ifdef __WXDEBUG__
-    // install the X error handler
-    gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
-#endif // __WXDEBUG__
+  while (!(mask & 0x1))
+    {
+      (*shift)++;
+      mask >>= 1;
+    }
 
-    wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
-        applicationShellWidgetClass,dpy,
-        NULL,0) ;
+  while (mask & 0x1)
+    {
+      (*prec)++;
+      mask >>= 1;
+    }
+}
 
-    // Add general resize proc
-    XtActionsRec rec;
-    rec.string = "resize";
-    rec.proc = (XtActionProc)wxWidgetResizeProc;
-    XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);
+// Create display, and other initialization
+bool wxApp::OnInitGui()
+{
+    // 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);
 
-    GetMainColormap(dpy);
-    m_maxRequestSize = XMaxRequestSize((Display*) dpy);
+    if (!wxAppBase::OnInitGui())
+        return FALSE;
 
+    GetMainColormap( wxApp::GetDisplay() );
+
+    m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
+
+#if !wxUSE_NANOX
+    // Get info about the current visual. It is enough
+    // to do this once here unless we support different
+    // visuals, displays and screens. Given that wxX11
+    // mostly for embedded things, that is no real
+    // limitation.
+    Display *xdisplay = (Display*) wxApp::GetDisplay();
+    int xscreen = DefaultScreen(xdisplay);
+    Visual* xvisual = DefaultVisual(xdisplay,xscreen);
+    int xdepth = DefaultDepth(xdisplay, xscreen);
+
+    XVisualInfo vinfo_template;
+    vinfo_template.visual = xvisual;
+    vinfo_template.visualid = XVisualIDFromVisual( xvisual );
+    vinfo_template.depth = xdepth;
+        
+    int nitem = 0;
+    XVisualInfo *vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
+    wxASSERT_MSG( vi, wxT("No visual info") );
+    
+    m_visualType = vi->visual->c_class;
+    m_visualScreen = vi->screen;
+    
+    m_visualRedMask = vi->red_mask;
+    m_visualGreenMask = vi->green_mask;
+    m_visualBlueMask = vi->blue_mask;
+    
+    if (m_visualType != GrayScale && m_visualType != PseudoColor)
+    {
+        wxCalcPrecAndShift( m_visualRedMask, &m_visualRedShift, &m_visualRedPrec );
+        wxCalcPrecAndShift( m_visualGreenMask, &m_visualGreenShift, &m_visualGreenPrec );
+        wxCalcPrecAndShift( m_visualBlueMask, &m_visualBlueShift, &m_visualBluePrec );
+    }
+    
+    m_visualDepth = xdepth;
+    if (xdepth == 16)
+        xdepth = m_visualRedPrec + m_visualGreenPrec + m_visualBluePrec;
+        
+    m_visualColormapSize = vi->colormap_size;
+        
+    XFree( vi );
+    
+    if (m_visualDepth > 8)
+        return TRUE;
+    
+    m_visualColormap = new XColor[m_visualColormapSize];
+    XColor* colors = (XColor*) m_visualColormap;
+    
+    for (int i = 0; i < m_visualColormapSize; i++)
+           colors[i].pixel = i;
+
+    XQueryColors( xdisplay, DefaultColormap(xdisplay,xscreen), colors, m_visualColormapSize );
+        
+    m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
+
+    for (int r = 0; r < 32; r++)
+    {
+        for (int g = 0; g < 32; g++)
+        {
+            for (int b = 0; b < 32; b++)
+            {
+                int rr = (r << 3) | (r >> 2);
+                int gg = (g << 3) | (g >> 2);
+                int bb = (b << 3) | (b >> 2);
+
+                int index = -1;
+
+                if (colors)
+                {
+                    int max = 3 * 65536;
+
+                    for (int i = 0; i < m_visualColormapSize; i++)
+                    {
+                        int rdiff = ((rr << 8) - colors[i].red);
+                        int gdiff = ((gg << 8) - colors[i].green);
+                        int bdiff = ((bb << 8) - colors[i].blue);
+                        int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+                        if (sum < max)
+                        {
+                            index = i; max = sum;
+                        }
+                    }
+                }
+                else
+                {
+                    // assume 8-bit true or static colors. this really exists
+                    index = (r >> (5 - m_visualRedPrec)) << m_visualRedShift;
+                    index |= (g >> (5 - m_visualGreenPrec)) << m_visualGreenShift;
+                    index |= (b >> (5 - m_visualBluePrec)) << m_visualBlueShift;
+                }
+                m_colorCube[ (r*1024) + (g*32) + b ] = index;
+            }
+        }
+    }
+#endif
+    
     return TRUE;
 }
 
@@ -626,89 +1133,33 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
     return (WXColormap) c;
 }
 
-// Returns TRUE if an accelerator has been processed
-bool wxApp::CheckForAccelerator(WXEvent* event)
-{
-    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
-        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(), xEvent->xany.window);
-        wxWindow* win = NULL;
-
-        // Find the first wxWindow that corresponds to this event window
-        while (widget && !(win = wxGetWindowFromTable(widget)))
-            widget = XtParent(widget);
-
-        if (!widget || !win)
-            return FALSE;
-
-        wxKeyEvent keyEvent(wxEVT_CHAR);
-        wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
-
-        // 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;
-}
-
-bool wxApp::CheckForKeyDown(WXEvent* event)
-{
-    XEvent* xEvent = (XEvent*) event;
-    if (xEvent->xany.type == KeyPress)
-    {
-        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
-                     xEvent->xany.window);
-    wxWindow* win = NULL;
-
-    // Find the first wxWindow that corresponds to this event window
-    while (widget && !(win = wxGetWindowFromTable(widget)))
-            widget = XtParent(widget);
-
-    if (!widget || !win)
-            return FALSE;
-
-    wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
-    wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
-
-    return win->ProcessEvent( keyEvent );
-    }
-
-    return FALSE;
-}
-
-bool wxApp::CheckForKeyUp(WXEvent* event)
+Window wxGetWindowParent(Window window)
 {
-    XEvent* xEvent = (XEvent*) event;
-    if (xEvent->xany.type == KeyRelease)
-    {
-        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
-                         xEvent->xany.window);
-        wxWindow* win = NULL;
-
-        // Find the first wxWindow that corresponds to this event window
-        while (widget && !(win = wxGetWindowFromTable(widget)))
-                widget = XtParent(widget);
+    wxASSERT_MSG( window, "invalid window" );
 
-        if (!widget || !win)
-                return FALSE;
-
-        wxKeyEvent keyEvent(wxEVT_KEY_UP);
-        wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+    return (Window) 0;
 
-        return win->ProcessEvent( keyEvent );
-    }
+    Window parent, root = 0;
+#if wxUSE_NANOX
+    int noChildren = 0;
+#else
+    unsigned int noChildren = 0;
+#endif
+    Window* children = NULL;
 
-    return FALSE;
+    // #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;
 }
 
 void wxExit()
@@ -743,54 +1194,49 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     s_inYield = TRUE;
 
+    // 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);
+    }
+
     while (wxTheApp && wxTheApp->Pending())
         wxTheApp->Dispatch();
 
+#if wxUSE_TIMER
+    wxTimer::NotifyTimers();
+#endif
+    ProcessIdle();
+
+    if (newEventLoop)
+    {
+        wxEventLoop::SetActive(NULL);
+        delete newEventLoop;
+    }
+
     s_inYield = FALSE;
 
     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__
 
-extern "C" XtAppContext wxGetAppContext()
-{
-    return (XtAppContext)wxTheApp->GetAppContext();
-}