X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fabb57533169f2f75367e0d120c762518548890..c4dbfe148c3dca9e9e8aa2954c257cfa75af01ab:/src/motif/app.cpp diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 1d34942d06..c8b0dff704 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__ @@ -29,8 +29,10 @@ #include "wx/module.h" #include "wx/memory.h" +#include "wx/thread.h" + #if wxUSE_WX_RESOURCES -#include "wx/resource.h" + #include "wx/resource.h" #endif #include @@ -52,6 +54,7 @@ wxHashTable *wxWidgetHashTable = NULL; #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) + BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() @@ -61,11 +64,7 @@ long wxApp::sm_lastMessageTime = 0; bool wxApp::Initialize() { -#ifdef __WXMSW__ - wxBuffer = new char[1500]; -#else wxBuffer = new char[BUFSIZ + 512]; -#endif wxClassInfo::InitializeClasses(); @@ -79,13 +78,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(); @@ -93,7 +92,7 @@ bool wxApp::Initialize() wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); wxModule::RegisterModules(); - wxASSERT( wxModule::InitializeModules() == TRUE ); + if (!wxModule::InitializeModules()) return FALSE; return TRUE; } @@ -129,11 +128,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(); @@ -145,7 +144,7 @@ void wxApp::CleanUp() delete wxTheApp; wxTheApp = NULL; - + #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, @@ -153,12 +152,12 @@ void wxApp::CleanUp() // wxDebugContext, too. 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(); } #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 +177,23 @@ int wxEntry( int argc, char *argv[] ) #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])); @@ -209,31 +208,31 @@ int wxEntry( int argc, char *argv[] ) // Here frames insert themselves automatically // into wxTopLevelWindows by getting created // in OnInit(). - + int retValue = 0; if (wxTheApp->OnInit()) { - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); + 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; @@ -265,16 +264,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 @@ -282,18 +281,30 @@ 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()) + { + // leave the main loop to give other threads a chance to + // perform their GUI work + wxMutexGuiLeave(); + wxUsleep(20); + wxMutexGuiEnter(); + } + } - ProcessXEvent((WXEvent*) & event); - ProcessIdle(); } return 0; @@ -316,15 +327,15 @@ 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; XEvent report; - + // to avoid flicker report = * event; while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report)); @@ -368,7 +379,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); @@ -389,7 +400,7 @@ void wxApp::OnIdle(wxIdleEvent& event) // Avoid recursion (via ProcessEvent default case) if (inOnIdle) - return; + return; inOnIdle = TRUE; @@ -399,13 +410,13 @@ void wxApp::OnIdle(wxIdleEvent& event) // 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; } @@ -414,15 +425,15 @@ void wxApp::OnIdle(wxIdleEvent& event) bool wxApp::SendIdleEvents() { bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) + wxNode* node = wxTopLevelWindows.First(); + while (node) + { + wxWindow* win = (wxWindow*) node->Data(); + if (SendIdleEvents(win)) needMore = TRUE; - node = node->Next(); - } + node = node->Next(); + } return needMore; } @@ -431,22 +442,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 ; } @@ -455,16 +466,16 @@ void wxApp::DeletePendingObjects() wxNode *node = wxPendingDelete.First(); while (node) { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; + wxObject *obj = (wxObject *)node->Data(); + + delete obj; - if (wxPendingDelete.Member(obj)) - delete node; + 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(); + // Deleting one object may have deleted other pending + // objects, so start from beginning of list again. + node = wxPendingDelete.First(); } } @@ -489,21 +500,24 @@ 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); + wxLogError(_("wxWindows could not open display for '%s': exiting."), + wxTheApp->GetClassName()); + exit(-1); } m_initialDisplay = (WXDisplay*) dpy; 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; @@ -520,14 +534,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; + + int defaultScreen = DefaultScreen((Display*) display); + Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen); - Colormap c = - DefaultColormapOfScreen(XScreenOfDisplay((Display*) display, - DefaultScreen((Display*) display))); + Colormap c = DefaultColormapOfScreen(screen); if (!m_mainColormap) - m_mainColormap = (WXColormap) c; + m_mainColormap = (WXColormap) c; return (WXColormap) c; } @@ -571,13 +586,13 @@ 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); } @@ -585,7 +600,13 @@ void wxExit() bool wxYield() { 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 + return TRUE; }