X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bcc364758483190ff62908d76ac99b922825027..850df2d78866c3edcf848103b5dbc7e7fa1ee5fa:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index ad51904800..c7ec2a5de7 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -12,24 +12,27 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/frame.h" #include "wx/app.h" -#include "wx/utils.h" -#include "wx/gdicmn.h" -#include "wx/icon.h" -#include "wx/dialog.h" -#include "wx/log.h" -#include "wx/module.h" -#include "wx/memory.h" -#include "wx/log.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/hash.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/frame.h" + #include "wx/icon.h" + #include "wx/dialog.h" + #include "wx/memory.h" + #include "wx/gdicmn.h" + #include "wx/module.h" +#endif + #include "wx/evtloop.h" -#include "wx/timer.h" #include "wx/filename.h" -#include "wx/hash.h" #include "wx/univ/theme.h" #include "wx/univ/renderer.h" +#include "wx/generic/private/timer.h" #if wxUSE_THREADS #include "wx/thread.h" @@ -43,8 +46,6 @@ // global data //------------------------------------------------------------------------ -extern wxList wxPendingDelete; - wxWindowHash *wxWidgetHashTable = NULL; wxWindowHash *wxClientWidgetHashTable = NULL; @@ -82,15 +83,10 @@ 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) +bool wxApp::Initialize(int& argC, wxChar **argV) { #if defined(__WXDEBUG__) && !wxUSE_NANOX // install the X error handler @@ -100,98 +96,88 @@ bool wxApp::Initialize(int& argc, wxChar **argv) wxString displayName; bool syncDisplay = false; - int argcOrig = argc; - for ( int i = 0; i < argcOrig; i++ ) + int argCOrig = argC; + for ( int i = 0; i < argCOrig; i++ ) { - if (wxStrcmp( argv[i], _T("-display") ) == 0) + if (wxStrcmp( argV[i], _T("-display") ) == 0) { - if (i < (argc - 1)) + if (i < (argC - 1)) { - argv[i++] = NULL; + argV[i++] = NULL; - displayName = argv[i]; + displayName = argV[i]; - argv[i] = NULL; - argc -= 2; + argV[i] = NULL; + argC -= 2; } } - else if (wxStrcmp( argv[i], _T("-geometry") ) == 0) + else if (wxStrcmp( argV[i], _T("-geometry") ) == 0) { - if (i < (argc - 1)) + if (i < (argC - 1)) { - argv[i++] = NULL; + argV[i++] = NULL; int w, h; - if (wxSscanf(argv[i], _T("%dx%d"), &w, &h) != 2) + if (wxSscanf(argV[i], _T("%dx%d"), &w, &h) != 2) { wxLogError( _("Invalid geometry specification '%s'"), - wxString(argv[i]).c_str() ); + wxString(argV[i]).c_str() ); } else { g_initialSize = wxSize(w, h); } - argv[i] = NULL; - argc -= 2; + argV[i] = NULL; + argC -= 2; } } - else if (wxStrcmp( argv[i], _T("-sync") ) == 0) + else if (wxStrcmp( argV[i], _T("-sync") ) == 0) { syncDisplay = true; - argv[i] = NULL; - argc--; + argV[i] = NULL; + argC--; } - else if (wxStrcmp( argv[i], _T("-iconic") ) == 0) + else if (wxStrcmp( argV[i], _T("-iconic") ) == 0) { g_showIconic = true; - argv[i] = NULL; - argc--; + argV[i] = NULL; + argC--; } } - if ( argc != argcOrig ) + if ( argC != argCOrig ) { // remove the argumens we consumed - for ( int i = 0; i < argc; i++ ) + for ( int i = 0; i < argC; i++ ) { - while ( !argv[i] ) + while ( !argV[i] ) { - memmove(argv + i, argv + i + 1, argcOrig - i); + memmove(argV + i, argV + i + 1, argCOrig - i); } } } - // 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); - - ms_display = (WXDisplay*) xdisplay; + XSynchronize(dpy, True); - XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask); + XSelectInput(dpy, XDefaultRootWindow(dpy), 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 @@ -220,12 +206,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; @@ -243,6 +225,7 @@ wxApp::~wxApp() } #if !wxUSE_NANOX + //----------------------------------------------------------------------- // X11 predicate function for exposure compression //----------------------------------------------------------------------- @@ -253,7 +236,8 @@ struct wxExposeInfo Bool found_non_matching; }; -static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg) +extern "C" +Bool wxX11ExposePredicate (Display *WXUNUSED(display), XEvent *xevent, XPointer arg) { wxExposeInfo *info = (wxExposeInfo*) arg; @@ -274,8 +258,8 @@ static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg) return TRUE; } -#endif - // wxUSE_NANOX + +#endif // wxUSE_NANOX //----------------------------------------------------------------------- // Processes an X event, returning true if the event was processed. @@ -322,7 +306,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) wxExposeInfo info; info.window = event->xexpose.window; info.found_non_matching = false; - while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info )) + while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info )) { // Don't worry about optimizing redrawing the border etc. } @@ -341,7 +325,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) wxExposeInfo info; info.window = event->xexpose.window; info.found_non_matching = false; - while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info )) + while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info )) { win->GetUpdateRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y, tmp_event.xexpose.width, tmp_event.xexpose.height ); @@ -410,8 +394,8 @@ bool wxApp::ProcessXEvent(WXEvent* _event) 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->GetEventHandler()->ProcessEvent( keyEvent )) return true; if ( (keyEvent.m_keyCode == WXK_TAB) && @@ -556,7 +540,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. @@ -646,7 +630,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 @@ -665,21 +649,24 @@ void wxApp::WakeUpIdle() // Create display, and other initialization bool wxApp::OnInitGui() { +#if wxUSE_LOG // Eventually this line will be removed, but for // now we don't want to try popping up a dialog // for error messages. delete wxLog::SetActiveTarget(new wxLogStderr); +#endif 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; @@ -695,33 +682,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) { @@ -804,7 +792,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // Make sure we have an event loop object, // or Pending/Dispatch will fail - wxEventLoop* eventLoop = wxEventLoop::GetActive(); + wxEventLoopBase * const eventLoop = wxEventLoop::GetActive(); wxEventLoop* newEventLoop = NULL; if (!eventLoop) { @@ -820,7 +808,7 @@ bool wxApp::Yield(bool onlyIfNeeded) wxTheApp->Dispatch(); #if wxUSE_TIMER - wxTimer::NotifyTimers(); + wxGenericTimerImpl::NotifyTimers(); #endif ProcessIdle();