aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc23
1 files changed, 9 insertions, 14 deletions
diff --git a/src/Window.cc b/src/Window.cc
index ca26e5a..f47f829 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.113 2003/02/02 16:32:39 rathnor Exp $ 25// $Id: Window.cc,v 1.114 2003/02/03 13:55:08 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -95,8 +95,10 @@ void grabButton(Display *display, unsigned int button,
95 95
96}; 96};
97 97
98FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num, FbTk::ImageControl &imgctrl, FbWinFrameTheme &tm, 98FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num,
99 FbTk::MenuTheme &menutheme): 99 FbTk::ImageControl &imgctrl, FbWinFrameTheme &tm,
100 FbTk::MenuTheme &menutheme,
101 FbTk::XLayer &layer):
100 m_hintsig(*this), 102 m_hintsig(*this),
101 m_statesig(*this), 103 m_statesig(*this),
102 m_layersig(*this), 104 m_layersig(*this),
@@ -110,12 +112,14 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num, FbTk::ImageCo
110 display(0), 112 display(0),
111 lastButtonPressTime(0), 113 lastButtonPressTime(0),
112 m_windowmenu(menutheme, screen_num, imgctrl), 114 m_windowmenu(menutheme, screen_num, imgctrl),
113 m_layeritem(0), 115 m_layeritem(getFrameWindow(), layer),
114 m_layernum(4), 116 m_layernum(4),
115 old_decoration(DECOR_NORMAL), 117 old_decoration(DECOR_NORMAL),
116 tab(0), 118 tab(0),
117 m_frame(tm, imgctrl, screen_num, 0, 0, 100, 100) { 119 m_frame(tm, imgctrl, screen_num, 0, 0, 100, 100) {
118 120
121
122
119 // redirect events from frame to us 123 // redirect events from frame to us
120 m_frame.setEventHandler(*this); 124 m_frame.setEventHandler(*this);
121 125
@@ -252,7 +256,7 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num, FbTk::ImageCo
252 256
253 positionWindows(); 257 positionWindows();
254 258
255 m_layeritem = new FbTk::XLayerItem(getFrameWindow()); 259
256 260
257 if (workspace_number < 0 || workspace_number >= screen->getCount()) 261 if (workspace_number < 0 || workspace_number >= screen->getCount())
258 workspace_number = screen->getCurrentWorkspaceID(); 262 workspace_number = screen->getCurrentWorkspaceID();
@@ -358,15 +362,6 @@ FluxboxWindow::~FluxboxWindow() {
358 if (client.window) 362 if (client.window)
359 fluxbox->removeWindowSearch(client.window); 363 fluxbox->removeWindowSearch(client.window);
360 364
361 if (m_layeritem) {
362 m_layeritem->removeWindow(getFrameWindow());
363 //if (hasTab())
364 // m_layeritem->removeWindow(get tab window)
365 if (m_layeritem->isEmpty()) {
366 screen->removeLayerItem(m_layeritem);
367 }
368 }
369
370#ifdef DEBUG 365#ifdef DEBUG
371 cerr<<__FILE__<<"("<<__LINE__<<"): ~FluxboxWindow("<<this<<")"<<endl; 366 cerr<<__FILE__<<"("<<__LINE__<<"): ~FluxboxWindow("<<this<<")"<<endl;
372#endif // DEBUG 367#endif // DEBUG