X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2386592d338b18cd408fa7912a50232e044e5f7..a7734bdfb398c42321d985abdad7304bb3ac5182:/src/x11/app.cpp?ds=sidebyside diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 2de877dd5c..a7165cf5ec 100644 --- 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: @@ -9,23 +9,27 @@ // 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/utils.h" -#include "wx/gdicmn.h" -#include "wx/icon.h" -#include "wx/dialog.h" -#include "wx/log.h" -#include "wx/module.h" -#include "wx/memory.h" -#include "wx/log.h" -#include "wx/intl.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/timer.h" + #include "wx/memory.h" + #include "wx/gdicmn.h" + #include "wx/module.h" +#endif + #include "wx/evtloop.h" -#include "wx/timer.h" +#include "wx/filename.h" #include "wx/univ/theme.h" #include "wx/univ/renderer.h" @@ -34,10 +38,6 @@ #include "wx/thread.h" #endif -#if wxUSE_WX_RESOURCES - #include "wx/resource.h" -#endif - #include "wx/x11/private.h" #include @@ -46,18 +46,10 @@ // global data //------------------------------------------------------------------------ -extern wxList wxPendingDelete; - -wxHashTable *wxWidgetHashTable = NULL; -wxHashTable *wxClientWidgetHashTable = NULL; - -wxApp *wxTheApp = NULL; +wxWindowHash *wxWidgetHashTable = NULL; +wxWindowHash *wxClientWidgetHashTable = 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 bool g_showIconic = false; static wxSize g_initialSize = wxDefaultSize; // This is required for wxFocusEvent::SetWindow(). It will only @@ -91,334 +83,153 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) //------------------------------------------------------------------------ long wxApp::sm_lastMessageTime = 0; -WXDisplay *wxApp::ms_display = NULL; IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) + EVT_IDLE(wxAppBase::OnIdle) 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() -{ - 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[] ) +bool wxApp::Initialize(int& argC, wxChar **argV) { -#ifdef __WXDEBUG__ -#if !wxUSE_NANOX +#if defined(__WXDEBUG__) && !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++) + bool syncDisplay = false; + + 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 ++; - displayName = argv[i]; - continue; + argV[i++] = NULL; + + displayName = argV[i]; + + 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; - 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); } - continue; + + argV[i] = NULL; + argC -= 2; } } - else if (arg == wxT("-sync")) + else if (wxStrcmp( argV[i], _T("-sync") ) == 0) { - syncDisplay = TRUE; - continue; + syncDisplay = true; + + 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 ++; } - Display* xdisplay = NULL; - if (displayName.IsEmpty()) - xdisplay = XOpenDisplay(NULL); - else - xdisplay = XOpenDisplay((char*) displayName.c_str()); - - if (!xdisplay) + if ( argC != argCOrig ) { - wxLogError( _("wxWindows could not open display. Exiting.") ); - return -1; + // remove the argumens we consumed + for ( int i = 0; i < argC; i++ ) + { + while ( !argV[i] ) + { + memmove(argV + i, argV + i + 1, argCOrig - i); + } + } } - if (syncDisplay) + // open and set up the X11 display + if ( !wxSetDisplay(displayName) ) { - XSynchronize(xdisplay, True); + wxLogError(_("wxWidgets could not open display. Exiting.")); + return false; } - wxApp::ms_display = (WXDisplay*) xdisplay; - - XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask); - - wxSetDetectableAutoRepeat( TRUE ); - - if (!wxApp::Initialize()) - return -1; + Display *dpy = wxGlobalDisplay(); + if (syncDisplay) + XSynchronize(dpy, True); - return 0; -} + XSelectInput(dpy, XDefaultRootWindow(dpy), PropertyChangeMask); -int wxEntryInitGui() -{ - int retValue = 0; + wxSetDetectableAutoRepeat( true ); - if ( !wxTheApp->OnInitGui() ) - retValue = -1; - return retValue; -} + if ( !wxAppBase::Initialize(argC, argV) ) + return false; - -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(); +#if wxUSE_UNICODE + // Glib's type system required by Pango + g_type_init(); #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 ( !wxTheApp->OnInit() ) - retValue = -1; - } - - if ( retValue == 0 ) - { - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); - } - - // 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); - } - - wxTheApp->DeletePendingObjects(); +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif - wxTheApp->OnExit(); + wxWidgetHashTable = new wxWindowHash; + wxClientWidgetHashTable = new wxWindowHash; - 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() { - 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_mainColormap = NULL; + m_topLevelWidget = NULL; m_maxRequestSize = 0; - m_mainLoop = NULL; - m_showIconic = FALSE; + m_showIconic = false; m_initialSize = wxDefaultSize; -} -bool wxApp::Initialized() -{ - if (GetTopWindow()) - return TRUE; - else - return FALSE; +#if !wxUSE_NANOX + m_visualInfo = NULL; +#endif } -int wxApp::MainLoop() +wxApp::~wxApp() { - int rt; - m_mainLoop = new wxEventLoop; - - rt = m_mainLoop->Run(); - - delete m_mainLoop; - m_mainLoop = NULL; - return rt; +#if !wxUSE_NANOX + delete m_visualInfo; +#endif } #if !wxUSE_NANOX + //----------------------------------------------------------------------- // X11 predicate function for exposure compression //----------------------------------------------------------------------- @@ -429,7 +240,8 @@ struct wxExposeInfo Bool found_non_matching; }; -static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg) +extern "C" +Bool wxX11ExposePredicate (Display *display, XEvent *xevent, XPointer arg) { wxExposeInfo *info = (wxExposeInfo*) arg; @@ -438,23 +250,23 @@ static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg) if (xevent->xany.type != Expose) { - info->found_non_matching = TRUE; + info->found_non_matching = true; return FALSE; } if (xevent->xexpose.window != info->window) { - info->found_non_matching = TRUE; + info->found_non_matching = true; return FALSE; } return TRUE; } -#endif - // wxUSE_NANOX + +#endif // wxUSE_NANOX //----------------------------------------------------------------------- -// Processes an X event, returning TRUE if the event was processed. +// Processes an X event, returning true if the event was processed. //----------------------------------------------------------------------- bool wxApp::ProcessXEvent(WXEvent* _event) @@ -480,7 +292,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) win = wxGetClientWindowFromTable(window); if (!win) #endif - return FALSE; + return false; } #ifdef __WXDEBUG__ @@ -491,14 +303,14 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { case Expose: { -#if wxUSE_TWO_WINDOWS - if (event->xexpose.window != (Window)win->GetClientWindow()) +#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 )) + info.found_non_matching = false; + while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info )) { // Don't worry about optimizing redrawing the border etc. } @@ -516,8 +328,8 @@ bool wxApp::ProcessXEvent(WXEvent* _event) XEvent tmp_event; wxExposeInfo info; info.window = event->xexpose.window; - info.found_non_matching = FALSE; - while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info )) + info.found_non_matching = false; + while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info )) { win->GetUpdateRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y, tmp_event.xexpose.width, tmp_event.xexpose.height ); @@ -534,23 +346,23 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // 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->Update(); + + // EXPERIMENT + //win->Update(); } - return TRUE; + return true; } #if !wxUSE_NANOX case GraphicsExpose: { - // 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); @@ -565,14 +377,14 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // win->Update(); } - return TRUE; + return true; } #endif case KeyPress: { if (!win->IsEnabled()) - return FALSE; + return false; wxKeyEvent keyEvent(wxEVT_KEY_DOWN); wxTranslateKeyEvent(keyEvent, win, window, event); @@ -581,11 +393,14 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR if (win->GetEventHandler()->ProcessEvent( keyEvent )) - return TRUE; + return true; keyEvent.SetEventType(wxEVT_CHAR); - if (win->GetEventHandler()->ProcessEvent( keyEvent )) - return TRUE; + // Do the translation again, retaining the ASCII + // code. + if (wxTranslateKeyEvent(keyEvent, win, window, event, true) && + win->GetEventHandler()->ProcessEvent( keyEvent )) + return true; if ( (keyEvent.m_keyCode == WXK_TAB) && win->GetParent() && (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) @@ -600,12 +415,12 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return win->GetParent()->GetEventHandler()->ProcessEvent( new_event ); } - return FALSE; + return false; } case KeyRelease: { if (!win->IsEnabled()) - return FALSE; + return false; wxKeyEvent keyEvent(wxEVT_KEY_UP); wxTranslateKeyEvent(keyEvent, win, window, event); @@ -618,16 +433,15 @@ bool wxApp::ProcessXEvent(WXEvent* _event) if (event->update.utype == GR_UPDATE_SIZE) #endif { - if (win->IsTopLevel()) + wxTopLevelWindow *tlw = wxDynamicCast(win, wxTopLevelWindow); + if ( tlw ) { - wxTopLevelWindow *tlw = (wxTopLevelWindow*) win; tlw->SetConfigureGeometry( XConfigureEventGetX(event), XConfigureEventGetY(event), XConfigureEventGetWidth(event), XConfigureEventGetHeight(event) ); } - if (win->IsTopLevel() && win->IsShown()) + if ( tlw && tlw->IsShown() ) { - wxTopLevelWindowX11 *tlw = (wxTopLevelWindowX11 *) win; tlw->SetNeedResizeInIdle(); } else @@ -638,8 +452,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return win->GetEventHandler()->ProcessEvent( sizeEvent ); } } - return FALSE; - break; + return false; } #if !wxUSE_NANOX case PropertyNotify: @@ -650,7 +463,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) case ClientMessage: { if (!win->IsEnabled()) - return FALSE; + return false; Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True); Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True); @@ -659,11 +472,11 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { if ((Atom) (event->xclient.data.l[0]) == wm_delete_window) { - win->Close(FALSE); - return TRUE; + win->Close(false); + return true; } } - return FALSE; + return false; } #if 0 case DestroyNotify: @@ -705,10 +518,10 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { if (win) { - win->Close(FALSE); - return TRUE; + win->Close(false); + return true; } - return FALSE; + return false; break; } #endif @@ -719,7 +532,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) case MotionNotify: { if (!win->IsEnabled()) - return FALSE; + return false; // Here we check if the top level window is // disabled, which is one aspect of modality. @@ -727,7 +540,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) while (tlw && !tlw->IsTopLevel()) tlw = tlw->GetParent(); if (tlw && !tlw->IsEnabled()) - return FALSE; + return false; if (event->type == ButtonPress) { @@ -738,6 +551,15 @@ bool wxApp::ProcessXEvent(WXEvent* _event) 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(); } } @@ -747,7 +569,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { // Throw out NotifyGrab and NotifyUngrab if (event->xcrossing.mode != NotifyNormal) - return FALSE; + return false; } #endif wxMouseEvent wxevent; @@ -755,14 +577,24 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return win->GetEventHandler()->ProcessEvent( wxevent ); } case FocusIn: - { #if !wxUSE_NANOX - if ((event->xfocus.detail != NotifyPointer) && - (event->xfocus.mode == NotifyNormal)) + if ((event->xfocus.detail != NotifyPointer) && + (event->xfocus.mode == NotifyNormal)) #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 ); @@ -770,68 +602,34 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return win->GetEventHandler()->ProcessEvent(focusEvent); } - return FALSE; - break; } + return false; + case FocusOut: - { #if !wxUSE_NANOX - if ((event->xfocus.detail != NotifyPointer) && - (event->xfocus.mode == NotifyNormal)) + if ((event->xfocus.detail != NotifyPointer) && + (event->xfocus.mode == NotifyNormal)) #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__ + default: //wxString eventName = wxGetXEventName(XEvent& event); //wxLogDebug(wxT("Event %s not handled"), eventName.c_str()); -#endif - return FALSE; 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 @@ -841,123 +639,82 @@ bool wxApp::HandlePropertyChange(WXEvent *event) // by default do nothing special // TODO: what to do for X11 // XtDispatchEvent((XEvent*) event); - return FALSE; + return false; } -void wxApp::OnIdle(wxIdleEvent& event) +void wxApp::WakeUpIdle() { - static bool s_inOnIdle = FALSE; - - // Avoid recursion (via ProcessEvent default case) - if (s_inOnIdle) - return; + // TODO: use wxMotif implementation? - 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... } -// 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) +// 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 - wxIdleEvent event; - event.SetEventObject(win); + if (!wxAppBase::OnInitGui()) + return false; - win->GetEventHandler()->ProcessEvent(event); + Display *dpy = wxGlobalDisplay(); + GetMainColormap(dpy); - win->OnInternalIdle(); + m_maxRequestSize = XMaxRequestSize(dpy); - if (event.MoreRequested()) - needMore = TRUE; +#if !wxUSE_NANOX + m_visualInfo = new wxXVisualInfo; + wxFillXVisualInfo(m_visualInfo, dpy); +#endif - wxNode* node = win->GetChildren().First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; + return true; +} - node = node->Next(); - } +#if wxUSE_UNICODE - return needMore; -} +#include +#include +#ifdef HAVE_PANGO_XFT + #include +#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; +#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"; + } - if (wxPendingDelete.Member(obj)) - delete node; + if (use_xft) + s_pangoContext = pango_xft_get_context(dpy, xscreen); + else +#endif // HAVE_PANGO_XFT + s_pangoContext = pango_x_get_context(dpy); - // Deleting one object may have deleted other pending - // objects, so start from beginning of list again. - node = wxPendingDelete.First(); + if (!PANGO_IS_CONTEXT(s_pangoContext)) + wxLogError( wxT("No pango context.") ); } -} - -// 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); - - if (!wxAppBase::OnInitGui()) - return FALSE; - - GetMainColormap( wxApp::GetDisplay() ); - - m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() ); - return TRUE; + return s_pangoContext; } +#endif // wxUSE_UNICODE + WXColormap wxApp::GetMainColormap(WXDisplay* display) { if (!display) /* Must be called first with non-NULL display */ @@ -976,11 +733,13 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display) Window wxGetWindowParent(Window window) { - wxASSERT_MSG( window, "invalid window" ); + wxASSERT_MSG( window, _T("invalid window") ); return (Window) 0; - Window parent, root = 0; +#ifndef __VMS + // VMS chokes on unreacheable code + Window parent, root = 0; #if wxUSE_NANOX int noChildren = 0; #else @@ -1001,75 +760,82 @@ Window wxGetWindowParent(Window window) return parent; else return (Window) 0; +#endif } -void wxExit() +void wxApp::Exit() { - int retValue = 0; - if (wxTheApp) - retValue = wxTheApp->OnExit(); - 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) { - 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(); + while (wxTheApp && wxTheApp->Pending()) + wxTheApp->Dispatch(); + #if wxUSE_TIMER - wxTimer::NotifyTimers(); + wxTimer::NotifyTimers(); #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 0 - wxAppBase::OnAssert(file, line, msg); +#if 1 + wxAppBase::OnAssert(file, line, cond, msg); #else wxString msg2; msg2.Printf("At file %s:%d: %s", file, line, msg); @@ -1077,3 +843,4 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) #endif } +#endif // __WXDEBUG__