placeholder

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 1ca16bb8e24da0060046a068fd46fee85aeb2aa8..1c924a182280b08fd8c078c270ea27a6f0364f7b 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
 


@@ -26,20 +26,16 @@
 #include "wx/intl.h"
 #include "wx/evtloop.h"
 #include "wx/timer.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"
 
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 

-#define ABS(a)    (((a) < 0) ? -(a) : (a))
-

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

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


@@ -53,12 +49,6 @@ extern wxList wxPendingDelete;
 wxHashTable *wxWidgetHashTable = NULL;
 wxHashTable *wxClientWidgetHashTable = NULL;
 
 wxHashTable *wxWidgetHashTable = NULL;
 wxHashTable *wxClientWidgetHashTable = NULL;
 

-wxApp *wxTheApp = 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;
 
 static bool g_showIconic = FALSE;
 static wxSize g_initialSize = wxDefaultSize;
 


@@ -98,344 +88,161 @@ WXDisplay *wxApp::ms_display = NULL;
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)

-    EVT_IDLE(wxApp::OnIdle)
+    EVT_IDLE(wxAppBase::OnIdle)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-bool wxApp::Initialize()
-{
-    wxClassInfo::InitializeClasses();
-
-    // 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
-
-    wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-    wxTheColourDatabase->Initialize();
-
-    wxInitializeStockLists();
-    wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
-
-    wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-    wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-
-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) return FALSE;
-
-    return TRUE;
-}
-
-void wxApp::CleanUp()
+bool wxApp::Initialize(int& argc, wxChar **argv)

 {
 {

-    if (g_newArgv)
-        delete[] g_newArgv;
-    g_newArgv = NULL;
-
-    delete wxWidgetHashTable;
-    wxWidgetHashTable = NULL;
-    delete wxClientWidgetHashTable;
-    wxClientWidgetHashTable = NULL;
-
-    wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
-
-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
-
-    wxDeleteStockObjects();
-
-    wxDeleteStockLists();
-
-    delete wxTheApp;
-    wxTheApp = NULL;
-
-    wxClassInfo::CleanUpClasses();
-
-#if wxUSE_THREADS
-    delete wxPendingEvents;
-    delete wxPendingEventsLocker;
-#endif
-
-#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.");
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-#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);
-}
-
-// NB: argc and argv may be changed here, pass by reference!
-int wxEntryStart( int& argc, char *argv[] )
-{
-#ifdef __WXDEBUG__
-#if !wxUSE_NANOX
+#if defined(__WXDEBUG__) && !wxUSE_NANOX

     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );

-#endif

 #endif // __WXDEBUG__
 
     wxString displayName;
     bool syncDisplay = FALSE;
 
 #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++)
+    int argcOrig = argc;
+    for ( int i = 0; i < argcOrig; i++ )

     {
     {

-        wxString arg(argv[i]);
-        if (arg == wxT("-display"))
+        if (wxStrcmp( argv[i], _T("-display") ) == 0)

         {
             if (i < (argc - 1))
             {
         {
             if (i < (argc - 1))
             {

-                i ++;
+                argv[i++] = NULL;
+

                 displayName = argv[i];
                 displayName = argv[i];

-                continue;
+
+                argv[i] = NULL;
+                argc -= 2;

             }
         }
             }
         }

-        else if (arg == wxT("-geometry"))
+        else if (wxStrcmp( argv[i], _T("-geometry") ) == 0)

         {
             if (i < (argc - 1))
             {
         {
             if (i < (argc - 1))
             {

-                i ++;
-                wxString windowGeometry = argv[i];
+                argv[i++] = NULL;
+

                 int w, h;
                 int w, h;

-                if (wxSscanf(windowGeometry.c_str(), _T("%dx%d"), &w, &h) != 2)
+                if (wxSscanf(argv[i], _T("%dx%d"), &w, &h) != 2)

                 {
                 {

-                    wxLogError(_("Invalid geometry specification '%s'"), windowGeometry.c_str());
+                    wxLogError( _("Invalid geometry specification '%s'"),
+                                wxString(argv[i]).c_str() );

                 }
                 else
                 {
                     g_initialSize = wxSize(w, h);
                 }
                 }
                 else
                 {
                     g_initialSize = wxSize(w, h);
                 }

-                continue;
+
+                argv[i] = NULL;
+                argc -= 2;

             }
         }
             }
         }

-        else if (arg == wxT("-sync"))
+        else if (wxStrcmp( argv[i], _T("-sync") ) == 0)

         {
             syncDisplay = TRUE;
         {
             syncDisplay = TRUE;

-            continue;
+
+            argv[i] = NULL;
+            argc--;

         }
         }

-        else if (arg == wxT("-iconic"))
+        else if (wxStrcmp( argv[i], _T("-iconic") ) == 0)

         {
             g_showIconic = TRUE;
 
         {
             g_showIconic = TRUE;
 

-            continue;
+            argv[i] = NULL;
+            argc--;

         }
         }

+    }

 
 

-        // Not eaten by wxWindows, so pass through
-        g_newArgv[g_newArgc] = argv[i];
-        g_newArgc ++;
+    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);
+            }
+        }

     }
 
     }
 

-    Display* xdisplay = NULL;
-    if (displayName.IsEmpty())
-        xdisplay = XOpenDisplay(NULL);
+    // X11 display stuff
+    Display *xdisplay;
+    if ( displayName.empty() )
+        xdisplay = XOpenDisplay( NULL );

     else
     else

-        xdisplay = XOpenDisplay((char*) displayName.c_str());
-
+        xdisplay = XOpenDisplay( displayName.ToAscii() );

     if (!xdisplay)
     {
         wxLogError( _("wxWindows could not open display. Exiting.") );
     if (!xdisplay)
     {
         wxLogError( _("wxWindows could not open display. Exiting.") );

-        return -1;
+        return false;

     }
 
     if (syncDisplay)
     }
 
     if (syncDisplay)

-    {

         XSynchronize(xdisplay, True);
         XSynchronize(xdisplay, True);

-    }

 
 

-    wxApp::ms_display = (WXDisplay*) xdisplay;
+    ms_display = (WXDisplay*) xdisplay;

 
     XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
 
 
     XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
 

+    // Misc.

     wxSetDetectableAutoRepeat( TRUE );
 
     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
-    // 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();
-#endif
-    int err = wxEntryStart(argc, argv);
-    if (err)
-        return err;
-
-    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;
-    };
-
-    wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
-    wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
-
-    // 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;
-
-    int retValue;
-    retValue = wxEntryInitGui();
-
-    // Here frames insert themselves automatically into wxTopLevelWindows by
-    // getting created in OnInit().
-    if ( retValue == 0 )
+    if ( !wxAppBase::Initialize(argc, argv) )

     {
     {

-        if ( !wxTheApp->OnInit() )
-            retValue = -1;
-    }
+        XCloseDisplay(xdisplay);

 
 

-    if ( retValue == 0 )
-    {
-        if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+        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())
-    {
-        delete wxTheApp->GetTopWindow();
-        wxTheApp->SetTopWindow(NULL);
-    }
+#if wxUSE_UNICODE
+    // Glib's type system required by Pango
+    g_type_init();
+#endif

 
 

-    wxTheApp->DeletePendingObjects();
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif

 
 

-    wxTheApp->OnExit();
+    wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
+    wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER);

 
 

-    wxApp::CleanUp();
+    return true;
+}

 
 

-    return retValue;
-};
+void wxApp::CleanUp()
+{
+    delete wxWidgetHashTable;
+    wxWidgetHashTable = NULL;
+    delete wxClientWidgetHashTable;
+    wxClientWidgetHashTable = NULL;

 
 

-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+    wxAppBase::CleanUp();
+}

 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-    m_topWindow = NULL;
-    wxTheApp = this;
-    m_className = "";
-    m_wantDebugOutput = TRUE ;
-    m_appName = "";
+    // TODO: parse the command line

     argc = 0;
     argv = NULL;
     argc = 0;
     argv = NULL;

-    m_exitOnFrameDelete = TRUE;
+

     m_mainColormap = (WXColormap) NULL;
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
     m_mainColormap = (WXColormap) NULL;
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;

-    m_mainLoop = NULL;

     m_showIconic = FALSE;
     m_initialSize = wxDefaultSize;
     m_showIconic = FALSE;
     m_initialSize = wxDefaultSize;

-    
+

 #if !wxUSE_NANOX
 #if !wxUSE_NANOX

-    m_visualColormap = NULL;
-    m_colorCube = NULL;
+    m_visualInfo = NULL;

 #endif
 }
 
 wxApp::~wxApp()
 {
 #if !wxUSE_NANOX
 #endif
 }
 
 wxApp::~wxApp()
 {
 #if !wxUSE_NANOX

-    if (m_colorCube)
-        free( m_colorCube );
-        
-    if (m_visualColormap)
-        delete [] (XColor*)m_visualColormap;
+    delete m_visualInfo;

 #endif
 }
 
 #endif
 }
 

-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
-}
-
-int wxApp::MainLoop()
-{
-    int rt;
-    m_mainLoop = new wxEventLoop;
-
-    rt = m_mainLoop->Run();
-
-    delete m_mainLoop;
-    m_mainLoop = NULL;
-    return rt;
-}
-

 #if !wxUSE_NANOX
 //-----------------------------------------------------------------------
 // X11 predicate function for exposure compression
 #if !wxUSE_NANOX
 //-----------------------------------------------------------------------
 // X11 predicate function for exposure compression


@@ -510,7 +317,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         case Expose:
         {
 #if wxUSE_TWO_WINDOWS && !wxUSE_NANOX
         case Expose:
         {
 #if wxUSE_TWO_WINDOWS && !wxUSE_NANOX

-            if (event->xexpose.window != (Window)win->GetClientWindow())
+            if (event->xexpose.window != (Window)win->GetClientAreaWindow())

             {
                 XEvent tmp_event;
                 wxExposeInfo info;
             {
                 XEvent tmp_event;
                 wxExposeInfo info;


@@ -552,12 +359,14 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
                 // If we only have one X11 window, always indicate
                 // that borders might have to be redrawn.
 
                 // If we only have one X11 window, always indicate
                 // that borders might have to be redrawn.

-                if (win->GetMainWindow() == win->GetClientWindow())
+                if (win->GetMainWindow() == win->GetClientAreaWindow())

                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.
                 win->SendEraseEvents();
                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.
                 win->SendEraseEvents();

-                // win->Update();
+
+                // EXPERIMENT
+                //win->Update();

             }
 
             return TRUE;
             }
 
             return TRUE;


@@ -566,11 +375,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 #if !wxUSE_NANOX
         case GraphicsExpose:
         {
 #if !wxUSE_NANOX
         case GraphicsExpose:
         {

-            printf( "GraphicExpose event\n" );
-
-            // wxLogDebug( "GraphicsExpose from %s", win->GetName().c_str(),
-            //                              event->xgraphicsexpose.x, event->xgraphicsexpose.y,
-            //                              event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+            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->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
                                           event->xgraphicsexpose.width, event->xgraphicsexpose.height);


@@ -604,6 +409,9 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                 return TRUE;
 
             keyEvent.SetEventType(wxEVT_CHAR);
                 return TRUE;
 
             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;
 
             if (win->GetEventHandler()->ProcessEvent( keyEvent ))
                 return TRUE;
 


@@ -740,7 +548,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         {
             if (!win->IsEnabled())
                 return FALSE;
         {
             if (!win->IsEnabled())
                 return FALSE;

-                
+

             // Here we check if the top level window is
             // disabled, which is one aspect of modality.
             wxWindow *tlw = win;
             // Here we check if the top level window is
             // disabled, which is one aspect of modality.
             wxWindow *tlw = win;


@@ -758,6 +566,15 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                     g_prevFocus = wxWindow::FindFocus();
                     g_nextFocus = win;
 
                     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();
                 }
             }
                     win->SetFocus();
                 }
             }


@@ -775,14 +592,24 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             return win->GetEventHandler()->ProcessEvent( wxevent );
         }
         case FocusIn:
             return win->GetEventHandler()->ProcessEvent( wxevent );
         }
         case FocusIn:

-            {

 #if !wxUSE_NANOX
 #if !wxUSE_NANOX

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

 #endif
 #endif

-                {
-                    // wxLogDebug( "FocusIn from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+            {
+                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 );
                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     focusEvent.SetWindow( g_prevFocus );


@@ -790,68 +617,34 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
                     return win->GetEventHandler()->ProcessEvent(focusEvent);
                 }
 
                     return win->GetEventHandler()->ProcessEvent(focusEvent);
                 }

-                return FALSE;
-                break;

             }
             }

+            return FALSE;
+

         case FocusOut:
         case FocusOut:

-            {

 #if !wxUSE_NANOX
 #if !wxUSE_NANOX

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

 #endif
 #endif

-                {
-                    // wxLogDebug( "FocusOut from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+            {
+                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;
+                wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
+                focusEvent.SetEventObject(win);
+                focusEvent.SetWindow( g_nextFocus );
+                g_nextFocus = NULL;
+                return win->GetEventHandler()->ProcessEvent(focusEvent);

             }
             }

-        default:
-        {
+            return FALSE;
+

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

+        default:

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

-#endif
-            return FALSE;

             break;
             break;

-        }
+#endif // __WXDEBUG__

     }
     }

-    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;
-    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
 }
 
 // This should be redefined in a derived class for


@@ -864,120 +657,14 @@ bool wxApp::HandlePropertyChange(WXEvent *event)
     return FALSE;
 }
 
     return FALSE;
 }
 

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

 {
 {

-    static bool s_inOnIdle = FALSE;
+    // TODO: use wxMotif implementation?

 
 

-    // Avoid recursion (via ProcessEvent default case)
-    if (s_inOnIdle)
-        return;
-
-    s_inOnIdle = TRUE;
-
-    // Resend in the main thread events which have been prepared in other
-    // threads
-    ProcessPendingEvents();
-
-    // 'Garbage' collection of windows deleted with Close()
-    DeletePendingObjects();
-
-    // Send OnIdle events to all windows
-    bool needMore = SendIdleEvents();
-
-    if (needMore)
-        event.RequestMore(TRUE);
-
-    s_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()
-{
-    bool needMore = FALSE;
-
-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-        node = node->GetNext();
-    }
-
-    return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
-    bool needMore = FALSE;
-
-    wxIdleEvent event;
-    event.SetEventObject(win);
-
-    win->GetEventHandler()->ProcessEvent(event);
-
-    if (event.MoreRequested())
-        needMore = TRUE;
-
-    wxNode* node = win->GetChildren().First();
-    while (node)
-    {
-        wxWindow* win = (wxWindow*) node->Data();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-
-        node = node->Next();
-    }
-
-    win->OnInternalIdle();
-
-    return needMore;
-}
-
-void wxApp::DeletePendingObjects()
-{
-    wxNode *node = wxPendingDelete.First();
-    while (node)
-    {
-        wxObject *obj = (wxObject *)node->Data();
-
-        delete obj;
-
-        if (wxPendingDelete.Member(obj))
-            delete node;
-
-        // Deleting one object may have deleted other pending
-        // objects, so start from beginning of list again.
-        node = wxPendingDelete.First();
-    }
-}
-
-static void wxCalcPrecAndShift( unsigned long mask, int *shift, int *prec )
-{
-  *shift = 0;
-  *prec = 0;
-
-  while (!(mask & 0x1))
-    {
-      (*shift)++;
-      mask >>= 1;
-    }
-
-  while (mask & 0x1)
-    {
-      (*prec)++;
-      mask >>= 1;
-    }
-}
-

 // Create display, and other initialization
 bool wxApp::OnInitGui()
 {
 // Create display, and other initialization
 bool wxApp::OnInitGui()
 {


@@ -994,103 +681,48 @@ bool wxApp::OnInitGui()
     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
 #if !wxUSE_NANOX
     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.
+    m_visualInfo = new wxXVisualInfo;
+    wxFillXVisualInfo( m_visualInfo, (Display*) wxApp::GetDisplay() );
+#endif
+
+    return TRUE;
+}
+
+#if wxUSE_UNICODE
+
+#include <pango/pango.h>
+#include <pango/pangox.h>
+#include <pango/pangoxft.h>
+
+PangoContext* wxApp::GetPangoContext()
+{
+    static PangoContext *ret = NULL;
+    if (ret)
+        return ret;
+

     Display *xdisplay = (Display*) wxApp::GetDisplay();
     Display *xdisplay = (Display*) wxApp::GetDisplay();

+
+#if 1

     int xscreen = DefaultScreen(xdisplay);
     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)
+    static int use_xft = -1;
+    if (use_xft == -1)

     {
     {

-        wxCalcPrecAndShift( m_visualRedMask, &m_visualRedShift, &m_visualRedPrec );
-        wxCalcPrecAndShift( m_visualGreenMask, &m_visualGreenShift, &m_visualGreenPrec );
-        wxCalcPrecAndShift( m_visualBlueMask, &m_visualBlueShift, &m_visualBluePrec );
+        wxString val = wxGetenv( L"GDK_USE_XFT" );
+        use_xft = (val == L"1");

     }
     }

-    
-    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;
-            }
-        }
-    }
+    if (use_xft)
+        ret = pango_xft_get_context( xdisplay, xscreen );
+    else

 #endif
 #endif

-    
-    return TRUE;
+        ret = pango_x_get_context( xdisplay );
+
+    if (!PANGO_IS_CONTEXT(ret))
+        wxLogError( wxT("No pango context.") );
+
+    return ret;

 }
 }

+#endif

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


@@ -1110,7 +742,7 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
 
 Window wxGetWindowParent(Window window)
 {
 
 Window wxGetWindowParent(Window window)
 {

-    wxASSERT_MSG( window, "invalid window" );
+    wxASSERT_MSG( window, _T("invalid window") );

 
     return (Window) 0;
 
 
     return (Window) 0;
 


@@ -1137,73 +769,79 @@ Window wxGetWindowParent(Window window)
         return (Window) 0;
 }
 
         return (Window) 0;
 }
 

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

 
 

-    // 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);
-    }
+        // 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())
+        // Call dispatch at least once so that sockets
+        // can be tested

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

+        while (wxTheApp && wxTheApp->Pending())
+            wxTheApp->Dispatch();
+

 #if wxUSE_TIMER
 #if wxUSE_TIMER

-    wxTimer::NotifyTimers();
+        wxTimer::NotifyTimers();

 #endif
 #endif

-    ProcessIdle();
+        ProcessIdle();

 
 

-    if (newEventLoop)
-    {
-        wxEventLoop::SetActive(NULL);
-        delete newEventLoop;
-    }
+        if (newEventLoop)
+        {
+            wxEventLoop::SetActive(NULL);
+            delete newEventLoop;
+        }

 
 

-    s_inYield = FALSE;
+        s_inYield = FALSE;
+    }

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+#ifdef __WXDEBUG__
+
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)

 {
     // While the GUI isn't working that well, just print out the
     // message.
 #if 1
 {
     // While the GUI isn't working that well, just print out the
     // message.
 #if 1

-    wxAppBase::OnAssert(file, line, msg);
+    wxAppBase::OnAssert(file, line, cond, msg);

 #else
     wxString msg2;
     msg2.Printf("At file %s:%d: %s", file, line, msg);
 #else
     wxString msg2;
     msg2.Printf("At file %s:%d: %s", file, line, msg);


@@ -1211,3 +849,5 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 #endif
 }
 
 #endif
 }
 

+#endif // __WXDEBUG__
+