X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5833988cb7a092f9976c1fb2320d4013f825400a..f2959820a5286e4b1595bb9c89de30fa69d6fc6a:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index e6d8aeba8a..1d2ab472d7 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2,7 +2,6 @@ // Name: src/gtk/window.cpp // Purpose: wxWindowGTK implementation // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -755,10 +754,10 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, KeySym keysym = gdk_event->keyval; - wxLogTrace(TRACE_KEYS, wxT("Key %s event: keysym = %ld"), + wxLogTrace(TRACE_KEYS, wxT("Key %s event: keysym = %lu"), event.GetEventType() == wxEVT_KEY_UP ? wxT("release") : wxT("press"), - keysym); + static_cast(keysym)); long key_code = wxTranslateKeySymToWXKey(keysym, false /* !isChar */); @@ -1615,30 +1614,18 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget), // "scroll_event" (mouse wheel event) //----------------------------------------------------------------------------- -static gboolean -window_scroll_event_hscrollbar(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) +// Compute lines/columns per action the same way as private GTK+ function +// _gtk_range_get_wheel_delta() +static inline int GetWheelScrollActionDelta(GtkRange* range) { - if (gdk_event->direction != GDK_SCROLL_LEFT && - gdk_event->direction != GDK_SCROLL_RIGHT) - { - return false; - } - - GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Horz]; - - if (range && gtk_widget_get_visible(GTK_WIDGET(range))) + int delta = 3; + if (range) { GtkAdjustment* adj = gtk_range_get_adjustment(range); - double delta = gtk_adjustment_get_step_increment(adj) * 3; - if (gdk_event->direction == GDK_SCROLL_LEFT) - delta = -delta; - - gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta); - - return TRUE; + const double page_size = gtk_adjustment_get_page_size(adj); + delta = wxRound(pow(page_size, 2.0 / 3.0)); } - - return FALSE; + return delta; } static gboolean @@ -1647,69 +1634,92 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) wxMouseEvent event(wxEVT_MOUSEWHEEL); InitMouseEvent(win, event, gdk_event); - // FIXME: Get these values from GTK or GDK - event.m_linesPerAction = 3; - event.m_columnsPerAction = 3; event.m_wheelDelta = 120; - // Determine the scroll direction. - switch (gdk_event->direction) - { - case GDK_SCROLL_UP: - case GDK_SCROLL_RIGHT: - event.m_wheelRotation = 120; - break; - - case GDK_SCROLL_DOWN: - case GDK_SCROLL_LEFT: - event.m_wheelRotation = -120; - break; #if GTK_CHECK_VERSION(3,4,0) - case GDK_SCROLL_SMOOTH: - // TODO -#endif - default: - return false; // Unknown/unhandled direction + if (gdk_event->direction == GDK_SCROLL_SMOOTH) + { + bool processed_x = false; + if (gdk_event->delta_x) + { + event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL; + event.m_wheelRotation = int(event.m_wheelDelta * gdk_event->delta_x); + GtkRange* range = win->m_scrollBar[wxWindow::ScrollDir_Horz]; + event.m_linesPerAction = GetWheelScrollActionDelta(range); + event.m_columnsPerAction = event.m_linesPerAction; + processed_x = win->GTKProcessEvent(event); + } + bool processed_y = false; + if (gdk_event->delta_y) + { + event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL; + event.m_wheelRotation = int(event.m_wheelDelta * gdk_event->delta_y); + GtkRange* range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; + event.m_linesPerAction = GetWheelScrollActionDelta(range); + event.m_columnsPerAction = event.m_linesPerAction; + processed_y = win->GTKProcessEvent(event); + } + return processed_x || processed_y; } - - // And the scroll axis. +#endif // GTK_CHECK_VERSION(3,4,0) + GtkRange *range; switch (gdk_event->direction) { case GDK_SCROLL_UP: case GDK_SCROLL_DOWN: + range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL; break; - case GDK_SCROLL_LEFT: case GDK_SCROLL_RIGHT: + range = win->m_scrollBar[wxWindow::ScrollDir_Horz]; event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL; break; -#if GTK_CHECK_VERSION(3,4,0) - case GDK_SCROLL_SMOOTH: - // TODO - break; -#endif + default: + return false; } - if (win->GTKProcessEvent(event)) - return TRUE; - - GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; - - if (range && gtk_widget_get_visible(GTK_WIDGET(range))) + event.m_wheelRotation = event.m_wheelDelta; + if (gdk_event->direction == GDK_SCROLL_UP || + gdk_event->direction == GDK_SCROLL_LEFT) { - GtkAdjustment* adj = gtk_range_get_adjustment(range); - double delta = gtk_adjustment_get_step_increment(adj) * 3; - if (gdk_event->direction == GDK_SCROLL_UP) - delta = -delta; + event.m_wheelRotation = -event.m_wheelRotation; + } + event.m_linesPerAction = GetWheelScrollActionDelta(range); + event.m_columnsPerAction = event.m_linesPerAction; - gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta); + return win->GTKProcessEvent(event); +} - return TRUE; +#if GTK_CHECK_VERSION(3,4,0) +static gboolean +hscrollbar_scroll_event(GtkWidget* widget, GdkEventScroll* gdk_event, wxWindow* win) +{ + GdkEventScroll event2; + if (gdk_event->direction == GDK_SCROLL_SMOOTH && gdk_event->delta_x == 0) + { + memcpy(&event2, gdk_event, sizeof(event2)); + event2.delta_x = event2.delta_y; + event2.delta_y = 0; + gdk_event = &event2; } + return window_scroll_event(widget, gdk_event, win); +} - return FALSE; +static gboolean +vscrollbar_scroll_event(GtkWidget* widget, GdkEventScroll* gdk_event, wxWindow* win) +{ + GdkEventScroll event2; + if (gdk_event->direction == GDK_SCROLL_SMOOTH && gdk_event->delta_y == 0) + { + memcpy(&event2, gdk_event, sizeof(event2)); + event2.delta_y = event2.delta_x; + event2.delta_x = 0; + gdk_event = &event2; + } + return window_scroll_event(widget, gdk_event, win); } +#endif // GTK_CHECK_VERSION(3,4,0) //----------------------------------------------------------------------------- // "popup-menu" @@ -1928,9 +1938,11 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxWindow* win) GtkAllocation a; gtk_widget_get_allocation(win->m_widget, &a); // update position for widgets in native containers, such as wxToolBar - // (for widgets in a wxPizza, the values should already be the same) - win->m_x = a.x; - win->m_y = a.y; + if (!WX_IS_PIZZA(gtk_widget_get_parent(win->m_widget))) + { + win->m_x = a.x; + win->m_y = a.y; + } win->m_useCachedClientSize = true; if (win->m_clientWidth != w || win->m_clientHeight != h) { @@ -2088,12 +2100,14 @@ void wxWindowGTK::GTKHandleUnrealize() wxWindow *wxWindowBase::DoFindFocus() { +#if wxUSE_MENUS // For compatibility with wxMSW, pretend that showing a popup menu doesn't // change the focus and that it remains on the window showing it, even // though the real focus does change in GTK. extern wxMenu *wxCurrentPopupMenu; if ( wxCurrentPopupMenu ) return wxCurrentPopupMenu->GetInvokingWindow(); +#endif // wxUSE_MENUS wxWindowGTK *focus = gs_pendingFocus ? gs_pendingFocus : gs_currentFocus; // the cast is necessary when we compile in wxUniversal mode @@ -2422,9 +2436,6 @@ wxWindowGTK::~wxWindowGTK() // destroy children before destroying this window itself DestroyChildren(); - if (m_widget) - Show( false ); - // delete before the widgets to avoid a crash on solaris if ( m_imContext ) { @@ -2638,12 +2649,21 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget ) g_signal_connect (widget, "scroll_event", G_CALLBACK (window_scroll_event), this); - if (m_scrollBar[ScrollDir_Horz]) - g_signal_connect (m_scrollBar[ScrollDir_Horz], "scroll_event", - G_CALLBACK (window_scroll_event_hscrollbar), this); - if (m_scrollBar[ScrollDir_Vert]) - g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event", - G_CALLBACK (window_scroll_event), this); + for (int i = 0; i < 2; i++) + { + GtkRange* range = m_scrollBar[i]; + if (range) + { +#if GTK_CHECK_VERSION(3,4,0) + GCallback cb = GCallback(i == ScrollDir_Horz + ? hscrollbar_scroll_event + : vscrollbar_scroll_event); +#else + GCallback cb = GCallback(window_scroll_event); +#endif + g_signal_connect(range, "scroll_event", cb, this); + } + } g_signal_connect (widget, "popup_menu", G_CALLBACK (wxgtk_window_popup_menu_callback), this); @@ -3374,6 +3394,8 @@ void wxWindowGTK::SetFocus() void wxWindowGTK::SetCanFocus(bool canFocus) { + wxCHECK_RET(m_widget, "invalid window"); + gtk_widget_set_can_focus(m_widget, canFocus); if ( m_wxwindow && (m_widget != m_wxwindow) ) @@ -4365,6 +4387,13 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) gtk_get_current_event_time() ); + // it is possible for gtk_menu_popup() to fail + if (!gtk_widget_get_visible(GTK_WIDGET(menu->m_menu))) + { + menu->m_popupShown = false; + return false; + } + while (menu->m_popupShown) { gtk_main_iteration(); @@ -4594,7 +4623,9 @@ int wxWindowGTK::GetScrollRange( int orient ) const // difference due to possible inexactness in floating point arithmetic static inline bool IsScrollIncrement(double increment, double x) { - wxASSERT(increment > 0); + wxASSERT(increment >= 0); + if ( increment == 0. ) + return false; const double tolerance = 1.0 / 1024; return fabs(increment - fabs(x)) < tolerance; }