X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d120f8391920145647ec10e84629bc21fa9f1bb..81b41c03c6bcbffa9293a0e280729ffaaf9ef2c7:/src/motif/app.cpp diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 2c179d7a2d..330ba91007 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -6,11 +6,16 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "app.h" + #pragma implementation "app.h" +#endif + +#ifdef __VMS +#define XtParent XTPARENT +#define XtDisplay XTDISPLAY #endif #include "wx/frame.h" @@ -28,61 +33,81 @@ #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" + #include "wx/thread.h" #endif #if wxUSE_WX_RESOURCES -#include "wx/resource.h" + #include "wx/resource.h" #endif +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include #include #include #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "wx/motif/private.h" #include -extern char *wxBuffer; extern wxList wxPendingDelete; +extern bool wxAddIdleCallback(); wxApp *wxTheApp = NULL; wxHashTable *wxWidgetHashTable = NULL; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) + BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) -EVT_IDLE(wxApp::OnIdle) + EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() -#endif + +#ifdef __WXDEBUG__ + typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *); + + XErrorHandlerFunc gs_pfnXErrorHandler = 0; + + static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) + { + // just forward to the default handler for now + return gs_pfnXErrorHandler(dpy, xevent); + } +#endif // __WXDEBUG__ long wxApp::sm_lastMessageTime = 0; bool wxApp::Initialize() { -#ifdef __WXMSW__ - wxBuffer = new char[1500]; -#else - wxBuffer = new char[BUFSIZ + 512]; -#endif - 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 - + // For PostScript printing #if wxUSE_POSTSCRIPT /* Done using wxModule now @@ -91,14 +116,14 @@ bool wxApp::Initialize() wxThePrintPaperDatabase->CreateDatabase(); */ #endif - + wxBitmap::InitStandardHandlers(); - + wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); - + wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; - + return TRUE; } @@ -106,32 +131,22 @@ void wxApp::CleanUp() { delete wxWidgetHashTable; wxWidgetHashTable = NULL; - + wxModule::CleanUpModules(); - + #if wxUSE_WX_RESOURCES wxCleanUpResourceSystem(); #endif - + wxDeleteStockObjects() ; - + // Destroy all GDI lists, etc. - - delete wxTheBrushList; - wxTheBrushList = NULL; - - delete wxThePenList; - wxThePenList = NULL; - - delete wxTheFontList; - wxTheFontList = NULL; - - delete wxTheBitmapList; - wxTheBitmapList = NULL; - + + wxDeleteStockLists(); + delete wxTheColourDatabase; wxTheColourDatabase = NULL; - + #if wxUSE_POSTSCRIPT /* Done using wxModule now wxInitializePrintSetupData(FALSE); @@ -139,17 +154,21 @@ void wxApp::CleanUp() wxThePrintPaperDatabase = NULL; */ #endif - + wxBitmap::CleanUpHandlers(); - - delete[] wxBuffer; - wxBuffer = NULL; - + wxClassInfo::CleanUpClasses(); - + delete wxTheApp; wxTheApp = NULL; - + + // GL: I'm annoyed ... I don't know where to put this and I don't want to + // create a module for that as it's part of the core. +#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, @@ -162,7 +181,7 @@ void wxApp::CleanUp() 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 @@ -180,10 +199,10 @@ int wxEntry( int argc, char *argv[] ) // checked, but this is a reasonable compromise. wxDebugContext::SetCheckpoint(); #endif - + if (!wxApp::Initialize()) return FALSE; - + if (!wxTheApp) { if (!wxApp::GetInitializerFunction()) @@ -191,74 +210,66 @@ int wxEntry( int argc, char *argv[] ) 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])); - + wxTheApp->argc = argc; wxTheApp->argv = argv; - + // GUI-specific initialization, such as creating an app context. wxTheApp->OnInitGui(); - - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). - + + // Here frames insert themselves automatically into wxTopLevelWindows by + // getting created in OnInit(). + int retValue = 0; if (wxTheApp->OnInit()) { 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(); - + wxTheApp->OnExit(); - + wxApp::CleanUp(); - + return retValue; }; // Static member initialization -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +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_printMode = wxPRINT_POSTSCRIPT; - m_exitOnFrameDelete = TRUE; - m_auto3D = TRUE; - + + m_eventLoop = new wxEventLoop; m_mainColormap = (WXColormap) NULL; m_appContext = (WXAppContext) NULL; m_topLevelWidget = (WXWidget) NULL; @@ -266,6 +277,11 @@ wxApp::wxApp() m_initialDisplay = (WXDisplay*) 0; } +wxApp::~wxApp() +{ + delete m_eventLoop; +} + bool wxApp::Initialized() { if (GetTopWindow()) @@ -276,107 +292,41 @@ bool wxApp::Initialized() int wxApp::MainLoop() { - m_keepGoing = TRUE; - /* * Sit around forever waiting to process X-events. Property Change * event are handled special, because they have to refer to * the root window rather than to a widget. therefore we can't * use an Xt-eventhandler. */ - + XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())), PropertyChangeMask); - - XEvent event; - - // Use this flag to allow breaking the loop via wxApp::ExitMainLoop() - while (m_keepGoing) - { - XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &event); - - ProcessXEvent((WXEvent*) & event); - - if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0) - { - if (!ProcessIdle()) - { - // TODO: Robert, what's this for? -#if wxUSE_THREADS - wxMutexGuiLeave(); - usleep(20); - wxMutexGuiEnter(); -#endif - } - } - - } - - return 0; -} -// Processes an X event. -void wxApp::ProcessXEvent(WXEvent* _event) -{ - XEvent* event = (XEvent*) _event; - - if ((event->type == KeyPress) && CheckForAccelerator(_event)) - { - // Do nothing! We intercepted and processed the event as an accelerator. - return; - } - else if (event->type == PropertyNotify) - { - HandlePropertyChange(_event); - return; - } - else if (event->type == ResizeRequest) - { - /* Terry Gitnick - 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. - */ - - Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()); - Window win = event->xany.window; - XEvent report; - - // to avoid flicker - report = * event; - while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report)); - - // TODO: when implementing refresh optimization, we can use - // XtAddExposureToRegion to expand the window's paint region. - - XtDispatchEvent(event); - } - else - { - XtDispatchEvent(event); - } + m_eventLoop->Run(); + + return 0; } +// Processes an idle event. // Returns TRUE if more time is needed. bool wxApp::ProcessIdle() { wxIdleEvent event; - event.SetEventObject(this); - ProcessEvent(event); - - return event.MoreRequested(); + + return ProcessEvent(event) && event.MoreRequested(); } void wxApp::ExitMainLoop() { - m_keepGoing = FALSE; + m_eventLoop->Exit(); } // Is a message/event pending? bool wxApp::Pending() { XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() )); - + // Fix by Doug from STI, to prevent a stall if non-X event // is found. return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ; @@ -385,11 +335,7 @@ bool wxApp::Pending() // Dispatch a message. void wxApp::Dispatch() { - // XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll); - - XEvent event; - XtAppNextEvent((XtAppContext) GetAppContext(), &event); - ProcessXEvent((WXEvent*) & event); + m_eventLoop->Dispatch(); } // This should be redefined in a derived class for @@ -403,27 +349,39 @@ void wxApp::HandlePropertyChange(WXEvent *event) 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; } @@ -431,15 +389,16 @@ void wxApp::OnIdle(wxIdleEvent& event) bool wxApp::SendIdleEvents() { bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); + + wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow* win = node->GetData(); if (SendIdleEvents(win)) needMore = TRUE; - - node = node->Next(); + node = node->GetNext(); } + return needMore; } @@ -447,90 +406,101 @@ bool wxApp::SendIdleEvents() bool wxApp::SendIdleEvents(wxWindow* win) { bool needMore = FALSE; - + wxIdleEvent event; event.SetEventObject(win); win->ProcessEvent(event); - + if (event.MoreRequested()) needMore = TRUE; - - wxNode* node = win->GetChildren().First(); + + wxWindowList::Node* node = win->GetChildren().GetFirst(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow* win = node->GetData(); if (SendIdleEvents(win)) needMore = TRUE; - - node = node->Next(); + + node = node->GetNext(); } return needMore ; } void wxApp::DeletePendingObjects() { - wxNode *node = wxPendingDelete.First(); + wxList::Node *node = wxPendingDelete.GetFirst(); while (node) { - wxObject *obj = (wxObject *)node->Data(); - + wxObject *obj = node->GetData(); + 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(); + node = wxPendingDelete.GetFirst(); } } -wxLog* wxApp::CreateLogTarget() -{ - return new wxLogGui; -} - -wxWindow* wxApp::GetTopWindow() const -{ - if (m_topWindow) - return m_topWindow; - else if (wxTopLevelWindows.Number() > 0) - return (wxWindow*) wxTopLevelWindows.First()->Data(); - else - return NULL; -} +static char *fallbackResources[] = { + "*menuBar.marginHeight: 0", + "*menuBar.shadowThickness: 1", + "*background: #c0c0c0", + "*foreground: black", + NULL +}; // Create an application context bool wxApp::OnInitGui() { + if( !wxAppBase::OnInitGui() ) + return FALSE; + XtToolkitInitialize() ; - wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ; + wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext(); + XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources); + Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL, - (const char*) wxTheApp->GetClassName(), NULL, + (const char*) wxTheApp->GetClassName(), NULL, 0, # if XtSpecificationRelease < 5 - 0,(Cardinal*) &argc,argv) ; + (Cardinal*) &argc, # else - 0,&argc,argv) ; + &argc, # endif + argv); + if (!dpy) { - cerr << "wxWindows could not open display for " << wxTheApp->GetClassName() << ": exiting.\n"; + // 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."), + (const char*) className); exit(-1); } m_initialDisplay = (WXDisplay*) dpy; - + +#ifdef __WXDEBUG__ + // install the X error handler + gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler); +#endif // __WXDEBUG__ + wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(), applicationShellWidgetClass,dpy, NULL,0) ; - + // Add general resize proc XtActionsRec rec; rec.string = "resize"; rec.proc = (XtActionProc)wxWidgetResizeProc; XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1); - + GetMainColormap(dpy); m_maxRequestSize = XMaxRequestSize((Display*) dpy); - + + wxAddIdleCallback(); + return TRUE; } @@ -538,50 +508,16 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display) { if (!display) /* Must be called first with non-NULL display */ return m_mainColormap; - - Colormap c = - DefaultColormapOfScreen(XScreenOfDisplay((Display*) display, - DefaultScreen((Display*) display))); - + + int defaultScreen = DefaultScreen((Display*) display); + Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen); + + Colormap c = DefaultColormapOfScreen(screen); + if (!m_mainColormap) m_mainColormap = (WXColormap) c; - - return (WXColormap) c; -} -// Returns TRUE if an accelerator has been processed -bool wxApp::CheckForAccelerator(WXEvent* event) -{ - XEvent* xEvent = (XEvent*) event; - if (xEvent->xany.type == KeyPress) - { - // Find a wxWindow for this window - // TODO: should get display for the window, not the current display - Widget widget = XtWindowToWidget((Display*) wxGetDisplay(), xEvent->xany.window); - wxWindow* win = NULL; - - // Find the first wxWindow that corresponds to this event window - while (widget && !(win = wxGetWindowFromTable(widget))) - widget = XtParent(widget); - - if (!widget || !win) - return FALSE; - - wxKeyEvent keyEvent(wxEVT_CHAR); - wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent); - - // Now we have a wxKeyEvent and we have a wxWindow. - // Go up the hierarchy until we find a matching accelerator, - // or we get to the top. - while (win) - { - if (win->ProcessAccelerator(keyEvent)) - return TRUE; - win = win->GetParent(); - } - return FALSE; - } - return FALSE; + return (WXColormap) c; } void wxExit() @@ -589,7 +525,7 @@ void wxExit() int retValue = 0; if (wxTheApp) retValue = wxTheApp->OnExit(); - + wxApp::CleanUp(); /* * Exit in some platform-specific way. Not recommended that the app calls this: @@ -599,10 +535,36 @@ void wxExit() } // Yield to other processes -bool wxYield() + +bool wxApp::Yield(bool onlyIfNeeded) { + bool s_inYield = FALSE; + + if ( s_inYield ) + { + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } + + return FALSE; + } + + s_inYield = TRUE; + while (wxTheApp && wxTheApp->Pending()) wxTheApp->Dispatch(); + + s_inYield = FALSE; + return TRUE; } +// ---------------------------------------------------------------------------- +// accessors for C modules +// ---------------------------------------------------------------------------- + +extern "C" XtAppContext wxGetAppContext() +{ + return (XtAppContext)wxTheApp->GetAppContext(); +}