An input-only window event box, copied from eel's ell-input-event-box.

2003-07-22  Christian Persch  <chpe@cvs.gnome.org>

	* lib/widgets/ephy-event-box.h:
	* lib/widgets/ephy-event-box.c:

	An input-only window event box, copied from eel's ell-input-event-box.

	* src/ephy-notebook.c: (tab_build_label):
	* src/ephy-favicon-action.c: (create_tool_item):

	Use EphyEventBox instead of GtkEventBox. Fixes transparency issue from
	bug #110747 .

6 files changed, 304 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f8fa00cba..cf4643b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-07-22  Christian Persch  <chpe@cvs.gnome.org>
+
+	* lib/widgets/ephy-event-box.h:
+	* lib/widgets/ephy-event-box.c:
+
+	An input-only window event box, copied from eel's ell-input-event-box.
+
+	* src/ephy-notebook.c: (tab_build_label):
+	* src/ephy-favicon-action.c: (create_tool_item):
+
+	Use EphyEventBox instead of GtkEventBox. Fixes transparency issue from
+	bug #110747 .
+
 2003-07-22  Reinout van Schouwen <reinout@cs.vu.nl>
 
 	* configure.in:
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index e89a98023..b7e1bdc23 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -19,6 +19,8 @@ libephywidgets_la_SOURCES = \
 	ephy-autocompletion-window.h		\
 	ephy-ellipsizing-label.c		\
 	ephy-ellipsizing-label.h		\
+	ephy-event-box.c			\
+	ephy-event-box.h			\
 	ephy-location-entry.c			\
 	ephy-location-entry.h			\
 	ephy-node-view.c			\
diff --git a/lib/widgets/ephy-event-box.c b/lib/widgets/ephy-event-box.c
new file mode 100644
index 000000000..c616ce236
--- /dev/null
+++ b/lib/widgets/ephy-event-box.c
@@ -0,0 +1,221 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 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 Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "ephy-event-box.h"
+
+
+static void ephy_event_box_class_init    (EphyEventBoxClass *klass);
+static void ephy_event_box_init          (EphyEventBox      *event_box);
+static void ephy_event_box_realize       (GtkWidget             *widget);
+static void ephy_event_box_unrealize     (GtkWidget             *widget);
+static void ephy_event_box_size_request  (GtkWidget             *widget,
+					  GtkRequisition        *requisition);
+static void ephy_event_box_size_allocate (GtkWidget             *widget,
+					  GtkAllocation         *allocation);
+static void ephy_event_box_map           (GtkWidget             *widget);
+static void ephy_event_box_unmap         (GtkWidget             *widget);
+
+static GtkBinClass *parent_class = NULL;
+
+GType
+ephy_event_box_get_type (void)
+{
+  static GType event_box_type = 0;
+
+  if (!event_box_type)
+    {
+      static const GTypeInfo event_box_info =
+      {
+	sizeof (EphyEventBoxClass),
+	NULL,		/* base_init */
+	NULL,		/* base_finalize */
+	(GClassInitFunc) ephy_event_box_class_init,
+	NULL,		/* class_finalize */
+	NULL,		/* class_data */
+	sizeof (EphyEventBox),
+	0,		/* n_preallocs */
+	(GInstanceInitFunc) ephy_event_box_init,
+      };
+
+      event_box_type = g_type_register_static (GTK_TYPE_BIN, "EphyEventBox",
+					       &event_box_info, 0);
+    }
+
+  return event_box_type;
+}
+
+
+static void
+ephy_event_box_class_init (EphyEventBoxClass *class)
+{
+  GtkWidgetClass *widget_class;
+
+  parent_class = g_type_class_peek_parent (class);
+  
+  widget_class = (GtkWidgetClass*) class;
+
+  widget_class->realize = ephy_event_box_realize;
+  widget_class->unrealize = ephy_event_box_unrealize;
+  widget_class->map = ephy_event_box_map;
+  widget_class->unmap = ephy_event_box_unmap;
+  widget_class->size_request = ephy_event_box_size_request;
+  widget_class->size_allocate = ephy_event_box_size_allocate;
+}
+
+static void
+ephy_event_box_init (EphyEventBox *event_box)
+{
+  GTK_WIDGET_SET_FLAGS (event_box, GTK_NO_WINDOW);
+}
+
+GtkWidget*
+ephy_event_box_new (void)
+{
+  return g_object_new (EPHY_TYPE_EVENT_BOX, NULL);
+}
+
+static void
+ephy_event_box_map (GtkWidget *widget)
+{
+  EphyEventBox *event_box;
+
+  event_box = EPHY_EVENT_BOX (widget);
+  
+  (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
+  
+  gdk_window_show (event_box->input_window);
+}
+
+static void
+ephy_event_box_unmap (GtkWidget *widget)
+{
+  EphyEventBox *event_box;
+
+  event_box = EPHY_EVENT_BOX (widget);
+  
+  gdk_window_hide (event_box->input_window);
+  
+  (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
+}
+
+static void
+ephy_event_box_realize (GtkWidget *widget)
+{
+  GdkWindowAttr attributes;
+  EphyEventBox *event_box;
+  gint attributes_mask;
+  gint border_width;
+
+  (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
+  
+  event_box = EPHY_EVENT_BOX (widget);
+  
+  border_width = GTK_CONTAINER (widget)->border_width;
+ 
+  attributes.x = widget->allocation.x + border_width;
+  attributes.y = widget->allocation.y + border_width;
+  attributes.width = widget->allocation.width - 2*border_width;
+  attributes.height = widget->allocation.height - 2*border_width;
+  attributes.window_type = GDK_WINDOW_CHILD;
+  //attributes.override_redirect = TRUE;
+  attributes.wclass = GDK_INPUT_ONLY;
+  attributes.event_mask = gtk_widget_get_events (widget)
+			| GDK_BUTTON_MOTION_MASK
+			| GDK_BUTTON_PRESS_MASK
+			| GDK_BUTTON_RELEASE_MASK
+			| GDK_ENTER_NOTIFY_MASK
+			| GDK_LEAVE_NOTIFY_MASK;
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
+
+  event_box->input_window = gdk_window_new (widget->window,
+					    &attributes, attributes_mask);
+  gdk_window_set_user_data (event_box->input_window, widget);
+}
+
+static void
+ephy_event_box_unrealize (GtkWidget *widget)
+{
+  EphyEventBox *event_box;
+
+  (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+
+  event_box = EPHY_EVENT_BOX (widget);
+  
+  gdk_window_set_user_data (event_box->input_window, NULL);
+  gdk_window_destroy (event_box->input_window);
+  event_box->input_window = NULL;
+}
+
+static void
+ephy_event_box_size_request (GtkWidget      *widget,
+			     GtkRequisition *requisition)
+{
+  GtkBin *bin = GTK_BIN (widget);
+
+  requisition->width = GTK_CONTAINER (widget)->border_width * 2;
+  requisition->height = GTK_CONTAINER (widget)->border_width * 2;
+
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+    {
+      GtkRequisition child_requisition;
+      
+      gtk_widget_size_request (bin->child, &child_requisition);
+
+      requisition->width += child_requisition.width;
+      requisition->height += child_requisition.height;
+    }
+}
+
+static void
+ephy_event_box_size_allocate (GtkWidget     *widget,
+			      GtkAllocation *allocation)
+{
+  GtkBin *bin;
+  GtkAllocation child_allocation;
+  EphyEventBox *event_box;
+  
+  widget->allocation = *allocation;
+  bin = GTK_BIN (widget);
+
+  child_allocation.x = allocation->x + GTK_CONTAINER (widget)->border_width;
+  child_allocation.y = allocation->y + GTK_CONTAINER (widget)->border_width;
+  child_allocation.width = MAX (allocation->width - GTK_CONTAINER (widget)->border_width * 2, 0);
+  child_allocation.height = MAX (allocation->height - GTK_CONTAINER (widget)->border_width * 2, 0);
+
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      event_box = EPHY_EVENT_BOX (widget);
+      gdk_window_move_resize (event_box->input_window,
+			      child_allocation.x,
+			      child_allocation.y,
+			      child_allocation.width,
+			      child_allocation.height);
+    }
+  
+  if (bin->child)
+    gtk_widget_size_allocate (bin->child, &child_allocation);
+}
diff --git a/lib/widgets/ephy-event-box.h b/lib/widgets/ephy-event-box.h
new file mode 100644
index 000000000..d1f0f267a
--- /dev/null
+++ b/lib/widgets/ephy-event-box.h
@@ -0,0 +1,64 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 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 Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#ifndef EPHY_EVENT_BOX_H
+#define EPHY_EVENT_BOX_H
+
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtkbin.h>
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_EVENT_BOX		(ephy_event_box_get_type ())
+#define EPHY_EVENT_BOX(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_EVENT_BOX, EphyEventBox))
+#define EPHY_EVENT_BOX_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_EVENT_BOX, EphyEventBoxClass))
+#define EPHY_IS_EVENT_BOX(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_EVENT_BOX))
+#define EPHY_IS_EVENT_BOX_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_TYPE_EVENT_BOX))
+#define EPHY_EVENT_BOX_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_TYPE_EVENT_BOX, EphyEventBoxClass))
+
+
+typedef struct _EphyEventBox		EphyEventBox;
+typedef struct _EphyEventBoxClass	EphyEventBoxClass;
+
+struct _EphyEventBox
+{
+  GtkBin bin;
+  GdkWindow *input_window;
+};
+
+struct _EphyEventBoxClass
+{
+  GtkBinClass parent_class;
+};
+
+GType		ephy_event_box_get_type	(void) G_GNUC_CONST;
+
+GtkWidget      *ephy_event_box_new	(void);
+
+G_END_DECLS
+
+#endif /* EPHY_EVENT_BOX_H */
diff --git a/src/ephy-favicon-action.c b/src/ephy-favicon-action.c
index 376794cba..bf1d96d36 100644
--- a/src/ephy-favicon-action.c
+++ b/src/ephy-favicon-action.c
@@ -23,6 +23,7 @@
 #include "ephy-dnd.h"
 #include "ephy-favicon-cache.h"
 #include "ephy-shell.h"
+#include "ephy-event-box.h"
 #include "ephy-debug.h"
 
 static GtkTargetEntry url_drag_types [] =
@@ -128,7 +129,7 @@ create_tool_item (EggAction *action)
 
 	item = GTK_WIDGET (egg_tool_item_new ());
 
-	ebox = gtk_event_box_new ();
+	ebox = ephy_event_box_new ();
 	image = gtk_image_new ();
 	gtk_container_add (GTK_CONTAINER (ebox), image);
 	gtk_container_set_border_width (GTK_CONTAINER (ebox), 2);
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 3e2bad417..7ce05b8ca 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -31,6 +31,7 @@
 #include "ephy-shell.h"
 #include "ephy-debug.h"
 #include "ephy-favicon-cache.h"
+#include "ephy-event-box.h"
 
 #include <gtk/gtk.h>
 #include <glib-object.h>
@@ -895,7 +896,7 @@ build_tab_label (EphyNotebook *nb, GtkWidget *child)
 	gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
 
 	/* setup label */
-	label_ebox = gtk_event_box_new ();
+	label_ebox = ephy_event_box_new ();
         label = gtk_label_new ("");
 	gtk_misc_set_alignment (GTK_MISC (label), 0.00, 0.5);
         gtk_misc_set_padding (GTK_MISC (label), 4, 0);