]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkpreview.c
Improve wording. String change! (#355128, David Lodge)
[~andy/gtk] / gtk / gtkpreview.c
index 6490fca6da24e6a14d3919d2482a7ab14c34cdfc..736c1bca12bf66be6bc2402e5ad229bab527b27e 100644 (file)
  * 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 Library General Public
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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/. 
+ */
+
+#undef GDK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+
+#include <config.h>
+
 #include <math.h>
 #include <string.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
-#include "gdk/gdkx.h"
+#endif
 #include "gdk/gdkrgb.h"
 #include "gtkpreview.h"
 #include "gtksignal.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
 
 
 #define PREVIEW_CLASS(w)      GTK_PREVIEW_CLASS (GTK_OBJECT (w)->klass)
 
-
-static void   gtk_preview_class_init    (GtkPreviewClass  *klass);
-static void   gtk_preview_init          (GtkPreview       *preview);
-static void   gtk_preview_finalize      (GtkObject        *object);
+enum {
+  PROP_0,
+  PROP_EXPAND
+};
+
+
+static void   gtk_preview_set_property  (GObject          *object,
+                                        guint             prop_id,
+                                        const GValue     *value,
+                                        GParamSpec       *pspec);
+static void   gtk_preview_get_property  (GObject          *object,
+                                        guint             prop_id,
+                                        GValue           *value,
+                                        GParamSpec       *pspec);
+static void   gtk_preview_finalize      (GObject          *object);
 static void   gtk_preview_realize       (GtkWidget        *widget);
+static void   gtk_preview_size_allocate (GtkWidget        *widget,
+                                        GtkAllocation    *allocation);
 static gint   gtk_preview_expose        (GtkWidget        *widget,
                                         GdkEventExpose   *event);
 static void   gtk_preview_make_buffer   (GtkPreview       *preview);
 static void   gtk_fill_lookup_array     (guchar           *array);
 
-static GtkWidgetClass *parent_class = NULL;
 static GtkPreviewClass *preview_class = NULL;
 static gint install_cmap = FALSE;
 
 
-guint
-gtk_preview_get_type (void)
-{
-  static guint preview_type = 0;
-
-  if (!preview_type)
-    {
-      GtkTypeInfo preview_info =
-      {
-        "GtkPreview",
-        sizeof (GtkPreview),
-        sizeof (GtkPreviewClass),
-        (GtkClassInitFunc) gtk_preview_class_init,
-        (GtkObjectInitFunc) gtk_preview_init,
-       /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      preview_type = gtk_type_unique (gtk_widget_get_type (), &preview_info);
-    }
-
-  return preview_type;
-}
+G_DEFINE_TYPE (GtkPreview, gtk_preview, GTK_TYPE_WIDGET)
 
 static void
 gtk_preview_class_init (GtkPreviewClass *klass)
 {
-  GtkObjectClass *object_class;
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class;
 
-  object_class = (GtkObjectClass*) klass;
   widget_class = (GtkWidgetClass*) klass;
 
-  parent_class = gtk_type_class (gtk_widget_get_type ());
   preview_class = klass;
 
-  object_class->finalize = gtk_preview_finalize;
+  gobject_class->finalize = gtk_preview_finalize;
+
+  gobject_class->set_property = gtk_preview_set_property;
+  gobject_class->get_property = gtk_preview_get_property;
 
   widget_class->realize = gtk_preview_realize;
+  widget_class->size_allocate = gtk_preview_size_allocate;
   widget_class->expose_event = gtk_preview_expose;
 
-  klass->info.visual = NULL;
-  klass->info.cmap = NULL;
-
   klass->info.lookup = NULL;
 
   klass->info.gamma = 1.0;
 
   gdk_rgb_init ();
-  klass->info.cmap = gdk_rgb_get_cmap ();
-  klass->info.visual = gdk_rgb_get_visual ();
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_EXPAND,
+                                   g_param_spec_boolean ("expand",
+                                                        P_("Expand"),
+                                                        P_("Whether the preview widget should take up the entire space it is allocated"),
+                                                        FALSE,
+                                                        GTK_PARAM_READWRITE));
+}
+
+static void
+gtk_preview_set_property (GObject      *object,
+                         guint         prop_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  GtkPreview *preview = GTK_PREVIEW (object);
+  
+  switch (prop_id)
+    {
+    case PROP_EXPAND:
+      gtk_preview_set_expand (preview, g_value_get_boolean (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_preview_get_property (GObject      *object,
+                         guint         prop_id,
+                         GValue       *value,
+                         GParamSpec   *pspec)
+{
+  GtkPreview *preview;
+  
+  preview = GTK_PREVIEW (object);
+  
+  switch (prop_id)
+    {
+    case PROP_EXPAND:
+      g_value_set_boolean (value, preview->expand);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
 }
 
 void
@@ -107,8 +157,6 @@ gtk_preview_reset (void)
 static void
 gtk_preview_init (GtkPreview *preview)
 {
-  GTK_WIDGET_SET_FLAGS (preview, GTK_BASIC);
-
   preview->buffer = NULL;
   preview->buffer_width = 0;
   preview->buffer_height = 0;
@@ -118,7 +166,6 @@ gtk_preview_init (GtkPreview *preview)
 void
 gtk_preview_uninit (void)
 {
-
   /* unimplemented */
 }
 
@@ -145,7 +192,6 @@ gtk_preview_size (GtkPreview *preview,
                  gint        width,
                  gint        height)
 {
-  g_return_if_fail (preview != NULL);
   g_return_if_fail (GTK_IS_PREVIEW (preview));
 
   if ((width != GTK_WIDGET (preview)->requisition.width) ||
@@ -171,21 +217,17 @@ gtk_preview_put (GtkPreview   *preview,
                 gint          width,
                 gint          height)
 {
-  GtkWidget *widget;
   GdkRectangle r1, r2, r3;
   guchar *src;
   guint bpp;
   guint rowstride;
 
-  g_return_if_fail (preview != NULL);
   g_return_if_fail (GTK_IS_PREVIEW (preview));
   g_return_if_fail (window != NULL);
 
   if (!preview->buffer)
     return;
 
-  widget = GTK_WIDGET (preview);
-
   r1.x = 0;
   r1.y = 0;
   r1.width = preview->buffer_width;
@@ -227,17 +269,6 @@ gtk_preview_put (GtkPreview   *preview,
                        
 }
 
-void
-gtk_preview_put_row (GtkPreview *preview,
-                    guchar     *src,
-                    guchar     *dest,
-                    gint        x,
-                    gint        y,
-                    gint        w)
-{
-  g_warning ("gtk_preview_put_row not implemented (deprecated)\n");
-}
-
 void
 gtk_preview_draw_row (GtkPreview *preview,
                      guchar     *data,
@@ -248,10 +279,8 @@ gtk_preview_draw_row (GtkPreview *preview,
   guint bpp;
   guint rowstride;
 
-  g_return_if_fail (preview != NULL);
   g_return_if_fail (GTK_IS_PREVIEW (preview));
   g_return_if_fail (data != NULL);
-  g_return_if_fail (preview_class->info.visual != NULL);
   
   bpp = (preview->type == GTK_PREVIEW_COLOR ? 3 : 1);
   rowstride = (preview->buffer_width * bpp + 3) & -4;
@@ -295,12 +324,19 @@ gtk_preview_draw_row (GtkPreview *preview,
 
 void
 gtk_preview_set_expand (GtkPreview *preview,
-                       gint        expand)
+                       gboolean    expand)
 {
-  g_return_if_fail (preview != NULL);
   g_return_if_fail (GTK_IS_PREVIEW (preview));
 
-  preview->expand = (expand != FALSE);
+  expand = expand != FALSE;
+
+  if (preview->expand != expand)
+    {
+      preview->expand = expand;
+      gtk_widget_queue_resize (GTK_WIDGET (preview));
+      g_object_notify (G_OBJECT (preview), "expand"); 
+    }
 }
 
 void
@@ -353,19 +389,13 @@ gtk_preview_set_dither (GtkPreview      *preview,
 GdkVisual*
 gtk_preview_get_visual (void)
 {
-  if (!preview_class)
-    preview_class = gtk_type_class (gtk_preview_get_type ());
-
-  return preview_class->info.visual;
+  return gdk_screen_get_rgb_visual (gdk_screen_get_default ());
 }
 
 GdkColormap*
 gtk_preview_get_cmap (void)
 {
-  if (!preview_class)
-    preview_class = gtk_type_class (gtk_preview_get_type ());
-
-  return preview_class->info.cmap;
+  return gdk_screen_get_rgb_colormap (gdk_screen_get_default ());
 }
 
 GtkPreviewInfo*
@@ -379,11 +409,10 @@ gtk_preview_get_info (void)
 
 
 static void
-gtk_preview_finalize (GtkObject *object)
+gtk_preview_finalize (GObject *object)
 {
   GtkPreview *preview;
 
-  g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_PREVIEW (object));
 
   preview = GTK_PREVIEW (object);
@@ -391,7 +420,7 @@ gtk_preview_finalize (GtkObject *object)
     g_free (preview->buffer);
   preview->type = (GtkPreviewType) -1;
 
-  (* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_preview_parent_class)->finalize (object);
 }
 
 static void
@@ -401,22 +430,30 @@ gtk_preview_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_PREVIEW (widget));
 
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
   preview = GTK_PREVIEW (widget);
 
   attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = widget->allocation.x;
-  attributes.y = widget->allocation.y;
-  attributes.width = widget->allocation.width;
-  attributes.height = widget->allocation.height;
+
+  if (preview->expand)
+    {
+      attributes.width = widget->allocation.width;
+      attributes.height = widget->allocation.height;
+    }
+  else
+    {
+      attributes.width = MIN (widget->requisition.width, widget->allocation.width);
+      attributes.height = MIN (widget->requisition.height, widget->allocation.height);
+    }
+
+  attributes.x = widget->allocation.x + (widget->allocation.width - attributes.width) / 2;
+  attributes.y = widget->allocation.y + (widget->allocation.height - attributes.height) / 2;;
+
   attributes.wclass = GDK_INPUT_OUTPUT;
-  attributes.visual = preview_class->info.visual;
-  attributes.colormap = preview_class->info.cmap;
   attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
 
   widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
   gdk_window_set_user_data (widget->window, widget);
@@ -425,13 +462,45 @@ gtk_preview_realize (GtkWidget *widget)
   gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
 }
 
+static void   
+gtk_preview_size_allocate (GtkWidget        *widget,
+                          GtkAllocation    *allocation)
+{
+  GtkPreview *preview;
+  gint width, height;
+
+  g_return_if_fail (GTK_IS_PREVIEW (widget));
+
+  preview = GTK_PREVIEW (widget);
+  widget->allocation = *allocation;
+
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      if (preview->expand)
+       {
+         width = widget->allocation.width;
+         height = widget->allocation.height;
+       }
+      else
+       {
+         width = MIN (widget->allocation.width, widget->requisition.width);
+         height = MIN (widget->allocation.height, widget->requisition.height);
+       }
+
+      gdk_window_move_resize (widget->window,
+                             widget->allocation.x + (widget->allocation.width - width) / 2,
+                             widget->allocation.y + (widget->allocation.height - height) / 2,
+                             width, height);
+    }
+}
+
 static gint
 gtk_preview_expose (GtkWidget      *widget,
                    GdkEventExpose *event)
 {
   GtkPreview *preview;
+  gint width, height;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_PREVIEW (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -439,12 +508,12 @@ gtk_preview_expose (GtkWidget      *widget,
     {
       preview = GTK_PREVIEW (widget);
       
+      gdk_window_get_size (widget->window, &width, &height);
+
       gtk_preview_put (GTK_PREVIEW (widget),
                       widget->window, widget->style->black_gc,
-                      event->area.x -
-                      (widget->allocation.width - preview->buffer_width)/2,
-                      event->area.y -
-                      (widget->allocation.height - preview->buffer_height)/2,
+                      event->area.x - (width - preview->buffer_width)/2,
+                      event->area.y - (height - preview->buffer_height)/2,
                       event->area.x, event->area.y,
                       event->area.width, event->area.height);
     }
@@ -459,7 +528,6 @@ gtk_preview_make_buffer (GtkPreview *preview)
   gint width;
   gint height;
 
-  g_return_if_fail (preview != NULL);
   g_return_if_fail (GTK_IS_PREVIEW (preview));
 
   widget = GTK_WIDGET (preview);
@@ -494,7 +562,7 @@ gtk_preview_make_buffer (GtkPreview *preview)
     }
 }
 
-/* This will be useful for implementing gamma. */
+/* This is used for implementing gamma. */
 static void
 gtk_fill_lookup_array (guchar *array)
 {
@@ -512,3 +580,6 @@ gtk_fill_lookup_array (guchar *array)
       array[i] = val;
     }
 }
+
+#define __GTK_PREVIEW_C__
+#include "gtkaliasdef.c"