X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkoffscreenwindow.c;h=8e9f23f02ce997649891ec1aa933c16e88b80851;hb=a97178af65072e98605b2ce168ee4cc36f684ca2;hp=26bbadb1ec07937c570821f1479fec039f02d15d;hpb=b140884fec56d0ac5f15fe3937879a7a1dd6f0c1;p=~andy%2Fgtk
diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c
index 26bbadb1e..8e9f23f02 100644
--- a/gtk/gtkoffscreenwindow.c
+++ b/gtk/gtkoffscreenwindow.c
@@ -10,9 +10,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 .
*
* Authors: Cody Russell
* Alexander Larsson
@@ -21,72 +19,102 @@
#include "config.h"
#include "gtkoffscreenwindow.h"
-
-#include "gtksizerequest.h"
+#include "gtkwidgetprivate.h"
+#include "gtkcontainerprivate.h"
+#include "gtkprivate.h"
/**
* SECTION:gtkoffscreenwindow
- * @short_description: A toplevel container widget used to manage offscreen
- * rendering of child widgets.
+ * @short_description: A toplevel to manage offscreen rendering of child widgets
* @title: GtkOffscreenWindow
*
- * #GtkOffscreenWindow is strictly intended to be used for obtaining
+ * GtkOffscreenWindow is strictly intended to be used for obtaining
* snapshots of widgets that are not part of a normal widget hierarchy.
- * It differs from gtk_widget_get_snapshot() in that the widget you
- * want to get a snapshot of need not be displayed on the user's screen
- * as a part of a widget hierarchy. However, since #GtkOffscreenWindow
- * is a toplevel widget you cannot obtain snapshots of a full window
- * with it since you cannot pack a toplevel widget in another toplevel.
+ * Since #GtkOffscreenWindow is a toplevel widget you cannot obtain
+ * snapshots of a full window with it since you cannot pack a toplevel
+ * widget in another toplevel.
*
* The idea is to take a widget and manually set the state of it,
- * add it to a #GtkOffscreenWindow and then retrieve the snapshot
- * as a #GdkPixmap or #GdkPixbuf.
+ * add it to a GtkOffscreenWindow and then retrieve the snapshot
+ * as a #cairo_surface_t or #GdkPixbuf.
*
- * #GtkOffscreenWindow derives from #GtkWindow only as an implementation
+ * GtkOffscreenWindow derives from #GtkWindow only as an implementation
* detail. Applications should not use any API specific to #GtkWindow
* to operate on this object. It should be treated as a #GtkBin that
* has no parent widget.
*
- * When contained offscreen widgets are redrawn, #GtkOffscreenWindow
+ * When contained offscreen widgets are redrawn, GtkOffscreenWindow
* will emit a #GtkWidget::damage-event signal.
*/
G_DEFINE_TYPE (GtkOffscreenWindow, gtk_offscreen_window, GTK_TYPE_WINDOW);
static void
-gtk_offscreen_window_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+gtk_offscreen_window_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ GtkBin *bin = GTK_BIN (widget);
+ GtkWidget *child;
+ gint border_width;
+ gint default_width;
+
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+ *minimum = border_width * 2;
+ *natural = border_width * 2;
+
+ child = gtk_bin_get_child (bin);
+
+ if (child != NULL && gtk_widget_get_visible (child))
+ {
+ gint child_min, child_nat;
+
+ gtk_widget_get_preferred_width (child, &child_min, &child_nat);
+
+ *minimum += child_min;
+ *natural += child_nat;
+ }
+
+ gtk_window_get_default_size (GTK_WINDOW (widget),
+ &default_width, NULL);
+
+ *minimum = MAX (*minimum, default_width);
+ *natural = MAX (*natural, default_width);
+}
+
+static void
+gtk_offscreen_window_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
GtkBin *bin = GTK_BIN (widget);
GtkWidget *child;
gint border_width;
- gint default_width, default_height;
+ gint default_height;
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
- requisition->width = border_width * 2;
- requisition->height = border_width * 2;
+ *minimum = border_width * 2;
+ *natural = border_width * 2;
child = gtk_bin_get_child (bin);
if (child != NULL && gtk_widget_get_visible (child))
{
- GtkRequisition child_req;
+ gint child_min, child_nat;
- gtk_size_request_get_size (GTK_SIZE_REQUEST (child),
- &child_req, NULL);
+ gtk_widget_get_preferred_height (child, &child_min, &child_nat);
- requisition->width += child_req.width;
- requisition->height += child_req.height;
+ *minimum += child_min;
+ *natural += child_nat;
}
gtk_window_get_default_size (GTK_WINDOW (widget),
- &default_width, &default_height);
- if (default_width > 0)
- requisition->width = default_width;
+ NULL, &default_height);
- if (default_height > 0)
- requisition->height = default_height;
+ *minimum = MAX (*minimum, default_height);
+ *natural = MAX (*natural, default_height);
}
static void
@@ -134,14 +162,11 @@ gtk_offscreen_window_realize (GtkWidget *widget)
GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
- gint border_width;
bin = GTK_BIN (widget);
gtk_widget_set_realized (widget, TRUE);
- border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
gtk_widget_get_allocation (widget, &allocation);
attributes.x = allocation.x;
@@ -151,23 +176,21 @@ gtk_offscreen_window_realize (GtkWidget *widget)
attributes.window_type = GDK_WINDOW_OFFSCREEN;
attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
attributes.wclass = GDK_INPUT_OUTPUT;
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
gtk_widget_set_window (widget, window);
- gdk_window_set_user_data (window, widget);
+ gtk_widget_register_window (widget, window);
child = gtk_bin_get_child (bin);
if (child)
gtk_widget_set_parent_window (child, window);
- gtk_widget_style_attach (widget);
- gtk_style_set_background (gtk_widget_get_style (widget),
- window, GTK_STATE_NORMAL);
+ gtk_style_context_set_background (gtk_widget_get_style_context (widget),
+ window);
}
static void
@@ -176,8 +199,7 @@ gtk_offscreen_window_resize (GtkWidget *widget)
GtkAllocation allocation = { 0, 0 };
GtkRequisition requisition;
- gtk_size_request_get_size (GTK_SIZE_REQUEST (widget),
- &requisition, NULL);
+ gtk_widget_get_preferred_size (widget, &requisition, NULL);
allocation.width = requisition.width;
allocation.height = requisition.height;
@@ -198,13 +220,10 @@ static void
gtk_offscreen_window_show (GtkWidget *widget)
{
gboolean need_resize;
- GtkContainer *container;
- GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
+ _gtk_widget_set_visible_flag (widget, TRUE);
- container = GTK_CONTAINER (widget);
- need_resize = _gtk_container_get_need_resize (container) || !gtk_widget_get_realized (widget);
- _gtk_container_set_need_resize (container, FALSE);
+ need_resize = _gtk_widget_get_alloc_needed (widget) || !gtk_widget_get_realized (widget);
if (need_resize)
gtk_offscreen_window_resize (widget);
@@ -219,7 +238,7 @@ gtk_offscreen_window_show (GtkWidget *widget)
static void
gtk_offscreen_window_hide (GtkWidget *widget)
{
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
+ _gtk_widget_set_visible_flag (widget, FALSE);
gtk_widget_unmap (widget);
}
@@ -244,7 +263,8 @@ gtk_offscreen_window_class_init (GtkOffscreenWindowClass *class)
widget_class->realize = gtk_offscreen_window_realize;
widget_class->show = gtk_offscreen_window_show;
widget_class->hide = gtk_offscreen_window_hide;
- widget_class->size_request = gtk_offscreen_window_size_request;
+ widget_class->get_preferred_width = gtk_offscreen_window_get_preferred_width;
+ widget_class->get_preferred_height = gtk_offscreen_window_get_preferred_height;
widget_class->size_allocate = gtk_offscreen_window_size_allocate;
container_class->check_resize = gtk_offscreen_window_check_resize;
@@ -260,9 +280,7 @@ gtk_offscreen_window_init (GtkOffscreenWindow *window)
* gtk_offscreen_window_new:
*
* Creates a toplevel container widget that is used to retrieve
- * snapshots of widgets without showing them on the screen. For
- * widgets that are on the screen and part of a normal widget
- * hierarchy, gtk_widget_get_snapshot() can be used instead.
+ * snapshots of widgets without showing them on the screen.
*
* Return value: A pointer to a #GtkWidget
*
@@ -275,23 +293,24 @@ gtk_offscreen_window_new (void)
}
/**
- * gtk_offscreen_window_get_pixmap:
+ * gtk_offscreen_window_get_surface:
* @offscreen: the #GtkOffscreenWindow contained widget.
*
* Retrieves a snapshot of the contained widget in the form of
- * a #GdkPixmap. If you need to keep this around over window
+ * a #cairo_surface_t. If you need to keep this around over window
* resizes then you should add a reference to it.
*
- * Returns: A #GdkPixmap pointer to the offscreen pixmap, or %NULL.
+ * Returns: (transfer none): A #cairo_surface_t pointer to the offscreen
+ * surface, or %NULL.
*
* Since: 2.20
*/
-GdkPixmap *
-gtk_offscreen_window_get_pixmap (GtkOffscreenWindow *offscreen)
+cairo_surface_t *
+gtk_offscreen_window_get_surface (GtkOffscreenWindow *offscreen)
{
g_return_val_if_fail (GTK_IS_OFFSCREEN_WINDOW (offscreen), NULL);
- return gdk_offscreen_window_get_pixmap (gtk_widget_get_window (GTK_WIDGET (offscreen)));
+ return gdk_offscreen_window_get_surface (gtk_widget_get_window (GTK_WIDGET (offscreen)));
}
/**
@@ -303,29 +322,28 @@ gtk_offscreen_window_get_pixmap (GtkOffscreenWindow *offscreen)
* and the application should unreference it once it is no longer
* needed.
*
- * Returns: A #GdkPixbuf pointer, or %NULL.
+ * Returns: (transfer full): A #GdkPixbuf pointer, or %NULL.
*
* Since: 2.20
*/
GdkPixbuf *
gtk_offscreen_window_get_pixbuf (GtkOffscreenWindow *offscreen)
{
- GdkPixmap *pixmap = NULL;
+ cairo_surface_t *surface;
GdkPixbuf *pixbuf = NULL;
+ GdkWindow *window;
g_return_val_if_fail (GTK_IS_OFFSCREEN_WINDOW (offscreen), NULL);
- pixmap = gdk_offscreen_window_get_pixmap (gtk_widget_get_window (GTK_WIDGET (offscreen)));
+ window = gtk_widget_get_window (GTK_WIDGET (offscreen));
+ surface = gdk_offscreen_window_get_surface (window);
- if (pixmap != NULL)
+ if (surface != NULL)
{
- gint width, height;
-
- gdk_drawable_get_size (pixmap, &width, &height);
-
- pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, NULL,
- 0, 0, 0, 0,
- width, height);
+ pixbuf = gdk_pixbuf_get_from_surface (surface,
+ 0, 0,
+ gdk_window_get_width (window),
+ gdk_window_get_height (window));
}
return pixbuf;