aboutsummaryrefslogtreecommitdiff
path: root/src/WinClient.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-14 12:07:06 (GMT)
committerfluxgen <fluxgen>2003-05-14 12:07:06 (GMT)
commit9d5eb092fab89c34c8b672d64bab0bffd27f3091 (patch)
tree76b3a8d89f964c8870a649f570e9297784622f50 /src/WinClient.cc
parent860b70e5b65e0f6771442f7e5417440e23a5d1cd (diff)
downloadfluxbox-9d5eb092fab89c34c8b672d64bab0bffd27f3091.zip
fluxbox-9d5eb092fab89c34c8b672d64bab0bffd27f3091.tar.bz2
added screen accessor and removed client from window before we send signal
Diffstat (limited to 'src/WinClient.cc')
-rw-r--r--src/WinClient.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/WinClient.cc b/src/WinClient.cc
index 77cc31f..95e027b 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.8 2003/05/10 22:59:32 fluxgen Exp $ 22// $Id: WinClient.cc,v 1.9 2003/05/14 12:07:06 fluxgen Exp $
23 23
24#include "WinClient.hh" 24#include "WinClient.hh"
25 25
@@ -56,13 +56,18 @@ WinClient::WinClient(Window win, FluxboxWindow &fbwin):FbTk::FbWindow(win),
56 m_win(&fbwin), 56 m_win(&fbwin),
57 modal(false), 57 modal(false),
58 m_title(""), m_icon_title(""), 58 m_title(""), m_icon_title(""),
59 m_diesig(*this) { } 59 m_diesig(*this), m_screen(fbwin.screen()) { }
60 60
61WinClient::~WinClient() { 61WinClient::~WinClient() {
62#ifdef DEBUG 62#ifdef DEBUG
63 cerr<<__FILE__<<"(~"<<__FUNCTION__<<")[this="<<this<<"]"<<endl; 63 cerr<<__FILE__<<"(~"<<__FUNCTION__<<")[this="<<this<<"]"<<endl;
64#endif // DEBUG 64#endif // DEBUG
65 65
66 FbTk::EventManager::instance()->remove(window());
67
68 if (m_win != 0)
69 m_win->removeClient(*this);
70
66 // this takes care of any focus issues 71 // this takes care of any focus issues
67 m_diesig.notify(); 72 m_diesig.notify();
68 73
@@ -93,11 +98,7 @@ WinClient::~WinClient() {
93 if (window()) 98 if (window())
94 fluxbox->removeWindowSearch(window()); 99 fluxbox->removeWindowSearch(window());
95 100
96 if (m_win != 0)
97 m_win->removeClient(*this);
98 FbTk::EventManager::instance()->remove(window());
99 m_win = 0; 101 m_win = 0;
100
101} 102}
102 103
103void WinClient::updateRect(int x, int y, 104void WinClient::updateRect(int x, int y,