XCopyArea with subwindow_mode = IncludeInferiors. (#70999)

Sat Feb  9 00:16:31 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image):
        XCopyArea with subwindow_mode = IncludeInferiors.
        (#70999)

        * demos/testpixbuf-save.c (configure_cb): Fix a minor
        memory management problem.
This commit is contained in:
Owen Taylor 2002-02-09 05:24:25 +00:00 committed by Owen Taylor
parent e16d01d6a6
commit 60542887d5
9 changed files with 70 additions and 3 deletions

View File

@ -1,3 +1,12 @@
Sat Feb 9 00:16:31 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image):
XCopyArea with subwindow_mode = IncludeInferiors.
(#70999)
* demos/testpixbuf-save.c (configure_cb): Fix a minor
memory management problem.
Fri Feb 8 20:24:58 2002 Owen Taylor <otaylor@redhat.com>

View File

@ -1,3 +1,12 @@
Sat Feb 9 00:16:31 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image):
XCopyArea with subwindow_mode = IncludeInferiors.
(#70999)
* demos/testpixbuf-save.c (configure_cb): Fix a minor
memory management problem.
Fri Feb 8 20:24:58 2002 Owen Taylor <otaylor@redhat.com>

View File

@ -1,3 +1,12 @@
Sat Feb 9 00:16:31 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image):
XCopyArea with subwindow_mode = IncludeInferiors.
(#70999)
* demos/testpixbuf-save.c (configure_cb): Fix a minor
memory management problem.
Fri Feb 8 20:24:58 2002 Owen Taylor <otaylor@redhat.com>

View File

@ -1,3 +1,12 @@
Sat Feb 9 00:16:31 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image):
XCopyArea with subwindow_mode = IncludeInferiors.
(#70999)
* demos/testpixbuf-save.c (configure_cb): Fix a minor
memory management problem.
Fri Feb 8 20:24:58 2002 Owen Taylor <otaylor@redhat.com>

View File

@ -1,3 +1,12 @@
Sat Feb 9 00:16:31 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image):
XCopyArea with subwindow_mode = IncludeInferiors.
(#70999)
* demos/testpixbuf-save.c (configure_cb): Fix a minor
memory management problem.
Fri Feb 8 20:24:58 2002 Owen Taylor <otaylor@redhat.com>

View File

@ -1,3 +1,12 @@
Sat Feb 9 00:16:31 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image):
XCopyArea with subwindow_mode = IncludeInferiors.
(#70999)
* demos/testpixbuf-save.c (configure_cb): Fix a minor
memory management problem.
Fri Feb 8 20:24:58 2002 Owen Taylor <otaylor@redhat.com>

View File

@ -1,3 +1,12 @@
Sat Feb 9 00:16:31 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image):
XCopyArea with subwindow_mode = IncludeInferiors.
(#70999)
* demos/testpixbuf-save.c (configure_cb): Fix a minor
memory management problem.
Fri Feb 8 20:24:58 2002 Owen Taylor <otaylor@redhat.com>

View File

@ -204,8 +204,8 @@ configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
root = gdk_get_default_root_window ();
new_pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
0, 0, 0, 0, evt->width, evt->height);
g_object_set_data (G_OBJECT (drawing_area), "pixbuf", new_pixbuf);
g_object_unref (pixbuf);
g_object_set_data_full (G_OBJECT (drawing_area), "pixbuf", new_pixbuf,
(GDestroyNotify) g_object_unref);
}
return FALSE;

View File

@ -506,9 +506,13 @@ _gdk_x11_copy_to_image (GdkDrawable *drawable,
shm_pixmap = _gdk_x11_image_get_shm_pixmap (image);
if (shm_pixmap)
{
GC xgc;
XGCValues values;
/* Again easy, we can just XCopyArea, and don't have to worry about clipping
*/
GC xgc = XCreateGC (impl->xdisplay, impl->xid, 0, NULL);
values.subwindow_mode = IncludeInferiors;
xgc = XCreateGC (impl->xdisplay, impl->xid, GCSubwindowMode, &values);
XCopyArea (impl->xdisplay, impl->xid, shm_pixmap, xgc,
src_x, src_y, width, height, dest_x, dest_y);