1 files changed, 114 insertions, 88 deletions

diff --git a/src/IconBar.cc b/src/IconBar.cc
index db3eabc..3ed4f54 100644
--- a/src/IconBar.cc
+++ b/src/IconBar.cc
@@ -1,5 +1,5 @@
-// IconBar.cc 
-// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
+// IconBar.cc for Fluxbox Window Manager
+// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -19,27 +19,52 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+// $Id: IconBar.cc,v 1.15 2002/08/04 15:23:24 fluxgen Exp $
+
 #include "IconBar.hh"
 #include "i18n.hh"
+#include "Screen.hh"
+
+#include <algorithm>
 
-IconBarObj::IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin) {
+IconBarObj::IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin)
+{
+        m_fluxboxwin = fluxboxwin;
         m_iconwin = iconwin;
-        m_fluxboxwin = fluxboxwin;      
 }
 
 IconBarObj::~IconBarObj() {
         
 }
 
-IconBar::IconBar(BScreen *scrn, Window parent) {
-        m_parent = parent;
-        m_screen = scrn;
-        m_iconlist = new IconList;      
+//---------- getIconWidth ------------
+// will return the width of an icon
+// window
+//------------------------------------
+unsigned int IconBarObj::width() const {
+        Window root;
+
+        unsigned int width, height;
+        unsigned int border_width, depth;       //not used
+        int x, y; //not used
+
+        Display *m_display = Fluxbox::instance()->getXDisplay();
+
+        XGetGeometry(m_display, m_iconwin, &root, &x, &y, 
+                                        &width, &height, &border_width, &depth);
+
+        return width;
+}
+
+
+IconBar::IconBar(BScreen *scrn, Window parent):
+m_screen(scrn),
+m_parent(parent)
+{
         m_display = scrn->getBaseDisplay()->getXDisplay();
 }
 
 IconBar::~IconBar() {
-        delete m_iconlist;
 }
 
 //------------ addIcon -----------------------
@@ -52,7 +77,7 @@ Window IconBar::addIcon(FluxboxWindow *fluxboxwin) {
         Window iconwin = createIconWindow(fluxboxwin, m_parent);
         decorate(iconwin);      
         //add window object to list     
-        m_iconlist->insert(new IconBarObj(fluxboxwin, iconwin));
+        m_iconlist.push_back(new IconBarObj(fluxboxwin, iconwin));
         //reposition all icons to fit windowbar
         repositionIcons();
         
@@ -72,11 +97,15 @@ Window IconBar::delIcon(FluxboxWindow *fluxboxwin) {
         Window retwin = None;
         IconBarObj *obj = findIcon(fluxboxwin);
         if (obj) {
-                m_iconlist->remove(obj);                                                                
-                retwin = obj->getIconWin();             
-                delete obj;                             
-                XDestroyWindow(m_display, retwin);
-                repositionIcons();              
+                IconList::iterator it =
+                        std::find(m_iconlist.begin(), m_iconlist.end(), obj);
+                if (it != m_iconlist.end()) {
+                        m_iconlist.erase(it);                                                           
+                        retwin = obj->getIconWin();             
+                        delete obj;                             
+                        XDestroyWindow(m_display, retwin);
+                        repositionIcons();              
+                }
         }               
         return retwin;
 }
@@ -88,28 +117,23 @@ Window IconBar::delIcon(FluxboxWindow *fluxboxwin) {
 void IconBar::loadTheme(unsigned int width, unsigned int height) {
         BImageControl *image_ctrl = m_screen->getImageControl();
         Pixmap tmp = m_focus_pm;
-  BTexture *texture = &(m_screen->getWindowStyle()->tab.l_focus);
+        FbTk::Texture *texture = &(m_screen->getWindowStyle()->tab.l_focus);
         
-  if (texture->getTexture() & BImage_ParentRelative ) {
-        
-                BTexture *pt = &(m_screen->getWindowStyle()->tab.t_focus);
-                if (pt->getTexture() == (BImage_Flat | BImage_Solid)) {
-          m_focus_pm = None;
-            m_focus_pixel = pt->getColor()->getPixel();
-        } else
-            m_focus_pm =
-            image_ctrl->renderImage(width, height, pt);  
+        //If we are working on a PARENTRELATIVE, change to right focus value
+        if (texture->type() & FbTk::Texture::PARENTRELATIVE ) {
+                texture = &(m_screen->getWindowStyle()->tab.t_focus);
+        }
                 
+        if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
+                m_focus_pm = None;
+                        m_focus_pixel = texture->color().pixel();
         } else {
-        
-                if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
-          m_focus_pm = None;
-            m_focus_pixel = texture->getColor()->getPixel();
-        } else
-            m_focus_pm =
-            image_ctrl->renderImage(width, height, texture);
+                m_focus_pm =
+                        image_ctrl->renderImage(width, height, texture);         
         }
-         if (tmp) image_ctrl->removeImage(tmp);
+
+        if (tmp)
+                image_ctrl->removeImage(tmp);
 }
 
 //------------ decorate ------------------
@@ -119,7 +143,7 @@ void IconBar::loadTheme(unsigned int width, unsigned int height) {
 void IconBar::decorate(Window win) {
 
         XSetWindowBorderWidth(m_display, win, m_screen->getWindowStyle()->tab.border_width);
-        XSetWindowBorder(m_display, win, m_screen->getWindowStyle()->tab.border_color.getPixel());
+        XSetWindowBorder(m_display, win, m_screen->getWindowStyle()->tab.border_color.pixel());
         if (m_focus_pm)
                 XSetWindowBackgroundPixmap(m_display, win, m_focus_pm);
         else
@@ -141,25 +165,26 @@ void IconBar::reconfigure() {
 //----------------------------------------
 void IconBar::exposeEvent(XExposeEvent *ee) {
         IconBarObj *obj=0;      
-        IconListIterator it(m_iconlist);        
-        for (; it.current(); it++) {
-                if (it.current()->getIconWin() == ee->window) {
-                        obj = it.current();
+        IconList::iterator it = m_iconlist.begin();
+        IconList::iterator it_end = m_iconlist.end();
+        for (; it != it_end; ++it) {
+                if ((*it)->getIconWin() == ee->window) {
+                        obj = (*it);
                         break;
                 }
         }       
 
         if (obj) {
-                                
+
                 Window root;
                 unsigned int width, height;
                 unsigned int border_width, depth;       //not used
                 int x, y;
                 XGetGeometry(m_display, m_parent, &root, &x, &y, &width, &height,
                                         &border_width, &depth);
-        
+
                 //max width on every icon
-                unsigned int icon_width = width / m_iconlist->count();
+                unsigned int icon_width = width / m_iconlist.size();
         
                 //load right size of theme
                 loadTheme(icon_width, height);
@@ -173,7 +198,7 @@ void IconBar::exposeEvent(XExposeEvent *ee) {
 // Calculates and moves/resizes the icons
 //-----------------------------------------
 void IconBar::repositionIcons(void) {
-        if (!m_iconlist->count())
+        if (m_iconlist.size() == 0)
                 return;
                 
         Window root;
@@ -181,22 +206,22 @@ void IconBar::repositionIcons(void) {
         unsigned int border_width, depth;       //not used
         int x, y;
         XGetGeometry(m_display, m_parent, &root, &x, &y, &width, &height,
-                                &border_width, &depth);
+                &border_width, &depth);
         
         //max width on every icon
-        unsigned int icon_width = width / m_iconlist->count();
+        unsigned int icon_width = width / m_iconlist.size();
         
         //load right size of theme
         loadTheme(icon_width, height);
-        
-        IconListIterator it(m_iconlist);        
 
-        for (x = 0; it.current(); it++, x+=icon_width) {
-                Window iconwin = it.current()->getIconWin();
+        IconList::iterator it = m_iconlist.begin();
+        IconList::iterator it_end = m_iconlist.end();
+        for (x = 0; it != it_end; ++it, x += icon_width) {
+                Window iconwin = (*it)->getIconWin();
                 XMoveResizeWindow(m_display, iconwin,
-                                                 x, 0,
-                                                 icon_width, height);   
-                draw(it.current(), icon_width);
+                         x, 0,
+                         icon_width, height);   
+                draw((*it), icon_width);
                 decorate(iconwin);
         }
                 
@@ -208,20 +233,20 @@ void IconBar::repositionIcons(void) {
 //----------------------------------------------
 Window IconBar::createIconWindow(FluxboxWindow *fluxboxwin, Window parent) {
         unsigned long attrib_mask = CWBackPixmap | CWBackPixel | CWBorderPixel |
-                              CWColormap | CWOverrideRedirect | CWEventMask;
+                        CWColormap | CWOverrideRedirect | CWEventMask;
         XSetWindowAttributes attrib;
-  attrib.background_pixmap = None;
-  attrib.background_pixel = attrib.border_pixel =
-                           fluxboxwin->getScreen()->getWindowStyle()->tab.border_color.getPixel();
-  attrib.colormap = fluxboxwin->getScreen()->getColormap();
-  attrib.override_redirect = True;
-  attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
-                      ButtonMotionMask | ExposureMask | EnterWindowMask;
+        attrib.background_pixmap = None;
+        attrib.background_pixel = attrib.border_pixel =
+                fluxboxwin->getScreen()->getWindowStyle()->tab.border_color.pixel();
+        attrib.colormap = fluxboxwin->getScreen()->colormap();
+        attrib.override_redirect = True;
+        attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
+                ButtonMotionMask | ExposureMask | EnterWindowMask;
                                                                                         
         //create iconwindow
         Window iconwin = XCreateWindow(m_display, parent, 0, 0, 1, 1, 0,
-                  fluxboxwin->getScreen()->getDepth(), InputOutput, fluxboxwin->getScreen()->getVisual(),
-                  attrib_mask, &attrib);
+                fluxboxwin->getScreen()->getDepth(), InputOutput, fluxboxwin->getScreen()->getVisual(),
+                attrib_mask, &attrib);
                 
         return iconwin;
 }
@@ -235,68 +260,67 @@ void IconBar::draw(IconBarObj *obj, int width) {
         
         FluxboxWindow *fluxboxwin = obj->getFluxboxWin();
         Window iconwin = obj->getIconWin();
-        char *title = *fluxboxwin->getIconTitle();
-        unsigned int title_len = strlen(title);
         unsigned int title_text_w;
 
-        if (I18n::instance()->multibyte()) {
+        const int multibyte = I18n::instance()->multibyte();
+
+        if (multibyte) {
                 XRectangle ink, logical;
                 XmbTextExtents(m_screen->getWindowStyle()->font.set,
-                                title, title_len, &ink, &logical);
+                        fluxboxwin->getIconTitle().c_str(), fluxboxwin->getIconTitle().size(), &ink, &logical);
                 title_text_w = logical.width;
         } else {
                 title_text_w = XTextWidth(m_screen->getWindowStyle()->font.fontstruct,
-                                title, title_len);
+                        fluxboxwin->getIconTitle().c_str(), fluxboxwin->getIconTitle().size());
         }
         
         int l = title_text_w;
-        int dlen=title_len;
+        unsigned int dlen=fluxboxwin->getIconTitle().size();
         unsigned int bevel_w = m_screen->getBevelWidth();
         int dx=bevel_w*2;
                 
         for (; dlen >= 0; dlen--) {
-                if (I18n::instance()->multibyte()) {
+                if (multibyte) {
                 XRectangle ink, logical;
                         XmbTextExtents(m_screen->getWindowStyle()->tab.font.set, 
-                                                                                title, dlen,
-                                                                                &ink, &logical);
+                                fluxboxwin->getIconTitle().c_str(), dlen,
+                                &ink, &logical);
                         l = logical.width;
                 } else
                         l = XTextWidth(m_screen->getWindowStyle()->tab.font.fontstruct, 
-                                                                title, dlen);
+                                fluxboxwin->getIconTitle().c_str(), dlen);
                         l += (bevel_w * 4);
 
                 if (l < width)
                         break;
         }
-        
-        
+
         switch (m_screen->getWindowStyle()->tab.font.justify) {
-        case FFont::Right:
+        case DrawUtil::Font::RIGHT:
                 dx += width - l;
                 break;
-        case FFont::Center:
+        case DrawUtil::Font::CENTER:
                 dx += (width - l) / 2;
                 break;
         default:
                 break;
         }
 
-        //Draw title to m_tabwin
+        //Draw title to m_iconwin
 
         XClearWindow(m_display, iconwin);               
         
-        if (I18n::instance()->multibyte()) {
+        if (multibyte) {
                 XmbDrawString(m_display, iconwin,
                         m_screen->getWindowStyle()->tab.font.set,
                         m_screen->getWindowStyle()->tab.l_text_focus_gc, dx, 
-                         1 - m_screen->getWindowStyle()->tab.font.set_extents->max_ink_extent.y,
-                        title, dlen);
+                        1 - m_screen->getWindowStyle()->tab.font.set_extents->max_ink_extent.y,
+                        fluxboxwin->getIconTitle().c_str(), dlen);
         } else {
                 XDrawString(m_display, iconwin,
                         m_screen->getWindowStyle()->tab.l_text_focus_gc, dx,
                         m_screen->getWindowStyle()->tab.font.fontstruct->ascent + 1, 
-                        title, dlen);
+                        fluxboxwin->getIconTitle().c_str(), dlen);
         }       
 
 }
@@ -309,10 +333,10 @@ void IconBar::draw(IconBarObj *obj, int width) {
 //----------------------------------
 FluxboxWindow *IconBar::findWindow(Window w) {
 
-        IconListIterator it(m_iconlist);        
-        
-        for (; it.current(); it++) {
-                IconBarObj *tmp = it.current();
+        IconList::iterator it = m_iconlist.begin();
+        IconList::iterator it_end = m_iconlist.end();
+        for (; it != it_end; ++it) {
+                IconBarObj *tmp = (*it);
                 if (tmp)
                         if (tmp->getIconWin() == w)
                                 return tmp->getFluxboxWin();                    
@@ -326,12 +350,13 @@ FluxboxWindow *IconBar::findWindow(Window w) {
 // returns pointer to IconBarObj on success else 
 // 0 on failure
 //------------------------------------
+
 IconBarObj *IconBar::findIcon(FluxboxWindow *fluxboxwin) {
 
-        IconListIterator it(m_iconlist);        
-        
-        for (; it.current(); it++) {
-                IconBarObj *tmp = it.current();
+        IconList::iterator it = m_iconlist.begin();
+        IconList::iterator it_end = m_iconlist.end();
+        for (; it != it_end; ++it) {
+                IconBarObj *tmp = (*it);
                 if (tmp)
                         if (tmp->getFluxboxWin() == fluxboxwin)
                                 return tmp;                     
@@ -339,3 +364,4 @@ IconBarObj *IconBar::findIcon(FluxboxWindow *fluxboxwin) {
         
         return 0;
 }
+