summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Window.cc16
-rw-r--r--src/Window.hh13
2 files changed, 16 insertions, 13 deletions
diff --git a/src/Window.cc b/src/Window.cc
index fc990c8..b02cc79 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.293 2004/07/15 18:20:13 fluxgen Exp $ 25// $Id: Window.cc,v 1.294 2004/08/10 12:05:47 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -2188,7 +2188,6 @@ void FluxboxWindow::unmapNotifyEvent(XUnmapEvent &ue) {
2188 cerr<<__FILE__<<"("<<__FUNCTION__<<"): 0x"<<hex<<client->window()<<dec<<endl; 2188 cerr<<__FILE__<<"("<<__FUNCTION__<<"): 0x"<<hex<<client->window()<<dec<<endl;
2189 cerr<<__FILE__<<"("<<__FUNCTION__<<"): title="<<client->title()<<endl; 2189 cerr<<__FILE__<<"("<<__FUNCTION__<<"): title="<<client->title()<<endl;
2190#endif // DEBUG 2190#endif // DEBUG
2191
2192 restore(client, false); 2191 restore(client, false);
2193 2192
2194} 2193}
@@ -3133,7 +3132,7 @@ void FluxboxWindow::attachTo(int x, int y, bool interrupted) {
3133 if (client) { 3132 if (client) {
3134 Fluxbox::TabsAttachArea area= Fluxbox::instance()->getTabsAttachArea(); 3133 Fluxbox::TabsAttachArea area= Fluxbox::instance()->getTabsAttachArea();
3135 if (area == Fluxbox::ATTACH_AREA_WINDOW) 3134 if (area == Fluxbox::ATTACH_AREA_WINDOW)
3136 attach_to_win = client->fbwindow(); 3135 attach_to_win = client->fbwindow();
3137 else if (area == Fluxbox::ATTACH_AREA_TITLEBAR) { 3136 else if (area == Fluxbox::ATTACH_AREA_TITLEBAR) {
3138 if(client->fbwindow()->hasTitlebar() && 3137 if(client->fbwindow()->hasTitlebar() &&
3139 client->fbwindow()->y() + client->fbwindow()->titlebarHeight() > dest_y) 3138 client->fbwindow()->y() + client->fbwindow()->titlebarHeight() > dest_y)
@@ -3182,9 +3181,10 @@ void FluxboxWindow::restore(WinClient *client, bool remap) {
3182 &xev)) { 3181 &xev)) {
3183#ifdef DEBUG 3182#ifdef DEBUG
3184 cerr<<"FluxboxWindow::restore: reparent 0x"<<hex<<client->window()<<dec<<" to root"<<endl; 3183 cerr<<"FluxboxWindow::restore: reparent 0x"<<hex<<client->window()<<dec<<" to root"<<endl;
3184
3185#endif // DEBUG 3185#endif // DEBUG
3186 // reparent to root window 3186 // reparent to root window
3187 client->reparent(screen().rootWindow().window(), frame().x(), frame().y()); 3187 client->reparent(screen().rootWindow(), frame().x(), frame().y());
3188 3188
3189 if (!remap) 3189 if (!remap)
3190 client->hide(); 3190 client->hide();
@@ -3197,8 +3197,10 @@ void FluxboxWindow::restore(WinClient *client, bool remap) {
3197 3197
3198 delete client; 3198 delete client;
3199 3199
3200
3200#ifdef DEBUG 3201#ifdef DEBUG
3201 cerr<<__FILE__<<"("<<__FUNCTION__<<"): numClients() = "<<numClients()<<endl; 3202 cerr<<"FluxboxWindow::restore: remap = "<<remap<<endl;
3203 cerr<<__FILE__<<"("<<__FUNCTION__<<"): numClients() = "<<numClients()<<endl;
3202#endif // DEBUG 3204#endif // DEBUG
3203 if (numClients() == 0) { 3205 if (numClients() == 0) {
3204 hide(true); 3206 hide(true);
@@ -3209,7 +3211,9 @@ void FluxboxWindow::restore(WinClient *client, bool remap) {
3209void FluxboxWindow::restore(bool remap) { 3211void FluxboxWindow::restore(bool remap) {
3210 if (numClients() == 0) 3212 if (numClients() == 0)
3211 return; 3213 return;
3212 3214#ifdef DEBUG
3215 cerr<<"restore("<<remap<<")"<<endl;
3216#endif // DEBUG
3213 while (!clientList().empty()) { 3217 while (!clientList().empty()) {
3214 restore(clientList().back(), remap); 3218 restore(clientList().back(), remap);
3215 // deleting winClient removes it from the clientList 3219 // deleting winClient removes it from the clientList
diff --git a/src/Window.hh b/src/Window.hh
index f12384e..a271fb5 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -22,15 +22,16 @@
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.hh,v 1.116 2004/06/20 04:49:33 rathnor Exp $ 25// $Id: Window.hh,v 1.117 2004/08/10 12:05:47 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
29 29
30#include "Timer.hh" 30#include "FbTk/Timer.hh"
31#include "Subject.hh" 31#include "FbTk/Subject.hh"
32#include "EventHandler.hh" 32#include "FbTk/EventHandler.hh"
33#include "XLayerItem.hh" 33#include "FbTk/XLayerItem.hh"
34
34#include "FbWinFrame.hh" 35#include "FbWinFrame.hh"
35 36
36#include <X11/Xlib.h> 37#include <X11/Xlib.h>
@@ -411,8 +412,6 @@ private:
411 void restoreGravity(); 412 void restoreGravity();
412 void setGravityOffsets(); 413 void setGravityOffsets();
413 void setState(unsigned long stateval, bool setting_up); 414 void setState(unsigned long stateval, bool setting_up);
414 void upsize();
415 void downsize();
416 415
417 // modifies left and top if snap is necessary 416 // modifies left and top if snap is necessary
418 void doSnapping(int &left, int &top); 417 void doSnapping(int &left, int &top);