Detect selection window destuction.

2 files changed, 31 insertions, 2 deletions

diff --git a/hw/dmx/dmxselection.c b/hw/dmx/dmxselection.c
index 700be95c2..4acaf43b7 100644
--- a/hw/dmx/dmxselection.c
+++ b/hw/dmx/dmxselection.c
@@ -453,7 +453,9 @@ dmxSelectionNotify (ScreenPtr pScreen,
 
 	if (cookie.sequence)
 	{
-	    const uint32_t value = XCB_EVENT_MASK_PROPERTY_CHANGE;
+	    const uint32_t value =
+		XCB_EVENT_MASK_STRUCTURE_NOTIFY |
+		XCB_EVENT_MASK_PROPERTY_CHANGE;
 
 	    dmxUnhookSelection (s, &convHead, &convTail);
 
@@ -494,6 +496,27 @@ dmxSelectionNotify (ScreenPtr pScreen,
 }
 
 Bool
+dmxSelectionDestroyNotify (ScreenPtr pScreen,
+			   Window    window)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    DMXSelection  *s;
+
+    for (s = reqHead; s; s = s->next)
+	if (s->value[pScreen->myNum].out == window &&
+	    s->property                  == dmxScreen->incrAtom)
+	    break;
+
+    if (s)
+    {
+	dmxSelectionDeleteReq (dmxUnhookSelection (s, &reqHead, &reqTail));
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+Bool
 dmxSelectionPropertyNotify (ScreenPtr pScreen,
 			    Window    window,
 			    int       state,
@@ -1278,7 +1301,9 @@ dmxProcSendEvent (ClientPtr client)
 
 		    if (property == dmxScreen->incrAtom)
 		    {
-			const uint32_t value = XCB_EVENT_MASK_PROPERTY_CHANGE;
+			const uint32_t value =
+			    XCB_EVENT_MASK_STRUCTURE_NOTIFY |
+			    XCB_EVENT_MASK_PROPERTY_CHANGE;
 
 			xcb_change_window_attributes (dmxScreen->connection,
 						      s->requestor,
diff --git a/hw/dmx/dmxselection.h b/hw/dmx/dmxselection.h
index ac807adf0..0d4b0f0d3 100644
--- a/hw/dmx/dmxselection.h
+++ b/hw/dmx/dmxselection.h
@@ -53,6 +53,10 @@ dmxSelectionPropertyNotify (ScreenPtr pScreen,
 			    Time      xTime);
 
 Bool
+dmxSelectionDestroyNotify (ScreenPtr pScreen,
+			   Window    requestor);
+
+Bool
 dmxSelectionPropertyReplyCheck (ScreenPtr           pScreen,
 				unsigned int        sequence,
 				xcb_generic_reply_t *reply);