aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Window.cc20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/Window.cc b/src/Window.cc
index bb271c3..df08744 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -49,7 +49,6 @@
49#include "FbTk/KeyUtil.hh" 49#include "FbTk/KeyUtil.hh"
50#include "FbTk/SimpleCommand.hh" 50#include "FbTk/SimpleCommand.hh"
51#include "FbTk/Select2nd.hh" 51#include "FbTk/Select2nd.hh"
52#include "FbTk/Transparent.hh"
53 52
54#ifdef HAVE_CONFIG_H 53#ifdef HAVE_CONFIG_H
55#include "config.h" 54#include "config.h"
@@ -295,7 +294,8 @@ FluxboxWindow::~FluxboxWindow() {
295 WindowCmd<void>::setWindow(0); 294 WindowCmd<void>::setWindow(0);
296 295
297#ifdef DEBUG 296#ifdef DEBUG
298 cerr<<__FILE__<<"("<<__LINE__<<"): starting ~FluxboxWindow("<<this<<", "<<title()<<")"<<endl; 297 const char* title = m_client ? m_client->title().c_str() : "" ;
298 cerr<<__FILE__<<"("<<__LINE__<<"): starting ~FluxboxWindow("<<this<<","<<title<<")"<<endl;
299 cerr<<__FILE__<<"("<<__LINE__<<"): num clients = "<<numClients()<<endl; 299 cerr<<__FILE__<<"("<<__LINE__<<"): num clients = "<<numClients()<<endl;
300 cerr<<__FILE__<<"("<<__LINE__<<"): curr client = "<<m_client<<endl; 300 cerr<<__FILE__<<"("<<__LINE__<<"): curr client = "<<m_client<<endl;
301 cerr<<__FILE__<<"("<<__LINE__<<"): m_labelbuttons.size = "<<m_labelbuttons.size()<<endl; 301 cerr<<__FILE__<<"("<<__LINE__<<"): m_labelbuttons.size = "<<m_labelbuttons.size()<<endl;
@@ -448,7 +448,10 @@ void FluxboxWindow::init() {
448 decorations.tab = false; //no tab for this window 448 decorations.tab = false; //no tab for this window
449 } 449 }
450 450
451 associateClientWindow(true, wattrib.x, wattrib.y, wattrib.width, wattrib.height, m_client->gravity(), m_client->old_bw); 451 associateClientWindow(true,
452 wattrib.x, wattrib.y,
453 wattrib.width, wattrib.height,
454 m_client->gravity(), m_client->old_bw);
452 455
453 Fluxbox::instance()->attachSignals(*this); 456 Fluxbox::instance()->attachSignals(*this);
454 457
@@ -3669,7 +3672,11 @@ FbTk::Menu &FluxboxWindow::menu() {
3669 3672
3670const FbTk::FbPixmap &FluxboxWindow::iconPixmap() const { return m_client->iconPixmap(); } 3673const FbTk::FbPixmap &FluxboxWindow::iconPixmap() const { return m_client->iconPixmap(); }
3671const FbTk::FbPixmap &FluxboxWindow::iconMask() const { return m_client->iconMask(); } 3674const FbTk::FbPixmap &FluxboxWindow::iconMask() const { return m_client->iconMask(); }
3672const bool FluxboxWindow::usePixmap() const { return m_client->usePixmap(); } 3675
3676const bool FluxboxWindow::usePixmap() const {
3677 return m_client ? m_client->usePixmap() : false;
3678}
3679
3673const bool FluxboxWindow::useMask() const { return m_client->useMask(); } 3680const bool FluxboxWindow::useMask() const { return m_client->useMask(); }
3674 3681
3675const FbTk::Menu &FluxboxWindow::menu() const { 3682const FbTk::Menu &FluxboxWindow::menu() const {
@@ -3686,15 +3693,16 @@ Window FluxboxWindow::clientWindow() const {
3686 return m_client->window(); 3693 return m_client->window();
3687} 3694}
3688 3695
3696
3689const string &FluxboxWindow::title() const { 3697const string &FluxboxWindow::title() const {
3690 static string empty_string(""); 3698 static string empty_string;
3691 if (m_client == 0) 3699 if (m_client == 0)
3692 return empty_string; 3700 return empty_string;
3693 return m_client->title(); 3701 return m_client->title();
3694} 3702}
3695 3703
3696const string &FluxboxWindow::iconTitle() const { 3704const string &FluxboxWindow::iconTitle() const {
3697 static string empty_string(""); 3705 static string empty_string;
3698 if (m_client == 0) 3706 if (m_client == 0)
3699 return empty_string; 3707 return empty_string;
3700 return m_client->iconTitle(); 3708 return m_client->iconTitle();