X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad02525dadb780a4bacb6482ac633e90a10fe25c..94e0018723919fe2ca2f5b5f0a42804c16dbf3a1:/src/x11/app.cpp?ds=inline diff --git a/src/x11/app.cpp b/src/x11/app.cpp index afcc29cb00..775f77de6b 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -22,10 +22,10 @@ #include "wx/frame.h" #include "wx/icon.h" #include "wx/dialog.h" - #include "wx/timer.h" #include "wx/memory.h" #include "wx/gdicmn.h" #include "wx/module.h" + #include "wx/crt.h" #endif #include "wx/evtloop.h" @@ -33,6 +33,7 @@ #include "wx/univ/theme.h" #include "wx/univ/renderer.h" +#include "wx/generic/private/timer.h" #if wxUSE_THREADS #include "wx/thread.h" @@ -63,7 +64,6 @@ static wxWindow *g_prevFocus = NULL; // X11 error handling //------------------------------------------------------------------------ -#ifdef __WXDEBUG__ typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *); XErrorHandlerFunc gs_pfnXErrorHandler = 0; @@ -76,7 +76,6 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) else return 0; } -#endif // __WXDEBUG__ //------------------------------------------------------------------------ // wxApp @@ -86,16 +85,12 @@ long wxApp::sm_lastMessageTime = 0; IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxAppBase::OnIdle) -END_EVENT_TABLE() - bool wxApp::Initialize(int& argC, wxChar **argV) { -#if defined(__WXDEBUG__) && !wxUSE_NANOX +#if !wxUSE_NANOX // install the X error handler gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler ); -#endif // __WXDEBUG__ +#endif wxString displayName; bool syncDisplay = false; @@ -103,9 +98,9 @@ bool wxApp::Initialize(int& argC, wxChar **argV) int argCOrig = argC; for ( int i = 0; i < argCOrig; i++ ) { - if (wxStrcmp( argV[i], _T("-display") ) == 0) + if (wxStrcmp( argV[i], wxT("-display") ) == 0) { - if (i < (argC - 1)) + if (i < (argCOrig - 1)) { argV[i++] = NULL; @@ -115,14 +110,14 @@ bool wxApp::Initialize(int& argC, wxChar **argV) argC -= 2; } } - else if (wxStrcmp( argV[i], _T("-geometry") ) == 0) + else if (wxStrcmp( argV[i], wxT("-geometry") ) == 0) { - if (i < (argC - 1)) + if (i < (argCOrig - 1)) { argV[i++] = NULL; int w, h; - if (wxSscanf(argV[i], _T("%dx%d"), &w, &h) != 2) + if (wxSscanf(argV[i], wxT("%dx%d"), &w, &h) != 2) { wxLogError( _("Invalid geometry specification '%s'"), wxString(argV[i]).c_str() ); @@ -136,14 +131,14 @@ bool wxApp::Initialize(int& argC, wxChar **argV) argC -= 2; } } - else if (wxStrcmp( argV[i], _T("-sync") ) == 0) + else if (wxStrcmp( argV[i], wxT("-sync") ) == 0) { syncDisplay = true; argV[i] = NULL; argC--; } - else if (wxStrcmp( argV[i], _T("-iconic") ) == 0) + else if (wxStrcmp( argV[i], wxT("-iconic") ) == 0) { g_showIconic = true; @@ -154,12 +149,12 @@ bool wxApp::Initialize(int& argC, wxChar **argV) if ( argC != argCOrig ) { - // remove the argumens we consumed + // remove the arguments we consumed for ( int i = 0; i < argC; i++ ) { while ( !argV[i] ) { - memmove(argV + i, argV + i + 1, argCOrig - i); + memmove(argV + i, argV + i + 1, (argCOrig - i)*sizeof(wxChar *)); } } } @@ -200,10 +195,8 @@ bool wxApp::Initialize(int& argC, wxChar **argV) void wxApp::CleanUp() { - delete wxWidgetHashTable; - wxWidgetHashTable = NULL; - delete wxClientWidgetHashTable; - wxClientWidgetHashTable = NULL; + wxDELETE(wxWidgetHashTable); + wxDELETE(wxClientWidgetHashTable); wxAppBase::CleanUp(); } @@ -241,7 +234,7 @@ struct wxExposeInfo }; extern "C" -Bool wxX11ExposePredicate (Display *display, XEvent *xevent, XPointer arg) +Bool wxX11ExposePredicate (Display *WXUNUSED(display), XEvent *xevent, XPointer arg) { wxExposeInfo *info = (wxExposeInfo*) arg; @@ -295,9 +288,6 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return false; } -#ifdef __WXDEBUG__ - wxString windowClass = win->GetClassInfo()->GetClassName(); -#endif switch (event->type) { @@ -346,7 +336,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // If we only have one X11 window, always indicate // that borders might have to be redrawn. - if (win->GetMainWindow() == win->GetClientAreaWindow()) + if (win->X11GetMainWindow() == win->GetClientAreaWindow()) win->NeedUpdateNcAreaInIdle(); // Only erase background, paint in idle time. @@ -362,7 +352,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) #if !wxUSE_NANOX case GraphicsExpose: { - wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str()); + wxLogTrace( wxT("expose"), wxT("GraphicsExpose from %s"), win->GetName().c_str()); win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y, event->xgraphicsexpose.width, event->xgraphicsexpose.height); @@ -392,14 +382,14 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // wxLogDebug( "OnKey from %s", win->GetName().c_str() ); // We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR - if (win->GetEventHandler()->ProcessEvent( keyEvent )) + if (win->HandleWindowEvent( keyEvent )) return true; keyEvent.SetEventType(wxEVT_CHAR); // Do the translation again, retaining the ASCII // code. if (wxTranslateKeyEvent(keyEvent, win, window, event, true) && - win->GetEventHandler()->ProcessEvent( keyEvent )) + win->HandleWindowEvent( keyEvent )) return true; if ( (keyEvent.m_keyCode == WXK_TAB) && @@ -412,7 +402,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ new_event.SetWindowChange( keyEvent.ControlDown() ); new_event.SetCurrentFocus( win ); - return win->GetParent()->GetEventHandler()->ProcessEvent( new_event ); + return win->GetParent()->HandleWindowEvent( new_event ); } return false; @@ -425,7 +415,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) wxKeyEvent keyEvent(wxEVT_KEY_UP); wxTranslateKeyEvent(keyEvent, win, window, event); - return win->GetEventHandler()->ProcessEvent( keyEvent ); + return win->HandleWindowEvent( keyEvent ); } case ConfigureNotify: { @@ -449,17 +439,15 @@ bool wxApp::ProcessXEvent(WXEvent* _event) wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() ); sizeEvent.SetEventObject( win ); - return win->GetEventHandler()->ProcessEvent( sizeEvent ); + return win->HandleWindowEvent( sizeEvent ); } } return false; } #if !wxUSE_NANOX case PropertyNotify: - { - //wxLogDebug("PropertyNotify: %s", windowClass.c_str()); return HandlePropertyChange(_event); - } + case ClientMessage: { if (!win->IsEnabled()) @@ -509,7 +497,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) wxSizeEvent sizeEvent(sz, win->GetId()); sizeEvent.SetEventObject(win); - return win->GetEventHandler()->ProcessEvent( sizeEvent ); + return win->HandleWindowEvent( sizeEvent ); } #endif #endif @@ -551,7 +539,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) g_prevFocus = wxWindow::FindFocus(); g_nextFocus = win; - wxLogTrace( _T("focus"), _T("About to call SetFocus on %s of type %s due to button press"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + wxLogTrace( wxT("focus"), wxT("About to call SetFocus on %s of type %s due to button press"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); // Record the fact that this window is // getting the focus, because we'll need to @@ -574,7 +562,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) #endif wxMouseEvent wxevent; wxTranslateMouseEvent(wxevent, win, window, event); - return win->GetEventHandler()->ProcessEvent( wxevent ); + return win->HandleWindowEvent( wxevent ); } case FocusIn: #if !wxUSE_NANOX @@ -582,7 +570,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) (event->xfocus.mode == NotifyNormal)) #endif { - wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + wxLogTrace( wxT("focus"), wxT("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); extern wxWindow* g_GettingFocus; if (g_GettingFocus && g_GettingFocus->GetParent() == win) @@ -590,7 +578,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // Ignore this, this can be a spurious FocusIn // caused by a child having its focus set. g_GettingFocus = NULL; - wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s being deliberately ignored"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + wxLogTrace( wxT("focus"), wxT("FocusIn from %s of type %s being deliberately ignored"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); return true; } else @@ -600,7 +588,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) focusEvent.SetWindow( g_prevFocus ); g_prevFocus = NULL; - return win->GetEventHandler()->ProcessEvent(focusEvent); + return win->HandleWindowEvent(focusEvent); } } return false; @@ -611,22 +599,15 @@ bool wxApp::ProcessXEvent(WXEvent* _event) (event->xfocus.mode == NotifyNormal)) #endif { - wxLogTrace( _T("focus"), _T("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + wxLogTrace( wxT("focus"), wxT("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId()); focusEvent.SetEventObject(win); focusEvent.SetWindow( g_nextFocus ); g_nextFocus = NULL; - return win->GetEventHandler()->ProcessEvent(focusEvent); + return win->HandleWindowEvent(focusEvent); } return false; - -#ifdef __WXDEBUG__ - default: - //wxString eventName = wxGetXEventName(XEvent& event); - //wxLogDebug(wxT("Event %s not handled"), eventName.c_str()); - break; -#endif // __WXDEBUG__ } return false; @@ -634,7 +615,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // This should be redefined in a derived class for // handling property change events for XAtom IPC. -bool wxApp::HandlePropertyChange(WXEvent *event) +bool wxApp::HandlePropertyChange(WXEvent *WXUNUSED(event)) { // by default do nothing special // TODO: what to do for X11 @@ -707,7 +688,9 @@ PangoContext* wxApp::GetPangoContext() s_pangoContext = pango_x_get_context(dpy); if (!PANGO_IS_CONTEXT(s_pangoContext)) + { wxLogError( wxT("No pango context.") ); + } } return s_pangoContext; @@ -733,7 +716,7 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display) Window wxGetWindowParent(Window window) { - wxASSERT_MSG( window, _T("invalid window") ); + wxASSERT_MSG( window, wxT("invalid window") ); return (Window) 0; @@ -770,77 +753,3 @@ void wxApp::Exit() wxAppConsole::Exit(); } -// Yield to other processes - -bool wxApp::Yield(bool onlyIfNeeded) -{ - // Sometimes only 2 yields seem - // to do the trick, e.g. in the - // progress dialog - int i; - for (i = 0; i < 2; i++) - { - static bool s_inYield = false; - - if ( s_inYield ) - { - if ( !onlyIfNeeded ) - { - wxFAIL_MSG( wxT("wxYield called recursively" ) ); - } - - return false; - } - - s_inYield = true; - - // Make sure we have an event loop object, - // or Pending/Dispatch will fail - wxEventLoop* eventLoop = wxEventLoop::GetActive(); - wxEventLoop* newEventLoop = NULL; - if (!eventLoop) - { - newEventLoop = new wxEventLoop; - wxEventLoop::SetActive(newEventLoop); - } - - // Call dispatch at least once so that sockets - // can be tested - wxTheApp->Dispatch(); - - while (wxTheApp && wxTheApp->Pending()) - wxTheApp->Dispatch(); - -#if wxUSE_TIMER - wxTimer::NotifyTimers(); -#endif - ProcessIdle(); - - if (newEventLoop) - { - wxEventLoop::SetActive(NULL); - delete newEventLoop; - } - - s_inYield = false; - } - - return true; -} - -#ifdef __WXDEBUG__ - -void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) -{ - // While the GUI isn't working that well, just print out the - // message. -#if 1 - wxAppBase::OnAssert(file, line, cond, msg); -#else - wxString msg2; - msg2.Printf("At file %s:%d: %s", file, line, msg); - wxLogDebug(msg2); -#endif -} - -#endif // __WXDEBUG__