retionalized multihead code in _gdk_x11_copy_to_image. fixes #80256 and

2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>

        * gdk/x11/gdkimage-x11.c : retionalized multihead code
	in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems.

diff --git a/ChangeLog b/ChangeLog
index 6b393f82e6a710738db8908bbb42f8628d824bec..7514d3bf53447cbd9a91c34ed3545cdadf2e4ae2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
+
+        * gdk/x11/gdkimage-x11.c : retionalized multihead code
+        in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems.
+
 2002-04-30  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6b393f82e6a710738db8908bbb42f8628d824bec..7514d3bf53447cbd9a91c34ed3545cdadf2e4ae2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
+
+        * gdk/x11/gdkimage-x11.c : retionalized multihead code
+        in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems.
+
 2002-04-30  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6b393f82e6a710738db8908bbb42f8628d824bec..7514d3bf53447cbd9a91c34ed3545cdadf2e4ae2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
+
+        * gdk/x11/gdkimage-x11.c : retionalized multihead code
+        in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems.
+
 2002-04-30  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6b393f82e6a710738db8908bbb42f8628d824bec..7514d3bf53447cbd9a91c34ed3545cdadf2e4ae2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
+
+        * gdk/x11/gdkimage-x11.c : retionalized multihead code
+        in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems.
+
 2002-04-30  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6b393f82e6a710738db8908bbb42f8628d824bec..7514d3bf53447cbd9a91c34ed3545cdadf2e4ae2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
+
+        * gdk/x11/gdkimage-x11.c : retionalized multihead code
+        in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems.
+
 2002-04-30  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6b393f82e6a710738db8908bbb42f8628d824bec..7514d3bf53447cbd9a91c34ed3545cdadf2e4ae2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
+
+        * gdk/x11/gdkimage-x11.c : retionalized multihead code
+        in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems.
+
 2002-04-30  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign

diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index a813d27faa1cfeb899dace97fbdaf3e70c1c0f35..3fd26d480678b899d36223f8b3991bab46f922db 100644 (file)
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -495,6 +495,8 @@ _gdk_x11_copy_to_image (GdkDrawable    *drawable,
   GdkImagePrivateX11 *private;
   GdkDrawableImplX11 *impl;
   GdkVisual *visual;
+  GdkDisplay *display;
+  Display *xdisplay;
   gboolean have_grab;
   GdkRectangle req;
   GdkRectangle window_rect;
@@ -506,13 +508,16 @@ _gdk_x11_copy_to_image (GdkDrawable    *drawable,
 
   visual = gdk_drawable_get_visual (drawable);
   impl = GDK_DRAWABLE_IMPL_X11 (drawable);
+  display = gdk_drawable_get_display (drawable);
+  xdisplay = gdk_x11_display_get_xdisplay (display);
+  
   
   have_grab = FALSE;
 
 #define UNGRAB() G_STMT_START {                                        \
     if (have_grab) {                                           \
-      gdk_x11_display_ungrab (GDK_DRAWABLE_DISPLAY (drawable)); \
-      XFlush (GDK_DRAWABLE_DISPLAY (drawable));                \
+      gdk_x11_display_ungrab (display);                                \
+      XFlush (xdisplay);                                       \
       have_grab = FALSE; }                                     \
   } G_STMT_END
 
@@ -524,7 +529,6 @@ _gdk_x11_copy_to_image (GdkDrawable    *drawable,
       shm_pixmap = _gdk_x11_image_get_shm_pixmap (image);
       if (shm_pixmap)
        {
-         Display *xdisplay = GDK_SCREEN_XDISPLAY (impl->screen);
          GC xgc;
          XGCValues values;
 
@@ -553,18 +557,18 @@ _gdk_x11_copy_to_image (GdkDrawable    *drawable,
       Window child;
 
       have_grab = TRUE;
-      gdk_x11_display_grab (gdk_screen_get_display (impl->screen));
+      gdk_x11_display_grab (display);
 
       /* Translate screen area into window coordinates */
-      XTranslateCoordinates (GDK_SCREEN_XDISPLAY (impl->screen),
+      XTranslateCoordinates (xdisplay,
                             GDK_SCREEN_XROOTWIN (impl->screen),
                             impl->xid,
                             0, 0, 
                             &screen_rect.x, &screen_rect.y, 
                             &child);
 
-      screen_rect.width = gdk_screen_get_width (visual->screen);
-      screen_rect.height = gdk_screen_get_height (visual->screen);
+      screen_rect.width = gdk_screen_get_width (impl->screen);
+      screen_rect.height = gdk_screen_get_height (impl->screen);
       
       gdk_error_trap_push ();
 
@@ -633,8 +637,7 @@ _gdk_x11_copy_to_image (GdkDrawable    *drawable,
       /* In the ShmImage but no ShmPixmap case, we could use XShmGetImage when
        * we are getting the entire image.
        */
-      if (XGetSubImage (GDK_SCREEN_XDISPLAY (impl->screen),
-                       impl->xid,
+      if (XGetSubImage (xdisplay, impl->xid,
                        req.x, req.y, req.width, req.height,
                        AllPlanes, ZPixmap,
                        private->ximage,
@@ -651,8 +654,8 @@ _gdk_x11_copy_to_image (GdkDrawable    *drawable,
   
   if (have_grab)
     {                          
-      gdk_x11_display_ungrab (gdk_drawable_get_display (drawable));
-      XFlush (GDK_DRAWABLE_XDISPLAY (drawable));
+      gdk_x11_display_ungrab (display);
+      XFlush (xdisplay);
       have_grab = FALSE;
     }