X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkinvisible.c;h=27ca2502cbc66b18a5342a035c9d71d80591675d;hb=a41b73fbc71f613e4ca90ae8b9dd3bd317d026d6;hp=529b3b3688e9a7ee11c670c7d278284276545e10;hpb=6341c2f9a202774b01118487c8ef735bfb34c132;p=~andy%2Fgtk

diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index 529b3b368..27ca2502c 100644
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -12,9 +12,7 @@
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,110 +22,230 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include "config.h"
 #include <gdk/gdk.h>
-#include "gtksignal.h"
 #include "gtkinvisible.h"
+#include "gtkwidgetprivate.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
 
-static void gtk_invisible_class_init    (GtkInvisibleClass *klass);
-static void gtk_invisible_init          (GtkInvisible      *invisible);
-static void gtk_invisible_destroy       (GtkObject         *object);
+
+/**
+ * SECTION:gtkinvisible
+ * @Short_description: A widget which is not displayed
+ * @Title: GtkInvisible
+ *
+ * The #GtkInvisible widget is used internally in GTK+, and is probably not
+ * very useful for application developers.
+ *
+ * It is used for reliable pointer grabs and selection handling in the code
+ * for drag-and-drop.
+ */
+
+
+struct _GtkInvisiblePrivate
+{
+  GdkScreen    *screen;
+  gboolean      has_user_ref_count;
+};
+
+enum {
+  PROP_0,
+  PROP_SCREEN,
+  LAST_ARG
+};
+
+static void gtk_invisible_destroy       (GtkWidget         *widget);
 static void gtk_invisible_realize       (GtkWidget         *widget);
-static void gtk_invisible_style_set     (GtkWidget         *widget,
-					 GtkStyle          *previous_style);
+static void gtk_invisible_style_updated (GtkWidget         *widget);
 static void gtk_invisible_show          (GtkWidget         *widget);
 static void gtk_invisible_size_allocate (GtkWidget         *widget,
 					 GtkAllocation     *allocation);
+static void gtk_invisible_set_property  (GObject           *object,
+					 guint              prop_id,
+					 const GValue      *value,
+					 GParamSpec        *pspec);
+static void gtk_invisible_get_property  (GObject           *object,
+					 guint              prop_id,
+					 GValue		   *value,
+					 GParamSpec        *pspec);
 
-GtkType
-gtk_invisible_get_type (void)
-{
-  static GtkType invisible_type = 0;
+static GObject *gtk_invisible_constructor (GType                  type,
+					   guint                  n_construct_properties,
+					   GObjectConstructParam *construct_params);
 
-  if (!invisible_type)
-    {
-      static const GtkTypeInfo invisible_info =
-      {
-	"GtkInvisible",
-	sizeof (GtkInvisible),
-	sizeof (GtkInvisibleClass),
-	(GtkClassInitFunc) gtk_invisible_class_init,
-	(GtkObjectInitFunc) gtk_invisible_init,
-	/* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      invisible_type = gtk_type_unique (GTK_TYPE_WIDGET, &invisible_info);
-    }
-
-  return invisible_type;
-}
+G_DEFINE_TYPE (GtkInvisible, gtk_invisible, GTK_TYPE_WIDGET)
 
 static void
 gtk_invisible_class_init (GtkInvisibleClass *class)
 {
-  GtkObjectClass *object_class;
+  GObjectClass	 *gobject_class;
   GtkWidgetClass *widget_class;
 
   widget_class = (GtkWidgetClass*) class;
-  object_class = (GtkObjectClass*) class;
+  gobject_class = (GObjectClass*) class;
 
   widget_class->realize = gtk_invisible_realize;
-  widget_class->style_set = gtk_invisible_style_set;
+  widget_class->style_updated = gtk_invisible_style_updated;
   widget_class->show = gtk_invisible_show;
   widget_class->size_allocate = gtk_invisible_size_allocate;
+  widget_class->destroy = gtk_invisible_destroy;
+
+  gobject_class->set_property = gtk_invisible_set_property;
+  gobject_class->get_property = gtk_invisible_get_property;
+  gobject_class->constructor = gtk_invisible_constructor;
 
-  object_class->destroy = gtk_invisible_destroy;
+  g_object_class_install_property (gobject_class,
+				   PROP_SCREEN,
+				   g_param_spec_object ("screen",
+ 							P_("Screen"),
+ 							P_("The screen where this window will be displayed"),
+							GDK_TYPE_SCREEN,
+ 							GTK_PARAM_READWRITE));
+
+  g_type_class_add_private (class, sizeof (GtkInvisiblePrivate));
 }
 
 static void
 gtk_invisible_init (GtkInvisible *invisible)
 {
-  GdkColormap *colormap;
-  
-  GTK_WIDGET_UNSET_FLAGS (invisible, GTK_NO_WINDOW);
-  GTK_WIDGET_SET_FLAGS (invisible, GTK_TOPLEVEL);
+  GtkInvisiblePrivate *priv;
 
-  gtk_widget_ref (GTK_WIDGET (invisible));
-  gtk_object_sink (GTK_OBJECT (invisible));
+  invisible->priv = G_TYPE_INSTANCE_GET_PRIVATE (invisible,
+                                                 GTK_TYPE_INVISIBLE,
+                                                 GtkInvisiblePrivate);
+  priv = invisible->priv;
 
-  invisible->has_user_ref_count = TRUE;
-  
-  colormap = _gtk_widget_peek_colormap ();
-  if (colormap)
-    gtk_widget_set_colormap (GTK_WIDGET (invisible), colormap);
+  gtk_widget_set_has_window (GTK_WIDGET (invisible), TRUE);
+  _gtk_widget_set_is_toplevel (GTK_WIDGET (invisible), TRUE);
+
+  g_object_ref_sink (invisible);
+
+  priv->has_user_ref_count = TRUE;
+  priv->screen = gdk_screen_get_default ();
 }
 
 static void
-gtk_invisible_destroy (GtkObject *object)
+gtk_invisible_destroy (GtkWidget *widget)
 {
-  GtkInvisible *invisible = GTK_INVISIBLE (object);
-  
-  if (invisible->has_user_ref_count)
+  GtkInvisible *invisible = GTK_INVISIBLE (widget);
+  GtkInvisiblePrivate *priv = invisible->priv;
+
+  if (priv->has_user_ref_count)
     {
-      invisible->has_user_ref_count = FALSE;
-      gtk_widget_unref (GTK_WIDGET (invisible));
+      priv->has_user_ref_count = FALSE;
+      g_object_unref (invisible);
     }
+
+  GTK_WIDGET_CLASS (gtk_invisible_parent_class)->destroy (widget);
+}
+
+/**
+ * gtk_invisible_new_for_screen:
+ * @screen: a #GdkScreen which identifies on which
+ *	    the new #GtkInvisible will be created.
+ *
+ * Creates a new #GtkInvisible object for a specified screen
+ *
+ * Return value: a newly created #GtkInvisible object
+ *
+ * Since: 2.2
+ **/
+GtkWidget* 
+gtk_invisible_new_for_screen (GdkScreen *screen)
+{
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+  
+  return g_object_new (GTK_TYPE_INVISIBLE, "screen", screen, NULL);
 }
 
+/**
+ * gtk_invisible_new:
+ * 
+ * Creates a new #GtkInvisible.
+ * 
+ * Return value: a new #GtkInvisible.
+ **/
 GtkWidget*
 gtk_invisible_new (void)
 {
-  GtkWidget *result = GTK_WIDGET (gtk_type_new (GTK_TYPE_INVISIBLE));
-  gtk_widget_realize (result);
+  return g_object_new (GTK_TYPE_INVISIBLE, NULL);
+}
+
+/**
+ * gtk_invisible_set_screen:
+ * @invisible: a #GtkInvisible.
+ * @screen: a #GdkScreen.
+ *
+ * Sets the #GdkScreen where the #GtkInvisible object will be displayed.
+ *
+ * Since: 2.2
+ **/ 
+void
+gtk_invisible_set_screen (GtkInvisible *invisible,
+			  GdkScreen    *screen)
+{
+  GtkInvisiblePrivate *priv;
+  GtkWidget *widget;
+  GdkScreen *previous_screen;
+  gboolean was_realized;
+
+  g_return_if_fail (GTK_IS_INVISIBLE (invisible));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+  priv = invisible->priv;
+
+  if (screen == priv->screen)
+    return;
+
+  widget = GTK_WIDGET (invisible);
+
+  previous_screen = priv->screen;
+  was_realized = gtk_widget_get_realized (widget);
+
+  if (was_realized)
+    gtk_widget_unrealize (widget);
+
+  priv->screen = screen;
+  if (screen != previous_screen)
+    _gtk_widget_propagate_screen_changed (widget, previous_screen);
+  g_object_notify (G_OBJECT (invisible), "screen");
+  
+  if (was_realized)
+    gtk_widget_realize (widget);
+}
+
+/**
+ * gtk_invisible_get_screen:
+ * @invisible: a #GtkInvisible.
+ *
+ * Returns the #GdkScreen object associated with @invisible
+ *
+ * Return value: (transfer none): the associated #GdkScreen.
+ *
+ * Since: 2.2
+ **/
+GdkScreen *
+gtk_invisible_get_screen (GtkInvisible *invisible)
+{
+  g_return_val_if_fail (GTK_IS_INVISIBLE (invisible), NULL);
 
-  return result;
+  return invisible->priv->screen;
 }
 
 static void
 gtk_invisible_realize (GtkWidget *widget)
 {
+  GdkWindow *parent;
+  GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (GTK_IS_INVISIBLE (widget));
+  gtk_widget_set_realized (widget, TRUE);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  parent = gtk_widget_get_parent_window (widget);
+  if (parent == NULL)
+    parent = gtk_widget_get_root_window (widget);
 
   attributes.x = -100;
   attributes.y = -100;
@@ -140,15 +258,13 @@ gtk_invisible_realize (GtkWidget *widget)
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
 
-  widget->window = gdk_window_new (NULL, &attributes, attributes_mask);
-  gdk_window_set_user_data (widget->window, widget);
-  
-  widget->style = gtk_style_attach (widget->style, widget->window);
+  window = gdk_window_new (parent, &attributes, attributes_mask);
+  gtk_widget_set_window (widget, window);
+  gtk_widget_register_window (widget, window);
 }
 
 static void
-gtk_invisible_style_set (GtkWidget *widget,
-			 GtkStyle  *previous_style)
+gtk_invisible_style_updated (GtkWidget *widget)
 {
   /* Don't chain up to parent implementation */
 }
@@ -156,15 +272,72 @@ gtk_invisible_style_set (GtkWidget *widget,
 static void
 gtk_invisible_show (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
-
-  GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
+  _gtk_widget_set_visible_flag (widget, TRUE);
   gtk_widget_map (widget);
 }
 
 static void
 gtk_invisible_size_allocate (GtkWidget     *widget,
-			    GtkAllocation *allocation)
+                             GtkAllocation *allocation)
+{
+  gtk_widget_set_allocation (widget, allocation);
+}
+
+
+static void 
+gtk_invisible_set_property  (GObject      *object,
+			     guint         prop_id,
+			     const GValue *value,
+			     GParamSpec   *pspec)
 {
-  widget->allocation = *allocation;
+  GtkInvisible *invisible = GTK_INVISIBLE (object);
+  
+  switch (prop_id)
+    {
+    case PROP_SCREEN:
+      gtk_invisible_set_screen (invisible, g_value_get_object (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void 
+gtk_invisible_get_property  (GObject      *object,
+			     guint         prop_id,
+			     GValue	  *value,
+			     GParamSpec   *pspec)
+{
+  GtkInvisible *invisible = GTK_INVISIBLE (object);
+  GtkInvisiblePrivate *priv = invisible->priv;
+
+  switch (prop_id)
+    {
+    case PROP_SCREEN:
+      g_value_set_object (value, priv->screen);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+/* We use a constructor here so that we can realize the invisible on
+ * the correct screen after the "screen" property has been set
+ */
+static GObject*
+gtk_invisible_constructor (GType                  type,
+			   guint                  n_construct_properties,
+			   GObjectConstructParam *construct_params)
+{
+  GObject *object;
+
+  object = G_OBJECT_CLASS (gtk_invisible_parent_class)->constructor (type,
+                                                                     n_construct_properties,
+                                                                     construct_params);
+
+  gtk_widget_realize (GTK_WIDGET (object));
+
+  return object;
 }