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

some cleaning, using CachedPixmap

Browse source
This commit is contained in:
fluxgen 2006-10-16 18:49:33 +00:00
parent 9f4baeb0fc
commit a3b30e1c63
2 changed files with 39 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/IconbarTool.cc
View file

@ -333,11 +333,11 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, BScr
m_screen(screen), m_screen(screen),
m_icon_container(parent), m_icon_container(parent),
m_theme(theme), m_theme(theme),
m_focused_pm(0), m_focused_pm( screen.imageControl() ),
m_unfocused_pm(0), m_unfocused_pm( screen.imageControl() ),
m_focused_err_pm(0), m_focused_err_pm( screen.imageControl() ),
m_unfocused_err_pm(0), m_unfocused_err_pm( screen.imageControl() ),
m_empty_pm(0), m_empty_pm( screen.imageControl() ),
m_rc_mode(screen.resourceManager(), WORKSPACE, m_rc_mode(screen.resourceManager(), WORKSPACE,
screen.name() + ".iconbar.mode", screen.altName() + ".Iconbar.Mode"), screen.name() + ".iconbar.mode", screen.altName() + ".Iconbar.Mode"),
m_wheel_mode(screen.resourceManager(), OFF, m_wheel_mode(screen.resourceManager(), OFF,
@ -393,19 +393,6 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, BScr
IconbarTool::~IconbarTool() { IconbarTool::~IconbarTool() {
deleteIcons(); deleteIcons();
// remove cached images
if (m_focused_pm)
m_screen.imageControl().removeImage(m_focused_pm);
if (m_unfocused_pm)
m_screen.imageControl().removeImage(m_unfocused_pm);
if (m_focused_err_pm)
m_screen.imageControl().removeImage(m_focused_err_pm);
if (m_unfocused_err_pm)
m_screen.imageControl().removeImage(m_unfocused_err_pm);
if (m_empty_pm)
m_screen.imageControl().removeImage(m_empty_pm);
} }
void IconbarTool::move(int x, int y) { void IconbarTool::move(int x, int y) {
@ -547,13 +534,14 @@ void IconbarTool::update(FbTk::Subject *subj) {
bool remove_all = false; // if we should readd all windows bool remove_all = false; // if we should readd all windows
if (subj != 0 && typeid(*subj) == typeid(BScreen::ScreenSubject) && mode() != ALLWINDOWS) { if (subj != 0 && typeid(*subj) == typeid(BScreen::ScreenSubject) &&
mode() != ALLWINDOWS && mode() != ICONS ) {
BScreen::ScreenSubject *screen_subj = static_cast<BScreen::ScreenSubject *>(subj); BScreen::ScreenSubject *screen_subj = static_cast<BScreen::ScreenSubject *>(subj);
// current workspace sig // current workspace sig
if (&m_screen.currentWorkspaceSig() == screen_subj && if (&m_screen.currentWorkspaceSig() == screen_subj ) {
mode() != ALLWINDOWS && mode() != ICONS) {
remove_all = true; // remove and readd all windows remove_all = true; // remove and readd all windows
} }
} }
// lock graphic update // lock graphic update
@ -621,9 +609,7 @@ void IconbarTool::renderTheme() {
// update button sizes before we get max width per client! // update button sizes before we get max width per client!
updateSizing(); updateSizing();
Pixmap tmp = m_focused_pm; unsigned int icon_width = 0, icon_height = 0;
Pixmap err_tmp = m_focused_err_pm;
unsigned int icon_width, icon_height;
unsigned int icon_width_off=0, icon_height_off=0; unsigned int icon_width_off=0, icon_height_off=0;
if (orientation() == FbTk::ROT0 || orientation() == FbTk::ROT180) { if (orientation() == FbTk::ROT0 || orientation() == FbTk::ROT180) {
@ -637,56 +623,42 @@ void IconbarTool::renderTheme() {
} }
if (!m_theme.focusedTexture().usePixmap()) { if (!m_theme.focusedTexture().usePixmap()) {
m_focused_pm = 0; m_focused_pm.reset( 0 );
m_focused_err_pm = 0; m_focused_err_pm.reset( 0 );
} else { } else {
m_focused_pm = m_screen.imageControl().renderImage(icon_width, m_focused_pm.reset( m_screen.imageControl().
icon_height, renderImage(icon_width, icon_height,
m_theme.focusedTexture(), orientation()); m_theme.focusedTexture(), orientation()) );
m_focused_err_pm = m_screen.imageControl().renderImage(icon_width+icon_width_off, m_focused_err_pm.reset( m_screen.imageControl().
icon_height+icon_height_off, renderImage(icon_width + icon_width_off,
m_theme.focusedTexture(), orientation()); icon_height + icon_height_off,
m_theme.focusedTexture(), orientation()) );
} }
if (tmp)
m_screen.imageControl().removeImage(tmp);
if (err_tmp)
m_screen.imageControl().removeImage(err_tmp);
tmp = m_unfocused_pm;
err_tmp = m_unfocused_err_pm;
if (!m_theme.unfocusedTexture().usePixmap()) { if (!m_theme.unfocusedTexture().usePixmap()) {
m_unfocused_pm = 0; m_unfocused_pm.reset( 0 );
m_unfocused_err_pm = 0; m_unfocused_err_pm.reset( 0 );
} else { } else {
m_unfocused_pm = m_screen.imageControl().renderImage(icon_width, m_unfocused_pm.reset( m_screen.imageControl().
icon_height, renderImage(icon_width, icon_height,
m_theme.unfocusedTexture(), orientation()); m_theme.unfocusedTexture(), orientation()) );
m_unfocused_err_pm = m_screen.imageControl().renderImage(icon_width+icon_width_off, m_unfocused_err_pm.reset( m_screen.imageControl().
icon_height+icon_height_off, renderImage(icon_width+icon_width_off,
m_theme.unfocusedTexture(), orientation()); icon_height+icon_height_off,
m_theme.unfocusedTexture(), orientation()) );
} }
if (tmp)
m_screen.imageControl().removeImage(tmp);
if (err_tmp)
m_screen.imageControl().removeImage(err_tmp);
// if we dont have any icons then we should render empty texture // if we dont have any icons then we should render empty texture
tmp = m_empty_pm;
if (!m_theme.emptyTexture().usePixmap()) { if (!m_theme.emptyTexture().usePixmap()) {
m_empty_pm = 0; m_empty_pm.reset( 0 );
m_icon_container.setBackgroundColor(m_theme.emptyTexture().color()); m_icon_container.setBackgroundColor(m_theme.emptyTexture().color());
} else { } else {
m_empty_pm = m_screen.imageControl().renderImage(m_icon_container.width(), m_empty_pm.reset( m_screen.imageControl().
m_icon_container.height(), renderImage(m_icon_container.width(), m_icon_container.height(),
m_theme.emptyTexture(), orientation()); m_theme.emptyTexture(), orientation()) );
m_icon_container.setBackgroundPixmap(m_empty_pm); m_icon_container.setBackgroundPixmap(m_empty_pm);
} }
if (tmp)
m_screen.imageControl().removeImage(tmp);
// set to zero so its consistent and not ugly // set to zero so its consistent and not ugly
m_icon_container.setBorderWidth(m_theme.border().width()); m_icon_container.setBorderWidth(m_theme.border().width());
m_icon_container.setBorderColor(m_theme.border().color()); m_icon_container.setBorderColor(m_theme.border().color());
@ -839,6 +811,7 @@ void IconbarTool::updateList() {
!checkDuplicate(*(*it)->fbwindow())) !checkDuplicate(*(*it)->fbwindow()))
addWindow(*(*it)->fbwindow()); addWindow(*(*it)->fbwindow());
} }
renderTheme(); renderTheme();
} }

9
src/IconbarTool.hh
View file

@ -29,6 +29,7 @@
#include "Container.hh" #include "Container.hh"
#include "FbMenu.hh" #include "FbMenu.hh"
#include "FbTk/CachedPixmap.hh"
#include "FbTk/Observer.hh" #include "FbTk/Observer.hh"
#include "FbTk/Resource.hh" #include "FbTk/Resource.hh"
#include "FbTk/Menu.hh" #include "FbTk/Menu.hh"
@ -88,7 +89,9 @@ public:
void setOrientation(FbTk::Orientation orient); void setOrientation(FbTk::Orientation orient);
Container::Alignment alignment() const { return m_icon_container.alignment(); } Container::Alignment alignment() const { return m_icon_container.alignment(); }
private: private:
/// @return button associated with window /// @return button associated with window
IconButton *findButton(FluxboxWindow &win); IconButton *findButton(FluxboxWindow &win);
@ -122,10 +125,10 @@ private:
Container m_icon_container; Container m_icon_container;
IconbarTheme &m_theme; IconbarTheme &m_theme;
// cached pixmaps // cached pixmaps
Pixmap m_focused_pm, m_unfocused_pm; FbTk::CachedPixmap m_focused_pm, m_unfocused_pm;
// some are a fraction bigger due to rounding // some are a fraction bigger due to rounding
Pixmap m_focused_err_pm, m_unfocused_err_pm; FbTk::CachedPixmap m_focused_err_pm, m_unfocused_err_pm;
Pixmap m_empty_pm; ///< pixmap for empty container FbTk::CachedPixmap m_empty_pm; ///< pixmap for empty container
IconList m_icon_list; IconList m_icon_list;