From 39c6969de2714904dec901c9d3f4e8b0ff01f062 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 29 Jan 2003 08:58:28 +0000 Subject: [PATCH] allow for the client to be validated. don't manage override_redirect windows. don't manage windows for whome get attributes fails. validate the client before managing it. validate the client in functions that query stuff off it: propertyHandler and clientMessageHandler --- src/client.cc | 23 +++++++++++++++++++++++ src/client.hh | 8 ++++++++ 2 files changed, 31 insertions(+) diff --git a/src/client.cc b/src/client.cc index 77906e80..3939b0c6 100644 --- a/src/client.cc +++ b/src/client.cc @@ -49,6 +49,8 @@ Client::Client(int screen, Window window) _layer = Layer_Normal; // default to not urgent _urgent = false; + // not positioned unless specified + _positioned = false; getArea(); getDesktop(); @@ -115,6 +117,21 @@ Client::~Client() } +bool Client::validate() const +{ + XSync(**otk::display, false); // get all events on the server + + XEvent e; + if (XCheckTypedWindowEvent(**otk::display, _window, DestroyNotify, &e) || + XCheckTypedWindowEvent(**otk::display, _window, UnmapNotify, &e)) { + XPutBackEvent(**otk::display, &e); + return false; + } + + return true; +} + + void Client::getGravity() { XWindowAttributes wattrib; @@ -636,6 +653,9 @@ void Client::updateTransientFor() void Client::propertyHandler(const XPropertyEvent &e) { otk::EventHandler::propertyHandler(e); + + // validate cuz we query stuff off the client here + if (!validate()) return; // compress changes to a single property into a single change XEvent ce; @@ -910,6 +930,9 @@ void Client::clientMessageHandler(const XClientMessageEvent &e) { otk::EventHandler::clientMessageHandler(e); + // validate cuz we query stuff off the client here + if (!validate()) return; + if (e.format != 32) return; if (e.message_type == otk::Property::atoms.wm_change_state) { diff --git a/src/client.hh b/src/client.hh index 0d846548..4bc7a517 100644 --- a/src/client.hh +++ b/src/client.hh @@ -602,6 +602,14 @@ BB @param window The window id that the Client class should handle //! Remove focus from the client window void unfocus() const; + //! Validate client, by making sure no Destroy or Unmap events exist in + //! the event queue for the window. + /*! + @return true if the client is valid; false if the client has already + been unmapped/destroyed, and so is invalid. + */ + bool validate() const; + virtual void focusHandler(const XFocusChangeEvent &e); virtual void unfocusHandler(const XFocusChangeEvent &e); virtual void propertyHandler(const XPropertyEvent &e); -- 2.45.2