X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/537a0880d225ab023024f6f5fc8955666b7641b8..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/common/popupcmn.cpp?ds=sidebyside diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 3dbf68daf8..cec606e52e 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -46,6 +46,9 @@ #ifdef __WXGTK__ #include #endif +#ifdef __WXX11__ +#include "wx/x11/private.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow) @@ -63,7 +66,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow) class wxPopupWindowHandler : public wxEvtHandler { public: - wxPopupWindowHandler(wxPopupTransientWindow *popup) { m_popup = popup; } + wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {} + ~wxPopupWindowHandler(); protected: // event handlers @@ -79,22 +83,11 @@ private: class wxPopupFocusHandler : public wxEvtHandler { public: - wxPopupFocusHandler(wxPopupTransientWindow *popup) - { - m_popup = popup; - } + wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {} + ~wxPopupFocusHandler(); protected: - // event handlers -#ifdef __WXMSW__ - // Under MSW, we catch the kill focus event void OnKillFocus(wxFocusEvent& event); -#else - // Under GTK+, event a transient popup window - // is a toplevel window so we need to catch - // deactivate events - void OnActivate(wxActivateEvent &event); -#endif void OnKeyDown(wxKeyEvent& event); private: @@ -113,14 +106,16 @@ BEGIN_EVENT_TABLE(wxPopupWindowHandler, wxEvtHandler) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) -#ifdef __WXMSW__ EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus) -#else - EVT_ACTIVATE(wxPopupFocusHandler::OnActivate) -#endif EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown) END_EVENT_TABLE() +BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) +#ifdef __WXMSW__ + EVT_IDLE(wxPopupTransientWindow::OnIdle) +#endif +END_EVENT_TABLE() + // ============================================================================ // implementation // ============================================================================ @@ -197,8 +192,12 @@ 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; } @@ -213,12 +212,13 @@ void wxPopupTransientWindow::PopHandlers() // handler - so don't risk deleting it second time m_handlerPopup = NULL; } - - m_child->ReleaseMouse(); + if (m_child->HasCapture()) + { + m_child->ReleaseMouse(); + } m_child = NULL; } -#ifdef __WXMSW__ if ( m_focus ) { if ( !m_focus->RemoveEventHandler(m_handlerFocus) ) @@ -227,13 +227,6 @@ void wxPopupTransientWindow::PopHandlers() m_handlerFocus = NULL; } } -#else - if ( !RemoveEventHandler(m_handlerFocus) ) - { - // see above - m_handlerFocus = NULL; - } -#endif m_focus = NULL; } @@ -251,10 +244,13 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) Show(); - delete m_handlerPopup; - m_handlerPopup = new wxPopupWindowHandler(this); + // There is is a problem if these are still in use + wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler()); + wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler()); + + if (!m_handlerPopup) + m_handlerPopup = new wxPopupWindowHandler(this); - m_child->CaptureMouse(); m_child->PushEventHandler(m_handlerPopup); m_focus = winFocus ? winFocus : this; @@ -265,35 +261,97 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) // subclass the window which has the focus, and not winFocus passed in or // otherwise everything else breaks down m_focus = FindFocus(); +#elif __WXGTK__ + // GTK+ catches the activate events from the popup + // window, not the focus events from the child window + m_focus = this; +#endif + if ( m_focus ) { - delete m_handlerFocus; - m_handlerFocus = new wxPopupFocusHandler(this); + if (!m_handlerFocus) + m_handlerFocus = new wxPopupFocusHandler(this); m_focus->PushEventHandler(m_handlerFocus); } -#else - // 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__ + // 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); + if (m_focus) + m_focus->Connect(wxEVT_DESTROY, + wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy), + NULL, this); } bool wxPopupTransientWindow::Show( bool show ) { #ifdef __WXGTK__ if (!show) + { + gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME ); + gtk_grab_remove( m_widget ); + } #endif - bool ret = wxPopupWindow::Show( show ); +#ifdef __WXX11__ + if (!show) + { + XUngrabPointer( wxGlobalDisplay(), CurrentTime ); + } +#endif + +#ifdef __WXMSW__ + if (!show && m_child && m_child->HasCapture()) + { + m_child->ReleaseMouse(); + } +#endif + bool ret = wxPopupWindow::Show( show ); + #ifdef __WXGTK__ if (show) + { gtk_grab_add( m_widget ); + + gdk_pointer_grab( m_widget->window, TRUE, + (GdkEventMask) + (GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_POINTER_MOTION_MASK), + (GdkWindow *) NULL, + (GdkCursor *) NULL, + (guint32)GDK_CURRENT_TIME ); + } +#endif + +#ifdef __WXX11__ + if (show) + { + Window xwindow = (Window) m_clientWindow; + + /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow, + True, + ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, + GrabModeAsync, + GrabModeAsync, + None, + None, + CurrentTime ); + } +#endif + +#ifdef __WXMSW__ + if (show && m_child) + { + // Assume that the mouse is outside the popup to begin with + m_child->CaptureMouse(); + } #endif return ret; @@ -301,15 +359,13 @@ bool wxPopupTransientWindow::Show( bool show ) void wxPopupTransientWindow::Dismiss() { - PopHandlers(); - Hide(); + PopHandlers(); } void wxPopupTransientWindow::DismissAndNotify() { Dismiss(); - OnDismiss(); } @@ -324,6 +380,43 @@ 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; +} + +#ifdef __WXMSW__ +void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) +{ + event.Skip(); + + if (IsShown() && m_child) + { + wxPoint pos = ScreenToClient(wxGetMousePosition()); + wxRect rect(GetSize()); + + if ( rect.Inside(pos) ) + { + if ( m_child->HasCapture() ) + { + m_child->ReleaseMouse(); + } + } + else + { + if ( !m_child->HasCapture() ) + { + m_child->CaptureMouse(); + } + } + } +} +#endif + + #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) // ---------------------------------------------------------------------------- @@ -350,7 +443,7 @@ bool wxPopupComboWindow::Create(wxComboControl *parent) void wxPopupComboWindow::PositionNearCombo() { // the origin point must be in screen coords - wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0, 0)); + wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0,0)); #if 0 //def __WXUNIVERSAL__ // account for the fact that (0, 0) is not the top left corner of the @@ -381,6 +474,11 @@ 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) { @@ -393,7 +491,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) wxPoint pos = event.GetPosition(); - // scrollbar on which the click occured + // scrollbar on which the click occurred wxWindow *sbar = NULL; wxWindow *win = (wxWindow *)event.GetEventObject(); @@ -469,8 +567,12 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) // ---------------------------------------------------------------------------- // wxPopupFocusHandler // ---------------------------------------------------------------------------- +wxPopupFocusHandler::~wxPopupFocusHandler() +{ + if (m_popup && (m_popup->m_handlerFocus == this)) + m_popup->m_handlerFocus = NULL; +} -#ifdef __WXMSW__ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) { // when we lose focus we always disappear - unless it goes to the popup (in @@ -485,13 +587,6 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) m_popup->DismissAndNotify(); } -#else -void wxPopupFocusHandler::OnActivate(wxActivateEvent &event) -{ - if (event.GetActive()) - m_popup->DismissAndNotify(); -} -#endif void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event) {