commit c25dfd17e1bea6a9bbd96e76f6ecd5754bb1cf9d Author: overweight <5324761+overweight@user.noreply.gitee.com> Date: Mon Sep 30 10:52:18 2019 -0400 Package init diff --git a/gtk+-2.24.32.tar.xz b/gtk+-2.24.32.tar.xz new file mode 100644 index 0000000..f6eb7f4 Binary files /dev/null and b/gtk+-2.24.32.tar.xz differ diff --git a/gtk2.spec b/gtk2.spec new file mode 100644 index 0000000..39102ed --- /dev/null +++ b/gtk2.spec @@ -0,0 +1,228 @@ +#Global macro or variable +%global __provides_exclude_from ^%{_libdir}/gtk-2.0 +%define bin_version 2.10.0 + +#Basic Information， +Name: gtk2 +Version: 2.24.32 +Release: 3 +Summary: GTK+ graphical user interface library +License: LGPLv2+ +URL: http://www.gtk.org +Source: http://download.gnome.org/sources/gtk+/2.24/gtk+-%{version}.tar.xz +Source2: im-cedilla.conf + +Patch1: system-python.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=583273 +Patch2: icon-padding.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=599618 +Patch8: tooltip-positioning.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=611313 +Patch15: window-dragging.patch + +#Dependency +BuildRequires: pkgconfig(glib-2.0) >= 2.28.0 pkgconfig(atk) >= 2.28.0 +BuildRequires: pkgconfig(pango) >= 1.20 pkgconfig(gdk-pixbuf-2.0) >= 2.21.0 +BuildRequires: pkgconfig(cairo) >= 1.6 pkgconfig(gobject-introspection-1.0) >= 0.9.3 +BuildRequires: pkgconfig(xi) pkgconfig(xrandr) pkgconfig(xrender) pkgconfig(xcursor) +BuildRequires: pkgconfig(xinerama) pkgconfig(xcomposite) pkgconfig(xdamage) +BuildRequires: gettext cups-devel +BuildRequires: gtk-doc automake autoconf libtool pkgconfig +Requires: hicolor-icon-theme gtk-update-icon-cache +Requires: gdk-pixbuf2-modules glib2 >= 2.28.0 atk >= 1.29.2 pango >= 1.20 +Requires: libXrandr >= 1.2.99.4-2 +Requires(post): libtiff >= 3.6.1 + +# Conflicts with packages containing theme engines +# built against the 2.4.0 ABI +Conflicts: gtk2-engines < 2.7.4-7 +Conflicts: libgnomeui < 2.15.1cvs20060505-2 +Conflicts: redhat-artwork < 0.243-1 + +Provides: gail = %{version}-%{release} +Obsoletes: gail < 2.13.0-1 + +%description +GTK+ is a library for creating graphical user interfaces. The library +is created in C programming language. The GTK+ is also called the GIMP +Toolkit. Originally, the library was created while developing the GIMP +image manipulation program. + +%package immodules +Summary: Input methods for GTK+ +Requires: gtk2 = %{version}-%{release} +# for /etc/X11/xinit/xinput.d +Requires: imsettings + +%description immodules +The gtk2-immodules package contains standalone input methods that are shipped +as part of GTK+. + +%package immodule-xim +Summary: XIM support for GTK+ +Requires: gtk2 = %{version}-%{release} + +%description immodule-xim +The gtk2-immodule-xim package contains XIM support for GTK+. + + +%package devel +Summary: Development files for GTK+ +Requires: gtk2 = %{version}-%{release} +Requires: pango-devel >= 1.20 gdk-pixbuf2-devel cairo-devel >= 1.6 +Requires: atk-devel >= 1.29.2 glib2-devel >= 2.28.0 +Requires: libX11-devel libXcursor-devel libXinerama-devel +Requires: libXext-devel libXi-devel libXrandr-devel +Requires: libXfixes-devel libXcomposite-devel +Requires: pkgconfig + +Provides: gail-devel = %{version}-%{release} +Obsoletes: gail-devel < 2.13.0-1 +Provides: gtk2-devel-doc = %{version}-%{release} +Obsoletes: gtk2-devel-doc < %{version}-%{release} + +%description devel +This package contains the libraries, header files and developer documentation +that are needed for writing applications with the GTK+ widget toolkit. + +%package help +Summary: Developer documentation for GTK+ +Requires: gtk2 = %{version}-%{release} + +%description help +This package contains developer documentation for the GTK+ widget toolkit. + +#Build sections +%prep +%autosetup -n gtk+-%{version} -p1 -Sgit + +%build +export CFLAGS='-fno-strict-aliasing %optflags' +(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; + %configure $CONFIGFLAGS \ + --enable-man \ + --with-xinput=xfree \ + --enable-debug \ +) +sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool +make + +%install +make install DESTDIR=$RPM_BUILD_ROOT \ + RUN_QUERY_IMMODULES_TEST=false + +echo ".so man1/gtk-query-immodules-2.0.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gtk-query-immodules-2.0-%{__isa_bits}.1 + +%find_lang gtk20 +%find_lang gtk20-properties + +mkdir -p tmpdocs +cp -aR docs/tutorial/html tmpdocs/tutorial +cp -aR docs/faq/html tmpdocs/faq + +for dir in examples/* ; do + if [ -d $dir ] ; then + mkdir -p tmpdocs/$dir + for file in $dir/* ; do + install -m 0644 $file tmpdocs/$dir + done + fi +done + +mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64 + +# Install input method frameworks conf +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d +cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d + +# rm unpackaged files +rm $RPM_BUILD_ROOT%{_libdir}/*.la +rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/*.la +rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/*/*.la +rm $RPM_BUILD_ROOT%{_bindir}/gtk-update-icon-cache +rm $RPM_BUILD_ROOT%{_mandir}/man1/gtk-update-icon-cache.1* + +touch $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/immodules.cache + +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/filesystems + +%transfiletriggerin -- %{_libdir}/gtk-2.0/immodules/ %{_libdir}/gtk-2.0/%{bin_version}/immodules/ +gtk-query-immodules-2.0-64 --update-cache + +%transfiletriggerpostun -- %{_libdir}/gtk-2.0/immodules/ %{_libdir}/gtk-2.0/%{bin_version}/immodules/ +gtk-query-immodules-2.0-64 --update-cache + +#Install and uninstall scripts +%pre + +%preun + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +#Files list +%files -f gtk20.lang +%doc AUTHORS NEWS README +%license COPYING +%{_bindir}/gtk-query-immodules-2.0-64 +%{_libdir}/libgtk-x11-2.0.so.* +%{_libdir}/libgdk-x11-2.0.so.* +%{_libdir}/libgailutil.so.* +%{_libdir}/girepository-1.0 +%dir %{_libdir}/gtk-2.0 +%dir %{_libdir}/gtk-2.0/%{bin_version} +%{_libdir}/gtk-2.0/%{bin_version}/engines +%{_libdir}/gtk-2.0/%{bin_version}/filesystems +%dir %{_libdir}/gtk-2.0/%{bin_version}/immodules +%{_libdir}/gtk-2.0/%{bin_version}/printbackends +%{_libdir}/gtk-2.0/modules +%{_libdir}/gtk-2.0/immodules +%ghost %{_libdir}/gtk-2.0/%{bin_version}/immodules.cache +%dir %{_datadir}/gtk-2.0 +%{_datadir}/themes/Default +%{_datadir}/themes/Emacs +%{_datadir}/themes/Raleigh + +%files immodules +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-am-et.so +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-cedilla.so +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-cyrillic-translit.so +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-inuktitut.so +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ipa.so +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-multipress.so +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-thai.so +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-er.so +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-et.so +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-viqr.so +%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf +%dir %{_sysconfdir}/gtk-2.0 +%config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf + +%files immodule-xim +%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-xim.so + +%files devel -f gtk20-properties.lang +%{_libdir}/lib*.so +%{_libdir}/gtk-2.0/include +%{_libdir}/pkgconfig/* +%{_bindir}/gtk-builder-convert +%{_bindir}/gtk-demo +%{_datadir}/gtk-2.0/demo +%{_datadir}/aclocal/* +%{_datadir}/gir-1.0 +%{_includedir}/* + +%files help +%{_datadir}/gtk-doc +%doc tmpdocs/tutorial +%doc tmpdocs/faq +%doc tmpdocs/examples +%{_mandir}/man1/gtk-query-immodules-2.0* +%{_mandir}/man1/gtk-builder-convert.1.gz + +%changelog +* Thu Sep 14 2019 openEuler Buildteam - 2.24.32-3 +- Package init diff --git a/icon-padding.patch b/icon-padding.patch new file mode 100644 index 0000000..45083a6 --- /dev/null +++ b/icon-padding.patch @@ -0,0 +1,258 @@ +diff -up gtk+-2.19.7/gtk/gtkstatusicon.c.icon-padding gtk+-2.19.7/gtk/gtkstatusicon.c +--- gtk+-2.19.7/gtk/gtkstatusicon.c.icon-padding 2010-03-08 08:42:22.000000000 -0500 ++++ gtk+-2.19.7/gtk/gtkstatusicon.c 2010-03-10 00:40:11.165527903 -0500 +@@ -170,6 +170,7 @@ static void gtk_status_icon_screen_c + GdkScreen *old_screen); + static void gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon); + static void gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon); ++static void gtk_status_icon_padding_changed (GtkStatusIcon *status_icon); + static gboolean gtk_status_icon_scroll (GtkStatusIcon *status_icon, + GdkEventScroll *event); + static gboolean gtk_status_icon_query_tooltip (GtkStatusIcon *status_icon, +@@ -850,6 +851,8 @@ gtk_status_icon_init (GtkStatusIcon *sta + G_CALLBACK (gtk_status_icon_embedded_changed), status_icon); + g_signal_connect_swapped (priv->tray_icon, "notify::orientation", + G_CALLBACK (gtk_status_icon_orientation_changed), status_icon); ++ g_signal_connect_swapped (priv->tray_icon, "notify::padding", ++ G_CALLBACK (gtk_status_icon_padding_changed), status_icon); + g_signal_connect_swapped (priv->tray_icon, "button-press-event", + G_CALLBACK (gtk_status_icon_button_press), status_icon); + g_signal_connect_swapped (priv->tray_icon, "button-release-event", +@@ -975,6 +978,8 @@ gtk_status_icon_finalize (GObject *objec + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_orientation_changed, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, ++ gtk_status_icon_padding_changed, status_icon); ++ g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_button_press, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_button_release, status_icon); +@@ -1679,14 +1684,32 @@ gtk_status_icon_screen_changed (GtkStatu + #ifdef GDK_WINDOWING_X11 + + static void ++gtk_status_icon_padding_changed (GtkStatusIcon *status_icon) ++{ ++ GtkStatusIconPrivate *priv = status_icon->priv; ++ GtkOrientation orientation; ++ gint padding; ++ ++ orientation = _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (priv->tray_icon)); ++ padding = _gtk_tray_icon_get_padding (GTK_TRAY_ICON (priv->tray_icon)); ++ ++ if (orientation == GTK_ORIENTATION_HORIZONTAL) ++ gtk_misc_set_padding (GTK_MISC (priv->image), padding, 0); ++ else ++ gtk_misc_set_padding (GTK_MISC (priv->image), 0, padding); ++} ++ ++static void + gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon) + { ++ gtk_status_icon_padding_changed (status_icon); + g_object_notify (G_OBJECT (status_icon), "embedded"); + } + + static void + gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon) + { ++ gtk_status_icon_padding_changed (status_icon); + g_object_notify (G_OBJECT (status_icon), "orientation"); + } + +@@ -1804,7 +1827,7 @@ gtk_status_icon_reset_image_data (GtkSta + + g_object_notify (G_OBJECT (status_icon), "stock"); + break; +- ++ + case GTK_IMAGE_ICON_NAME: + g_free (priv->image_data.icon_name); + priv->image_data.icon_name = NULL; +diff -up gtk+-2.19.7/gtk/gtktrayicon.h.icon-padding gtk+-2.19.7/gtk/gtktrayicon.h +--- gtk+-2.19.7/gtk/gtktrayicon.h.icon-padding 2009-10-18 01:35:45.000000000 -0400 ++++ gtk+-2.19.7/gtk/gtktrayicon.h 2010-03-10 00:40:11.169528392 -0500 +@@ -69,7 +69,8 @@ void _gtk_tray_icon_cancel_mes + guint id); + + GtkOrientation _gtk_tray_icon_get_orientation (GtkTrayIcon *icon); +- ++gint _gtk_tray_icon_get_padding (GtkTrayIcon *icon); ++ + G_END_DECLS + + #endif /* __GTK_TRAY_ICON_H__ */ +diff -up gtk+-2.19.7/gtk/gtktrayicon-x11.c.icon-padding gtk+-2.19.7/gtk/gtktrayicon-x11.c +--- gtk+-2.19.7/gtk/gtktrayicon-x11.c.icon-padding 2010-03-08 21:01:28.000000000 -0500 ++++ gtk+-2.19.7/gtk/gtktrayicon-x11.c 2010-03-10 00:49:48.229509604 -0500 +@@ -43,23 +43,26 @@ + + enum { + PROP_0, +- PROP_ORIENTATION ++ PROP_ORIENTATION, ++ PROP_PADDING + }; + + struct _GtkTrayIconPrivate + { + guint stamp; +- ++ + Atom selection_atom; + Atom manager_atom; + Atom system_tray_opcode_atom; + Atom orientation_atom; + Atom visual_atom; ++ Atom padding_atom; + Window manager_window; + GdkVisual *manager_visual; + gboolean manager_visual_rgba; + + GtkOrientation orientation; ++ gint padding; + }; + + static void gtk_tray_icon_constructed (GObject *object); +@@ -113,6 +116,16 @@ gtk_tray_icon_class_init (GtkTrayIconCla + GTK_ORIENTATION_HORIZONTAL, + GTK_PARAM_READABLE)); + ++ g_object_class_install_property (gobject_class, ++ PROP_PADDING, ++ g_param_spec_int ("padding", ++ P_("Padding"), ++ P_("Padding that should be put around icons in the tray"), ++ 0, ++ G_MAXINT, ++ 0, ++ GTK_PARAM_READABLE)); ++ + g_type_class_add_private (class, sizeof (GtkTrayIconPrivate)); + } + +@@ -124,6 +137,7 @@ gtk_tray_icon_init (GtkTrayIcon *icon) + + icon->priv->stamp = 1; + icon->priv->orientation = GTK_ORIENTATION_HORIZONTAL; ++ icon->priv->padding = 0; + + gtk_widget_set_app_paintable (GTK_WIDGET (icon), TRUE); + gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK); +@@ -161,6 +175,10 @@ gtk_tray_icon_constructed (GObject *obje + "_NET_SYSTEM_TRAY_VISUAL", + False); + ++ icon->priv->padding_atom = XInternAtom (xdisplay, ++ "_NET_SYSTEM_TRAY_PADDING", ++ False); ++ + /* Add a root window filter so that we get changes on MANAGER */ + gdk_window_add_filter (root_window, + gtk_tray_icon_manager_filter, icon); +@@ -212,6 +230,9 @@ gtk_tray_icon_get_property (GObject * + case PROP_ORIENTATION: + g_value_set_enum (value, icon->priv->orientation); + break; ++ case PROP_PADDING: ++ g_value_set_int (value, icon->priv->padding); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -372,9 +393,58 @@ gtk_tray_icon_get_visual_property (GtkTr + XFree (prop.prop); + } + ++static void ++gtk_tray_icon_get_padding_property (GtkTrayIcon *icon) ++{ ++ GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (icon)); ++ GdkDisplay *display = gdk_screen_get_display (screen); ++ Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); ++ ++ Atom type; ++ int format; ++ union { ++ gulong *prop; ++ guchar *prop_ch; ++ } prop = { NULL }; ++ gulong nitems; ++ gulong bytes_after; ++ int error, result; ++ ++ g_assert (icon->priv->manager_window != None); ++ ++ gdk_error_trap_push (); ++ type = None; ++ result = XGetWindowProperty (xdisplay, ++ icon->priv->manager_window, ++ icon->priv->padding_atom, ++ 0, G_MAXLONG, FALSE, ++ XA_CARDINAL, ++ &type, &format, &nitems, ++ &bytes_after, &(prop.prop_ch)); ++ error = gdk_error_trap_pop (); ++ ++ if (!error && result == Success && ++ type == XA_CARDINAL && nitems == 1 && format == 32) ++ { ++ gint padding; ++ ++ padding = prop.prop[0]; ++ ++ if (icon->priv->padding != padding) ++ { ++ icon->priv->padding = padding; ++ ++ g_object_notify (G_OBJECT (icon), "padding"); ++ } ++ } ++ ++ if (type != None) ++ XFree (prop.prop); ++} ++ + static GdkFilterReturn +-gtk_tray_icon_manager_filter (GdkXEvent *xevent, +- GdkEvent *event, ++gtk_tray_icon_manager_filter (GdkXEvent *xevent, ++ GdkEvent *event, + gpointer user_data) + { + GtkTrayIcon *icon = user_data; +@@ -399,6 +469,11 @@ gtk_tray_icon_manager_filter (GdkXEvent + + gtk_tray_icon_get_orientation_property (icon); + } ++ else if (xev->xany.type == PropertyNotify && ++ xev->xproperty.atom == icon->priv->padding_atom) ++ { ++ gtk_tray_icon_get_padding_property (icon); ++ } + else if (xev->xany.type == DestroyNotify) + { + GTK_NOTE (PLUGSOCKET, +@@ -504,6 +579,7 @@ gtk_tray_icon_update_manager_window (Gtk + + gtk_tray_icon_get_orientation_property (icon); + gtk_tray_icon_get_visual_property (icon); ++ gtk_tray_icon_get_padding_property (icon); + + if (gtk_widget_get_realized (GTK_WIDGET (icon))) + { +@@ -740,6 +816,14 @@ _gtk_tray_icon_get_orientation (GtkTrayI + return icon->priv->orientation; + } + ++gint ++_gtk_tray_icon_get_padding (GtkTrayIcon *icon) ++{ ++ g_return_val_if_fail (GTK_IS_TRAY_ICON (icon), 0); ++ ++ return icon->priv->padding; ++} ++ + + #define __GTK_TRAY_ICON_X11_C__ + #include "gtkaliasdef.c" diff --git a/im-cedilla.conf b/im-cedilla.conf new file mode 100644 index 0000000..d8a1976 --- /dev/null +++ b/im-cedilla.conf @@ -0,0 +1,6 @@ +XIM=none +XIM_PROGRAM=/bin/true +XIM_ARGS= +SHORT_DESC=im-cedilla +GTK_IM_MODULE=cedilla +QT_IM_MODULE=xim diff --git a/system-python.patch b/system-python.patch new file mode 100644 index 0000000..3f697fa --- /dev/null +++ b/system-python.patch @@ -0,0 +1,9 @@ +diff -up gtk+-2.18.2/gtk/gtk-builder-convert.system-python gtk+-2.18.2/gtk/gtk-builder-convert +--- gtk+-2.18.2/gtk/gtk-builder-convert.system-python 2009-10-13 15:59:50.423385098 -0400 ++++ gtk+-2.18.2/gtk/gtk-builder-convert 2009-10-13 16:00:31.876142050 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # + # Copyright (C) 2006-2008 Async Open Source + # Henrique Romano diff --git a/tooltip-positioning.patch b/tooltip-positioning.patch new file mode 100644 index 0000000..49b72c2 --- /dev/null +++ b/tooltip-positioning.patch @@ -0,0 +1,182 @@ +diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c +index 5cc2334..204a2b6 100644 +--- a/gtk/gtktooltip.c ++++ b/gtk/gtktooltip.c +@@ -903,53 +903,128 @@ gtk_tooltip_position (GtkTooltip *tooltip, + { + gint x, y; + GdkScreen *screen; ++ gint monitor_num; ++ GdkRectangle monitor; ++ GtkRequisition requisition; ++ guint cursor_size; ++ GdkRectangle bounds; ++ ++#define MAX_DISTANCE 32 + + tooltip->tooltip_widget = new_tooltip_widget; + ++ screen = gtk_widget_get_screen (new_tooltip_widget); ++ ++ gtk_widget_size_request (GTK_WIDGET (tooltip->current_window), &requisition); ++ ++ monitor_num = gdk_screen_get_monitor_at_point (screen, ++ tooltip->last_x, ++ tooltip->last_y); ++ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); ++ ++ get_bounding_box (new_tooltip_widget, &bounds); ++ + /* Position the tooltip */ +- /* FIXME: should we swap this when RTL is enabled? */ +- if (tooltip->keyboard_mode_enabled) ++ ++ cursor_size = gdk_display_get_default_cursor_size (display); ++ ++ /* Try below */ ++ x = bounds.x + bounds.width / 2 - requisition.width / 2; ++ y = bounds.y + bounds.height + 4; ++ ++ if (y + requisition.height <= monitor.y + monitor.height) + { +- GdkRectangle bounds; ++ if (tooltip->keyboard_mode_enabled) ++ goto found; + +- get_bounding_box (new_tooltip_widget, &bounds); ++ if (y <= tooltip->last_y + cursor_size + MAX_DISTANCE) ++ { ++ if (tooltip->last_x + cursor_size + MAX_DISTANCE < x) ++ x = tooltip->last_x + cursor_size + MAX_DISTANCE; ++ else if (x + requisition.width < tooltip->last_x - MAX_DISTANCE) ++ x = tooltip->last_x - MAX_DISTANCE - requisition.width; + +- /* For keyboard mode we position the tooltip below the widget, +- * right of the center of the widget. +- */ +- x = bounds.x + bounds.width / 2; +- y = bounds.y + bounds.height + 4; ++ goto found; ++ } ++ } ++ ++ /* Try above */ ++ x = bounds.x + bounds.width / 2 - requisition.width / 2; ++ y = bounds.y - requisition.height - 4; ++ ++ if (y >= monitor.y) ++ { ++ if (tooltip->keyboard_mode_enabled) ++ goto found; ++ ++ if (y + requisition.height >= tooltip->last_y - MAX_DISTANCE) ++ { ++ if (tooltip->last_x + cursor_size + MAX_DISTANCE < x) ++ x = tooltip->last_x + cursor_size + MAX_DISTANCE; ++ else if (x + requisition.width < tooltip->last_x - MAX_DISTANCE) ++ x = tooltip->last_x - MAX_DISTANCE - requisition.width; ++ ++ goto found; ++ } + } +- else ++ ++ /* Try right FIXME: flip on rtl ? */ ++ x = bounds.x + bounds.width + 4; ++ y = bounds.y + bounds.height / 2 - requisition.height / 2; ++ ++ if (x + requisition.width <= monitor.x + monitor.width) + { +- guint cursor_size; ++ if (tooltip->keyboard_mode_enabled) ++ goto found; + +- x = tooltip->last_x; +- y = tooltip->last_y; ++ if (x <= tooltip->last_x + cursor_size + MAX_DISTANCE) ++ { ++ if (tooltip->last_y + cursor_size + MAX_DISTANCE < y) ++ y = tooltip->last_y + cursor_size + MAX_DISTANCE; ++ else if (y + requisition.height < tooltip->last_y - MAX_DISTANCE) ++ y = tooltip->last_y - MAX_DISTANCE - requisition.height; + +- /* For mouse mode, we position the tooltip right of the cursor, +- * a little below the cursor's center. +- */ +- cursor_size = gdk_display_get_default_cursor_size (display); +- x += cursor_size / 2; +- y += cursor_size / 2; ++ goto found; ++ } + } + +- screen = gtk_widget_get_screen (new_tooltip_widget); ++ /* Try left FIXME: flip on rtl ? */ ++ x = bounds.x - requisition.width - 4; ++ y = bounds.y + bounds.height / 2 - requisition.height / 2; + +- /* Show it */ +- if (tooltip->current_window) ++ if (x >= monitor.x) + { +- gint monitor_num; +- GdkRectangle monitor; +- GtkRequisition requisition; ++ if (tooltip->keyboard_mode_enabled) ++ goto found; + +- gtk_widget_size_request (GTK_WIDGET (tooltip->current_window), +- &requisition); ++ if (x + requisition.width >= tooltip->last_x - MAX_DISTANCE) ++ { ++ if (tooltip->last_y + cursor_size + MAX_DISTANCE < y) ++ y = tooltip->last_y + cursor_size + MAX_DISTANCE; ++ else if (y + requisition.height < tooltip->last_y - MAX_DISTANCE) ++ y = tooltip->last_y - MAX_DISTANCE - requisition.height; + +- monitor_num = gdk_screen_get_monitor_at_point (screen, x, y); +- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); ++ goto found; ++ } ++ } + ++ /* Fallback */ ++ if (tooltip->keyboard_mode_enabled) ++ { ++ x = bounds.x + bounds.width / 2 - requisition.width / 2; ++ y = bounds.y + bounds.height + 4; ++ } ++ else ++ { ++ /* At cursor */ ++ x = tooltip->last_x + cursor_size * 3 / 4; ++ y = tooltip->last_y + cursor_size * 3 / 4; ++ } ++ ++found: ++ /* Show it */ ++ if (tooltip->current_window) ++ { + if (x + requisition.width > monitor.x + monitor.width) + x -= x - (monitor.x + monitor.width) + requisition.width; + else if (x < monitor.x) +@@ -957,7 +1032,9 @@ gtk_tooltip_position (GtkTooltip *tooltip, + + if (y + requisition.height > monitor.y + monitor.height) + y -= y - (monitor.y + monitor.height) + requisition.height; +- ++ else if (y < monitor.y) ++ y = monitor.y; ++ + if (!tooltip->keyboard_mode_enabled) + { + /* don't pop up under the pointer */ +@@ -965,7 +1042,7 @@ gtk_tooltip_position (GtkTooltip *tooltip, + y <= tooltip->last_y && tooltip->last_y < y + requisition.height) + y = tooltip->last_y - requisition.height - 2; + } +- ++ + gtk_window_move (GTK_WINDOW (tooltip->current_window), x, y); + gtk_widget_show (GTK_WIDGET (tooltip->current_window)); + } diff --git a/window-dragging.patch b/window-dragging.patch new file mode 100644 index 0000000..549bcb6 --- /dev/null +++ b/window-dragging.patch @@ -0,0 +1,116 @@ +diff -up gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging gtk+-2.24.7/gtk/gtkmenushell.c +--- gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging 2011-08-15 22:30:52.000000000 -0400 ++++ gtk+-2.24.7/gtk/gtkmenushell.c 2011-10-17 19:50:52.180468086 -0400 +@@ -589,18 +589,45 @@ gtk_menu_shell_button_press (GtkWidget + + if (!menu_shell->active || !menu_shell->button) + { +- gtk_menu_shell_activate (menu_shell); ++ gboolean initially_active = menu_shell->active; + + menu_shell->button = event->button; + +- if (menu_item && _gtk_menu_item_is_selectable (menu_item) && +- menu_item->parent == widget && +- menu_item != menu_shell->active_menu_item) ++ if (menu_item) + { +- if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM) ++ if (_gtk_menu_item_is_selectable (menu_item) && ++ menu_item->parent == widget && ++ menu_item != menu_shell->active_menu_item) + { +- menu_shell->activate_time = event->time; +- gtk_menu_shell_select_item (menu_shell, menu_item); ++ gtk_menu_shell_activate (menu_shell); ++ menu_shell->button = event->button; ++ ++ if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM) ++ { ++ menu_shell->activate_time = event->time; ++ gtk_menu_shell_select_item (menu_shell, menu_item); ++ } ++ } ++ } ++ else ++ { ++ if (!initially_active) ++ { ++ gboolean window_drag = FALSE; ++ ++ gtk_widget_style_get (widget, ++ "window-dragging", &window_drag, ++ NULL); ++ ++ if (window_drag) ++ { ++ gtk_menu_shell_deactivate (menu_shell); ++ gtk_window_begin_move_drag (GTK_WINDOW (gtk_widget_get_toplevel (widget)), ++ event->button, ++ event->x_root, ++ event->y_root, ++ event->time); ++ } + } + } + } +diff -up gtk+-2.24.7/gtk/gtktoolbar.c.window-dragging gtk+-2.24.7/gtk/gtktoolbar.c +--- gtk+-2.24.7/gtk/gtktoolbar.c.window-dragging 2011-10-01 11:29:06.000000000 -0400 ++++ gtk+-2.24.7/gtk/gtktoolbar.c 2011-10-17 19:52:56.104463657 -0400 +@@ -2701,6 +2701,8 @@ static gboolean + gtk_toolbar_button_press (GtkWidget *toolbar, + GdkEventButton *event) + { ++ GtkWidget *window; ++ + if (_gtk_button_event_triggers_context_menu (event)) + { + gboolean return_value; +@@ -2711,7 +2713,29 @@ gtk_toolbar_button_press (GtkWidget + + return return_value; + } +- ++ ++ window = gtk_widget_get_toplevel (toolbar); ++ ++ if (window) ++ { ++ gboolean window_drag = FALSE; ++ ++ gtk_widget_style_get (toolbar, ++ "window-dragging", &window_drag, ++ NULL); ++ ++ if (window_drag) ++ { ++ gtk_window_begin_move_drag (GTK_WINDOW (window), ++ event->button, ++ event->x_root, ++ event->y_root, ++ event->time); ++ ++ return TRUE; ++ } ++ } ++ + return FALSE; + } + +diff -up gtk+-2.24.7/gtk/gtkwidget.c.window-dragging gtk+-2.24.7/gtk/gtkwidget.c +--- gtk+-2.24.7/gtk/gtkwidget.c.window-dragging 2011-10-17 19:50:52.175468086 -0400 ++++ gtk+-2.24.7/gtk/gtkwidget.c 2011-10-17 19:50:52.184468086 -0400 +@@ -2467,6 +2467,13 @@ gtk_widget_class_init (GtkWidgetClass *k + 0.0, 1.0, 0.04, + GTK_PARAM_READABLE)); + ++ gtk_widget_class_install_style_property (klass, ++ g_param_spec_boolean ("window-dragging", ++ P_("Window dragging"), ++ P_("Window dragging"), ++ FALSE, ++ GTK_PARAM_READWRITE)); ++ + /** + * GtkWidget:draw-border: + *