X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c6e1335a077ca74858d3a873fed4b4efd5fc38f..f92722960b2a15f813cc62a23ecb321bc0555099:/src/motif/app.cpp?ds=sidebyside diff --git a/src/motif/app.cpp b/src/motif/app.cpp index c8b0dff704..5ef52fda83 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -10,7 +10,8 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "app.h" + #pragma implementation "app.h" + #pragma implementation "appbase.h" #endif #include "wx/frame.h" @@ -28,8 +29,12 @@ #include "wx/log.h" #include "wx/module.h" #include "wx/memory.h" +#include "wx/log.h" +#include "wx/intl.h" -#include "wx/thread.h" +#if wxUSE_THREADS + #include "wx/thread.h" +#endif #if wxUSE_WX_RESOURCES #include "wx/resource.h" @@ -48,6 +53,11 @@ extern char *wxBuffer; extern wxList wxPendingDelete; +#if wxUSE_THREADS +extern wxList *wxPendingEvents; +extern wxCriticalSection *wxPendingEventsLocker; +#endif // wxUSE_THREADS + wxApp *wxTheApp = NULL; wxHashTable *wxWidgetHashTable = NULL; @@ -68,6 +78,13 @@ bool wxApp::Initialize() 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(); @@ -145,6 +162,13 @@ 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, @@ -205,9 +229,8 @@ 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(). + // Here frames insert themselves automatically into wxTopLevelWindows by + // getting created in OnInit(). int retValue = 0; if (wxTheApp->OnInit()) @@ -239,7 +262,7 @@ int wxEntry( int argc, char *argv[] ) }; // Static member initialization -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; wxApp::wxApp() { @@ -250,9 +273,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; @@ -297,11 +318,13 @@ int wxApp::MainLoop() { 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 } } @@ -315,10 +338,24 @@ 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. + if (CheckForAccelerator(_event)) + { + // Do nothing! We intercepted and processed the event as an + // accelerator. + return; + } + else if (CheckForKeyDown(_event)) + { + // We intercepted and processed the key down event + return; + } + else + { + XtDispatchEvent(event); return; + } } else if (event->type == PropertyNotify) { @@ -327,10 +364,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; @@ -407,6 +444,11 @@ void wxApp::OnIdle(wxIdleEvent& event) // '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() ) @@ -425,15 +467,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; } @@ -479,20 +522,23 @@ void wxApp::DeletePendingObjects() } } -wxLog* wxApp::CreateLogTarget() +#if wxUSE_THREADS +void wxApp::ProcessPendingEvents() { - return new wxLogGui; -} + wxNode *node = wxPendingEvents->First(); + wxCriticalSectionLocker locker(*wxPendingEventsLocker); -wxWindow* wxApp::GetTopWindow() const -{ - if (m_topWindow) - return m_topWindow; - else if (wxTopLevelWindows.Number() > 0) - return (wxWindow*) wxTopLevelWindows.First()->Data(); - else - return NULL; + while (node) + { + wxEvtHandler *handler = (wxEvtHandler *)node->Data(); + + handler->ProcessPendingEvents(); + + delete node; + node = wxPendingEvents->First(); + } } +#endif // wxUSE_THREADS // Create an application context bool wxApp::OnInitGui() @@ -509,8 +555,9 @@ bool wxApp::OnInitGui() argv); if (!dpy) { + wxString className(wxTheApp->GetClassName()); wxLogError(_("wxWindows could not open display for '%s': exiting."), - wxTheApp->GetClassName()); + (const char*) className); exit(-1); } m_initialDisplay = (WXDisplay*) dpy; @@ -582,6 +629,37 @@ bool wxApp::CheckForAccelerator(WXEvent* event) return FALSE; } +bool wxApp::CheckForKeyDown(WXEvent* event) +{ + XEvent* xEvent = (XEvent*) event; + // VZ: this code doesn't work for me because it never finds the correct + // window. Also, if we go this way, we should generate KEY_UP and + // CHAR events as well, not only KEY_DOWN. +#if 0 + 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); + + win->ProcessEvent( keyEvent ); + return (keyEvent.GetSkipped() != TRUE); + } +#endif // 0 + + return FALSE; +} + void wxExit() { int retValue = 0; @@ -610,3 +688,32 @@ bool wxYield() 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" + +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); + } +}