X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/184b5d99a5382cd7a19888c85aff11f8a21af2f6..ef70f0ecdbc4268923e132b257c95e8a2525f4ca:/src/motif/app.cpp?ds=sidebyside diff --git a/src/motif/app.cpp b/src/motif/app.cpp index e0f7726e4a..fa1fd15f66 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,16 +33,28 @@ #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" +#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" @@ -50,34 +67,37 @@ 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() { -#ifdef __WXMSW__ - wxBuffer = new char[1500]; -#else wxBuffer = new char[BUFSIZ + 512]; -#endif -/* No longer used -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - - streambuf* sBuf = new wxDebugStreamBuf; - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); + 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 -*/ - - wxClassInfo::InitializeClasses(); wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); wxTheColourDatabase->Initialize(); @@ -89,13 +109,13 @@ bool wxApp::Initialize() wxInitializeResourceSystem(); #endif - // For PostScript printing + // For PostScript printing #if wxUSE_POSTSCRIPT -/* Done using wxModule now + /* Done using wxModule now wxInitializePrintSetupData(); wxThePrintPaperDatabase = new wxPrintPaperDatabase; wxThePrintPaperDatabase->CreateDatabase(); -*/ + */ #endif wxBitmap::InitStandardHandlers(); @@ -103,7 +123,7 @@ bool wxApp::Initialize() wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); wxModule::RegisterModules(); - wxASSERT( wxModule::InitializeModules() == TRUE ); + if (!wxModule::InitializeModules()) return FALSE; return TRUE; } @@ -139,11 +159,11 @@ void wxApp::CleanUp() wxTheColourDatabase = NULL; #if wxUSE_POSTSCRIPT -/* Done using wxModule now + /* Done using wxModule now wxInitializePrintSetupData(FALSE); delete wxThePrintPaperDatabase; wxThePrintPaperDatabase = NULL; -*/ + */ #endif wxBitmap::CleanUpHandlers(); @@ -155,21 +175,27 @@ void wxApp::CleanUp() 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, // as a special case. Then when dumping we need to ignore // wxDebugContext, too. - if (wxDebugContext::CountObjectsLeft() > 0) + if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { - wxLogDebug("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); + wxLogDebug("There were memory leaks.\n"); + wxDebugContext::Dump(); + wxDebugContext::PrintStatistics(); } -// wxDebugContext::SetStream(NULL, NULL); #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 @@ -178,23 +204,34 @@ void wxApp::CleanUp() int wxEntry( int argc, char *argv[] ) { +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + // This seems to be necessary since there are 'rogue' + // objects present at this point (perhaps global objects?) + // Setting a checkpoint will ignore them as far as the + // memory checking facility is concerned. + // Of course you may argue that memory allocated in globals should be + // checked, but this is a reasonable compromise. + wxDebugContext::SetCheckpoint(); +#endif + if (!wxApp::Initialize()) - return FALSE; + return FALSE; + if (!wxTheApp) { - if (!wxApp::GetInitializerFunction()) - { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; - }; - - wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) (); + if (!wxApp::GetInitializerFunction()) + { + 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; + printf( "wxWindows error: wxTheApp == NULL\n" ); + return 0; }; wxTheApp->SetClassName(wxFileNameFromPath(argv[0])); @@ -206,42 +243,40 @@ int wxEntry( int argc, char *argv[] ) // GUI-specific initialization, such as creating an app context. wxTheApp->OnInitGui(); - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). - - if (!wxTheApp->OnInit()) return 0; + // Here frames insert themselves automatically into wxTopLevelWindows by + // getting created in OnInit(). int retValue = 0; - - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); + 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(); + pLog->Flush(); delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used - // for further messages + // for further messages if (wxTheApp->GetTopWindow()) { - delete wxTheApp->GetTopWindow(); - wxTheApp->SetTopWindow(NULL); + 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() { @@ -252,9 +287,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; @@ -266,16 +299,16 @@ wxApp::wxApp() bool wxApp::Initialized() { if (GetTopWindow()) - return TRUE; + return TRUE; else - return FALSE; + return FALSE; } 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 @@ -283,18 +316,32 @@ int wxApp::MainLoop() */ XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), - XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())), - PropertyChangeMask); + 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); + 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 + } + } - ProcessXEvent((WXEvent*) & event); - ProcessIdle(); } return 0; @@ -305,10 +352,51 @@ void wxApp::ProcessXEvent(WXEvent* _event) { XEvent* event = (XEvent*) _event; - if ((event->type == KeyPress) && CheckForAccelerator(_event)) + if (event->type == KeyPress) { - // Do nothing! We intercepted and processed the event as an accelerator. - return; +#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)) + { + // 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) { @@ -325,7 +413,7 @@ void wxApp::ProcessXEvent(WXEvent* _event) Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()); Window win = event->xany.window; XEvent report; - + // to avoid flicker report = * event; while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report)); @@ -369,7 +457,7 @@ bool wxApp::Pending() // Dispatch a message. void wxApp::Dispatch() { -// XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll); + // XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll); XEvent event; XtAppNextEvent((XtAppContext) GetAppContext(), &event); @@ -390,40 +478,60 @@ void wxApp::OnIdle(wxIdleEvent& event) // Avoid recursion (via ProcessEvent default case) if (inOnIdle) - return; + 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(); + pLog->Flush(); // Send OnIdle events to all windows bool needMore = SendIdleEvents(); if (needMore) - event.RequestMore(TRUE); + event.RequestMore(TRUE); 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() { bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) + + wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); + while (node) + { + wxWindow* win = node->GetData(); + if (SendIdleEvents(win)) needMore = TRUE; + node = node->GetNext(); + } - node = node->Next(); - } return needMore; } @@ -432,22 +540,22 @@ bool wxApp::SendIdleEvents(wxWindow* win) { bool needMore = FALSE; - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); + wxIdleEvent event; + event.SetEventObject(win); + win->ProcessEvent(event); if (event.MoreRequested()) needMore = TRUE; - wxNode* node = win->GetChildren()->First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) + wxNode* node = win->GetChildren().First(); + while (node) + { + wxWindow* win = (wxWindow*) node->Data(); + if (SendIdleEvents(win)) needMore = TRUE; - node = node->Next(); - } + node = node->Next(); + } return needMore ; } @@ -456,32 +564,17 @@ void wxApp::DeletePendingObjects() wxNode *node = wxPendingDelete.First(); while (node) { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; + wxObject *obj = (wxObject *)node->Data(); - if (wxPendingDelete.Member(obj)) - delete node; + delete obj; - // Deleting one object may have deleted other pending - // objects, so start from beginning of list again. - node = wxPendingDelete.First(); - } -} + if (wxPendingDelete.Member(obj)) + delete node; -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; + // Deleting one object may have deleted other pending + // objects, so start from beginning of list again. + node = wxPendingDelete.First(); + } } // Create an application context @@ -490,21 +583,30 @@ bool wxApp::OnInitGui() XtToolkitInitialize() ; wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ; 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"; - exit(-1); + 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) ; + applicationShellWidgetClass,dpy, + NULL,0) ; // Add general resize proc XtActionsRec rec; @@ -521,14 +623,15 @@ bool wxApp::OnInitGui() WXColormap wxApp::GetMainColormap(WXDisplay* display) { if (!display) /* Must be called first with non-NULL display */ - return m_mainColormap; + 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; + m_mainColormap = (WXColormap) c; return (WXColormap) c; } @@ -568,25 +671,141 @@ 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; if (wxTheApp) - retValue = wxTheApp->OnExit(); + retValue = wxTheApp->OnExit(); wxApp::CleanUp(); /* - * Exit in some platform-specific way. Not recommended that the app calls this: - * only for emergencies. - */ + * Exit in some platform-specific way. Not recommended that the app calls this: + * only for emergencies. + */ exit(retValue); } // Yield to other processes + +static bool gs_inYield = FALSE; + bool wxYield() { +#ifdef __WXDEBUG__ + if (gs_inYield) + wxFAIL_MSG( wxT("wxYield called recursively" ) ); +#endif + + gs_inYield = TRUE; + while (wxTheApp && wxTheApp->Pending()) - wxTheApp->Dispatch(); + wxTheApp->Dispatch(); + + // VZ: is it the same as this (taken from old wxExecute)? +#if 0 + XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll); +#endif + + gs_inYield = FALSE; + return TRUE; } +// Yield to incoming messages; but fail silently if recursion is detected. +bool wxYieldIfNeeded() +{ + if (gs_inYield) + return FALSE; + + return wxYield(); +} + + +// 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 +{ + 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); + } +} + +// ---------------------------------------------------------------------------- +// accessors for C modules +// ---------------------------------------------------------------------------- + +extern "C" XtAppContext wxGetAppContext() +{ + return (XtAppContext)wxTheApp->GetAppContext(); +}