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

minor cleaning

Browse source
This commit is contained in:
fluxgen 2007-01-27 20:34:16 +00:00
parent d446ba265a
commit a8003ba2c0
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Window.cc
View file

@ -49,7 +49,6 @@
#include "FbTk/KeyUtil.hh" #include "FbTk/KeyUtil.hh"
#include "FbTk/SimpleCommand.hh" #include "FbTk/SimpleCommand.hh"
#include "FbTk/Select2nd.hh" #include "FbTk/Select2nd.hh"
#include "FbTk/Transparent.hh"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -295,7 +294,8 @@ FluxboxWindow::~FluxboxWindow() {
WindowCmd<void>::setWindow(0); WindowCmd<void>::setWindow(0);
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__LINE__<<"): starting ~FluxboxWindow("<<this<<", "<<title()<<")"<<endl; const char* title = m_client ? m_client->title().c_str() : "" ;
cerr<<__FILE__<<"("<<__LINE__<<"): starting ~FluxboxWindow("<<this<<","<<title<<")"<<endl;
cerr<<__FILE__<<"("<<__LINE__<<"): num clients = "<<numClients()<<endl; cerr<<__FILE__<<"("<<__LINE__<<"): num clients = "<<numClients()<<endl;
cerr<<__FILE__<<"("<<__LINE__<<"): curr client = "<<m_client<<endl; cerr<<__FILE__<<"("<<__LINE__<<"): curr client = "<<m_client<<endl;
cerr<<__FILE__<<"("<<__LINE__<<"): m_labelbuttons.size = "<<m_labelbuttons.size()<<endl; cerr<<__FILE__<<"("<<__LINE__<<"): m_labelbuttons.size = "<<m_labelbuttons.size()<<endl;
@ -448,7 +448,10 @@ void FluxboxWindow::init() {
decorations.tab = false; //no tab for this window decorations.tab = false; //no tab for this window
} }
associateClientWindow(true, wattrib.x, wattrib.y, wattrib.width, wattrib.height, m_client->gravity(), m_client->old_bw); associateClientWindow(true,
wattrib.x, wattrib.y,
wattrib.width, wattrib.height,
m_client->gravity(), m_client->old_bw);
Fluxbox::instance()->attachSignals(*this); Fluxbox::instance()->attachSignals(*this);
@ -3669,7 +3672,11 @@ FbTk::Menu &FluxboxWindow::menu() {
const FbTk::FbPixmap &FluxboxWindow::iconPixmap() const { return m_client->iconPixmap(); } const FbTk::FbPixmap &FluxboxWindow::iconPixmap() const { return m_client->iconPixmap(); }
const FbTk::FbPixmap &FluxboxWindow::iconMask() const { return m_client->iconMask(); } const FbTk::FbPixmap &FluxboxWindow::iconMask() const { return m_client->iconMask(); }
const bool FluxboxWindow::usePixmap() const { return m_client->usePixmap(); }
const bool FluxboxWindow::usePixmap() const {
return m_client ? m_client->usePixmap() : false;
}
const bool FluxboxWindow::useMask() const { return m_client->useMask(); } const bool FluxboxWindow::useMask() const { return m_client->useMask(); }
const FbTk::Menu &FluxboxWindow::menu() const { const FbTk::Menu &FluxboxWindow::menu() const {
@ -3686,15 +3693,16 @@ Window FluxboxWindow::clientWindow() const {
return m_client->window(); return m_client->window();
} }
const string &FluxboxWindow::title() const { const string &FluxboxWindow::title() const {
static string empty_string(""); static string empty_string;
if (m_client == 0) if (m_client == 0)
return empty_string; return empty_string;
return m_client->title(); return m_client->title();
} }
const string &FluxboxWindow::iconTitle() const { const string &FluxboxWindow::iconTitle() const {
static string empty_string(""); static string empty_string;
if (m_client == 0) if (m_client == 0)
return empty_string; return empty_string;
return m_client->iconTitle(); return m_client->iconTitle();