aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Ewmh.cc3
-rw-r--r--src/FbTk/Layer.hh7
-rw-r--r--src/FbTk/LayerItem.hh3
-rw-r--r--src/FbTk/XLayer.cc5
-rw-r--r--src/FbTk/XLayer.hh2
-rw-r--r--src/FbTk/XLayerItem.cc2
-rw-r--r--src/FbTk/XLayerItem.hh2
7 files changed, 19 insertions, 5 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index aada7cf..6fe6b83 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -399,9 +399,6 @@ void Ewmh::updateClientList(BScreen &screen) {
399 for (; client_it != client_it_end; ++client_it) 399 for (; client_it != client_it_end; ++client_it)
400 wl[win++] = (*client_it)->window(); 400 wl[win++] = (*client_it)->window();
401 401
402 //number of windows to show in client list
403 num = win;
404
405 /* From Extended Window Manager Hints, draft 1.3: 402 /* From Extended Window Manager Hints, draft 1.3:
406 * 403 *
407 * _NET_CLIENT_LIST, WINDOW[]/32 404 * _NET_CLIENT_LIST, WINDOW[]/32
diff --git a/src/FbTk/Layer.hh b/src/FbTk/Layer.hh
index bbb3037..4fc2c8b 100644
--- a/src/FbTk/Layer.hh
+++ b/src/FbTk/Layer.hh
@@ -41,18 +41,22 @@ public:
41 virtual iterator insert(ItemType &item, unsigned int pos=0); 41 virtual iterator insert(ItemType &item, unsigned int pos=0);
42 /// remove item from list 42 /// remove item from list
43 virtual void remove(ItemType &item); 43 virtual void remove(ItemType &item);
44#ifdef NOT_USED
44 /// cycle all item upwards 45 /// cycle all item upwards
45 virtual void cycleUp(); 46 virtual void cycleUp();
46 /// cycle all items downwards 47 /// cycle all items downwards
47 virtual void cycleDown(); 48 virtual void cycleDown();
49#endif // NOT_USED
48 /// move item to top 50 /// move item to top
49 virtual void raise(ItemType &item); 51 virtual void raise(ItemType &item);
50 /// move item to bottom 52 /// move item to bottom
51 virtual void lower(ItemType &item); 53 virtual void lower(ItemType &item);
54#ifdef NOT_USED
52 /// raise a specific item one step 55 /// raise a specific item one step
53 virtual void stepUp(ItemType &item); 56 virtual void stepUp(ItemType &item);
54 /// lower a specific item one step 57 /// lower a specific item one step
55 virtual void stepDown(ItemType &item); 58 virtual void stepDown(ItemType &item);
59#endif // NOT_USED
56 virtual void restack(); 60 virtual void restack();
57 /// @return layer item on specific position, on failure 0 61 /// @return layer item on specific position, on failure 0
58 ItemType *getItem(unsigned int position); 62 ItemType *getItem(unsigned int position);
@@ -93,6 +97,7 @@ void Layer<ItemType, Container>::remove(ItemType &item) {
93 m_list.erase(it); 97 m_list.erase(it);
94} 98}
95 99
100#ifdef NOT_USED
96template <typename ItemType, typename Container> 101template <typename ItemType, typename Container>
97void Layer<ItemType, Container>::cycleUp() { 102void Layer<ItemType, Container>::cycleUp() {
98 if (size() == 0) 103 if (size() == 0)
@@ -157,6 +162,8 @@ void Layer<ItemType, Container>::stepDown(ItemType &item) {
157 itemList().insert(new_pos, textitem); 162 itemList().insert(new_pos, textitem);
158 restack(); 163 restack();
159} 164}
165#endif // NOT_USED
166
160template <typename ItemType, typename Container> 167template <typename ItemType, typename Container>
161void Layer<ItemType, Container>::raise(ItemType &item) { 168void Layer<ItemType, Container>::raise(ItemType &item) {
162 if (&item == itemList().front()) // already at the bottom 169 if (&item == itemList().front()) // already at the bottom
diff --git a/src/FbTk/LayerItem.hh b/src/FbTk/LayerItem.hh
index b6f4df9..14eac40 100644
--- a/src/FbTk/LayerItem.hh
+++ b/src/FbTk/LayerItem.hh
@@ -34,8 +34,11 @@ public:
34 34
35 virtual void raise() = 0; 35 virtual void raise() = 0;
36 virtual void lower() = 0; 36 virtual void lower() = 0;
37
38#ifdef NOT_USED
37 virtual void stepUp() = 0; 39 virtual void stepUp() = 0;
38 virtual void stepDown() = 0; 40 virtual void stepDown() = 0;
41#endif // NOT_USED
39}; 42};
40 43
41} // end namespace FbTk 44} // end namespace FbTk
diff --git a/src/FbTk/XLayer.cc b/src/FbTk/XLayer.cc
index f7eda8c..0341563 100644
--- a/src/FbTk/XLayer.cc
+++ b/src/FbTk/XLayer.cc
@@ -190,6 +190,7 @@ void XLayer::remove(XLayerItem &item) {
190 } 190 }
191} 191}
192 192
193#ifdef NOT_USED
193void XLayer::cycleUp() { 194void XLayer::cycleUp() {
194 // need to find highest visible window, and move it to bottom 195 // need to find highest visible window, and move it to bottom
195 iterator it = itemList().begin(); 196 iterator it = itemList().begin();
@@ -265,8 +266,7 @@ void XLayer::stepDown(XLayerItem &item) {
265 return; // nothing to do 266 return; // nothing to do
266 267
267 // get our position 268 // get our position
268 iterator myit = find(itemList().begin(), itemList().end(), &item); 269 iterator it = find(itemList().begin(), itemList().end(), &item);
269 iterator it = myit;
270 270
271 // go one below it (top is front, so we must increment) 271 // go one below it (top is front, so we must increment)
272 it++; 272 it++;
@@ -282,6 +282,7 @@ void XLayer::stepDown(XLayerItem &item) {
282 stackBelowItem(&item, *it); 282 stackBelowItem(&item, *it);
283 // if we did reach the end, then there are no visible windows, so we don't do anything 283 // if we did reach the end, then there are no visible windows, so we don't do anything
284} 284}
285#endif // NOT_USED
285 286
286void XLayer::raise(XLayerItem &item) { 287void XLayer::raise(XLayerItem &item) {
287 // assume it is already in this layer 288 // assume it is already in this layer
diff --git a/src/FbTk/XLayer.hh b/src/FbTk/XLayer.hh
index bed93cc..660886e 100644
--- a/src/FbTk/XLayer.hh
+++ b/src/FbTk/XLayer.hh
@@ -63,12 +63,14 @@ public:
63 iterator insert(XLayerItem &item, unsigned int pos=0); 63 iterator insert(XLayerItem &item, unsigned int pos=0);
64 void remove(XLayerItem &item); 64 void remove(XLayerItem &item);
65 65
66#ifdef NOT_USED
66 // move highest to bottom 67 // move highest to bottom
67 void cycleUp(); 68 void cycleUp();
68 void cycleDown(); 69 void cycleDown();
69 // just go above the next window up in the current layer (not all the way to the top) 70 // just go above the next window up in the current layer (not all the way to the top)
70 void stepUp(XLayerItem &item); 71 void stepUp(XLayerItem &item);
71 void stepDown(XLayerItem &item); 72 void stepDown(XLayerItem &item);
73#endif // NOT_USED
72 74
73 // bring to top of layer 75 // bring to top of layer
74 void raise(XLayerItem &item); 76 void raise(XLayerItem &item);
diff --git a/src/FbTk/XLayerItem.cc b/src/FbTk/XLayerItem.cc
index ff554ad..bb6cea1 100644
--- a/src/FbTk/XLayerItem.cc
+++ b/src/FbTk/XLayerItem.cc
@@ -60,6 +60,7 @@ void XLayerItem::tempRaise() {
60 m_layer->tempRaise(*this); 60 m_layer->tempRaise(*this);
61} 61}
62 62
63#ifdef NOT_USED
63void XLayerItem::stepUp() { 64void XLayerItem::stepUp() {
64 m_layer->stepUp(*this); 65 m_layer->stepUp(*this);
65} 66}
@@ -67,6 +68,7 @@ void XLayerItem::stepUp() {
67void XLayerItem::stepDown() { 68void XLayerItem::stepDown() {
68 m_layer->stepDown(*this); 69 m_layer->stepDown(*this);
69} 70}
71#endif // NOT_USED
70 72
71void XLayerItem::raiseLayer() { 73void XLayerItem::raiseLayer() {
72 m_layer->raiseLayer(*this); 74 m_layer->raiseLayer(*this);
diff --git a/src/FbTk/XLayerItem.hh b/src/FbTk/XLayerItem.hh
index 3d778bb..90d2167 100644
--- a/src/FbTk/XLayerItem.hh
+++ b/src/FbTk/XLayerItem.hh
@@ -48,9 +48,11 @@ public:
48 void lower(); 48 void lower();
49 void tempRaise(); // this raise gets reverted by a restack() 49 void tempRaise(); // this raise gets reverted by a restack()
50 50
51#ifdef NOT_USED
51 // go above the next item visible in this layer 52 // go above the next item visible in this layer
52 void stepUp(); 53 void stepUp();
53 void stepDown(); 54 void stepDown();
55#endif // NOT_USED
54 56
55 // send to next layer up 57 // send to next layer up
56 void raiseLayer(); 58 void raiseLayer();