From 95843529d1fb5efc65784f69245159fdbfe84822 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 9 Jan 1999 00:21:37 +0000 Subject: [PATCH] Fixed some list-manipulation breakage. Fri Jan 8 19:00:17 1999 Owen Taylor * gdk/gdkdnd.c (gdk_window_cache_filter): Fixed some list-manipulation breakage. * gdk/gdkdnd.c (gdk_window_cache_destroy): Free window cache structure. * gtk/gtkdnd.c (gtk_drag_set_icon_pixmap): Set an event mask on the drag window so clicking on it doesn't pop up root menus, etc. * gtk/gtkdnd.c (gtk_drag_button_release_cb): Remove signal handlers at button release. --- ChangeLog | 15 +++++++++++++++ ChangeLog.pre-2-0 | 15 +++++++++++++++ ChangeLog.pre-2-10 | 15 +++++++++++++++ ChangeLog.pre-2-2 | 15 +++++++++++++++ ChangeLog.pre-2-4 | 15 +++++++++++++++ ChangeLog.pre-2-6 | 15 +++++++++++++++ ChangeLog.pre-2-8 | 15 +++++++++++++++ gdk/gdkdnd.c | 7 ++++++- gdk/x11/gdkdnd-x11.c | 7 ++++++- gtk/gtkdnd.c | 5 +++-- 10 files changed, 120 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7edc0e2fbe..001d71527f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Fri Jan 8 19:00:17 1999 Owen Taylor + + * gdk/gdkdnd.c (gdk_window_cache_filter): Fixed + some list-manipulation breakage. + + * gdk/gdkdnd.c (gdk_window_cache_destroy): Free + window cache structure. + + * gtk/gtkdnd.c (gtk_drag_set_icon_pixmap): Set an + event mask on the drag window so clicking on it + doesn't pop up root menus, etc. + + * gtk/gtkdnd.c (gtk_drag_button_release_cb): Remove + signal handlers at button release. + Fri Jan 8 00:42:00 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7edc0e2fbe..001d71527f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,18 @@ +Fri Jan 8 19:00:17 1999 Owen Taylor + + * gdk/gdkdnd.c (gdk_window_cache_filter): Fixed + some list-manipulation breakage. + + * gdk/gdkdnd.c (gdk_window_cache_destroy): Free + window cache structure. + + * gtk/gtkdnd.c (gtk_drag_set_icon_pixmap): Set an + event mask on the drag window so clicking on it + doesn't pop up root menus, etc. + + * gtk/gtkdnd.c (gtk_drag_button_release_cb): Remove + signal handlers at button release. + Fri Jan 8 00:42:00 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7edc0e2fbe..001d71527f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +Fri Jan 8 19:00:17 1999 Owen Taylor + + * gdk/gdkdnd.c (gdk_window_cache_filter): Fixed + some list-manipulation breakage. + + * gdk/gdkdnd.c (gdk_window_cache_destroy): Free + window cache structure. + + * gtk/gtkdnd.c (gtk_drag_set_icon_pixmap): Set an + event mask on the drag window so clicking on it + doesn't pop up root menus, etc. + + * gtk/gtkdnd.c (gtk_drag_button_release_cb): Remove + signal handlers at button release. + Fri Jan 8 00:42:00 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7edc0e2fbe..001d71527f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,18 @@ +Fri Jan 8 19:00:17 1999 Owen Taylor + + * gdk/gdkdnd.c (gdk_window_cache_filter): Fixed + some list-manipulation breakage. + + * gdk/gdkdnd.c (gdk_window_cache_destroy): Free + window cache structure. + + * gtk/gtkdnd.c (gtk_drag_set_icon_pixmap): Set an + event mask on the drag window so clicking on it + doesn't pop up root menus, etc. + + * gtk/gtkdnd.c (gtk_drag_button_release_cb): Remove + signal handlers at button release. + Fri Jan 8 00:42:00 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7edc0e2fbe..001d71527f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +Fri Jan 8 19:00:17 1999 Owen Taylor + + * gdk/gdkdnd.c (gdk_window_cache_filter): Fixed + some list-manipulation breakage. + + * gdk/gdkdnd.c (gdk_window_cache_destroy): Free + window cache structure. + + * gtk/gtkdnd.c (gtk_drag_set_icon_pixmap): Set an + event mask on the drag window so clicking on it + doesn't pop up root menus, etc. + + * gtk/gtkdnd.c (gtk_drag_button_release_cb): Remove + signal handlers at button release. + Fri Jan 8 00:42:00 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7edc0e2fbe..001d71527f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +Fri Jan 8 19:00:17 1999 Owen Taylor + + * gdk/gdkdnd.c (gdk_window_cache_filter): Fixed + some list-manipulation breakage. + + * gdk/gdkdnd.c (gdk_window_cache_destroy): Free + window cache structure. + + * gtk/gtkdnd.c (gtk_drag_set_icon_pixmap): Set an + event mask on the drag window so clicking on it + doesn't pop up root menus, etc. + + * gtk/gtkdnd.c (gtk_drag_button_release_cb): Remove + signal handlers at button release. + Fri Jan 8 00:42:00 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7edc0e2fbe..001d71527f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +Fri Jan 8 19:00:17 1999 Owen Taylor + + * gdk/gdkdnd.c (gdk_window_cache_filter): Fixed + some list-manipulation breakage. + + * gdk/gdkdnd.c (gdk_window_cache_destroy): Free + window cache structure. + + * gtk/gtkdnd.c (gtk_drag_set_icon_pixmap): Set an + event mask on the drag window so clicking on it + doesn't pop up root menus, etc. + + * gtk/gtkdnd.c (gtk_drag_button_release_cb): Remove + signal handlers at button release. + Fri Jan 8 00:42:00 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index 728bdb7f5d..c3fdaa58be 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -1,5 +1,5 @@ /* GDK - The GIMP Drawing Kit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * Copyright (C) 1995-1999 Peter Mattis, Spencer Kimball and Josh MacDonald * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -244,6 +244,8 @@ gdk_window_cache_filter (GdkXEvent *xev, { cache->children = g_list_remove_link (cache->children, node); node->next = above_node->next; + if (node->next) + node->next->prev = node; node->prev = above_node; above_node->next = node; } @@ -254,6 +256,7 @@ gdk_window_cache_filter (GdkXEvent *xev, case CreateNotify: { XCreateWindowEvent *xcwe = &xevent->xcreatewindow; + if (!g_hash_table_lookup (cache->child_hash, GUINT_TO_POINTER (xcwe->window))) gdk_window_cache_add (cache, xcwe->window, @@ -378,6 +381,8 @@ gdk_window_cache_destroy (GdkWindowCache *cache) g_list_foreach (cache->children, (GFunc)g_free, NULL); g_list_free (cache->children); g_hash_table_destroy (cache->child_hash); + + g_free (cache); } static Window diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 728bdb7f5d..c3fdaa58be 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -1,5 +1,5 @@ /* GDK - The GIMP Drawing Kit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * Copyright (C) 1995-1999 Peter Mattis, Spencer Kimball and Josh MacDonald * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -244,6 +244,8 @@ gdk_window_cache_filter (GdkXEvent *xev, { cache->children = g_list_remove_link (cache->children, node); node->next = above_node->next; + if (node->next) + node->next->prev = node; node->prev = above_node; above_node->next = node; } @@ -254,6 +256,7 @@ gdk_window_cache_filter (GdkXEvent *xev, case CreateNotify: { XCreateWindowEvent *xcwe = &xevent->xcreatewindow; + if (!g_hash_table_lookup (cache->child_hash, GUINT_TO_POINTER (xcwe->window))) gdk_window_cache_add (cache, xcwe->window, @@ -378,6 +381,8 @@ gdk_window_cache_destroy (GdkWindowCache *cache) g_list_foreach (cache->children, (GFunc)g_free, NULL); g_list_free (cache->children); g_hash_table_destroy (cache->child_hash); + + g_free (cache); } static Window diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index cb7df4d695..9dab1b40e6 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -1,5 +1,5 @@ /* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * Copyright (C) 1995-1999 Peter Mattis, Spencer Kimball and Josh MacDonald * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -1759,6 +1759,7 @@ gtk_drag_set_icon_pixmap (GdkDragContext *context, gtk_widget_push_colormap (colormap); window = gtk_window_new (GTK_WINDOW_POPUP); + gtk_widget_set_events (window, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE); gtk_widget_pop_visual (); @@ -2334,7 +2335,6 @@ gtk_drag_source_info_destroy (gpointer data) if (info->widget) gtk_widget_unref (info->widget); - gtk_signal_disconnect_by_data (GTK_OBJECT (info->ipc_widget), info); gtk_selection_remove_all (info->ipc_widget); gtk_object_set_data (GTK_OBJECT (info->ipc_widget), "gtk-info", NULL); source_widgets = g_slist_remove (source_widgets, info->ipc_widget); @@ -2459,6 +2459,7 @@ gtk_drag_button_release_cb (GtkWidget *widget, } gtk_grab_remove (widget); + gtk_signal_disconnect_by_data (GTK_OBJECT (widget), info); /* Send on a release pair to the the original * widget to convince it to release its grab. We need to -- GitLab