X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c6441a0d747d983ab4851249011c093b78d1633b..f8a139493553049e0b92db4bbee11deb33093ee3:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 086654892a..6afd9e2006 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/x11/app.cpp // Purpose: wxApp // Author: Julian Smart // Modified by: @@ -9,25 +9,27 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "app.h" -#endif +// 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" + +#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/timer.h" + #include "wx/memory.h" + #include "wx/gdicmn.h" +#endif + #include "wx/module.h" -#include "wx/memory.h" -#include "wx/log.h" -#include "wx/intl.h" #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" @@ -44,12 +46,10 @@ // global data //------------------------------------------------------------------------ -extern wxList wxPendingDelete; +wxWindowHash *wxWidgetHashTable = NULL; +wxWindowHash *wxClientWidgetHashTable = NULL; -wxHashTable *wxWidgetHashTable = NULL; -wxHashTable *wxClientWidgetHashTable = NULL; - -static bool g_showIconic = FALSE; +static bool g_showIconic = false; static wxSize g_initialSize = wxDefaultSize; // This is required for wxFocusEvent::SetWindow(). It will only @@ -91,7 +91,7 @@ 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 @@ -99,68 +99,68 @@ bool wxApp::Initialize(int& argc, wxChar **argv) #endif // __WXDEBUG__ wxString displayName; - bool syncDisplay = FALSE; + 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; + 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; + 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); } } } @@ -173,7 +173,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) xdisplay = XOpenDisplay( displayName.ToAscii() ); if (!xdisplay) { - wxLogError( _("wxWindows could not open display. Exiting.") ); + wxLogError( _("wxWidgets could not open display. Exiting.") ); return false; } @@ -185,9 +185,9 @@ bool wxApp::Initialize(int& argc, wxChar **argv) XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask); // Misc. - wxSetDetectableAutoRepeat( TRUE ); + wxSetDetectableAutoRepeat( true ); - if ( !wxAppBase::Initialize(argc, argv) ) + if ( !wxAppBase::Initialize(argC, argV) ) { XCloseDisplay(xdisplay); @@ -203,8 +203,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv) wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif - wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); - wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER); + wxWidgetHashTable = new wxWindowHash; + wxClientWidgetHashTable = new wxWindowHash; return true; } @@ -228,8 +228,7 @@ wxApp::wxApp() m_mainColormap = (WXColormap) NULL; m_topLevelWidget = (WXWindow) NULL; m_maxRequestSize = 0; - m_mainLoop = NULL; - m_showIconic = FALSE; + m_showIconic = false; m_initialSize = wxDefaultSize; #if !wxUSE_NANOX @@ -244,27 +243,8 @@ wxApp::~wxApp() #endif } -bool wxApp::Initialized() -{ - if (GetTopWindow()) - return TRUE; - else - return FALSE; -} - -int wxApp::MainLoop() -{ - int rt; - m_mainLoop = new wxEventLoop; - - rt = m_mainLoop->Run(); - - delete m_mainLoop; - m_mainLoop = NULL; - return rt; -} - #if !wxUSE_NANOX + //----------------------------------------------------------------------- // X11 predicate function for exposure compression //----------------------------------------------------------------------- @@ -275,7 +255,8 @@ struct wxExposeInfo Bool found_non_matching; }; -static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg) +extern "C" +Bool wxX11ExposePredicate (Display *display, XEvent *xevent, XPointer arg) { wxExposeInfo *info = (wxExposeInfo*) arg; @@ -284,23 +265,23 @@ static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg) if (xevent->xany.type != Expose) { - info->found_non_matching = TRUE; + info->found_non_matching = true; return FALSE; } if (xevent->xexpose.window != info->window) { - info->found_non_matching = TRUE; + info->found_non_matching = true; return FALSE; } return TRUE; } -#endif - // wxUSE_NANOX + +#endif // wxUSE_NANOX //----------------------------------------------------------------------- -// Processes an X event, returning TRUE if the event was processed. +// Processes an X event, returning true if the event was processed. //----------------------------------------------------------------------- bool wxApp::ProcessXEvent(WXEvent* _event) @@ -326,7 +307,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) win = wxGetClientWindowFromTable(window); if (!win) #endif - return FALSE; + return false; } #ifdef __WXDEBUG__ @@ -343,8 +324,8 @@ bool wxApp::ProcessXEvent(WXEvent* _event) XEvent tmp_event; wxExposeInfo info; info.window = event->xexpose.window; - info.found_non_matching = FALSE; - while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info )) + info.found_non_matching = false; + while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info )) { // Don't worry about optimizing redrawing the border etc. } @@ -362,8 +343,8 @@ bool wxApp::ProcessXEvent(WXEvent* _event) XEvent tmp_event; wxExposeInfo info; info.window = event->xexpose.window; - info.found_non_matching = FALSE; - while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info )) + info.found_non_matching = false; + 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 ); @@ -390,14 +371,12 @@ bool wxApp::ProcessXEvent(WXEvent* _event) //win->Update(); } - return TRUE; + return true; } #if !wxUSE_NANOX case GraphicsExpose: { - printf( "GraphicExpose event\n" ); - wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str()); win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y, @@ -413,14 +392,14 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // win->Update(); } - return TRUE; + return true; } #endif case KeyPress: { if (!win->IsEnabled()) - return FALSE; + return false; wxKeyEvent keyEvent(wxEVT_KEY_DOWN); wxTranslateKeyEvent(keyEvent, win, window, event); @@ -429,14 +408,14 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR if (win->GetEventHandler()->ProcessEvent( keyEvent )) - return TRUE; + return true; keyEvent.SetEventType(wxEVT_CHAR); // Do the translation again, retaining the ASCII // code. - wxTranslateKeyEvent(keyEvent, win, window, event, TRUE); + wxTranslateKeyEvent(keyEvent, win, window, event, true); if (win->GetEventHandler()->ProcessEvent( keyEvent )) - return TRUE; + return true; if ( (keyEvent.m_keyCode == WXK_TAB) && win->GetParent() && (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) @@ -451,12 +430,12 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return win->GetParent()->GetEventHandler()->ProcessEvent( new_event ); } - return FALSE; + return false; } case KeyRelease: { if (!win->IsEnabled()) - return FALSE; + return false; wxKeyEvent keyEvent(wxEVT_KEY_UP); wxTranslateKeyEvent(keyEvent, win, window, event); @@ -469,16 +448,15 @@ bool wxApp::ProcessXEvent(WXEvent* _event) if (event->update.utype == GR_UPDATE_SIZE) #endif { - if (win->IsTopLevel()) + wxTopLevelWindow *tlw = wxDynamicCast(win, wxTopLevelWindow); + if ( tlw ) { - wxTopLevelWindow *tlw = (wxTopLevelWindow*) win; tlw->SetConfigureGeometry( XConfigureEventGetX(event), XConfigureEventGetY(event), XConfigureEventGetWidth(event), XConfigureEventGetHeight(event) ); } - if (win->IsTopLevel() && win->IsShown()) + if ( tlw && tlw->IsShown() ) { - wxTopLevelWindowX11 *tlw = (wxTopLevelWindowX11 *) win; tlw->SetNeedResizeInIdle(); } else @@ -489,8 +467,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return win->GetEventHandler()->ProcessEvent( sizeEvent ); } } - return FALSE; - break; + return false; } #if !wxUSE_NANOX case PropertyNotify: @@ -501,7 +478,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) case ClientMessage: { if (!win->IsEnabled()) - return FALSE; + return false; Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True); Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True); @@ -510,11 +487,11 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { if ((Atom) (event->xclient.data.l[0]) == wm_delete_window) { - win->Close(FALSE); - return TRUE; + win->Close(false); + return true; } } - return FALSE; + return false; } #if 0 case DestroyNotify: @@ -556,10 +533,10 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { if (win) { - win->Close(FALSE); - return TRUE; + win->Close(false); + return true; } - return FALSE; + return false; break; } #endif @@ -570,7 +547,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) case MotionNotify: { if (!win->IsEnabled()) - return FALSE; + return false; // Here we check if the top level window is // disabled, which is one aspect of modality. @@ -578,7 +555,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) while (tlw && !tlw->IsTopLevel()) tlw = tlw->GetParent(); if (tlw && !tlw->IsEnabled()) - return FALSE; + return false; if (event->type == ButtonPress) { @@ -607,7 +584,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { // Throw out NotifyGrab and NotifyUngrab if (event->xcrossing.mode != NotifyNormal) - return FALSE; + return false; } #endif wxMouseEvent wxevent; @@ -615,83 +592,59 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return win->GetEventHandler()->ProcessEvent( wxevent ); } case FocusIn: - { #if !wxUSE_NANOX - if ((event->xfocus.detail != NotifyPointer) && - (event->xfocus.mode == NotifyNormal)) + if ((event->xfocus.detail != NotifyPointer) && + (event->xfocus.mode == NotifyNormal)) #endif + { + wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + + extern wxWindow* g_GettingFocus; + if (g_GettingFocus && g_GettingFocus->GetParent() == win) { - wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + // 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; - 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; } + return false; + case FocusOut: - { #if !wxUSE_NANOX - if ((event->xfocus.detail != NotifyPointer) && - (event->xfocus.mode == NotifyNormal)) + if ((event->xfocus.detail != NotifyPointer) && + (event->xfocus.mode == NotifyNormal)) #endif - { - wxLogTrace( _T("focus"), _T("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); - focusEvent.SetWindow( g_nextFocus ); - g_nextFocus = NULL; - return win->GetEventHandler()->ProcessEvent(focusEvent); - } - return FALSE; - break; + wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId()); + focusEvent.SetEventObject(win); + focusEvent.SetWindow( g_nextFocus ); + g_nextFocus = NULL; + return win->GetEventHandler()->ProcessEvent(focusEvent); } - default: - { + return false; + #ifdef __WXDEBUG__ + default: //wxString eventName = wxGetXEventName(XEvent& event); //wxLogDebug(wxT("Event %s not handled"), eventName.c_str()); -#endif - return FALSE; break; - } +#endif // __WXDEBUG__ } - return FALSE; -} -void wxApp::ExitMainLoop() -{ - if (m_mainLoop) - m_mainLoop->Exit(0); -} - -// Is a message/event pending? -bool wxApp::Pending() -{ - return wxEventLoop::GetActive()->Pending(); -} - -// Dispatch a message. -void wxApp::Dispatch() -{ - wxEventLoop::GetActive()->Dispatch(); + return false; } // This should be redefined in a derived class for @@ -701,7 +654,7 @@ bool wxApp::HandlePropertyChange(WXEvent *event) // by default do nothing special // TODO: what to do for X11 // XtDispatchEvent((XEvent*) event); - return FALSE; + return false; } void wxApp::WakeUpIdle() @@ -715,13 +668,15 @@ 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; + return false; GetMainColormap( wxApp::GetDisplay() ); @@ -732,14 +687,16 @@ bool wxApp::OnInitGui() wxFillXVisualInfo( m_visualInfo, (Display*) wxApp::GetDisplay() ); #endif - return TRUE; + return true; } #if wxUSE_UNICODE #include #include -#include +#ifdef HAVE_PANGO_XFT + #include +#endif PangoContext* wxApp::GetPangoContext() { @@ -749,7 +706,7 @@ PangoContext* wxApp::GetPangoContext() Display *xdisplay = (Display*) wxApp::GetDisplay(); -#if 1 +#ifdef HAVE_PANGO_XFT int xscreen = DefaultScreen(xdisplay); static int use_xft = -1; if (use_xft == -1) @@ -789,11 +746,13 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display) Window wxGetWindowParent(Window window) { - wxASSERT_MSG( window, "invalid window" ); + wxASSERT_MSG( window, _T("invalid window") ); return (Window) 0; - Window parent, root = 0; +#ifndef __VMS + // VMS chokes on unreacheable code + Window parent, root = 0; #if wxUSE_NANOX int noChildren = 0; #else @@ -814,6 +773,7 @@ Window wxGetWindowParent(Window window) return parent; else return (Window) 0; +#endif } void wxApp::Exit() @@ -833,7 +793,7 @@ bool wxApp::Yield(bool onlyIfNeeded) int i; for (i = 0; i < 2; i++) { - bool s_inYield = FALSE; + static bool s_inYield = false; if ( s_inYield ) { @@ -842,10 +802,10 @@ bool wxApp::Yield(bool 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 @@ -875,10 +835,10 @@ bool wxApp::Yield(bool onlyIfNeeded) delete newEventLoop; } - s_inYield = FALSE; + s_inYield = false; } - return TRUE; + return true; } #ifdef __WXDEBUG__ @@ -897,4 +857,3 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxC } #endif // __WXDEBUG__ -