yay, the great STL conversion is almost done, LinkedList is now gone …

…from the source
bbidulock · Mar 13, 2002 · 83b4b71 · 83b4b71
1 parent 699daa1
commit 83b4b71
Show file tree

Hide file tree

Showing 12 changed files with 208 additions and 668 deletions.
diff --git a/src/Basemenu.cc b/src/Basemenu.cc
diff --git a/src/Basemenu.hh b/src/Basemenu.hh
@@ -25,18 +25,19 @@
 #define   __Basemenu_hh
 
 #include <X11/Xlib.h>
+#include <deque>
 
 class Blackbox;
 class BImageControl;
 class BScreen;
 class Basemenu;
 class BasemenuItem;
-#include "LinkedList.hh"
 
 
 class Basemenu {
 private:
-  LinkedList<BasemenuItem> *menuitems;
+  typedef std::deque<BasemenuItem*> MenuItems;
+  MenuItems menuitems;
   Blackbox *blackbox;
   Basemenu *parent;
   BImageControl *image_ctrl;
@@ -60,7 +61,7 @@ private:
 
 
 protected:
-  inline BasemenuItem *find(int index) { return menuitems->find(index); }
+  BasemenuItem *find(int index);
   inline void setTitleVisibility(Bool b) { title_vis = b; }
   inline void setMovable(Bool b) { movable = b; }
   inline void setHideTree(Bool h) { hide_tree = h; }
@@ -87,14 +88,15 @@ public:
 
   inline const char *getLabel(void) const { return menu.label; }
 
+  int insert(BasemenuItem *, int);
   int insert(const char *, int = 0, const char * = (const char *) 0, int = -1);
   int insert(const char **, int = -1, int = 0);
   int insert(const char *, Basemenu *, int = -1);
   int remove(int);
 
   inline const int getX(void) const { return menu.x; }
   inline const int getY(void) const { return menu.y; }
-  inline int getCount(void) { return menuitems->count(); }
+  inline int getCount(void) { return menuitems.size(); }
   inline const int getCurrentSubmenu(void) const { return which_sub; }
 
   inline const unsigned int getWidth(void) const { return menu.width; }

diff --git a/src/ImageControl.cc b/src/ImageControl.cc
@@ -33,6 +33,8 @@
 #  include <ctype.h>
 #endif // HAVE_CTYPE_H
 
+#include <X11/Xlib.h>
+
 #include <algorithm>
 
 #include "blackbox.hh"
@@ -399,7 +401,7 @@ Pixmap BImageControl::searchCache(unsigned int width, unsigned int height,
   CacheContainer::iterator it = cache.begin();
   const CacheContainer::iterator end = cache.end();
   for (; it != end; ++it) {
-    CachedImage &tmp = *it;
+    CachedImage& tmp = *it;
     if ((tmp.width == width) && (tmp.height == height) &&
         (tmp.texture == texture) && (tmp.pixel1 == c1->getPixel()))
       if (texture & BImage_Gradient) {
@@ -710,7 +712,24 @@ struct ZeroRefCheck {
   }
 };
 
+struct CacheCleaner {
+  Display *display;
+  CacheCleaner(Display *d): display(d) {}
+  void operator()(const BImageControl::CachedImage& image) const {
+    if (image.count == 0)
+      XFreePixmap(display, image.pixmap);
+  }
+};
+
+struct ZeroRefCount {
+  bool operator()(const BImageControl::CachedImage& image) const {
+    return (image.count == 0);
+  }
+};
+
 void BImageControl::timeout(void) {
-  cache.erase(std::remove_if(cache.begin(), cache.end(), ZeroRefCheck()),
-              cache.end());
+  std::for_each(cache.begin(), cache.end(),
+                CacheCleaner(basedisplay->getXDisplay()));
+  cache.remove_if(ZeroRefCount());
 }
+