X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a371f70393c2af47d08c317ed496f751213c8fcb..38a5c64e29ab1d081af309a73c7af94069cf799f:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 461200728d..9bb8539733 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" + +#ifndef WX_PRECOMP + #include "wx/hash.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/frame.h" +#endif + #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" #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" @@ -46,10 +48,10 @@ extern wxList wxPendingDelete; -wxHashTable *wxWidgetHashTable = NULL; -wxHashTable *wxClientWidgetHashTable = NULL; +wxWindowHash *wxWidgetHashTable = NULL; +wxWindowHash *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 +93,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 +101,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 +175,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 +187,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 +205,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,7 +230,7 @@ wxApp::wxApp() m_mainColormap = (WXColormap) NULL; m_topLevelWidget = (WXWindow) NULL; m_maxRequestSize = 0; - m_showIconic = FALSE; + m_showIconic = false; m_initialSize = wxDefaultSize; #if !wxUSE_NANOX @@ -244,6 +246,7 @@ wxApp::~wxApp() } #if !wxUSE_NANOX + //----------------------------------------------------------------------- // X11 predicate function for exposure compression //----------------------------------------------------------------------- @@ -254,7 +257,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; @@ -263,23 +267,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) @@ -305,7 +309,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) win = wxGetClientWindowFromTable(window); if (!win) #endif - return FALSE; + return false; } #ifdef __WXDEBUG__ @@ -322,8 +326,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. } @@ -341,8 +345,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 ); @@ -369,7 +373,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) //win->Update(); } - return TRUE; + return true; } #if !wxUSE_NANOX @@ -390,14 +394,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); @@ -406,14 +410,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)) ) @@ -428,12 +432,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); @@ -446,16 +450,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 @@ -466,8 +469,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return win->GetEventHandler()->ProcessEvent( sizeEvent ); } } - return FALSE; - break; + return false; } #if !wxUSE_NANOX case PropertyNotify: @@ -478,7 +480,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); @@ -487,11 +489,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: @@ -533,10 +535,10 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { if (win) { - win->Close(FALSE); - return TRUE; + win->Close(false); + return true; } - return FALSE; + return false; break; } #endif @@ -547,7 +549,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. @@ -555,7 +557,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) { @@ -584,7 +586,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) { // Throw out NotifyGrab and NotifyUngrab if (event->xcrossing.mode != NotifyNormal) - return FALSE; + return false; } #endif wxMouseEvent wxevent; @@ -606,7 +608,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // 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; + return true; } else { @@ -618,7 +620,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return win->GetEventHandler()->ProcessEvent(focusEvent); } } - return FALSE; + return false; case FocusOut: #if !wxUSE_NANOX @@ -634,7 +636,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) g_nextFocus = NULL; return win->GetEventHandler()->ProcessEvent(focusEvent); } - return FALSE; + return false; #ifdef __WXDEBUG__ default: @@ -644,7 +646,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) #endif // __WXDEBUG__ } - return FALSE; + return false; } // This should be redefined in a derived class for @@ -654,7 +656,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() @@ -674,7 +676,7 @@ bool wxApp::OnInitGui() delete wxLog::SetActiveTarget(new wxLogStderr); if (!wxAppBase::OnInitGui()) - return FALSE; + return false; GetMainColormap( wxApp::GetDisplay() ); @@ -685,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() { @@ -702,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,7 +793,7 @@ bool wxApp::Yield(bool onlyIfNeeded) int i; for (i = 0; i < 2; i++) { - static bool s_inYield = FALSE; + static bool s_inYield = false; if ( s_inYield ) { @@ -798,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 @@ -831,10 +835,10 @@ bool wxApp::Yield(bool onlyIfNeeded) delete newEventLoop; } - s_inYield = FALSE; + s_inYield = false; } - return TRUE; + return true; } #ifdef __WXDEBUG__ @@ -853,4 +857,3 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxC } #endif // __WXDEBUG__ -