missed updating wm_protocols

This commit is contained in:
rathnor 2003-07-28 15:46:00 +00:00
parent d353b688de
commit 35234ae644
3 changed files with 9 additions and 8 deletions

View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // 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" #include "WinClient.hh"
@ -67,6 +67,7 @@ WinClient::WinClient(Window win, BScreen &screen, FluxboxWindow *fbwin):FbTk::Fb
updateWMHints(); updateWMHints();
updateWMNormalHints(); updateWMNormalHints();
updateWMClassHint(); updateWMClassHint();
updateWMProtocols();
updateTitle(); updateTitle();
updateIconTitle(); updateIconTitle();
Fluxbox::instance()->saveWindowSearch(win, this); Fluxbox::instance()->saveWindowSearch(win, this);
@ -574,7 +575,7 @@ bool WinClient::focus() {
return m_win->setCurrentClient(*this, true); return m_win->setCurrentClient(*this, true);
} }
void WinClient::getWMProtocols() { void WinClient::updateWMProtocols() {
Atom *proto = 0; Atom *proto = 0;
int num_return = 0; int num_return = 0;
FbAtoms *fbatoms = FbAtoms::instance(); FbAtoms *fbatoms = FbAtoms::instance();

View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // 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 #ifndef WINCLIENT_HH
#define WINCLIENT_HH #define WINCLIENT_HH
@ -57,7 +57,7 @@ public:
const std::string &getWMClassClass() const; const std::string &getWMClassClass() const;
/// updates from wm class hints /// updates from wm class hints
void updateWMClassHint(); void updateWMClassHint();
void getWMProtocols(); void updateWMProtocols();
inline const std::string &getTitle() const { return m_title; } inline const std::string &getTitle() const { return m_title; }
void updateTitle(); void updateTitle();

View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // 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" #include "Window.hh"
@ -420,13 +420,13 @@ void FluxboxWindow::init() {
functions.resize = functions.move = functions.iconify = functions.maximize = true; functions.resize = functions.move = functions.iconify = functions.maximize = true;
decorations.close = false; decorations.close = false;
functions.close = m_client->isClosable();
if (m_client->getBlackboxHint() != 0) if (m_client->getBlackboxHint() != 0)
getBlackboxHints(); getBlackboxHints();
else else
getMWMHints(); getMWMHints();
functions.close = m_client->isClosable();
//!! //!!
// fetch client size and placement // fetch client size and placement
XWindowAttributes wattrib; XWindowAttributes wattrib;
@ -2254,7 +2254,7 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) {
default: default:
if (atom == FbAtoms::instance()->getWMProtocolsAtom()) { if (atom == FbAtoms::instance()->getWMProtocolsAtom()) {
m_client->getWMProtocols(); m_client->updateWMProtocols();
//!!TODO check this area //!!TODO check this area
// reset window actions // reset window actions
setupWindow(); setupWindow();