configure.ac | 2 vcl/inc/unx/gtk/gtkframe.hxx | 16 ----- vcl/unx/gtk3/a11y/atkcomponent.cxx | 7 -- vcl/unx/gtk3/a11y/atktext.cxx | 6 -- vcl/unx/gtk3/a11y/atkwrapper.cxx | 13 +--- vcl/unx/gtk3/gtkinst.cxx | 101 ++++++++++--------------------------- vcl/unx/gtk3/gtksalmenu.cxx | 89 ++++++-------------------------- 7 files changed, 54 insertions(+), 180 deletions(-)
New commits: commit c392f7b8a614c7ef32cfa9888aeb06b27b535390 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 5 17:44:57 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Nov 5 23:30:47 2025 +0100 gtk3: Require GTK >= 3.24 AlmaLinux 9 has GTK 3 3.24.31 [1]. Therefore, require GTK 3.24 as new minimum version after commit 09208d0e6ec9e01def256fbc3fac3520f1b48535 Date: Mon Jul 28 15:06:09 2025 +0200 prep Linux baseline bump to Almalinux 9 and drop now obsolete code for older GTK versions. The new minimum version might also help to further unify the gtk3 and gtk4 code paths in some places in the future, s.a. [2]. (`git show --ignore-space-change` can be helpful to more easily see the "actual changes".) [1] https://pkgs.org/download/gtk3 [2] https://docs.gtk.org/gtk4/migrating-3to4.html#preparation-in-gtk-3x Change-Id: Ib2b0d83b1a40b121660ffe04baf3eeb0bebe0da1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193477 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/configure.ac b/configure.ac index 15920c6b26ad..2e7a46ee29df 100644 --- a/configure.ac +++ b/configure.ac @@ -12537,7 +12537,7 @@ if test "$test_gtk3" = yes -a "x$enable_gtk3" = "xyes" -o "x$enable_gtk3_kde5" = add_warning 'Non-system cairo combined with gtk3 is known to cause trouble (eg. broken image in the splashscreen). Use --with-system-cairo unless you know what you are doing.' fi : ${with_system_cairo:=yes} - PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.20 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.36 cairo) + PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.24 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.36 cairo) GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" FilterLibs "${GTK3_LIBS}" diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 6533af1ae583..5acb24f85a8a 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -675,20 +675,4 @@ AtkObject* ooo_fixed_get_accessible(GtkWidget *obj); } // extern "C" -#if !GTK_CHECK_VERSION(3, 22, 0) -enum GdkAnchorHints -{ - GDK_ANCHOR_FLIP_X = 1 << 0, - GDK_ANCHOR_FLIP_Y = 1 << 1, - GDK_ANCHOR_SLIDE_X = 1 << 2, - GDK_ANCHOR_SLIDE_Y = 1 << 3, - GDK_ANCHOR_RESIZE_X = 1 << 4, - GDK_ANCHOR_RESIZE_Y = 1 << 5, - GDK_ANCHOR_FLIP = GDK_ANCHOR_FLIP_X | GDK_ANCHOR_FLIP_Y, - GDK_ANCHOR_SLIDE = GDK_ANCHOR_SLIDE_X | GDK_ANCHOR_SLIDE_Y, - GDK_ANCHOR_RESIZE = GDK_ANCHOR_RESIZE_X | GDK_ANCHOR_RESIZE_Y -}; -#endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index feaf7ba52542..c30b7879fca4 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -11295,78 +11295,45 @@ public: #else gulong nSignalId = g_signal_connect_swapped(G_OBJECT(m_pMenu), "deactivate", G_CALLBACK(g_main_loop_quit), pLoop); -#if GTK_CHECK_VERSION(3,22,0) - if (gtk_check_version(3, 22, 0) == nullptr) - { - GdkRectangle aRect; - pWidget = getPopupRect(pWidget, rRect, aRect); - gtk_menu_attach_to_widget(m_pMenu, pWidget, nullptr); - - // Send a keyboard event through gtk_main_do_event to toggle any active tooltip offs - // before trying to launch the menu - // https://gitlab.gnome.org/GNOME/gtk/issues/1785 - // Fixed in GTK 3.24 - GdkEvent *pKeyEvent = GtkSalFrame::makeFakeKeyPress(pWidget); - gtk_main_do_event(pKeyEvent); - - GdkEvent *pTriggerEvent = gtk_get_current_event(); - bool bEventOwnership = true; - if (!pTriggerEvent) - { - pTriggerEvent = pKeyEvent; - bEventOwnership = false; - } + GdkRectangle aRect; + pWidget = getPopupRect(pWidget, rRect, aRect); + gtk_menu_attach_to_widget(m_pMenu, pWidget, nullptr); - bool bSwapForRTL = SwapForRTL(pWidget); + // Send a keyboard event through gtk_main_do_event to toggle any active tooltip offs + // before trying to launch the menu + // https://gitlab.gnome.org/GNOME/gtk/issues/1785 + // Fixed in GTK 3.24 + GdkEvent *pKeyEvent = GtkSalFrame::makeFakeKeyPress(pWidget); + gtk_main_do_event(pKeyEvent); - if (ePlace == weld::Placement::Under) - { - if (bSwapForRTL) - gtk_menu_popup_at_rect(m_pMenu, widget_get_surface(pWidget), &aRect, GDK_GRAVITY_SOUTH_EAST, GDK_GRAVITY_NORTH_EAST, pTriggerEvent); - else - gtk_menu_popup_at_rect(m_pMenu, widget_get_surface(pWidget), &aRect, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, pTriggerEvent); - } - else - { - if (bSwapForRTL) - gtk_menu_popup_at_rect(m_pMenu, widget_get_surface(pWidget), &aRect, GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_NORTH_EAST, pTriggerEvent); - else - gtk_menu_popup_at_rect(m_pMenu, widget_get_surface(pWidget), &aRect, GDK_GRAVITY_NORTH_EAST, GDK_GRAVITY_NORTH_WEST, pTriggerEvent); - } - if (bEventOwnership) - gdk_event_free(pTriggerEvent); + GdkEvent *pTriggerEvent = gtk_get_current_event(); + bool bEventOwnership = true; + if (!pTriggerEvent) + { + pTriggerEvent = pKeyEvent; + bEventOwnership = false; + } + + bool bSwapForRTL = SwapForRTL(pWidget); - gdk_event_free(pKeyEvent); + if (ePlace == weld::Placement::Under) + { + if (bSwapForRTL) + gtk_menu_popup_at_rect(m_pMenu, widget_get_surface(pWidget), &aRect, GDK_GRAVITY_SOUTH_EAST, GDK_GRAVITY_NORTH_EAST, pTriggerEvent); + else + gtk_menu_popup_at_rect(m_pMenu, widget_get_surface(pWidget), &aRect, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, pTriggerEvent); } else -#else - (void) rRect; -#endif { - gtk_menu_attach_to_widget(m_pMenu, pWidget, nullptr); - - guint nButton; - guint32 nTime; - - //typically there is an event, and we can then distinguish if this was - //launched from the keyboard (gets auto-mnemoniced) or the mouse (which - //doesn't) - GdkEvent *pEvent = gtk_get_current_event(); - if (pEvent) - { - if (!gdk_event_get_button(pEvent, &nButton)) - nButton = 0; - nTime = gdk_event_get_time(pEvent); - gdk_event_free(pEvent); - } + if (bSwapForRTL) + gtk_menu_popup_at_rect(m_pMenu, widget_get_surface(pWidget), &aRect, GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_NORTH_EAST, pTriggerEvent); else - { - nButton = 0; - nTime = GtkSalFrame::GetLastInputEventTime(); - } - - gtk_menu_popup(m_pMenu, nullptr, nullptr, nullptr, nullptr, nButton, nTime); + gtk_menu_popup_at_rect(m_pMenu, widget_get_surface(pWidget), &aRect, GDK_GRAVITY_NORTH_EAST, GDK_GRAVITY_NORTH_WEST, pTriggerEvent); } + if (bEventOwnership) + gdk_event_free(pTriggerEvent); + + gdk_event_free(pKeyEvent); #endif if (g_main_loop_is_running(pLoop)) diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx index 0e7795fc9e15..56774b6ad9f4 100644 --- a/vcl/unx/gtk3/gtksalmenu.cxx +++ b/vcl/unx/gtk3/gtksalmenu.cxx @@ -398,22 +398,6 @@ void GtkSalMenu::Update() ImplUpdate(false, !bAlwaysShowDisabledEntries); } -#if !GTK_CHECK_VERSION(4, 0, 0) -static void MenuPositionFunc(GtkMenu* menu, gint* x, gint* y, gboolean* push_in, gpointer user_data) -{ - Point *pPos = static_cast<Point*>(user_data); - *x = pPos->X(); - if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) - { - GtkRequisition natural_size; - gtk_widget_get_preferred_size(GTK_WIDGET(menu), nullptr, &natural_size); - *x -= natural_size.width; - } - *y = pPos->Y(); - *push_in = false; -} -#endif - static void MenuClosed(GtkPopover* pWidget, GMainLoop* pLoop) { // gtk4 4.4.0: click on an entry in a submenu of a menu crashes without this workaround @@ -483,65 +467,30 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, const tools::Rectangl gtk_popover_popup(GTK_POPOVER(mpMenuWidget)); #else -#if GTK_CHECK_VERSION(3,22,0) - if (gtk_check_version(3, 22, 0) == nullptr) - { - AbsoluteScreenPixelRectangle aFloatRect = FloatingWindow::ImplConvertToAbsPos(xParent, rRect); - aFloatRect.Move(-mpFrame->GetUnmirroredGeometry().x(), -mpFrame->GetUnmirroredGeometry().y()); - GdkRectangle rect {static_cast<int>(aFloatRect.Left()), static_cast<int>(aFloatRect.Top()), - static_cast<int>(aFloatRect.GetWidth()), static_cast<int>(aFloatRect.GetHeight())}; + AbsoluteScreenPixelRectangle aFloatRect = FloatingWindow::ImplConvertToAbsPos(xParent, rRect); + aFloatRect.Move(-mpFrame->GetUnmirroredGeometry().x(), -mpFrame->GetUnmirroredGeometry().y()); + GdkRectangle rect {static_cast<int>(aFloatRect.Left()), static_cast<int>(aFloatRect.Top()), + static_cast<int>(aFloatRect.GetWidth()), static_cast<int>(aFloatRect.GetHeight())}; - GdkGravity rect_anchor = GDK_GRAVITY_SOUTH_WEST, menu_anchor = GDK_GRAVITY_NORTH_WEST; + GdkGravity rect_anchor = GDK_GRAVITY_SOUTH_WEST, menu_anchor = GDK_GRAVITY_NORTH_WEST; - if (nFlags & FloatWinPopupFlags::Left) - { - rect_anchor = GDK_GRAVITY_NORTH_WEST; - menu_anchor = GDK_GRAVITY_NORTH_EAST; - } - else if (nFlags & FloatWinPopupFlags::Up) - { - rect_anchor = GDK_GRAVITY_NORTH_WEST; - menu_anchor = GDK_GRAVITY_SOUTH_WEST; - } - else if (nFlags & FloatWinPopupFlags::Right) - { - rect_anchor = GDK_GRAVITY_NORTH_EAST; - } - - GdkSurface* gdkWindow = widget_get_surface(mpFrame->getMouseEventWidget()); - gtk_menu_popup_at_rect(GTK_MENU(mpMenuWidget), gdkWindow, &rect, rect_anchor, menu_anchor, nullptr); + if (nFlags & FloatWinPopupFlags::Left) + { + rect_anchor = GDK_GRAVITY_NORTH_WEST; + menu_anchor = GDK_GRAVITY_NORTH_EAST; } - else -#endif + else if (nFlags & FloatWinPopupFlags::Up) { - guint nButton; - guint32 nTime; - - //typically there is an event, and we can then distinguish if this was - //launched from the keyboard (gets auto-mnemoniced) or the mouse (which - //doesn't) - GdkEvent *pEvent = gtk_get_current_event(); - if (pEvent) - { - gdk_event_get_button(pEvent, &nButton); - nTime = gdk_event_get_time(pEvent); - } - else - { - nButton = 0; - nTime = GtkSalFrame::GetLastInputEventTime(); - } - - // Do the same strange semantics as vcl popup windows to arrive at a frame geometry - // in mirrored UI case; best done by actually executing the same code. - // (see code in FloatingWindow::StartPopupMode) - sal_uInt16 nArrangeIndex; - Point aPos = FloatingWindow::ImplCalcPos(pWin, rRect, nFlags, nArrangeIndex); - AbsoluteScreenPixelPoint aPosAbs = FloatingWindow::ImplConvertToAbsPos(xParent, aPos); - - gtk_menu_popup(GTK_MENU(mpMenuWidget), nullptr, nullptr, MenuPositionFunc, - &aPosAbs, nButton, nTime); + rect_anchor = GDK_GRAVITY_NORTH_WEST; + menu_anchor = GDK_GRAVITY_SOUTH_WEST; } + else if (nFlags & FloatWinPopupFlags::Right) + { + rect_anchor = GDK_GRAVITY_NORTH_EAST; + } + + GdkSurface* gdkWindow = widget_get_surface(mpFrame->getMouseEventWidget()); + gtk_menu_popup_at_rect(GTK_MENU(mpMenuWidget), gdkWindow, &rect, rect_anchor, menu_anchor, nullptr); #endif if (g_main_loop_is_running(pLoop)) commit 5392680f0ef8747acf20538d55de12651c0ae506 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 5 17:31:21 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Nov 5 23:30:40 2025 +0100 gtk3 a11y: Use atk_object_set_accessible_id directly This function is available since ATK 2.34 [1], so can be used unconditionally, now that Change-Id: If538f3db902b50be61d631986ec4c583972dc997 Author: Michael Weghorn <[email protected]> Date: Wed Nov 5 17:27:42 2025 +0100 gtk3 a11y: Require ATK >= 2.36 increased the minimum supported version to 2.36 which is in line with the AlmaLinux 9 baseline. [1] https://gnome.pages.gitlab.gnome.org/at-spi2-core/atk/method.Object.set_accessible_id.html Change-Id: If23b9bc920295b48df0fb8c85dea7768bd11f0d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193471 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx index c3845861d19e..9047f6f00a6a 100644 --- a/vcl/unx/gtk3/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx @@ -1005,15 +1005,12 @@ atk_object_wrapper_new( const css::uno::Reference< css::accessibility::XAccessib OSL_ASSERT( false ); } - static auto func = reinterpret_cast<void(*)(AtkObject*, const gchar*)>(dlsym(nullptr, "atk_object_set_accessible_id")); - if (func) + css::uno::Reference<css::accessibility::XAccessibleContext2> xContext2(xContext, + css::uno::UNO_QUERY); + if (xContext2.is()) { - css::uno::Reference<css::accessibility::XAccessibleContext2> xContext2(xContext, css::uno::UNO_QUERY); - if( xContext2.is() ) - { - OString aId = OUStringToOString( xContext2->getAccessibleId(), RTL_TEXTENCODING_UTF8); - (*func)(atk_obj, aId.getStr()); - } + OString aId = OUStringToOString(xContext2->getAccessibleId(), RTL_TEXTENCODING_UTF8); + atk_object_set_accessible_id(atk_obj, aId.getStr()); } // tdf#141197 if we have a sysobj child then include that in the hierarchy commit 22b9104f0808311bbc7ef3e4ba6f02ca66b3f27f Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 5 17:27:42 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Nov 5 23:30:32 2025 +0100 gtk3 a11y: Require ATK >= 2.36 AlmaLinux 9 has ATK 2.36.0 [1]. Therefore, require that as new minimum version after commit 09208d0e6ec9e01def256fbc3fac3520f1b48535 Date: Mon Jul 28 15:06:09 2025 +0200 prep Linux baseline bump to Almalinux 9 and drop now obsolete code for older ATK versions. [1] https://pkgs.org/download/atk(x86-64) Change-Id: If538f3db902b50be61d631986ec4c583972dc997 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193470 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/configure.ac b/configure.ac index 5cb15dc92acb..15920c6b26ad 100644 --- a/configure.ac +++ b/configure.ac @@ -12537,7 +12537,7 @@ if test "$test_gtk3" = yes -a "x$enable_gtk3" = "xyes" -o "x$enable_gtk3_kde5" = add_warning 'Non-system cairo combined with gtk3 is known to cause trouble (eg. broken image in the splashscreen). Use --with-system-cairo unless you know what you are doing.' fi : ${with_system_cairo:=yes} - PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.20 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo) + PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.20 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.36 cairo) GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" FilterLibs "${GTK3_LIBS}" diff --git a/vcl/unx/gtk3/a11y/atkcomponent.cxx b/vcl/unx/gtk3/a11y/atkcomponent.cxx index 1211cecdf5e3..c13d41f066f3 100644 --- a/vcl/unx/gtk3/a11y/atkcomponent.cxx +++ b/vcl/unx/gtk3/a11y/atkcomponent.cxx @@ -213,14 +213,8 @@ component_wrapper_get_position (AtkComponent *component, aPos = pComponent->getLocationOnScreen(); else if (coord_type == ATK_XY_WINDOW) aPos = lcl_getLocationInWindow(component, pComponent); -#if ATK_CHECK_VERSION(2, 30, 0) else if (coord_type == ATK_XY_PARENT) -#else - // ATK_XY_PARENT added in ATK 2.30, so can't use the constant here - else -#endif aPos = pComponent->getLocation(); -#if ATK_CHECK_VERSION(2, 30, 0) else { SAL_WARN("vcl.gtk", @@ -228,7 +222,6 @@ component_wrapper_get_position (AtkComponent *component, << coord_type); return; } -#endif *x = aPos.X; *y = aPos.Y; diff --git a/vcl/unx/gtk3/a11y/atktext.cxx b/vcl/unx/gtk3/a11y/atktext.cxx index 54973d739e0c..33226a85e992 100644 --- a/vcl/unx/gtk3/a11y/atktext.cxx +++ b/vcl/unx/gtk3/a11y/atktext.cxx @@ -59,7 +59,6 @@ text_type_from_boundary(AtkTextBoundary boundary_type) /*****************************************************************************/ -#if ATK_CHECK_VERSION(2,32,0) static accessibility::AccessibleScrollType scroll_type_from_scroll_type(AtkScrollType type) { @@ -83,7 +82,6 @@ scroll_type_from_scroll_type(AtkScrollType type) throw lang::NoSupportException(); } } -#endif /*****************************************************************************/ @@ -828,7 +826,6 @@ text_wrapper_set_selection (AtkText *text, return FALSE; } -#if ATK_CHECK_VERSION(2,32,0) static gboolean text_wrapper_scroll_substring_to(AtkText *text, gint start_offset, @@ -849,7 +846,6 @@ text_wrapper_scroll_substring_to(AtkText *text, return FALSE; } -#endif } // extern "C" @@ -876,9 +872,7 @@ textIfaceInit (gpointer iface_, gpointer) iface->get_default_attributes = text_wrapper_get_default_attributes; iface->get_character_extents = text_wrapper_get_character_extents; iface->get_offset_at_point = text_wrapper_get_offset_at_point; -#if ATK_CHECK_VERSION(2,32,0) iface->scroll_substring_to = text_wrapper_scroll_substring_to; -#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index d9ad63b465e0..feaf7ba52542 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -3688,13 +3688,9 @@ public: virtual OUString get_accessible_id() const override { #if !GTK_CHECK_VERSION(4, 0, 0) -#if ATK_CHECK_VERSION(2, 34, 0) AtkObject* pAtkObject = gtk_widget_get_accessible(m_pWidget); const char* pStr = pAtkObject ? atk_object_get_accessible_id(pAtkObject) : nullptr; return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8); -#else - return OUString(); -#endif #else return OUString(); #endif @@ -18575,7 +18571,6 @@ public: g_object_ref(m_pAccessible); } -#if ATK_CHECK_VERSION(2, 34, 0) // if set, take over accessible ID from the XAccessible to the GtkWidget // (While e.g. accessible name and description can be handled on demand by overriding // AtkObjectClass::get_name and AtkObjectClass::get_description, s. atk_object_wrapper_class_init), @@ -18591,7 +18586,6 @@ public: m_pAccessible, OUStringToOString(sId, RTL_TEXTENCODING_UTF8).getStr()); } } -#endif return m_pAccessible; } #endif @@ -18754,13 +18748,9 @@ public: virtual OUString get_accessible_id() const override { #if !GTK_CHECK_VERSION(4, 0, 0) -#if ATK_CHECK_VERSION(2, 34, 0) AtkObject* pAtkObject = default_drawing_area_get_accessible(m_pWidget); const char* pStr = pAtkObject ? atk_object_get_accessible_id(pAtkObject) : nullptr; return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8); -#else - return OUString(); -#endif #else return OUString(); #endif
