From 35234ae644d14b929c72b4a04a8d59eb46d72448 Mon Sep 17 00:00:00 2001 From: rathnor Date: Mon, 28 Jul 2003 15:46:00 +0000 Subject: missed updating wm_protocols --- src/WinClient.cc | 5 +++-- src/WinClient.hh | 4 ++-- src/Window.cc | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/WinClient.cc b/src/WinClient.cc index 60cf647..6fce6f5 100644 --- a/src/WinClient.cc +++ b/src/WinClient.cc @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: WinClient.cc,v 1.20 2003/07/28 15:06:34 rathnor Exp $ +// $Id: WinClient.cc,v 1.21 2003/07/28 15:46:00 rathnor Exp $ #include "WinClient.hh" @@ -67,6 +67,7 @@ WinClient::WinClient(Window win, BScreen &screen, FluxboxWindow *fbwin):FbTk::Fb updateWMHints(); updateWMNormalHints(); updateWMClassHint(); + updateWMProtocols(); updateTitle(); updateIconTitle(); Fluxbox::instance()->saveWindowSearch(win, this); @@ -574,7 +575,7 @@ bool WinClient::focus() { return m_win->setCurrentClient(*this, true); } -void WinClient::getWMProtocols() { +void WinClient::updateWMProtocols() { Atom *proto = 0; int num_return = 0; FbAtoms *fbatoms = FbAtoms::instance(); diff --git a/src/WinClient.hh b/src/WinClient.hh index 50f26ee..755a235 100644 --- a/src/WinClient.hh +++ b/src/WinClient.hh @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: WinClient.hh,v 1.11 2003/07/28 15:06:34 rathnor Exp $ +// $Id: WinClient.hh,v 1.12 2003/07/28 15:46:00 rathnor Exp $ #ifndef WINCLIENT_HH #define WINCLIENT_HH @@ -57,7 +57,7 @@ public: const std::string &getWMClassClass() const; /// updates from wm class hints void updateWMClassHint(); - void getWMProtocols(); + void updateWMProtocols(); inline const std::string &getTitle() const { return m_title; } void updateTitle(); diff --git a/src/Window.cc b/src/Window.cc index 70d1ee1..6f82f90 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Window.cc,v 1.213 2003/07/28 15:06:34 rathnor Exp $ +// $Id: Window.cc,v 1.214 2003/07/28 15:46:00 rathnor Exp $ #include "Window.hh" @@ -420,13 +420,13 @@ void FluxboxWindow::init() { functions.resize = functions.move = functions.iconify = functions.maximize = true; decorations.close = false; - functions.close = m_client->isClosable(); - if (m_client->getBlackboxHint() != 0) getBlackboxHints(); else getMWMHints(); + functions.close = m_client->isClosable(); + //!! // fetch client size and placement XWindowAttributes wattrib; @@ -2254,7 +2254,7 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) { default: if (atom == FbAtoms::instance()->getWMProtocolsAtom()) { - m_client->getWMProtocols(); + m_client->updateWMProtocols(); //!!TODO check this area // reset window actions setupWindow(); -- cgit v0.11.2