X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02761f6cd478e3c2c97cf6f93442747f7b029833..2e334012b4babcf063fbe79540c4c154cd54ab2b:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index e5dc6785da..4c9868ce0c 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" @@ -83,14 +84,9 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) //------------------------------------------------------------------------ long wxApp::sm_lastMessageTime = 0; -WXDisplay *wxApp::ms_display = NULL; 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 @@ -165,34 +161,24 @@ bool wxApp::Initialize(int& argC, wxChar **argV) } } - // X11 display stuff - Display *xdisplay; - if ( displayName.empty() ) - xdisplay = XOpenDisplay( NULL ); - else - xdisplay = XOpenDisplay( displayName.ToAscii() ); - if (!xdisplay) + // open and set up the X11 display + if ( !wxSetDisplay(displayName) ) { - wxLogError( _("wxWidgets could not open display. Exiting.") ); + wxLogError(_("wxWidgets could not open display. Exiting.")); return false; } + Display *dpy = wxGlobalDisplay(); if (syncDisplay) - XSynchronize(xdisplay, True); + XSynchronize(dpy, True); - ms_display = (WXDisplay*) xdisplay; + XSelectInput(dpy, XDefaultRootWindow(dpy), PropertyChangeMask); - XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask); - - // Misc. wxSetDetectableAutoRepeat( true ); - if ( !wxAppBase::Initialize(argC, argV) ) - { - XCloseDisplay(xdisplay); + if ( !wxAppBase::Initialize(argC, argV) ) return false; - } #if wxUSE_UNICODE // Glib's type system required by Pango @@ -221,12 +207,8 @@ void wxApp::CleanUp() wxApp::wxApp() { - // TODO: parse the command line - argc = 0; - argv = NULL; - - m_mainColormap = (WXColormap) NULL; - m_topLevelWidget = (WXWindow) NULL; + m_mainColormap = NULL; + m_topLevelWidget = NULL; m_maxRequestSize = 0; m_showIconic = false; m_initialSize = wxDefaultSize; @@ -256,7 +238,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; @@ -407,14 +389,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. - wxTranslateKeyEvent(keyEvent, win, window, event, true); - if (win->GetEventHandler()->ProcessEvent( keyEvent )) + if (wxTranslateKeyEvent(keyEvent, win, window, event, true) && + win->HandleWindowEvent( keyEvent )) return true; if ( (keyEvent.m_keyCode == WXK_TAB) && @@ -427,7 +409,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; @@ -440,7 +422,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: { @@ -464,7 +446,7 @@ 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; @@ -524,7 +506,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 @@ -559,7 +541,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) if (event->type == ButtonPress) { - if ((win != wxWindow::FindFocus()) && win->AcceptsFocus()) + if ((win != wxWindow::FindFocus()) && win->CanAcceptFocus()) { // This might actually be done in wxWindow::SetFocus() // and not here. TODO. @@ -589,7 +571,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 @@ -615,7 +597,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) focusEvent.SetWindow( g_prevFocus ); g_prevFocus = NULL; - return win->GetEventHandler()->ProcessEvent(focusEvent); + return win->HandleWindowEvent(focusEvent); } } return false; @@ -632,7 +614,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) focusEvent.SetEventObject(win); focusEvent.SetWindow( g_nextFocus ); g_nextFocus = NULL; - return win->GetEventHandler()->ProcessEvent(focusEvent); + return win->HandleWindowEvent(focusEvent); } return false; @@ -649,7 +631,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 @@ -678,13 +660,14 @@ bool wxApp::OnInitGui() if (!wxAppBase::OnInitGui()) return false; - GetMainColormap( wxApp::GetDisplay() ); + Display *dpy = wxGlobalDisplay(); + GetMainColormap(dpy); - m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() ); + m_maxRequestSize = XMaxRequestSize(dpy); #if !wxUSE_NANOX m_visualInfo = new wxXVisualInfo; - wxFillXVisualInfo( m_visualInfo, (Display*) wxApp::GetDisplay() ); + wxFillXVisualInfo(m_visualInfo, dpy); #endif return true; @@ -700,33 +683,34 @@ bool wxApp::OnInitGui() PangoContext* wxApp::GetPangoContext() { - static PangoContext *ret = NULL; - if (ret) - return ret; - - Display *xdisplay = (Display*) wxApp::GetDisplay(); + static PangoContext *s_pangoContext = NULL; + if ( !s_pangoContext ) + { + Display *dpy = wxGlobalDisplay(); #ifdef HAVE_PANGO_XFT - int xscreen = DefaultScreen(xdisplay); - static int use_xft = -1; - if (use_xft == -1) - { - wxString val = wxGetenv( L"GDK_USE_XFT" ); - use_xft = (val == L"1"); - } + int xscreen = DefaultScreen(dpy); + static int use_xft = -1; + if (use_xft == -1) + { + wxString val = wxGetenv( L"GDK_USE_XFT" ); + use_xft = val == L"1"; + } - if (use_xft) - ret = pango_xft_get_context( xdisplay, xscreen ); - else -#endif - ret = pango_x_get_context( xdisplay ); + if (use_xft) + s_pangoContext = pango_xft_get_context(dpy, xscreen); + else +#endif // HAVE_PANGO_XFT + s_pangoContext = pango_x_get_context(dpy); - if (!PANGO_IS_CONTEXT(ret)) - wxLogError( wxT("No pango context.") ); + if (!PANGO_IS_CONTEXT(s_pangoContext)) + wxLogError( wxT("No pango context.") ); + } - return ret; + return s_pangoContext; } -#endif + +#endif // wxUSE_UNICODE WXColormap wxApp::GetMainColormap(WXDisplay* display) { @@ -809,14 +793,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // 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); - } - + wxEventLoopGuarantor dummyLoopIfNeeded; // Call dispatch at least once so that sockets // can be tested wxTheApp->Dispatch(); @@ -825,16 +802,10 @@ bool wxApp::Yield(bool onlyIfNeeded) wxTheApp->Dispatch(); #if wxUSE_TIMER - wxTimer::NotifyTimers(); + wxGenericTimerImpl::NotifyTimers(); #endif ProcessIdle(); - if (newEventLoop) - { - wxEventLoop::SetActive(NULL); - delete newEventLoop; - } - s_inYield = false; }