X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e838cc14684f8dfd4ede39e4649e04a5bd79d149..395cb311cf3dd86a69137b18b1027372bda6b914:/src/motif/app.cpp?ds=sidebyside diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 53b01e0f35..096845166f 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -13,6 +13,11 @@ #pragma implementation "app.h" #endif +#ifdef __VMS +#define XtParent XTPARENT +#define XtDisplay XTDISPLAY +#endif + #include "wx/frame.h" #include "wx/app.h" #include "wx/utils.h" @@ -30,15 +35,13 @@ #include "wx/memory.h" #include "wx/log.h" #include "wx/intl.h" +#include "wx/evtloop.h" +#include "wx/hash.h" #if wxUSE_THREADS #include "wx/thread.h" #endif -#if wxUSE_WX_RESOURCES - #include "wx/resource.h" -#endif - #ifdef __VMS__ #pragma message disable nosimpint #endif @@ -55,8 +58,8 @@ #include -extern char *wxBuffer; extern wxList wxPendingDelete; +extern bool wxAddIdleCallback(); wxApp *wxTheApp = NULL; @@ -84,8 +87,6 @@ long wxApp::sm_lastMessageTime = 0; bool wxApp::Initialize() { - wxBuffer = new char[BUFSIZ + 512]; - wxClassInfo::InitializeClasses(); // GL: I'm annoyed ... I don't know where to put this and I don't want to @@ -100,10 +101,6 @@ bool wxApp::Initialize() wxInitializeStockLists(); wxInitializeStockObjects(); -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif - // For PostScript printing #if wxUSE_POSTSCRIPT /* Done using wxModule now @@ -130,25 +127,11 @@ void wxApp::CleanUp() 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; @@ -163,9 +146,6 @@ void wxApp::CleanUp() wxBitmap::CleanUpHandlers(); - delete[] wxBuffer; - wxBuffer = NULL; - wxClassInfo::CleanUpClasses(); delete wxTheApp; @@ -275,15 +255,10 @@ wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NUL wxApp::wxApp() { - m_topWindow = NULL; - wxTheApp = this; - m_className = ""; - m_wantDebugOutput = TRUE ; - m_appName = ""; argc = 0; argv = NULL; - m_exitOnFrameDelete = TRUE; + m_eventLoop = new wxEventLoop; m_mainColormap = (WXColormap) NULL; m_appContext = (WXAppContext) NULL; m_topLevelWidget = (WXWidget) NULL; @@ -291,6 +266,11 @@ wxApp::wxApp() m_initialDisplay = (WXDisplay*) 0; } +wxApp::~wxApp() +{ + delete m_eventLoop; +} + bool wxApp::Initialized() { if (GetTopWindow()) @@ -301,8 +281,6 @@ 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 @@ -314,149 +292,42 @@ int wxApp::MainLoop() 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()) - { -#if wxUSE_THREADS - // leave the main loop to give other threads a chance to - // perform their GUI work - wxMutexGuiLeave(); - wxUsleep(20); - wxMutexGuiEnter(); -#endif - } - } - - } + m_eventLoop->Run(); return 0; } -// Processes an X event. -void wxApp::ProcessXEvent(WXEvent* _event) -{ - XEvent* event = (XEvent*) _event; - - if (event->type == KeyPress) - { -#ifdef __WXDEBUG__ - Widget widget = XtWindowToWidget(event->xany.display, event->xany.window); - wxLogDebug("Got key press event for 0x%08x (parent = 0x%08x)", - widget, XtParent(widget)); -#endif // DEBUG - - if (CheckForAccelerator(_event)) - { - // Do nothing! We intercepted and processed the event as an - // accelerator. - return; - } -#if 1 - // It seemed before that this hack was redundant and - // key down events were being generated by wxCanvasInputEvent. - // But no longer - why ??? - // - else if (CheckForKeyDown(_event)) - { - // We intercepted and processed the key down event - return; - } -#endif - else - { - XtDispatchEvent(event); - return; - } - } - else if (event->type == KeyRelease) - { - // TODO: work out why we still need this ! -michael - // - if (CheckForKeyUp(_event)) - { - // We intercepted and processed the key up event - return; - } - else - { - XtDispatchEvent(event); - 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); - } -} - +// 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() { + 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() { - // 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 @@ -477,13 +348,20 @@ void wxApp::OnIdle(wxIdleEvent& event) inOnIdle = TRUE; - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); + // 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 -#if wxUSE_THREADS // Flush pending events. ProcessPendingEvents(); -#endif + + // 'Garbage' collection of windows deleted with Close(). + DeletePendingObjects(); // flush the logged messages if any wxLog *pLog = wxLog::GetActiveTarget(); @@ -499,13 +377,6 @@ void wxApp::OnIdle(wxIdleEvent& event) 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() { @@ -535,24 +406,24 @@ bool wxApp::SendIdleEvents(wxWindow* win) 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; @@ -561,17 +432,30 @@ void wxApp::DeletePendingObjects() // Deleting one object may have deleted other pending // objects, so start from beginning of list again. - node = wxPendingDelete.First(); + node = wxPendingDelete.GetFirst(); } } +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, 0, + wxTheApp->GetClassName().c_str(), NULL, 0, # if XtSpecificationRelease < 5 (Cardinal*) &argc, # else @@ -580,9 +464,11 @@ bool wxApp::OnInitGui() argv); if (!dpy) { + // 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); + className.c_str()); exit(-1); } m_initialDisplay = (WXDisplay*) dpy; @@ -592,9 +478,11 @@ bool wxApp::OnInitGui() gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler); #endif // __WXDEBUG__ - wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(), - applicationShellWidgetClass,dpy, - NULL,0) ; + wxTheApp->m_topLevelWidget = + (WXWidget) XtAppCreateShell((String)NULL, + wxTheApp->GetClassName().c_str(), + applicationShellWidgetClass,dpy, + NULL,0) ; // Add general resize proc XtActionsRec rec; @@ -605,6 +493,8 @@ bool wxApp::OnInitGui() GetMainColormap(dpy); m_maxRequestSize = XMaxRequestSize((Display*) dpy); + wxAddIdleCallback(); + return TRUE; } @@ -624,91 +514,6 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display) 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; -} - -bool wxApp::CheckForKeyDown(WXEvent* event) -{ - XEvent* xEvent = (XEvent*) event; - if (xEvent->xany.type == KeyPress) - { - 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_KEY_DOWN); - wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent); - - return win->ProcessEvent( keyEvent ); - } - - return FALSE; -} - -bool wxApp::CheckForKeyUp(WXEvent* event) -{ - XEvent* xEvent = (XEvent*) event; - if (xEvent->xany.type == KeyRelease) - { - 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_KEY_UP); - wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent); - - return win->ProcessEvent( keyEvent ); - } - - return FALSE; -} - void wxExit() { int retValue = 0; @@ -724,47 +529,29 @@ void wxExit() } // Yield to other processes -bool wxYield() -{ - while (wxTheApp && wxTheApp->Pending()) - wxTheApp->Dispatch(); - - // VZ: is it the same as this (taken from old wxExecute)? -#if 0 - XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll); -#endif - return TRUE; -} - -// TODO use XmGetPixmap (?) to get the really standard icons! - -#include "wx/generic/info.xpm" -#include "wx/generic/error.xpm" -#include "wx/generic/question.xpm" -#include "wx/generic/warning.xpm" - -wxIcon -wxApp::GetStdIcon(int which) const +bool wxApp::Yield(bool onlyIfNeeded) { - switch(which) + bool s_inYield = FALSE; + + if ( s_inYield ) { - case wxICON_INFORMATION: - return wxIcon(info_xpm); + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } - case wxICON_QUESTION: - return wxIcon(question_xpm); + return FALSE; + } - case wxICON_EXCLAMATION: - return wxIcon(warning_xpm); + s_inYield = TRUE; - default: - wxFAIL_MSG("requested non existent standard icon"); - // still fall through + while (wxTheApp && wxTheApp->Pending()) + wxTheApp->Dispatch(); - case wxICON_HAND: - return wxIcon(error_xpm); - } + s_inYield = FALSE; + + return TRUE; } // ----------------------------------------------------------------------------