nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some debugmessages and minor fixes

Browse source
This commit is contained in:
fluxgen 2004-08-10 12:05:47 +00:00
parent 05c0bfc8f8
commit 5f819e8537
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Window.cc
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.293 2004/07/15 18:20:13 fluxgen Exp $ // $Id: Window.cc,v 1.294 2004/08/10 12:05:47 fluxgen Exp $
#include "Window.hh" #include "Window.hh"
@ -2188,7 +2188,6 @@ void FluxboxWindow::unmapNotifyEvent(XUnmapEvent &ue) {
cerr<<__FILE__<<"("<<__FUNCTION__<<"): 0x"<<hex<<client->window()<<dec<<endl; cerr<<__FILE__<<"("<<__FUNCTION__<<"): 0x"<<hex<<client->window()<<dec<<endl;
cerr<<__FILE__<<"("<<__FUNCTION__<<"): title="<<client->title()<<endl; cerr<<__FILE__<<"("<<__FUNCTION__<<"): title="<<client->title()<<endl;
#endif // DEBUG #endif // DEBUG
restore(client, false); restore(client, false);
} }
@ -3133,7 +3132,7 @@ void FluxboxWindow::attachTo(int x, int y, bool interrupted) {
if (client) { if (client) {
Fluxbox::TabsAttachArea area= Fluxbox::instance()->getTabsAttachArea(); Fluxbox::TabsAttachArea area= Fluxbox::instance()->getTabsAttachArea();
if (area == Fluxbox::ATTACH_AREA_WINDOW) if (area == Fluxbox::ATTACH_AREA_WINDOW)
attach_to_win = client->fbwindow(); attach_to_win = client->fbwindow();
else if (area == Fluxbox::ATTACH_AREA_TITLEBAR) { else if (area == Fluxbox::ATTACH_AREA_TITLEBAR) {
if(client->fbwindow()->hasTitlebar() && if(client->fbwindow()->hasTitlebar() &&
client->fbwindow()->y() + client->fbwindow()->titlebarHeight() > dest_y) client->fbwindow()->y() + client->fbwindow()->titlebarHeight() > dest_y)
@ -3182,9 +3181,10 @@ void FluxboxWindow::restore(WinClient *client, bool remap) {
&xev)) { &xev)) {
#ifdef DEBUG #ifdef DEBUG
cerr<<"FluxboxWindow::restore: reparent 0x"<<hex<<client->window()<<dec<<" to root"<<endl; cerr<<"FluxboxWindow::restore: reparent 0x"<<hex<<client->window()<<dec<<" to root"<<endl;
#endif // DEBUG #endif // DEBUG
// reparent to root window // reparent to root window
client->reparent(screen().rootWindow().window(), frame().x(), frame().y()); client->reparent(screen().rootWindow(), frame().x(), frame().y());
if (!remap) if (!remap)
client->hide(); client->hide();
@ -3197,8 +3197,10 @@ void FluxboxWindow::restore(WinClient *client, bool remap) {
delete client; delete client;
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__FUNCTION__<<"): numClients() = "<<numClients()<<endl; cerr<<"FluxboxWindow::restore: remap = "<<remap<<endl;
cerr<<__FILE__<<"("<<__FUNCTION__<<"): numClients() = "<<numClients()<<endl;
#endif // DEBUG #endif // DEBUG
if (numClients() == 0) { if (numClients() == 0) {
hide(true); hide(true);
@ -3209,7 +3211,9 @@ void FluxboxWindow::restore(WinClient *client, bool remap) {
void FluxboxWindow::restore(bool remap) { void FluxboxWindow::restore(bool remap) {
if (numClients() == 0) if (numClients() == 0)
return; return;
#ifdef DEBUG
cerr<<"restore("<<remap<<")"<<endl;
#endif // DEBUG
while (!clientList().empty()) { while (!clientList().empty()) {
restore(clientList().back(), remap); restore(clientList().back(), remap);
// deleting winClient removes it from the clientList // deleting winClient removes it from the clientList

13
src/Window.hh
View file

@ -22,15 +22,16 @@
// 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.hh,v 1.116 2004/06/20 04:49:33 rathnor Exp $ // $Id: Window.hh,v 1.117 2004/08/10 12:05:47 fluxgen Exp $
#ifndef WINDOW_HH #ifndef WINDOW_HH
#define WINDOW_HH #define WINDOW_HH
#include "Timer.hh" #include "FbTk/Timer.hh"
#include "Subject.hh" #include "FbTk/Subject.hh"
#include "EventHandler.hh" #include "FbTk/EventHandler.hh"
#include "XLayerItem.hh" #include "FbTk/XLayerItem.hh"
#include "FbWinFrame.hh" #include "FbWinFrame.hh"
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -411,8 +412,6 @@ private:
void restoreGravity(); void restoreGravity();
void setGravityOffsets(); void setGravityOffsets();
void setState(unsigned long stateval, bool setting_up); void setState(unsigned long stateval, bool setting_up);
void upsize();
void downsize();
// modifies left and top if snap is necessary // modifies left and top if snap is necessary
void doSnapping(int &left, int &top); void doSnapping(int &left, int &top);