X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8601b2e15bf924d4be6b7843064028e514a71ec8..6500c0b134e57412145f72b27396dc573adf0844:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 3408003de4..b42979accb 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -105,6 +105,10 @@ bool wxApp::Initialize() { wxClassInfo::InitializeClasses(); +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif + // 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 @@ -384,21 +388,17 @@ wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NUL wxApp::wxApp() { - m_topWindow = NULL; - wxTheApp = this; - m_className = ""; - m_wantDebugOutput = TRUE ; - m_appName = ""; + // TODO: parse the command line argc = 0; argv = NULL; - m_exitOnFrameDelete = TRUE; + m_mainColormap = (WXColormap) NULL; m_topLevelWidget = (WXWindow) NULL; m_maxRequestSize = 0; m_mainLoop = NULL; m_showIconic = FALSE; m_initialSize = wxDefaultSize; - + #if !wxUSE_NANOX m_visualColormap = NULL; m_colorCube = NULL; @@ -410,7 +410,7 @@ wxApp::~wxApp() #if !wxUSE_NANOX if (m_colorCube) free( m_colorCube ); - + if (m_visualColormap) delete [] (XColor*)m_visualColormap; #endif @@ -510,7 +510,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) case Expose: { #if wxUSE_TWO_WINDOWS && !wxUSE_NANOX - if (event->xexpose.window != (Window)win->GetClientWindow()) + if (event->xexpose.window != (Window)win->GetClientAreaWindow()) { XEvent tmp_event; wxExposeInfo info; @@ -552,7 +552,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->GetClientWindow()) + if (win->GetMainWindow() == win->GetClientAreaWindow()) win->NeedUpdateNcAreaInIdle(); // Only erase background, paint in idle time. @@ -568,9 +568,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { printf( "GraphicExpose event\n" ); - // wxLogDebug( "GraphicsExpose from %s", win->GetName().c_str(), - // event->xgraphicsexpose.x, event->xgraphicsexpose.y, - // event->xgraphicsexpose.width, event->xgraphicsexpose.height); + wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str()); win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y, event->xgraphicsexpose.width, event->xgraphicsexpose.height); @@ -740,7 +738,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { if (!win->IsEnabled()) return FALSE; - + // Here we check if the top level window is // disabled, which is one aspect of modality. wxWindow *tlw = win; @@ -758,6 +756,15 @@ 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() ); + + // Record the fact that this window is + // getting the focus, because we'll need to + // check if its parent is getting a bogus + // focus and duly ignore it. + // TODO: may need to have this code in SetFocus, too. + extern wxWindow* g_GettingFocus; + g_GettingFocus = win; win->SetFocus(); } } @@ -781,14 +788,26 @@ bool wxApp::ProcessXEvent(WXEvent* _event) (event->xfocus.mode == NotifyNormal)) #endif { - // wxLogDebug( "FocusIn from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); - wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId()); - focusEvent.SetEventObject(win); - focusEvent.SetWindow( g_prevFocus ); - g_prevFocus = NULL; + extern wxWindow* g_GettingFocus; + if (g_GettingFocus && g_GettingFocus->GetParent() == win) + { + // 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() ); + return TRUE; + } + else + { + wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId()); + focusEvent.SetEventObject(win); + focusEvent.SetWindow( g_prevFocus ); + g_prevFocus = NULL; - return win->GetEventHandler()->ProcessEvent(focusEvent); + return win->GetEventHandler()->ProcessEvent(focusEvent); + } } return FALSE; break; @@ -800,7 +819,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) (event->xfocus.mode == NotifyNormal)) #endif { - // wxLogDebug( "FocusOut from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + wxLogTrace( _T("focus"), _T("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId()); focusEvent.SetEventObject(win); @@ -924,8 +943,6 @@ bool wxApp::SendIdleEvents(wxWindow* win) win->GetEventHandler()->ProcessEvent(event); - win->OnInternalIdle(); - if (event.MoreRequested()) needMore = TRUE; @@ -939,6 +956,8 @@ bool wxApp::SendIdleEvents(wxWindow* win) node = node->Next(); } + win->OnInternalIdle(); + return needMore; } @@ -1008,44 +1027,44 @@ bool wxApp::OnInitGui() vinfo_template.visual = xvisual; vinfo_template.visualid = XVisualIDFromVisual( xvisual ); vinfo_template.depth = xdepth; - + int nitem = 0; XVisualInfo *vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); wxASSERT_MSG( vi, wxT("No visual info") ); - + m_visualType = vi->visual->c_class; m_visualScreen = vi->screen; - + m_visualRedMask = vi->red_mask; m_visualGreenMask = vi->green_mask; m_visualBlueMask = vi->blue_mask; - + if (m_visualType != GrayScale && m_visualType != PseudoColor) { wxCalcPrecAndShift( m_visualRedMask, &m_visualRedShift, &m_visualRedPrec ); wxCalcPrecAndShift( m_visualGreenMask, &m_visualGreenShift, &m_visualGreenPrec ); wxCalcPrecAndShift( m_visualBlueMask, &m_visualBlueShift, &m_visualBluePrec ); } - + m_visualDepth = xdepth; if (xdepth == 16) xdepth = m_visualRedPrec + m_visualGreenPrec + m_visualBluePrec; - + m_visualColormapSize = vi->colormap_size; - + XFree( vi ); - + if (m_visualDepth > 8) return TRUE; - + m_visualColormap = new XColor[m_visualColormapSize]; XColor* colors = (XColor*) m_visualColormap; - + for (int i = 0; i < m_visualColormapSize; i++) colors[i].pixel = i; XQueryColors( xdisplay, DefaultColormap(xdisplay,xscreen), colors, m_visualColormapSize ); - + m_colorCube = (unsigned char*)malloc(32 * 32 * 32); for (int r = 0; r < 32; r++) @@ -1088,7 +1107,7 @@ bool wxApp::OnInitGui() } } #endif - + return TRUE; } @@ -1155,55 +1174,64 @@ void wxExit() bool wxApp::Yield(bool onlyIfNeeded) { - bool s_inYield = FALSE; - - if ( s_inYield ) + // Sometimes only 2 yields seem + // to do the trick, e.g. in the + // progress dialog + int i; + for (i = 0; i < 2; i++) { - if ( !onlyIfNeeded ) + bool s_inYield = FALSE; + + if ( s_inYield ) { - wxFAIL_MSG( wxT("wxYield called recursively" ) ); - } + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } - return FALSE; - } + return FALSE; + } - s_inYield = TRUE; + 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); - } + // 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); + } - while (wxTheApp && wxTheApp->Pending()) - wxTheApp->Dispatch(); + while (wxTheApp && wxTheApp->Pending()) + wxTheApp->Dispatch(); #if wxUSE_TIMER - wxTimer::NotifyTimers(); + wxTimer::NotifyTimers(); #endif - ProcessIdle(); + ProcessIdle(); - if (newEventLoop) - { - wxEventLoop::SetActive(NULL); - delete newEventLoop; - } + if (newEventLoop) + { + wxEventLoop::SetActive(NULL); + delete newEventLoop; + } - s_inYield = FALSE; + s_inYield = FALSE; + } return TRUE; } -void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) +#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 0 - wxAppBase::OnAssert(file, line, msg); +#if 1 + wxAppBase::OnAssert(file, line, cond, msg); #else wxString msg2; msg2.Printf("At file %s:%d: %s", file, line, msg); @@ -1211,3 +1239,5 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) #endif } +#endif // __WXDEBUG__ +