Add GDK_SUBSTRUCTURE_NOTIFY_MASK

Add GDK_SUBSTRUCTURE_NOTIFY_MASK

Fixed GDK_DESTROY handling WRT GnomeRootwin widget.

gdk/gdk.c

@@ -2279,6 +2279,7 @@ gdk_event_translate (GdkEvent *event,
 	if (gdk_dnd.drag_perhaps && gdk_dnd.drag_really && 
 	    (xevent->xcrossing.window == gdk_dnd.real_sw->xwindow))
 	  {
+#if 0
 	    gdk_dnd.drag_really = 0;
 
 	    GDK_NOTE (DND, g_print("Ungrabbed\n"));
@@ -2288,6 +2289,7 @@ gdk_event_translate (GdkEvent *event,
 	    gdk_dnd.drag_startwindows = NULL;
 	    /* We don't want to ungrab the pointer here, or we'll
 	     * start getting spurious enter/leave events */
+#endif
 #if 0
 	    XChangeActivePointerGrab (gdk_display, 0, None, CurrentTime);
 #endif
@@ -2519,7 +2521,8 @@ gdk_event_translate (GdkEvent *event,
 
       return_val = window_private && !window_private->destroyed;
 
-      gdk_window_destroy_notify (window);
+      if(window && window_private->xwindow != GDK_ROOT_WINDOW())
+        gdk_window_destroy_notify (window);
       break;
 
     case UnmapNotify:

gdk/gdktypes.h

@@ -390,7 +390,8 @@ typedef enum
   GDK_VISIBILITY_NOTIFY_MASK	= 1 << 17,
   GDK_PROXIMITY_IN_MASK		= 1 << 18,
   GDK_PROXIMITY_OUT_MASK	= 1 << 19,
-  GDK_ALL_EVENTS_MASK		= 0x07FFFF
+  GDK_SUBSTRUCTURE_MASK		= 1 << 20,
+  GDK_ALL_EVENTS_MASK		= 0x0FFFFF
 } GdkEventMask;
 
 /* Types of enter/leave notifications.

gdk/gdkwindow.c

@@ -33,8 +33,8 @@
 #include <X11/extensions/shape.h>
 #endif
 
-int nevent_masks = 17;
-int event_mask_table[19] =
+int nevent_masks = 20;
+int event_mask_table[20] =
 {
   ExposureMask,
   PointerMotionMask,
@@ -54,7 +54,8 @@ int event_mask_table[19] =
   PropertyChangeMask,
   VisibilityChangeMask,
   0,				/* PROXIMITY_IN */
-  0				/* PROXIMTY_OUT */
+  0,				/* PROXIMTY_OUT */
+  SubstructureNotifyMask
 };
 
 

gdk/x11/gdkmain-x11.c

@@ -2279,6 +2279,7 @@ gdk_event_translate (GdkEvent *event,
 	if (gdk_dnd.drag_perhaps && gdk_dnd.drag_really && 
 	    (xevent->xcrossing.window == gdk_dnd.real_sw->xwindow))
 	  {
+#if 0
 	    gdk_dnd.drag_really = 0;
 
 	    GDK_NOTE (DND, g_print("Ungrabbed\n"));
@@ -2288,6 +2289,7 @@ gdk_event_translate (GdkEvent *event,
 	    gdk_dnd.drag_startwindows = NULL;
 	    /* We don't want to ungrab the pointer here, or we'll
 	     * start getting spurious enter/leave events */
+#endif
 #if 0
 	    XChangeActivePointerGrab (gdk_display, 0, None, CurrentTime);
 #endif
@@ -2519,7 +2521,8 @@ gdk_event_translate (GdkEvent *event,
 
       return_val = window_private && !window_private->destroyed;
 
-      gdk_window_destroy_notify (window);
+      if(window && window_private->xwindow != GDK_ROOT_WINDOW())
+        gdk_window_destroy_notify (window);
       break;
 
     case UnmapNotify:

gdk/x11/gdkwindow-x11.c

@@ -33,8 +33,8 @@
 #include <X11/extensions/shape.h>
 #endif
 
-int nevent_masks = 17;
-int event_mask_table[19] =
+int nevent_masks = 20;
+int event_mask_table[20] =
 {
   ExposureMask,
   PointerMotionMask,
@@ -54,7 +54,8 @@ int event_mask_table[19] =
   PropertyChangeMask,
   VisibilityChangeMask,
   0,				/* PROXIMITY_IN */
-  0				/* PROXIMTY_OUT */
+  0,				/* PROXIMTY_OUT */
+  SubstructureNotifyMask
 };