X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31528cd3cac75558beef4bce0ba21fd182a808ab..6d9022fe3bb50a75b9b5eaf5cf32558e518ba310:/src/motif/app.cpp diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 2e37fb6e74..17699b8d08 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -11,7 +11,11 @@ #ifdef __GNUG__ #pragma implementation "app.h" - #pragma implementation "appbase.h" +#endif + +#ifdef __VMS +#define XtParent XTPARENT +#define XtDisplay XTDISPLAY #endif #include "wx/frame.h" @@ -40,48 +44,55 @@ #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 // create a module for that as it's part of the core. #if wxUSE_THREADS - wxPendingEvents = new wxList(); wxPendingEventsLocker = new wxCriticalSection(); #endif @@ -129,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; @@ -154,9 +155,6 @@ void wxApp::CleanUp() wxBitmap::CleanUpHandlers(); - delete[] wxBuffer; - wxBuffer = NULL; - wxClassInfo::CleanUpClasses(); delete wxTheApp; @@ -340,28 +338,49 @@ void wxApp::ProcessXEvent(WXEvent* _event) if (event->type == KeyPress) { -#ifdef __WXDEBUG__ +#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. + 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 (CheckForKeyDown(_event)) - { - // We intercepted and processed the key down event + } + } + 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 - { + } + else + { XtDispatchEvent(event); return; - } + } } else if (event->type == PropertyNotify) { @@ -447,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(); @@ -469,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() { @@ -528,24 +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 - // Create an application context bool wxApp::OnInitGui() { @@ -568,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) ; @@ -640,22 +660,46 @@ 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; + 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); + // Find the first wxWindow that corresponds to this event window + while (widget && !(win = wxGetWindowFromTable(widget))) + widget = XtParent(widget); - if (!widget || !win) - return FALSE; + if (!widget || !win) + return FALSE; - wxKeyEvent keyEvent(wxEVT_KEY_DOWN); - wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent); + wxKeyEvent keyEvent(wxEVT_KEY_DOWN); + wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent); - win->ProcessEvent( keyEvent ); - return (keyEvent.GetSkipped() != TRUE); + 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; @@ -676,45 +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; } -// 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" +// ---------------------------------------------------------------------------- +// accessors for C modules +// ---------------------------------------------------------------------------- -wxIcon -wxApp::GetStdIcon(int which) const +extern "C" XtAppContext wxGetAppContext() { - switch(which) - { - case wxICON_INFORMATION: - return wxIcon(info_xpm); - - case wxICON_QUESTION: - return wxIcon(question_xpm); - - case wxICON_EXCLAMATION: - return wxIcon(warning_xpm); - - default: - wxFAIL_MSG("requested non existent standard icon"); - // still fall through - - case wxICON_HAND: - return wxIcon(error_xpm); - } + return (XtAppContext)wxTheApp->GetAppContext(); }