X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d3a259aff5b9a699041ca9f126001dfb156223e..836915e177aa750ca5c3bc19b4dbdedd36603e8d:/src/motif/app.cpp?ds=sidebyside diff --git a/src/motif/app.cpp b/src/motif/app.cpp index b70716f889..17699b8d08 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -10,7 +10,12 @@ ///////////////////////////////////////////////////////////////////////////// #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,57 +33,66 @@ #include "wx/log.h" #include "wx/module.h" #include "wx/memory.h" +#include "wx/log.h" +#include "wx/intl.h" #if wxUSE_THREADS -#include "wx/thread.h" + #include "wx/thread.h" #endif #if wxUSE_WX_RESOURCES #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; -#if wxUSE_THREADS -extern wxList *wxPendingEvents; -extern wxCriticalSection *wxPendingEventsLocker; -#endif // wxUSE_THREADS - wxApp *wxTheApp = NULL; wxHashTable *wxWidgetHashTable = NULL; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) 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() { - 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 + // 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 - wxPendingEvents = new wxList(); wxPendingEventsLocker = new wxCriticalSection(); #endif @@ -126,17 +140,7 @@ void wxApp::CleanUp() // 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; @@ -151,9 +155,6 @@ void wxApp::CleanUp() wxBitmap::CleanUpHandlers(); - delete[] wxBuffer; - wxBuffer = NULL; - wxClassInfo::CleanUpClasses(); delete wxTheApp; @@ -259,7 +260,7 @@ int wxEntry( int argc, char *argv[] ) }; // Static member initialization -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; wxApp::wxApp() { @@ -270,9 +271,7 @@ wxApp::wxApp() m_appName = ""; argc = 0; argv = NULL; - m_printMode = wxPRINT_POSTSCRIPT; m_exitOnFrameDelete = TRUE; - m_auto3D = TRUE; m_mainColormap = (WXColormap) NULL; m_appContext = (WXAppContext) NULL; @@ -337,11 +336,52 @@ void wxApp::ProcessXEvent(WXEvent* _event) { XEvent* event = (XEvent*) _event; - if ((event->type == KeyPress) && CheckForAccelerator(_event)) + if (event->type == KeyPress) + { +#if 0 // def __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)) { - // Do nothing! We intercepted and processed the event as an accelerator. + // 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); @@ -349,10 +389,10 @@ void wxApp::ProcessXEvent(WXEvent* _event) } 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. - */ + /* 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; @@ -426,13 +466,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(); @@ -448,6 +495,13 @@ 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() { @@ -507,39 +561,6 @@ void wxApp::DeletePendingObjects() } } -#if wxUSE_THREADS -void wxApp::ProcessPendingEvents() -{ - wxNode *node = wxPendingEvents->First(); - wxCriticalSectionLocker locker(*wxPendingEventsLocker); - - while (node) - { - wxEvtHandler *handler = (wxEvtHandler *)node->Data(); - - handler->ProcessPendingEvents(); - - delete node; - node = wxPendingEvents->First(); - } -} -#endif // wxUSE_THREADS - -wxLog* wxApp::CreateLogTarget() -{ - return new wxLogGui; -} - -wxWindow* wxApp::GetTopWindow() const -{ - if (m_topWindow) - return m_topWindow; - else if (wxTopLevelWindows.GetCount() > 0) - return wxTopLevelWindows.GetFirst()->GetData(); - else - return NULL; -} - // Create an application context bool wxApp::OnInitGui() { @@ -562,6 +583,11 @@ bool wxApp::OnInitGui() } 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) ; @@ -629,6 +655,56 @@ bool wxApp::CheckForAccelerator(WXEvent* event) 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; @@ -644,16 +720,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(); - // VZ: is it the same as this (taken from old wxExecute)? -#if 0 - XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll); -#endif + s_inYield = FALSE; return TRUE; } +// ---------------------------------------------------------------------------- +// accessors for C modules +// ---------------------------------------------------------------------------- + +extern "C" XtAppContext wxGetAppContext() +{ + return (XtAppContext)wxTheApp->GetAppContext(); +}