X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b30bb0bda00908650d46b326ba04237f0d4121f..9bb50fd0b04c824fc7ba14c0dc4ba4a2a9a1e6ad:/src/motif/app.cpp diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 64758e0572..ef00606e5f 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -9,10 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "app.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #ifdef __VMS #define XtParent XTPARENT #define XtDisplay XTDISPLAY @@ -26,7 +29,6 @@ #include "wx/intl.h" #include "wx/evtloop.h" #include "wx/hash.h" -#include "wx/hashmap.h" #if wxUSE_THREADS #include "wx/thread.h" @@ -51,14 +53,16 @@ struct wxPerDisplayData { wxPerDisplayData() - { m_visualInfo = NULL; m_topLevelWidget = NULL; } + { + m_visualInfo = NULL; + m_topLevelWidget = NULL; + m_topLevelRealizedWidget = NULL; + } wxXVisualInfo* m_visualInfo; - Widget m_topLevelWidget; + Widget m_topLevelWidget, m_topLevelRealizedWidget; }; -WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData, wxPerDisplayDataMap ); - static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData, XtPointer ptr); static WXWidget wxCreateTopLevelWidget( WXDisplay* display ); @@ -71,37 +75,62 @@ wxHashTable *wxWidgetHashTable = NULL; IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) + EVT_IDLE(wxAppBase::OnIdle) END_EVENT_TABLE() #ifdef __WXDEBUG__ +extern "C" +{ typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *); +} - XErrorHandlerFunc gs_pfnXErrorHandler = 0; +XErrorHandlerFunc gs_pfnXErrorHandler = 0; - static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) - { - // just forward to the default handler for now - return gs_pfnXErrorHandler(dpy, xevent); - } +extern "C" +{ + +static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) +{ + // just forward to the default handler for now + return gs_pfnXErrorHandler(dpy, xevent); +} + +} #endif // __WXDEBUG__ -bool wxApp::Initialize(int& argc, wxChar **argv) +bool wxApp::Initialize(int& argcOrig, wxChar **argvOrig) { - if ( !wxAppBase::Initialize(argc, argv) ) + if ( !wxAppBase::Initialize(argcOrig, argvOrig) ) return false; wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif + return true; } void wxApp::CleanUp() { + wxAppBase::CleanUp(); + delete wxWidgetHashTable; wxWidgetHashTable = NULL; - wxAppBase::CleanUp(); + delete m_mainLoop; + + for( wxPerDisplayDataMap::iterator it = m_perDisplayData->begin(), + end = m_perDisplayData->end(); + it != end; ++it ) + { + delete it->second->m_visualInfo; + XtDestroyWidget( it->second->m_topLevelWidget ); + delete it->second; + } + + delete m_perDisplayData; } void wxApp::Exit() @@ -120,7 +149,7 @@ wxApp::wxApp() argc = 0; argv = NULL; - m_eventLoop = new wxEventLoop; + m_mainLoop = new wxEventLoop; m_mainColormap = (WXColormap) NULL; m_appContext = (WXAppContext) NULL; m_initialDisplay = (WXDisplay*) 0; @@ -129,27 +158,7 @@ wxApp::wxApp() wxApp::~wxApp() { - delete m_eventLoop; - - for( wxPerDisplayDataMap::iterator it = m_perDisplayData->begin(), - end = m_perDisplayData->end(); - it != end; ++it ) - { - delete it->second.m_visualInfo; - XtDestroyWidget( it->second.m_topLevelWidget ); - } - - delete m_perDisplayData; - - wxTheApp = NULL; -} - -bool wxApp::Initialized() -{ - if (GetTopWindow()) - return TRUE; - else - return FALSE; + wxApp::SetInstance(NULL); } int wxApp::MainLoop() @@ -165,49 +174,11 @@ int wxApp::MainLoop() XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())), PropertyChangeMask); - m_eventLoop->Run(); + m_mainLoop->Run(); return 0; } -// Processes an idle event. -// Returns TRUE if more time is needed. -bool wxApp::ProcessIdle() -{ - wxIdleEvent event; - - bool processed = ProcessEvent(event); - - wxUpdateUIEvent::ResetUpdateTime(); - - return processed && event.MoreRequested(); -} - -void wxApp::ExitMainLoop() -{ - if( m_eventLoop->IsRunning() ) - m_eventLoop->Exit(); -} - -// Is a message/event pending? -bool wxApp::Pending() -{ - return m_eventLoop->Pending(); -#if 0 - XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() )); - - // Fix by Doug from STI, to prevent a stall if non-X event - // is found. - return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ; -#endif -} - -// Dispatch a message. -void wxApp::Dispatch() -{ - m_eventLoop->Dispatch(); -} - // This should be redefined in a derived class for // handling property change events for XAtom IPC. void wxApp::HandlePropertyChange(WXEvent *event) @@ -216,91 +187,20 @@ void wxApp::HandlePropertyChange(WXEvent *event) XtDispatchEvent((XEvent*) event); /* let Motif do the work */ } -void wxApp::OnIdle(wxIdleEvent& event) -{ - 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; -} - -// 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; - - wxWindowList::Node* node = win->GetChildren().GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->GetNext(); - } - return needMore ; -} - static char *fallbackResources[] = { - "*menuBar.marginHeight: 0", - "*menuBar.shadowThickness: 1", - "*background: #c0c0c0", - "*foreground: black", + // better defaults for CDE under Irix + // + // TODO: do something similar for the other systems, the hardcoded defaults + // below are ugly +#ifdef __SGI__ + wxMOTIF_STR("*sgiMode: True"), + wxMOTIF_STR("*useSchemes: all"), +#else // !__SGI__ + wxMOTIF_STR("*menuBar.marginHeight: 0"), + wxMOTIF_STR("*menuBar.shadowThickness: 1"), + wxMOTIF_STR("*background: #c0c0c0"), + wxMOTIF_STR("*foreground: black"), +#endif // __SGI__/!__SGI__ NULL }; @@ -308,8 +208,9 @@ static char *fallbackResources[] = { bool wxApp::OnInitGui() { if( !wxAppBase::OnInitGui() ) - return FALSE; + return false; + XtSetLanguageProc(NULL, NULL, NULL); XtToolkitInitialize() ; wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext(); XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources); @@ -327,7 +228,7 @@ bool wxApp::OnInitGui() // if you don't log to stderr, nothing will be shown... delete wxLog::SetActiveTarget(new wxLogStderr); wxString className(wxTheApp->GetClassName()); - wxLogError(_("wxWindows could not open display for '%s': exiting."), + wxLogError(_("wxWidgets could not open display for '%s': exiting."), className.c_str()); exit(-1); } @@ -340,7 +241,7 @@ bool wxApp::OnInitGui() // Add general resize proc XtActionsRec rec; - rec.string = "resize"; + rec.string = wxMOTIF_STR("resize"); rec.proc = (XtActionProc)wxWidgetResizeProc; XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1); @@ -348,7 +249,7 @@ bool wxApp::OnInitGui() wxAddIdleCallback(); - return TRUE; + return true; } WXColormap wxApp::GetMainColormap(WXDisplay* display) @@ -367,17 +268,30 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display) return (WXColormap) c; } -wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display ) +static inline wxPerDisplayData& GetOrCreatePerDisplayData + ( wxPerDisplayDataMap& m, WXDisplay* display ) { - wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display ); + wxPerDisplayDataMap::iterator it = m.find( display ); + if( it != m.end() && it->second != NULL ) + return *(it->second); - if( it != m_perDisplayData->end() && it->second.m_visualInfo ) - return it->second.m_visualInfo; + wxPerDisplayData* nData = new wxPerDisplayData(); + m[display] = nData; + + return *nData; +} + +wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display ) +{ + wxPerDisplayData& data = GetOrCreatePerDisplayData( *m_perDisplayData, + display ); + if( data.m_visualInfo ) + return data.m_visualInfo; wxXVisualInfo* vi = new wxXVisualInfo; wxFillXVisualInfo( vi, (Display*)display ); - (*m_perDisplayData)[display].m_visualInfo = vi; + data.m_visualInfo = vi; return vi; } @@ -386,8 +300,12 @@ static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData, XtPointer ptr) { if( wxTheApp ) + { wxTheApp->SetTopLevelWidget( (WXDisplay*)XtDisplay(w), (WXWidget)NULL ); + wxTheApp->SetTopLevelRealizedWidget( (WXDisplay*)XtDisplay(w), + (WXWidget)NULL ); + } } WXWidget wxCreateTopLevelWidget( WXDisplay* display ) @@ -397,8 +315,9 @@ WXWidget wxCreateTopLevelWidget( WXDisplay* display ) applicationShellWidgetClass, (Display*)display, NULL, 0 ); - XtSetMappedWhenManaged( tlw, False ); - XtRealizeWidget( tlw ); + XtVaSetValues( tlw, + XmNoverrideRedirect, True, + NULL ); XtAddCallback( tlw, XmNdestroyCallback, (XtCallbackProc)wxTLWidgetDestroyCallback, @@ -407,13 +326,24 @@ WXWidget wxCreateTopLevelWidget( WXDisplay* display ) return (WXWidget)tlw; } +WXWidget wxCreateTopLevelRealizedWidget( WXDisplay* display ) +{ + Widget rTlw = XtVaCreateWidget( "dummy_widget", topLevelShellWidgetClass, + (Widget)wxTheApp->GetTopLevelWidget(), + NULL, 0 ); + XtSetMappedWhenManaged( rTlw, False ); + XtRealizeWidget( rTlw ); + + return (WXWidget)rTlw; +} + WXWidget wxApp::GetTopLevelWidget() { WXDisplay* display = wxGetDisplay(); - wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display ); - - if( it != m_perDisplayData->end() && it->second.m_topLevelWidget ) - return (WXWidget)it->second.m_topLevelWidget; + wxPerDisplayData& data = GetOrCreatePerDisplayData( *m_perDisplayData, + display ); + if( data.m_topLevelWidget ) + return (WXWidget)data.m_topLevelWidget; WXWidget tlw = wxCreateTopLevelWidget( display ); SetTopLevelWidget( display, tlw ); @@ -421,16 +351,37 @@ WXWidget wxApp::GetTopLevelWidget() return tlw; } +WXWidget wxApp::GetTopLevelRealizedWidget() +{ + WXDisplay* display = wxGetDisplay(); + wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display ); + + if( it != m_perDisplayData->end() && it->second->m_topLevelRealizedWidget ) + return (WXWidget)it->second->m_topLevelRealizedWidget; + + WXWidget rTlw = wxCreateTopLevelRealizedWidget( display ); + SetTopLevelRealizedWidget( display, rTlw ); + + return rTlw; +} + void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget) { - (*m_perDisplayData)[display].m_topLevelWidget = (Widget)widget; + GetOrCreatePerDisplayData( *m_perDisplayData, display ) + .m_topLevelWidget = (Widget)widget; +} + +void wxApp::SetTopLevelRealizedWidget(WXDisplay* display, WXWidget widget) +{ + GetOrCreatePerDisplayData( *m_perDisplayData, display ) + .m_topLevelRealizedWidget = (Widget)widget; } // Yield to other processes bool wxApp::Yield(bool onlyIfNeeded) { - bool s_inYield = FALSE; + static bool s_inYield = false; if ( s_inYield ) { @@ -439,17 +390,17 @@ bool wxApp::Yield(bool onlyIfNeeded) wxFAIL_MSG( wxT("wxYield called recursively" ) ); } - return FALSE; + return false; } - s_inYield = TRUE; + s_inYield = true; while (wxTheApp && wxTheApp->Pending()) wxTheApp->Dispatch(); - s_inYield = FALSE; + s_inYield = false; - return TRUE; + return true; } // ----------------------------------------------------------------------------