aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/WinClient.cc5
-rw-r--r--src/WinClient.hh4
-rw-r--r--src/Window.cc8
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 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: WinClient.cc,v 1.20 2003/07/28 15:06:34 rathnor Exp $ 22// $Id: WinClient.cc,v 1.21 2003/07/28 15:46:00 rathnor Exp $
23 23
24#include "WinClient.hh" 24#include "WinClient.hh"
25 25
@@ -67,6 +67,7 @@ WinClient::WinClient(Window win, BScreen &screen, FluxboxWindow *fbwin):FbTk::Fb
67 updateWMHints(); 67 updateWMHints();
68 updateWMNormalHints(); 68 updateWMNormalHints();
69 updateWMClassHint(); 69 updateWMClassHint();
70 updateWMProtocols();
70 updateTitle(); 71 updateTitle();
71 updateIconTitle(); 72 updateIconTitle();
72 Fluxbox::instance()->saveWindowSearch(win, this); 73 Fluxbox::instance()->saveWindowSearch(win, this);
@@ -574,7 +575,7 @@ bool WinClient::focus() {
574 return m_win->setCurrentClient(*this, true); 575 return m_win->setCurrentClient(*this, true);
575} 576}
576 577
577void WinClient::getWMProtocols() { 578void WinClient::updateWMProtocols() {
578 Atom *proto = 0; 579 Atom *proto = 0;
579 int num_return = 0; 580 int num_return = 0;
580 FbAtoms *fbatoms = FbAtoms::instance(); 581 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 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: WinClient.hh,v 1.11 2003/07/28 15:06:34 rathnor Exp $ 22// $Id: WinClient.hh,v 1.12 2003/07/28 15:46:00 rathnor Exp $
23 23
24#ifndef WINCLIENT_HH 24#ifndef WINCLIENT_HH
25#define WINCLIENT_HH 25#define WINCLIENT_HH
@@ -57,7 +57,7 @@ public:
57 const std::string &getWMClassClass() const; 57 const std::string &getWMClassClass() const;
58 /// updates from wm class hints 58 /// updates from wm class hints
59 void updateWMClassHint(); 59 void updateWMClassHint();
60 void getWMProtocols(); 60 void updateWMProtocols();
61 61
62 inline const std::string &getTitle() const { return m_title; } 62 inline const std::string &getTitle() const { return m_title; }
63 void updateTitle(); 63 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 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.213 2003/07/28 15:06:34 rathnor Exp $ 25// $Id: Window.cc,v 1.214 2003/07/28 15:46:00 rathnor Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -420,13 +420,13 @@ void FluxboxWindow::init() {
420 functions.resize = functions.move = functions.iconify = functions.maximize = true; 420 functions.resize = functions.move = functions.iconify = functions.maximize = true;
421 decorations.close = false; 421 decorations.close = false;
422 422
423 functions.close = m_client->isClosable();
424
425 if (m_client->getBlackboxHint() != 0) 423 if (m_client->getBlackboxHint() != 0)
426 getBlackboxHints(); 424 getBlackboxHints();
427 else 425 else
428 getMWMHints(); 426 getMWMHints();
429 427
428 functions.close = m_client->isClosable();
429
430 //!! 430 //!!
431 // fetch client size and placement 431 // fetch client size and placement
432 XWindowAttributes wattrib; 432 XWindowAttributes wattrib;
@@ -2254,7 +2254,7 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) {
2254 2254
2255 default: 2255 default:
2256 if (atom == FbAtoms::instance()->getWMProtocolsAtom()) { 2256 if (atom == FbAtoms::instance()->getWMProtocolsAtom()) {
2257 m_client->getWMProtocols(); 2257 m_client->updateWMProtocols();
2258 //!!TODO check this area 2258 //!!TODO check this area
2259 // reset window actions 2259 // reset window actions
2260 setupWindow(); 2260 setupWindow();