add note that the semantics of this call, when mixed with the new

2007-07-20  Ryan Lortie  <desrt@desrt.ca>

        * gtk/gtkwidget.c (gtk_widget_is_composited): add note that the
        semantics of this call, when mixed with the new
        gdk_window_set_composited(), will change in the future.

        * gdk/x11/gdkevents-x11.c (gdk_event_translate): only grab Damage
        events that belong to us.

svn path=/trunk/; revision=18506

diff --git a/ChangeLog b/ChangeLog
index 53cca51a3aef972fc229e4351cc1d216297c9d96..f2db9026c2c8dc16dbbd1df180615f2c0148a20d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-20  Ryan Lortie  <desrt@desrt.ca>
+
+       * gtk/gtkwidget.c (gtk_widget_is_composited): add note that the
+       semantics of this call, when mixed with the new
+       gdk_window_set_composited(), will change in the future.
+
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): only grab Damage
+       events that belong to us.
+
 2007-07-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_completion_key_press): Handle

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index c2dac336df298016da7e2af585048dcd508805c2..2028693cb08223498800aa52a73e86c4809f173a 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1,5 +1,6 @@
 /* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ * Copyright (C) 1995-2007 Peter Mattis, Spencer Kimball,
+ * Josh MacDonald, Ryan Lortie
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 5c95de7dfa0973e65f50b58b7c74901d38ff4c12..d55b572dd54a21ec37fd926cda9f894b8aee3296 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1,5 +1,6 @@
 /* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ * Copyright (C) 1995-2007 Peter Mattis, Spencer Kimball,
+ * Josh MacDonald, Ryan Lortie
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -2103,7 +2104,8 @@ gdk_event_translate (GdkDisplay *display,
 #endif
 #if defined(HAVE_XCOMPOSITE) && defined (HAVE_XDAMAGE) && defined (HAVE_XFIXES)
       if (display_x11->have_xdamage && window_private && window_private->composited &&
-         xevent->type == display_x11->xdamage_event_base + XDamageNotify)
+         xevent->type == display_x11->xdamage_event_base + XDamageNotify &&
+         ((XDamageNotifyEvent *) xevent)->damage == window_impl->damage)
        {
          XDamageNotifyEvent *damage_event = (XDamageNotifyEvent *) xevent;
          XserverRegion repair;
@@ -2115,7 +2117,7 @@ gdk_event_translate (GdkDisplay *display,
          rect.height = damage_event->area.height;
 
          repair = XFixesCreateRegion (display_x11->xdisplay,
-                                     &damage_event->area, 1);
+                                      &damage_event->area, 1);
          XDamageSubtract (display_x11->xdisplay,
                           window_impl->damage,
                           repair, None);

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 045e5a037409bb85b36e79b6db433f8f479ac541..ae4fab0630ac741c84fde1dd12d03490f11f8019 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1,5 +1,6 @@
 /* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ * Copyright (C) 1995-2007 Peter Mattis, Spencer Kimball,
+ * Josh MacDonald, Ryan Lortie
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 8e784013c4ee9167a0c7fee5400713afd12207ad..56829568c60ba577012f28187ad8e7e03c044bdf 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6154,6 +6154,11 @@ gtk_widget_propagate_screen_changed_recurse (GtkWidget *widget,
  * Whether @widget can rely on having its alpha channel
  * drawn correctly. On X11 this function returns whether a
  * compositing manager is running for @widget's screen.
+ *
+ * Please note that the semantics of this call will change
+ * in the future if used on a widget that has a composited
+ * window in its heirarchy (as set by
+ * gdk_window_set_composited()).
  * 
  * Return value: %TRUE if the widget can rely on its alpha
  * channel being drawn correctly.