diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-04-25 22:29:14 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-04-25 22:29:14 +0000 |
| commit | 425b9886c9e042bc4e8c789e6983127981aca6cf (patch) | |
| tree | 9ee6face8770b4e4bea7d4b68cb4e31cb2aa86ab /gdk/gdkpixbuf-drawable.c | |
| parent | e39e92123b156b6a470d54fd4d9000d7eedcf478 (diff) | |
| download | gtk+-425b9886c9e042bc4e8c789e6983127981aca6cf.tar.gz | |
Start of integration of Erwann Chenede's multihead work from the
Thu Apr 25 16:51:40 2002 Owen Taylor <otaylor@redhat.com>
Start of integration of Erwann Chenede's multihead work
from the gtk-multihead branch.
* gdk/gdkdisplay.[ch] gdk/gdkscreen.[ch]
gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkscreen-x11.[ch]
New classes representing a set of screens with attached
input devices and a single contiguous area, respectively.
* gdk/gdk.[ch] gdk/gdkinternals.h gdk/x11/gdkmain-x11.c:
gdk/x11/gdkprivate-x11.h: Make the initialization interface
simple _gdk_windowing_init() and do the rest in
gdk_open_display() calls.
* gdk/gdk.[ch]: Add gdk_parse_args() which can be used
to do the display-independent part of initialization
instead of gdk_init_[check].
* gdk/gdkcursor.h gdk/gdkfont.h gdk/gdkkeys.h gdk/gdkpixmap.h
gdk/gdkproperty.h gdk/gdkselection.h gdk/gdkwindow.h:
Add multihead variants (_for_display(), for_screen()) of functions
getting information specific to a particular screen screen or
display.
* gdk/gdkscreen.[ch]: Add gdk_screen__* variants of functions
like gdk_rgb_get_colormap() that used to get/list global
objects.
* gdk/x11/gdkx.h: Add functions for converting GdkScreen
and GdkDisplay into the X equivalents.
* gdk/x11/gdkwindow-x11.c: Removed gdk_window_xid_at_coords()
not in the headers and unused.
* configure.in gdk/x11/{gxid.c,gxid_lib.[ch],gdkinput-gxi.c}:
Remove gxid support ... has not been tested for a long time...
"xfree" support is more portable to non XFree86.
* gdk/**.h: Add a GDK_MULTIHEAD_SAFE define that can be
used to turn off functions that are inherently non-multihead
safe.
* gdk/**.c: add GDK_NOTE(multihead, ...) calls when functions
are used in non-multihead-safe ways.
* gdk/*.c gdk/x11/*.c: Changes to make the internals of GDK
multihead safe.
Diffstat (limited to 'gdk/gdkpixbuf-drawable.c')
| -rw-r--r-- | gdk/gdkpixbuf-drawable.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c index d74ee95d2d..0a4474969d 100644 --- a/gdk/gdkpixbuf-drawable.c +++ b/gdk/gdkpixbuf-drawable.c @@ -25,12 +25,12 @@ #include <config.h> #include <stdio.h> #include <string.h> -#include "gdk.h" /* For gdk_screen_width/gdk_screen_height */ #include "gdkcolor.h" #include "gdkimage.h" #include "gdkvisual.h" #include "gdkwindow.h" #include "gdkpixbuf.h" +#include "gdkpixmap.h" #include "gdk-pixbuf-private.h" #include "gdkinternals.h" @@ -1552,7 +1552,8 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest, gint width1 = MIN (width - x0, GDK_SCRATCH_IMAGE_WIDTH); - image = _gdk_image_get_scratch (width1, height1, depth, &xs0, &ys0); + image = _gdk_image_get_scratch (gdk_drawable_get_screen (src), + width1, height1, depth, &xs0, &ys0); _gdk_drawable_copy_to_image (src, image, src_x + x0, src_y + y0, |