From 95c80db77f91f72369ce7cb3dd13c3ecf8cad718 Mon Sep 17 00:00:00 2001 From: frese Date: Fri, 25 Apr 2003 18:51:07 +0000 Subject: [PATCH] fixed bug with structure-notify and substructure-notify event-masks --- scheme/xlib/sync-event.scm | 45 +++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/scheme/xlib/sync-event.scm b/scheme/xlib/sync-event.scm index cf35b5b..5f23269 100644 --- a/scheme/xlib/sync-event.scm +++ b/scheme/xlib/sync-event.scm @@ -196,36 +196,51 @@ (eq? type (event-type resize-request))) ((eq? mask-item (event-mask-item structure-notify)) (or (and (eq? type (event-type circulate-notify)) - (eq? window (circulate-event-event event))) + (eq? window (circulate-event-event event)) + (eq? window (circulate-event-window event))) (and (eq? type (event-type configure-notify)) - (eq? window (configure-event-event event))) + (eq? window (configure-event-event event)) + (eq? window (configure-event-window event))) (and (eq? type (event-type destroy-notify)) - (eq? window (destroy-window-event-event event))) + (eq? window (destroy-window-event-event event)) + (eq? window (destroy-window-event-window event))) (and (eq? type (event-type gravity-notify)) - (eq? window (gravity-event-event event))) + (eq? window (gravity-event-event event)) + (eq? window (gravity-event-window event))) (and (eq? type (event-type map-notify)) - (eq? window (map-event-event event))) + (eq? window (map-event-event event)) + (eq? window (map-event-window event))) (and (eq? type (event-type reparent-notify)) - (eq? window (reparent-event-event event))) + (eq? window (reparent-event-event event)) + (eq? window (reparent-event-window event))) (and (eq? type (event-type unmap-notify)) - (eq? window (unmap-event-event event))))) + (eq? window (unmap-event-event event)) + (eq? window (unmap-event-window event))))) ((eq? mask-item (event-mask-item substructure-notify)) (or (and (eq? type (event-type circulate-notify)) - (eq? window (circulate-event-event event))) + (eq? window (circulate-event-event event)) + (not (eq? window (circulate-event-window event)))) (and (eq? type (event-type configure-notify)) - (eq? window (configure-event-event event))) + (eq? window (configure-event-event event)) + (not (eq? window (configure-event-window event)))) (and (eq? type (event-type create-notify)) - (eq? window (create-window-event-parent event))) + (eq? window (create-window-event-parent event)) + (not (eq? window (create-window-event-window event)))) (and (eq? type (event-type destroy-notify)) - (eq? window (destroy-window-event-event event))) + (eq? window (destroy-window-event-event event)) + (not (eq? window (destroy-window-event-window event)))) (and (eq? type (event-type gravity-notify)) - (eq? window (gravity-event-event event))) + (eq? window (gravity-event-event event)) + (not (eq? window (gravity-event-window event)))) (and (eq? type (event-type map-notify)) - (eq? window (map-event-event event))) + (eq? window (map-event-event event)) + (not (eq? window (map-event-window event)))) (and (eq? type (event-type reparent-notify)) - (eq? window (reparent-event-event event))) + (eq? window (reparent-event-event event)) + (not (eq? window (reparent-event-window event)))) (and (eq? type (event-type unmap-notify)) - (eq? window (unmap-event-event event))))) + (eq? window (unmap-event-event event)) + (not (eq? window (unmap-event-window event)))))) ((eq? mask-item (event-mask-item substructure-redirect)) (or (eq? type (event-type circulate-request)) (eq? type (event-type configure-request))