X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82ceade76a4913f9c6fd8dfda1fb291bf08e1d89..51c72a7b56ea50fb3c9b082da1bbaddf6a218073:/src/common/popupcmn.cpp diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index a620970488..d837d7b0c4 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/popupcmn.cpp +// Name: src/common/popupcmn.cpp // Purpose: implementation of wxPopupTransientWindow // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "popupwinbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -33,21 +29,25 @@ #include "wx/popupwin.h" #ifndef WX_PRECOMP - #include "wx/combobox.h" // wxComboControl + #include "wx/combobox.h" // wxComboCtrl #include "wx/app.h" // wxPostEvent #include "wx/log.h" - #include "wx/app.h" #endif //WX_PRECOMP +#include "wx/display.h" +#include "wx/recguard.h" + #ifdef __WXUNIVERSAL__ #include "wx/univ/renderer.h" + #include "wx/scrolbar.h" #endif // __WXUNIVERSAL__ #ifdef __WXGTK__ #include -#endif -#ifdef __WXX11__ -#include "wx/x11/private.h" +#elif defined(__WXMSW__) + #include "wx/msw/private.h" +#elif defined(__WXX11__) + #include "wx/x11/private.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) @@ -67,7 +67,6 @@ class wxPopupWindowHandler : public wxEvtHandler { public: wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {} - ~wxPopupWindowHandler(); protected: // event handlers @@ -77,14 +76,13 @@ private: wxPopupTransientWindow *m_popup; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxPopupWindowHandler) + wxDECLARE_NO_COPY_CLASS(wxPopupWindowHandler); }; class wxPopupFocusHandler : public wxEvtHandler { public: wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {} - ~wxPopupFocusHandler(); protected: void OnKillFocus(wxFocusEvent& event); @@ -94,7 +92,7 @@ private: wxPopupTransientWindow *m_popup; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxPopupFocusHandler) + wxDECLARE_NO_COPY_CLASS(wxPopupFocusHandler); }; // ---------------------------------------------------------------------------- @@ -110,6 +108,12 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown) END_EVENT_TABLE() +BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) +#if defined( __WXMSW__ ) || defined( __WXMAC__) + EVT_IDLE(wxPopupTransientWindow::OnIdle) +#endif +END_EVENT_TABLE() + // ============================================================================ // implementation // ============================================================================ @@ -131,13 +135,31 @@ bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags)) void wxPopupWindowBase::Position(const wxPoint& ptOrigin, const wxSize& size) { - wxSize sizeScreen = wxGetDisplaySize(), - sizeSelf = GetSize(); + // determine the position and size of the screen we clamp the popup to + wxPoint posScreen; + wxSize sizeScreen; + + const int displayNum = wxDisplay::GetFromPoint(ptOrigin); + if ( displayNum != wxNOT_FOUND ) + { + const wxRect rectScreen = wxDisplay(displayNum).GetGeometry(); + posScreen = rectScreen.GetPosition(); + sizeScreen = rectScreen.GetSize(); + } + else // outside of any display? + { + // just use the primary one then + posScreen = wxPoint(0, 0); + sizeScreen = wxGetDisplaySize(); + } + + + const wxSize sizeSelf = GetSize(); // is there enough space to put the popup below the window (where we put it // by default)? wxCoord y = ptOrigin.y + size.y; - if ( y + sizeSelf.y > sizeScreen.y ) + if ( y + sizeSelf.y > posScreen.y + sizeScreen.y ) { // check if there is enough space above if ( ptOrigin.y > sizeSelf.y ) @@ -149,8 +171,19 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin, } // now check left/right too - wxCoord x = ptOrigin.x + size.x; - if ( x + sizeSelf.x > sizeScreen.x ) + wxCoord x = ptOrigin.x; + + if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) + { + // shift the window to the left instead of the right. + x -= size.x; + x -= sizeSelf.x; // also shift it by window width. + } + else + x += size.x; + + + if ( x + sizeSelf.x > posScreen.x + sizeScreen.x ) { // check if there is enough space to the left if ( ptOrigin.x > sizeSelf.x ) @@ -168,18 +201,10 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin, // wxPopupTransientWindow // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) -#ifdef __WXMSW__ - EVT_ENTER_WINDOW(wxPopupTransientWindow::OnEnter) - EVT_LEAVE_WINDOW(wxPopupTransientWindow::OnLeave) - EVT_LEFT_DOWN(wxPopupTransientWindow::OnLeftDown) -#endif -END_EVENT_TABLE() - void wxPopupTransientWindow::Init() { m_child = - m_focus = (wxWindow *)NULL; + m_focus = NULL; m_handlerFocus = NULL; m_handlerPopup = NULL; @@ -194,50 +219,41 @@ wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style) wxPopupTransientWindow::~wxPopupTransientWindow() { - PopHandlers(); + if (m_handlerPopup && m_handlerPopup->GetNextHandler()) + PopHandlers(); + + wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler()); + wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler()); + + delete m_handlerFocus; + delete m_handlerPopup; } void wxPopupTransientWindow::PopHandlers() { if ( m_child ) { - if ( m_handlerPopup && !m_child->RemoveEventHandler(m_handlerPopup) ) + if ( !m_child->RemoveEventHandler(m_handlerPopup) ) { // something is very wrong and someone else probably deleted our // handler - so don't risk deleting it second time m_handlerPopup = NULL; } - + if (m_child->HasCapture()) + { + m_child->ReleaseMouse(); + } m_child = NULL; } -#ifdef __WXMSW__ - if ( HasCapture() ) - { - ReleaseCapture(); - } if ( m_focus ) { - if ( m_handlerFocus && !m_focus->RemoveEventHandler(m_handlerFocus) ) + if ( !m_focus->RemoveEventHandler(m_handlerFocus) ) { // see above m_handlerFocus = NULL; } } -#else - if ( m_handlerFocus && !RemoveEventHandler(m_handlerFocus) ) - { - // see above - m_handlerFocus = NULL; - } -#endif - - // delete the handlers, they'll be created as necessary in Popup() - delete m_handlerPopup; - m_handlerPopup = NULL; - delete m_handlerFocus; - m_handlerFocus = NULL; - m_focus = NULL; } @@ -255,63 +271,44 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) Show(); - // There is is a problem if these are still valid - wxASSERT_MSG(!m_handlerPopup, wxT("Popup handler not deleted")); - wxASSERT_MSG(!m_handlerFocus, wxT("Focus handler not deleted")); + // There is a problem if these are still in use + wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler()); + wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler()); - delete m_handlerPopup; - m_handlerPopup = new wxPopupWindowHandler(this); + if (!m_handlerPopup) + m_handlerPopup = new wxPopupWindowHandler(this); m_child->PushEventHandler(m_handlerPopup); - m_focus = winFocus ? winFocus : this; - m_focus->SetFocus(); +#if defined(__WXMSW__) + // Focusing on child of popup window does not work on MSW unless WS_POPUP + // style is set. We do not even want to try to set the focus, as it may + // provoke errors on some Windows versions (Vista and later). + if ( ::GetWindowLong(GetHwnd(), GWL_STYLE) & WS_POPUP ) +#endif + { + m_focus = winFocus ? winFocus : this; + m_focus->SetFocus(); + } -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || (defined( __WXMAC__) && wxOSX_USE_CARBON) // MSW doesn't allow to set focus to the popup window, but we need to // subclass the window which has the focus, and not winFocus passed in or // otherwise everything else breaks down m_focus = FindFocus(); - if ( m_focus ) - { - delete m_handlerFocus; - m_handlerFocus = new wxPopupFocusHandler(this); - - m_focus->PushEventHandler(m_handlerFocus); - } -#else +#elif defined(__WXGTK__) // GTK+ catches the activate events from the popup // window, not the focus events from the child window - delete m_handlerFocus; - m_handlerFocus = new wxPopupFocusHandler(this); - PushEventHandler(m_handlerFocus); -#endif // __WXMSW__ + m_focus = this; +#endif - // catch destroy events, if you close a program with a popup shown in MSW - // you get a segfault if m_child or m_focus are deleted before this is - m_child->Connect(wxEVT_DESTROY, - wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy), - NULL, this); - m_focus->Connect(wxEVT_DESTROY, - wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy), - NULL, this); -#ifdef __WXMSW__ - // Assume that the mouse is currently outside of the popup window - CaptureMouse(); - - // Connect the child Enter/Leave events too, incase the child completly - // covers the popup (because then the popup's enter/leave events won't be - // sent. - if (m_child != this) + if ( m_focus ) { - m_child->Connect(wxEVT_ENTER_WINDOW, - wxMouseEventHandler(wxPopupTransientWindow::OnChildEnter), - NULL, this); - m_child->Connect(wxEVT_LEAVE_WINDOW, - wxMouseEventHandler(wxPopupTransientWindow::OnChildLeave), - NULL, this); + if (!m_handlerFocus) + m_handlerFocus = new wxPopupFocusHandler(this); + + m_focus->PushEventHandler(m_handlerFocus); } -#endif } bool wxPopupTransientWindow::Show( bool show ) @@ -332,6 +329,13 @@ bool wxPopupTransientWindow::Show( bool show ) } #endif +#if defined( __WXMSW__ ) || defined( __WXMAC__) + if (!show && m_child && m_child->HasCapture()) + { + m_child->ReleaseMouse(); + } +#endif + bool ret = wxPopupWindow::Show( show ); #ifdef __WXGTK__ @@ -345,8 +349,8 @@ bool wxPopupTransientWindow::Show( bool show ) GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_MASK), - (GdkWindow *) NULL, - (GdkCursor *) NULL, + NULL, + NULL, (guint32)GDK_CURRENT_TIME ); } #endif @@ -366,20 +370,27 @@ bool wxPopupTransientWindow::Show( bool show ) CurrentTime ); } #endif + +#if defined( __WXMSW__ ) || defined( __WXMAC__) + if (show && m_child) + { + // Assume that the mouse is outside the popup to begin with + m_child->CaptureMouse(); + } +#endif + return ret; } void wxPopupTransientWindow::Dismiss() { - PopHandlers(); - Hide(); + PopHandlers(); } void wxPopupTransientWindow::DismissAndNotify() { Dismiss(); - OnDismiss(); } @@ -394,65 +405,34 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) return false; } -void wxPopupTransientWindow::OnDestroy(wxWindowDestroyEvent& event) -{ - if (event.GetEventObject() == m_child) - m_child = NULL; - if (event.GetEventObject() == m_focus) - m_focus = NULL; -} - -void wxPopupTransientWindow::OnEnter(wxMouseEvent& /*event*/) -{ - if ( HasCapture() ) - { - ReleaseCapture(); - } -} - -void wxPopupTransientWindow::OnLeave(wxMouseEvent& /*event*/) +#if defined( __WXMSW__ ) || defined( __WXMAC__) +void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) { - CaptureMouse(); -} + event.Skip(); -void wxPopupTransientWindow::OnLeftDown(wxMouseEvent& event) -{ - if (m_handlerPopup && m_child && m_child != this) + if (IsShown() && m_child) { - m_child->GetEventHandler()->ProcessEvent(event); - } -} - + wxPoint pos = ScreenToClient(wxGetMousePosition()); + wxRect rect(GetSize()); - -// If the child is the same size as the popup window then handle the event, -// otherwise assume that there is enough of the popup showing that it will get -// it's own Enter/Leave events. A more reliable way to detect this situation -// would be appreciated... - -void wxPopupTransientWindow::OnChildEnter(wxMouseEvent& event) -{ - if (m_child) - { - wxSize cs = m_child->GetSize(); - wxSize ps = GetClientSize(); - - if ((cs.x * cs.y) >= (ps.x * ps.y)) - OnEnter(event); + if ( rect.Contains(pos) ) + { + if ( m_child->HasCapture() ) + { + m_child->ReleaseMouse(); + } + } + else + { + if ( !m_child->HasCapture() ) + { + m_child->CaptureMouse(); + } + } } } +#endif // __WXMSW__ -void wxPopupTransientWindow::OnChildLeave(wxMouseEvent& event) -{ - if (m_child) - { - wxSize cs = m_child->GetSize(); - wxSize ps = GetClientSize(); - - if ((cs.x * cs.y) >= (ps.x * ps.y)) - OnLeave(event); - } -} #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -464,13 +444,13 @@ BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow) EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown) END_EVENT_TABLE() -wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent) +wxPopupComboWindow::wxPopupComboWindow(wxComboCtrl *parent) : wxPopupTransientWindow(parent) { m_combo = parent; } -bool wxPopupComboWindow::Create(wxComboControl *parent) +bool wxPopupComboWindow::Create(wxComboCtrl *parent) { m_combo = parent; @@ -498,12 +478,12 @@ void wxPopupComboWindow::PositionNearCombo() void wxPopupComboWindow::OnDismiss() { - m_combo->OnDismiss(); + m_combo->OnPopupDismiss(); } void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event) { - m_combo->ProcessEvent(event); + m_combo->ProcessWindowEvent(event); } #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -511,11 +491,6 @@ void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event) // ---------------------------------------------------------------------------- // wxPopupWindowHandler // ---------------------------------------------------------------------------- -wxPopupWindowHandler::~wxPopupWindowHandler() -{ - if (m_popup && (m_popup->m_handlerPopup == this)) - m_popup->m_handlerPopup = NULL; -} void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) { @@ -528,8 +503,11 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) wxPoint pos = event.GetPosition(); - // scrollbar on which the click occured + // in non-Univ ports the system manages scrollbars for us +#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR + // scrollbar on which the click occurred wxWindow *sbar = NULL; +#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR wxWindow *win = (wxWindow *)event.GetEventObject(); @@ -549,20 +527,20 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) // dismissing a tooltip shouldn't waste a click, i.e. you // should be able to dismiss it and press the button with the // same click, so repost this event to the window beneath us - wxWindow *win = wxFindWindowAtPoint(event2.GetPosition()); - if ( win ) + wxWindow *winUnder = wxFindWindowAtPoint(event2.GetPosition()); + if ( winUnder ) { // translate the event coords to the ones of the window // which is going to get the event - win->ScreenToClient(&event2.m_x, &event2.m_y); + winUnder->ScreenToClient(&event2.m_x, &event2.m_y); - event2.SetEventObject(win); - wxPostEvent(win, event2); + event2.SetEventObject(winUnder); + wxPostEvent(winUnder->GetEventHandler(), event2); } } break; -#ifdef __WXUNIVERSAL__ +#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR case wxHT_WINDOW_HORZ_SCROLLBAR: sbar = win->GetScrollbar(wxHORIZONTAL); break; @@ -570,11 +548,11 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) case wxHT_WINDOW_VERT_SCROLLBAR: sbar = win->GetScrollbar(wxVERTICAL); break; -#endif +#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR default: // forgot to update the switch after adding a new hit test code? - wxFAIL_MSG( _T("unexpected HitTest() return value") ); + wxFAIL_MSG( wxT("unexpected HitTest() return value") ); // fall through case wxHT_WINDOW_CORNER: @@ -587,6 +565,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) break; } +#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR if ( sbar ) { // translate the event coordinates to the scrollbar ones @@ -599,16 +578,12 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) (void)sbar->GetEventHandler()->ProcessEvent(event2); } +#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR } // ---------------------------------------------------------------------------- // wxPopupFocusHandler // ---------------------------------------------------------------------------- -wxPopupFocusHandler::~wxPopupFocusHandler() -{ - if (m_popup && (m_popup->m_handlerFocus == this)) - m_popup->m_handlerFocus = NULL; -} void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) { @@ -627,8 +602,18 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event) { + // we can be associated with the popup itself in which case we should avoid + // infinite recursion + static int s_inside; + wxRecursionGuard guard(s_inside); + if ( guard.IsInside() ) + { + event.Skip(); + return; + } + // let the window have it first, it might process the keys - if ( !m_popup->ProcessEvent(event) ) + if ( !m_popup->GetEventHandler()->ProcessEvent(event) ) { // by default, dismiss the popup m_popup->DismissAndNotify(); @@ -636,4 +621,3 @@ void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event) } #endif // wxUSE_POPUPWIN -