use IMPLEMENT_APP_CONSOLE and not IMPLEMENT_APP for console apps

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index e06786959fcc5808f3f45a089be4cbc946a1ea5c..4c9868ce0c98d82ce22c26087c671eb3912a98af 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.cpp
+// Name:        src/x11/app.cpp

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


@@ -9,64 +9,60 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "app.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#include "wx/frame.h"

 #include "wx/app.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/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"

 
 

-#if wxUSE_THREADS
-    #include "wx/thread.h"
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/icon.h"
+    #include "wx/dialog.h"
+    #include "wx/memory.h"
+    #include "wx/gdicmn.h"
+    #include "wx/module.h"
+    #include "wx/crt.h"

 #endif
 
 #endif
 

-#if wxUSE_WX_RESOURCES
-    #include "wx/resource.h"
-#endif
+#include "wx/evtloop.h"
+#include "wx/filename.h"

 
 

-#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
+#include "wx/univ/theme.h"
+#include "wx/univ/renderer.h"
+#include "wx/generic/private/timer.h"
+
+#if wxUSE_THREADS
+    #include "wx/thread.h"

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

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

 
 

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

 
 

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

 
 

-static Window wxGetParentWindow(Window window);
+// 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;

 
 

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

 
 #ifdef __WXDEBUG__
 typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
 
 #ifdef __WXDEBUG__
 typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);


@@ -76,564 +72,646 @@ 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

-    return gs_pfnXErrorHandler(dpy, xevent);
+    if (gs_pfnXErrorHandler)
+        return gs_pfnXErrorHandler(dpy, xevent);
+    else
+        return 0;

 }
 #endif // __WXDEBUG__
 
 }
 #endif // __WXDEBUG__
 

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

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

-bool wxApp::Initialize()
+IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+
+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];

 
 

-    wxInitializeStockLists();
-    wxInitializeStockObjects();
+                argV[i] = NULL;
+                argC -= 2;
+            }
+        }
+        else if (wxStrcmp( argV[i], _T("-geometry") ) == 0)
+        {
+            if (i < (argC - 1))
+            {
+                argV[i++] = NULL;

 
 

-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
+                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);
+                }

 
 

-    wxBitmap::InitStandardHandlers();
+                argV[i] = NULL;
+                argC -= 2;
+            }
+        }
+        else if (wxStrcmp( argV[i], _T("-sync") ) == 0)
+        {
+            syncDisplay = true;

 
 

-    wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
+            argV[i] = NULL;
+            argC--;
+        }
+        else if (wxStrcmp( argV[i], _T("-iconic") ) == 0)
+        {
+            g_showIconic = true;

 
 

-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) return FALSE;
+            argV[i] = NULL;
+            argC--;
+        }
+    }

 
 

-    return TRUE;
-}
+    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);
+            }
+        }
+    }

 
 

-void wxApp::CleanUp()
-{
-    delete wxWidgetHashTable;
-    wxWidgetHashTable = NULL;
+    // open and set up the X11 display
+    if ( !wxSetDisplay(displayName) )
+    {
+        wxLogError(_("wxWidgets could not open display. Exiting."));
+        return false;
+    }

 
 

-    wxModule::CleanUpModules();
+    Display *dpy = wxGlobalDisplay();
+    if (syncDisplay)
+        XSynchronize(dpy, True);

 
 

-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
+    XSelectInput(dpy, XDefaultRootWindow(dpy), PropertyChangeMask);

 
 

-    wxDeleteStockObjects() ;
+    wxSetDetectableAutoRepeat( true );

 
 

-    // Destroy all GDI lists, etc.

 
 

-    wxDeleteStockLists();
+    if ( !wxAppBase::Initialize(argC, argV) )
+        return false;

 
 

-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
+#if wxUSE_UNICODE
+    // Glib's type system required by Pango
+    g_type_init();
+#endif

 
 

-    wxBitmap::CleanUpHandlers();
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif

 
 

-    delete[] wxBuffer;
-    wxBuffer = NULL;
+    wxWidgetHashTable = new wxWindowHash;
+    wxClientWidgetHashTable = new wxWindowHash;

 
 

-    wxClassInfo::CleanUpClasses();
+    return true;
+}

 
 

-    delete wxTheApp;
-    wxTheApp = NULL;
+void wxApp::CleanUp()
+{
+    delete wxWidgetHashTable;
+    wxWidgetHashTable = NULL;
+    delete wxClientWidgetHashTable;
+    wxClientWidgetHashTable = 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.
-#if wxUSE_THREADS
-    delete wxPendingEvents;
-    delete wxPendingEventsLocker;
-#endif
+    wxAppBase::CleanUp();
+}

 
 

-#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)
-    {
-        wxLogDebug("There were memory leaks.\n");
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-#endif
+wxApp::wxApp()
+{
+    m_mainColormap = NULL;
+    m_topLevelWidget = NULL;
+    m_maxRequestSize = 0;
+    m_showIconic = false;
+    m_initialSize = wxDefaultSize;

 
 

-    // 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);
+#if !wxUSE_NANOX
+    m_visualInfo = NULL;
+#endif

 }
 
 }
 

-int wxEntry( int argc, char *argv[] )
+wxApp::~wxApp()

 {
 {

-#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();
+#if !wxUSE_NANOX
+    delete m_visualInfo;

 #endif
 #endif

+}

 
 

-    if (!wxApp::Initialize())
-        return FALSE;
-
-    if (!wxTheApp)
-    {
-        if (!wxApp::GetInitializerFunction())
-        {
-            printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-            return 0;
-        };
-
-        wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
-    };
-
-    if (!wxTheApp)
-    {
-        printf( "wxWindows error: wxTheApp == NULL\n" );
-        return 0;
-    };
+#if !wxUSE_NANOX

 
 

-    wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
-    wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
+//-----------------------------------------------------------------------
+// X11 predicate function for exposure compression
+//-----------------------------------------------------------------------

 
 

-    wxTheApp->argc = argc;
-    wxTheApp->argv = argv;
+struct wxExposeInfo
+{
+    Window window;
+    Bool found_non_matching;
+};

 
 

-    // GUI-specific initialization, such as creating an app context.
-    wxTheApp->OnInitGui();
+extern "C"
+Bool wxX11ExposePredicate (Display *WXUNUSED(display), XEvent *xevent, XPointer arg)
+{
+    wxExposeInfo *info = (wxExposeInfo*) arg;

 
 

-    // Here frames insert themselves automatically into wxTopLevelWindows by
-    // getting created in OnInit().
+    if (info->found_non_matching)
+       return FALSE;

 
 

-    int retValue = 0;
-    if (wxTheApp->OnInit())
+    if (xevent->xany.type != Expose)

     {
     {

-        if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+        info->found_non_matching = true;
+        return FALSE;

     }
 
     }
 

-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
-
-    delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
-    // for further messages
-
-    if (wxTheApp->GetTopWindow())
+    if (xevent->xexpose.window != info->window)

     {
     {

-        delete wxTheApp->GetTopWindow();
-        wxTheApp->SetTopWindow(NULL);
+        info->found_non_matching = true;
+        return FALSE;

     }
 
     }
 

-    wxTheApp->DeletePendingObjects();
-
-    wxTheApp->OnExit();
-
-    wxApp::CleanUp();
-
-    return retValue;
-};
-
-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
-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;
-    m_mainLoop = NULL;
-}
-
-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
+    return TRUE;

 }
 
 }
 

-int wxApp::MainLoop()
-{
-     int rt;
-    m_mainLoop = new wxEventLoop;
-
-    rt = m_mainLoop->Run();
+#endif // wxUSE_NANOX

 
 

-    delete m_mainLoop;
-    m_mainLoop = NULL;
-    return rt;
-}
+//-----------------------------------------------------------------------
+// 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;
 
     wxWindow* win = NULL;
 {
     XEvent* event = (XEvent*) _event;
 
     wxWindow* win = NULL;

-    Window window = event->xany.window;
+    Window window = XEventGetWindow(event);
+#if 0

     Window actualWindow = window;
     Window actualWindow = window;

+#endif

 
     // Find the first wxWindow that corresponds to this event window
 
     // Find the first wxWindow that corresponds to this event window

-    // TODO: may need to translate coordinates from actualWindow
-    // to window, if the receiving window != wxWindow window
-    while (window && !(win = wxGetWindowFromTable(window)))
-        window = wxGetParentWindow(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)
+    {
+#if wxUSE_TWO_WINDOWS
+        win = wxGetClientWindowFromTable(window);
+        if (!win)
+#endif
+            return false;
+    }
+
+#ifdef __WXDEBUG__
+    wxString windowClass = win->GetClassInfo()->GetClassName();
+#endif

 
 

-    // TODO: shouldn't all the ProcessEvents below
-    // be win->GetEventHandler()->ProcessEvent?

     switch (event->type)
     {
     switch (event->type)
     {

-        case KeyPress:
+        case Expose:

         {
         {

-            if (win && !win->IsEnabled())
-                return;
-
-            if (CheckForAccelerator(_event))
+#if wxUSE_TWO_WINDOWS && !wxUSE_NANOX
+            if (event->xexpose.window != (Window)win->GetClientAreaWindow())

             {
             {

-                // Do nothing! We intercepted and processed the event as an
-                // accelerator.
-                return;
+                XEvent tmp_event;
+                wxExposeInfo info;
+                info.window = event->xexpose.window;
+                info.found_non_matching = false;
+                while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info ))
+                {
+                    // Don't worry about optimizing redrawing the border etc.
+                }
+                win->NeedUpdateNcAreaInIdle();

             }
             else
             }
             else

+#endif

             {
             {

-                if (win)
+                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, wxX11ExposePredicate, (XPointer) &info ))

                 {
                 {

-                    wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
-                    wxTranslateKeyEvent(keyEvent, win, window, event);
-        
-                    // We didn't process wxEVT_KEY_DOWN, so send
-                    // wxEVT_CHAR
-                    if (!win->GetEventHandler()->ProcessEvent( keyEvent ))
-                    {
-                        keyEvent.SetEventType(wxEVT_CHAR);
-                        win->GetEventHandler()->ProcessEvent( keyEvent );
-                    }
-
-                    // We intercepted and processed the key down event
-                    return;
+                    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
+
+                // This simplifies the expose and clear areas to simple
+                // rectangles.
+                win->GetUpdateRegion() = win->GetUpdateRegion().GetBox();
+                win->GetClearRegion() = win->GetClearRegion().GetBox();
+
+                // If we only have one X11 window, always indicate
+                // that borders might have to be redrawn.
+                if (win->GetMainWindow() == win->GetClientAreaWindow())
+                    win->NeedUpdateNcAreaInIdle();
+
+                // Only erase background, paint in idle time.
+                win->SendEraseEvents();
+
+                // EXPERIMENT
+                //win->Update();
+            }
+
+            return true;
+        }
+
+#if !wxUSE_NANOX
+        case GraphicsExpose:
+        {
+            wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str());
+
+            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;
+
+            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->HandleWindowEvent( keyEvent ))
+                return true;
+
+            keyEvent.SetEventType(wxEVT_CHAR);
+            // Do the translation again, retaining the ASCII
+            // code.
+            if (wxTranslateKeyEvent(keyEvent, win, window, event, true) &&
+                win->HandleWindowEvent( 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()->HandleWindowEvent( new_event );
+            }
+
+            return false;

         }
         case KeyRelease:
         {
         }
         case KeyRelease:
         {

-            if (win && !win->IsEnabled())
-                return;
+            if (!win->IsEnabled())
+                return false;

 
 

-            if (win)
+            wxKeyEvent keyEvent(wxEVT_KEY_UP);
+            wxTranslateKeyEvent(keyEvent, win, window, event);
+
+            return win->HandleWindowEvent( keyEvent );
+        }
+        case ConfigureNotify:
+        {
+#if wxUSE_NANOX
+            if (event->update.utype == GR_UPDATE_SIZE)
+#endif

             {
             {

-                wxKeyEvent keyEvent(wxEVT_KEY_UP);
-                wxTranslateKeyEvent(keyEvent, win, window, event);
-        
-                win->GetEventHandler()->ProcessEvent( keyEvent );
+                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->HandleWindowEvent( sizeEvent );
+                }

             }
             }

-            return;
+            return false;

         }
         }

+#if !wxUSE_NANOX

         case PropertyNotify:
         {
         case PropertyNotify:
         {

-            HandlePropertyChange(_event);
-            return;
+            //wxLogDebug("PropertyNotify: %s", windowClass.c_str());
+            return HandlePropertyChange(_event);

         }
         case ClientMessage:
         }
         case ClientMessage:

-        {           
-            Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);;
-            Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);;
+        {
+            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 (event->xclient.message_type == wm_protocols)
             {

-                if (event->xclient.data.l[0] == wm_delete_window)
+                if ((Atom) (event->xclient.data.l[0]) == wm_delete_window)

                 {
                 {

-                    if (win)
-                    {
-                        win->Close(FALSE);
-                    }
+                    win->Close(false);
+                    return true;

                 }
             }
                 }
             }

-            return;
+            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:
         {
         }
         case 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.
-            */
-        
+            printf( "resize request from %s\n", win->GetName().c_str() );
+

             Display *disp = (Display*) wxGetDisplay();
             XEvent report;
             Display *disp = (Display*) wxGetDisplay();
             XEvent report;

-            
+

             //  to avoid flicker
             report = * event;
             while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));
             //  to avoid flicker
             report = * event;
             while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));

-            
-            // TODO: when implementing refresh optimization, we can use
-            // XtAddExposureToRegion to expand the window's paint region.

 
 

-            if (win)
-            {
-                wxSize sz = win->GetSize();
-                wxSizeEvent sizeEvent(sz, win->GetId());
-                sizeEvent.SetEventObject(win);
-
-                win->GetEventHandler()->ProcessEvent( sizeEvent );
-            }
+            wxSize sz = win->GetSize();
+            wxSizeEvent sizeEvent(sz, win->GetId());
+            sizeEvent.SetEventObject(win);

 
 

-            return;
+            return win->HandleWindowEvent( sizeEvent );

         }
         }

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

         {
             if (win)
             {
         {
             if (win)
             {

-                win->GetUpdateRegion().Union( event->xexpose.x, event->xexpose.y,
-                                              event->xexpose.width, event->xexpose.height);
-                if (event->xexpose.count == 0)
-                {
-                    win->X11SendPaintEvents();  // TODO let an idle handler do that
-                }
+                win->Close(false);
+                return true;

             }
             }

-
-            return;
+            return false;
+            break;

         }
         }

+#endif

         case EnterNotify:
         case LeaveNotify:
         case ButtonPress:
         case ButtonRelease:
         case MotionNotify:
         {
         case EnterNotify:
         case LeaveNotify:
         case ButtonPress:
         case ButtonRelease:
         case MotionNotify:
         {

-            if (win && !win->IsEnabled())
-                return;
+            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->CanAcceptFocus())
+                {
+                    // 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 (win)
+#if !wxUSE_NANOX
+            if (event->type == LeaveNotify || event->type == EnterNotify)

             {
             {

-                wxMouseEvent wxevent;
-                wxTranslateMouseEvent(wxevent, win, window, event);
-                win->GetEventHandler()->ProcessEvent( wxevent );
+                // Throw out NotifyGrab and NotifyUngrab
+                if (event->xcrossing.mode != NotifyNormal)
+                    return false;

             }
             }

-            return;
+#endif
+            wxMouseEvent wxevent;
+            wxTranslateMouseEvent(wxevent, win, window, event);
+            return win->HandleWindowEvent( wxevent );

         }
         case FocusIn:
         }
         case FocusIn:

+#if !wxUSE_NANOX
+            if ((event->xfocus.detail != NotifyPointer) &&
+                (event->xfocus.mode == NotifyNormal))
+#endif

             {
             {

-                if (win && event->xfocus.detail != NotifyPointer)
+                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)

                 {
                 {

-                    wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
-                    focusEvent.SetEventObject(win);
-                    win->GetEventHandler()->ProcessEvent(focusEvent);
+                    // 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;

                 }
                 }

-                break;
-            }
-        case FocusOut:
-            {
-                if (win && event->xfocus.detail != NotifyPointer)
+                else

                 {
                 {

-                    wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
+                    wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());

                     focusEvent.SetEventObject(win);
                     focusEvent.SetEventObject(win);

-                    win->GetEventHandler()->ProcessEvent(focusEvent);
+                    focusEvent.SetWindow( g_prevFocus );
+                    g_prevFocus = NULL;
+
+                    return win->HandleWindowEvent(focusEvent);

                 }
                 }

-                break;

             }
             }

-        case DestroyNotify:
+            return false;
+
+        case FocusOut:
+#if !wxUSE_NANOX
+            if ((event->xfocus.detail != NotifyPointer) &&
+                (event->xfocus.mode == NotifyNormal))
+#endif

             {
             {

-                // Do we want to process this (for top-level windows)?
-                // But we want to be able to veto closes, anyway
-                break;
+                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->HandleWindowEvent(focusEvent);

             }
             }

+            return false;
+
+#ifdef __WXDEBUG__

         default:
         default:

-        {
+            //wxString eventName = wxGetXEventName(XEvent& event);
+            //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());

             break;
             break;

-        }
+#endif // __WXDEBUG__

     }
     }

-}

 
 

-// 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;
-    event.SetEventObject(this);
-    ProcessEvent(event);
-
-    return event.MoreRequested();
-}
-
-void wxApp::ExitMainLoop()
-{
-    if (m_mainLoop)
-        m_mainLoop->Exit(0);
-}
-
-// Is a message/event pending?
-bool wxApp::Pending()
-{
-    return wxEventLoop::GetActive()->Pending();
-}
-
-// Dispatch a message.
-void wxApp::Dispatch()
-{
-    wxEventLoop::GetActive()->Dispatch();
+    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 *WXUNUSED(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();
-
-    if (needMore)
-        event.RequestMore(TRUE);
-
-    inOnIdle = FALSE;
-}
+    // TODO: use wxMotif implementation?

 
 

-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;
+#if wxUSE_LOG
+    // 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);
+#endif

 
 

-    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;
-}
+    Display *dpy = wxGlobalDisplay();
+    GetMainColormap(dpy);

 
 

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

 
 

-    wxIdleEvent event;
-    event.SetEventObject(win);
-    win->ProcessEvent(event);
+#if !wxUSE_NANOX
+    m_visualInfo = new wxXVisualInfo;
+    wxFillXVisualInfo(m_visualInfo, dpy);
+#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>
+#ifdef HAVE_PANGO_XFT
+    #include <pango/pangoxft.h>
+#endif

 
 

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

 {
 {

-    wxNode *node = wxPendingDelete.First();
-    while (node)
+    static PangoContext *s_pangoContext = NULL;
+    if ( !s_pangoContext )

     {
     {

-        wxObject *obj = (wxObject *)node->Data();
+        Display *dpy = wxGlobalDisplay();

 
 

-        delete obj;
-
-        if (wxPendingDelete.Member(obj))
-            delete node;
+#ifdef HAVE_PANGO_XFT
+        int xscreen = DefaultScreen(dpy);
+        static int use_xft = -1;
+        if (use_xft == -1)
+        {
+            wxString val = wxGetenv( L"GDK_USE_XFT" );
+            use_xft = val == L"1";
+        }

 
 

-        // Deleting one object may have deleted other pending
-        // objects, so start from beginning of list again.
-        node = wxPendingDelete.First();
-    }
-}
+        if (use_xft)
+            s_pangoContext = pango_xft_get_context(dpy, xscreen);
+        else
+#endif // HAVE_PANGO_XFT
+            s_pangoContext = pango_x_get_context(dpy);

 
 

-// 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 (!PANGO_IS_CONTEXT(s_pangoContext))
+            wxLogError( wxT("No pango context.") );

     }
     }

-    XSelectInput((Display*) m_initialDisplay,
-        XDefaultRootWindow((Display*) m_initialDisplay),
-        PropertyChangeMask);
-
-#ifdef __WXDEBUG__
-    // install the X error handler
-    gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
-#endif // __WXDEBUG__
-
-    GetMainColormap(dpy);
-    m_maxRequestSize = XMaxRequestSize((Display*) dpy);

 
 

-    return TRUE;
+    return s_pangoContext;

 }
 
 }
 

+#endif // wxUSE_UNICODE
+

 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
     if (!display) /* Must be called first with non-NULL display */
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
     if (!display) /* Must be called first with non-NULL display */


@@ -650,134 +728,103 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
     return (WXColormap) c;
 }
 
     return (WXColormap) c;
 }
 

-Window wxGetParentWindow(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((Display*) 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)
-{
-    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 = wxGetWindowParent(window);
-
-        if (!window || !win)
-            return FALSE;
-
-        wxKeyEvent keyEvent(wxEVT_CHAR);
-        wxTranslateKeyEvent(keyEvent, win, (Window) 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;
-}
-
-void wxExit()
+void wxApp::Exit()

 {
 {

-    int retValue = 0;
-    if (wxTheApp)
-        retValue = wxTheApp->OnExit();
-

     wxApp::CleanUp();
     wxApp::CleanUp();

-    /*
-    * Exit in some platform-specific way. Not recommended that the app calls this:
-    * only for emergencies.
-    */
-    exit(retValue);
+
+    wxAppConsole::Exit();

 }
 
 // Yield to other processes
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
 }
 
 // Yield to other processes
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {

-    bool s_inYield = FALSE;
-
-    if ( s_inYield )
+    // Sometimes only 2 yields seem
+    // to do the trick, e.g. in the
+    // progress dialog
+    int i;
+    for (i = 0; i < 2; i++)

     {
     {

-        if ( !onlyIfNeeded )
+        static bool s_inYield = false;
+
+        if ( s_inYield )

         {
         {

-            wxFAIL_MSG( wxT("wxYield called recursively" ) );
-        }
+            if ( !onlyIfNeeded )
+            {
+                wxFAIL_MSG( wxT("wxYield called recursively" ) );
+            }

 
 

-        return FALSE;
-    }
+            return false;
+        }

 
 

-    s_inYield = TRUE;
+        s_inYield = true;

 
 

-    while (wxTheApp && wxTheApp->Pending())
+        // Make sure we have an event loop object,
+        // or Pending/Dispatch will fail
+       wxEventLoopGuarantor dummyLoopIfNeeded;
+        // Call dispatch at least once so that sockets
+        // can be tested

         wxTheApp->Dispatch();
 
         wxTheApp->Dispatch();
 

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

 
 

-    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
-
-wxIcon
-wxApp::GetStdIcon(int which) const
-{
-    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
+#if wxUSE_TIMER
+        wxGenericTimerImpl::NotifyTimers();
+#endif
+        ProcessIdle();

 
 

-        case wxICON_HAND:
-            return wxIcon(error_xpm);
+        s_inYield = false;

     }
     }

+
+    return true;

 }
 
 }
 

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

 
 

-#if 0
-extern "C" XtAppContext wxGetAppContext()
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)

 {
 {

-    return (XtAppContext)wxTheApp->GetAppContext();
-}
+    // 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
 #endif

+}
+
+#endif // __WXDEBUG__