X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a91b47e800c78dbf8e91191ce3977d148a13f1fe..58c7cd12b9035450e702d36dfdce63bfd008bcd0:/src/motif/app.cpp?ds=sidebyside diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 7836a95070..2ccea798a9 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -28,13 +28,15 @@ #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 #include @@ -50,14 +52,20 @@ 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) + EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() #endif @@ -65,24 +73,27 @@ 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 + wxPendingEvents = new wxList(); + 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 +102,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 +117,32 @@ 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; - + delete wxTheColourDatabase; wxTheColourDatabase = NULL; - + #if wxUSE_POSTSCRIPT /* Done using wxModule now wxInitializePrintSetupData(FALSE); @@ -139,17 +150,24 @@ 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 +180,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 +198,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,55 +209,54 @@ 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; }; @@ -258,7 +275,7 @@ wxApp::wxApp() m_printMode = wxPRINT_POSTSCRIPT; m_exitOnFrameDelete = TRUE; m_auto3D = TRUE; - + m_mainColormap = (WXColormap) NULL; m_appContext = (WXAppContext) NULL; m_topLevelWidget = (WXWidget) NULL; @@ -277,42 +294,43 @@ 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 + // leave the main loop to give other threads a chance to + // perform their GUI work wxMutexGuiLeave(); - usleep(20); + wxUsleep(20); wxMutexGuiEnter(); #endif } } - + } - + return 0; } @@ -320,7 +338,7 @@ int wxApp::MainLoop() 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. @@ -337,18 +355,18 @@ void wxApp::ProcessXEvent(WXEvent* _event) * 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 @@ -363,7 +381,7 @@ bool wxApp::ProcessIdle() wxIdleEvent event; event.SetEventObject(this); ProcessEvent(event); - + return event.MoreRequested(); } @@ -376,7 +394,7 @@ void wxApp::ExitMainLoop() 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) ; @@ -386,7 +404,7 @@ bool wxApp::Pending() void wxApp::Dispatch() { // XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll); - + XEvent event; XtAppNextEvent((XtAppContext) GetAppContext(), &event); ProcessXEvent((WXEvent*) & event); @@ -403,27 +421,32 @@ 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; - + // 'Garbage' collection of windows deleted with Close(). DeletePendingObjects(); - + +#if wxUSE_THREADS + // Flush pending events. + ProcessPendingEvents(); +#endif + // 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 +454,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,21 +471,21 @@ 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(); while (node) { wxWindow* win = (wxWindow*) node->Data(); if (SendIdleEvents(win)) needMore = TRUE; - + node = node->Next(); } return needMore ; @@ -473,18 +497,36 @@ void wxApp::DeletePendingObjects() while (node) { wxObject *obj = (wxObject *)node->Data(); - + 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(); } } +#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; @@ -494,8 +536,8 @@ wxWindow* wxApp::GetTopWindow() const { if (m_topWindow) return m_topWindow; - else if (wxTopLevelWindows.Number() > 0) - return (wxWindow*) wxTopLevelWindows.First()->Data(); + else if (wxTopLevelWindows.GetCount() > 0) + return wxTopLevelWindows.GetFirst()->GetData(); else return NULL; } @@ -506,31 +548,35 @@ 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"; + wxString className(wxTheApp->GetClassName()); + wxLogError(_("wxWindows could not open display for '%s': exiting."), + (const char*) className); exit(-1); } m_initialDisplay = (WXDisplay*) dpy; - + 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); - + return TRUE; } @@ -541,12 +587,12 @@ WXColormap wxApp::GetMainColormap(WXDisplay* 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; } @@ -560,17 +606,17 @@ bool wxApp::CheckForAccelerator(WXEvent* event) // 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. @@ -590,7 +636,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: @@ -604,6 +650,12 @@ 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; }