X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60178eb439b4624d6663a997b6a29d0e93b20f70..92850d6b2ff6072f4801152fd6bfdb7263715ec0:/src/common/popupcmn.cpp diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 2fabd49c70..79b3bbf23b 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -6,7 +6,7 @@ // Created: 06.01.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "popupwinbase.h" #endif @@ -28,24 +28,29 @@ #pragma hdrstop #endif -#if wxUSE_POPUPWIN && !defined(__WXMOTIF__) +#if wxUSE_POPUPWIN #include "wx/popupwin.h" #ifndef WX_PRECOMP #include "wx/combobox.h" // wxComboControl + #include "wx/app.h" // wxPostEvent + #include "wx/log.h" + #include "wx/app.h" #endif //WX_PRECOMP #ifdef __WXUNIVERSAL__ #include "wx/univ/renderer.h" #endif // __WXUNIVERSAL__ -// there is no src/{msw,mgl}/popupwin.cpp to put this in, so we do it here - BTW we -// probably could do it for all ports here just as well -#if defined(__WXMSW__) || defined(__WXMGL__) - IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) -#endif // __WXMSW__ +#ifdef __WXGTK__ + #include +#endif +#ifdef __WXX11__ +#include "wx/x11/private.h" +#endif +IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow) #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -71,22 +76,26 @@ private: wxPopupTransientWindow *m_popup; DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxPopupWindowHandler) }; class wxPopupFocusHandler : public wxEvtHandler { public: - wxPopupFocusHandler(wxPopupTransientWindow *popup) { m_popup = popup; } + wxPopupFocusHandler(wxPopupTransientWindow *popup) + { + m_popup = popup; + } protected: - // event handlers void OnKillFocus(wxFocusEvent& event); - void OnKeyUp(wxKeyEvent& event); + void OnKeyDown(wxKeyEvent& event); private: wxPopupTransientWindow *m_popup; DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxPopupFocusHandler) }; // ---------------------------------------------------------------------------- @@ -99,7 +108,7 @@ END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus) - EVT_KEY_UP(wxPopupFocusHandler::OnKeyUp) + EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown) END_EVENT_TABLE() // ============================================================================ @@ -117,7 +126,7 @@ wxPopupWindowBase::~wxPopupWindowBase() bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags)) { - return TRUE; + return true; } void wxPopupWindowBase::Position(const wxPoint& ptOrigin, @@ -164,6 +173,9 @@ void wxPopupTransientWindow::Init() { m_child = m_focus = (wxWindow *)NULL; + + m_handlerFocus = NULL; + m_handlerPopup = NULL; } wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style) @@ -182,16 +194,41 @@ void wxPopupTransientWindow::PopHandlers() { if ( m_child ) { - m_child->PopEventHandler(TRUE /* delete it */); - m_child->ReleaseMouse(); + if ( m_handlerPopup && !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; + } + + // m_child->ReleaseMouse(); m_child = NULL; } +#ifdef __WXMSW__ if ( m_focus ) { - m_focus->PopEventHandler(TRUE /* delete it */); - m_focus = NULL; + if ( m_handlerFocus && !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; } void wxPopupTransientWindow::Popup(wxWindow *winFocus) @@ -206,36 +243,92 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) m_child = this; } - // we can't capture mouse before the window is shown in wxGTK -#ifdef __WXGTK__ Show(); -#endif - m_child->CaptureMouse(); - m_child->PushEventHandler(new wxPopupWindowHandler(this)); + delete m_handlerPopup; + m_handlerPopup = new wxPopupWindowHandler(this); -#ifndef __WXGTK__ - Show(); -#endif + // m_child->CaptureMouse(); + m_child->PushEventHandler(m_handlerPopup); m_focus = winFocus ? winFocus : this; m_focus->SetFocus(); - // FIXME: I don't know why does this happen but sometimes SetFocus() simply - // refuses to work under MSW - no error happens but the focus is not - // given to the window, i.e. the assert below is triggered - // - // Try work around this as we can... -#if 0 - wxASSERT_MSG( FindFocus() == m_focus, _T("setting focus failed") ); -#else +#ifdef __WXMSW__ + // 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 + // 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__ + +} + +bool wxPopupTransientWindow::Show( bool show ) +{ +#ifdef __WXGTK__ + if (!show) + { + gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME ); + + gtk_grab_remove( m_widget ); + } #endif - if ( m_focus ) +#ifdef __WXX11__ + if (!show) { - m_focus->PushEventHandler(new wxPopupFocusHandler(this)); + XUngrabPointer( wxGlobalDisplay(), CurrentTime ); } +#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 + return ret; } void wxPopupTransientWindow::Dismiss() @@ -260,7 +353,7 @@ void wxPopupTransientWindow::OnDismiss() bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) { // no special processing here - return FALSE; + return false; } #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -269,6 +362,10 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) // wxPopupComboWindow // ---------------------------------------------------------------------------- +BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow) + EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown) +END_EVENT_TABLE() + wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent) : wxPopupTransientWindow(parent) { @@ -306,6 +403,11 @@ void wxPopupComboWindow::OnDismiss() m_combo->OnDismiss(); } +void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event) +{ + m_combo->ProcessEvent(event); +} + #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) // ---------------------------------------------------------------------------- @@ -327,11 +429,34 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) wxWindow *sbar = NULL; wxWindow *win = (wxWindow *)event.GetEventObject(); + switch ( win->HitTest(pos.x, pos.y) ) { case wxHT_WINDOW_OUTSIDE: - // clicking outside a popup dismisses it - m_popup->DismissAndNotify(); + { + // do the coords translation now as after DismissAndNotify() + // m_popup may be destroyed + wxMouseEvent event2(event); + + m_popup->ClientToScreen(&event2.m_x, &event2.m_y); + + // clicking outside a popup dismisses it + m_popup->DismissAndNotify(); + + // 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 ) + { + // 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); + + event2.SetEventObject(win); + wxPostEvent(win, event2); + } + } break; #ifdef __WXUNIVERSAL__ @@ -381,11 +506,18 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) { // when we lose focus we always disappear - unless it goes to the popup (in // which case we don't really lose it) - if ( event.GetWindow() != m_popup ) - m_popup->DismissAndNotify(); + wxWindow *win = event.GetWindow(); + while ( win ) + { + if ( win == m_popup ) + return; + win = win->GetParent(); + } + + m_popup->DismissAndNotify(); } -void wxPopupFocusHandler::OnKeyUp(wxKeyEvent& event) +void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event) { // let the window have it first, it might process the keys if ( !m_popup->ProcessEvent(event) )