summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FbTk/FbWindow.hh23
-rw-r--r--src/ToolFactory.cc2
-rw-r--r--src/Window.cc28
3 files changed, 26 insertions, 27 deletions
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index f266ec3..b8de60e 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -244,29 +244,6 @@ private:
244 244
245bool operator == (Window win, const FbWindow &fbwin); 245bool operator == (Window win, const FbWindow &fbwin);
246 246
247/// helper class for some STL routines
248class ChangeProperty {
249public:
250 ChangeProperty(Display *disp, Atom prop, int mode,
251 unsigned char *state, int num):m_disp(disp),
252 m_prop(prop),
253 m_state(state),
254 m_num(num),
255 m_mode(mode){
256
257 }
258 void operator () (FbTk::FbWindow *win) {
259 XChangeProperty(m_disp, win->window(), m_prop, m_prop, 32, m_mode,
260 m_state, m_num);
261 }
262private:
263 Display *m_disp;
264 Atom m_prop;
265 unsigned char *m_state;
266 int m_num;
267 int m_mode;
268};
269
270/// Interface class to render FbWindow foregrounds. 247/// Interface class to render FbWindow foregrounds.
271class FbWindowRenderer { 248class FbWindowRenderer {
272public: 249public:
diff --git a/src/ToolFactory.cc b/src/ToolFactory.cc
index 35bdf75..1a1d8d7 100644
--- a/src/ToolFactory.cc
+++ b/src/ToolFactory.cc
@@ -41,8 +41,6 @@
41#include "Toolbar.hh" 41#include "Toolbar.hh"
42#include "fluxbox.hh" 42#include "fluxbox.hh"
43 43
44#include "FbTk/FbWindow.hh"
45
46#include <utility> 44#include <utility>
47 45
48namespace { 46namespace {
diff --git a/src/Window.cc b/src/Window.cc
index 8222c06..b05593c 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -234,6 +234,30 @@ private:
234 WinClient &m_client; 234 WinClient &m_client;
235}; 235};
236 236
237
238/// helper class for some STL routines
239class ChangeProperty {
240public:
241 ChangeProperty(Display *disp, Atom prop, int mode,
242 unsigned char *state, int num):m_disp(disp),
243 m_prop(prop),
244 m_state(state),
245 m_num(num),
246 m_mode(mode){
247
248 }
249 void operator () (FbTk::FbWindow *win) {
250 XChangeProperty(m_disp, win->window(), m_prop, m_prop, 32, m_mode,
251 m_state, m_num);
252 }
253private:
254 Display *m_disp;
255 Atom m_prop;
256 unsigned char *m_state;
257 int m_num;
258 int m_mode;
259};
260
237}; 261};
238 262
239 263
@@ -2012,7 +2036,7 @@ void FluxboxWindow::installColormap(bool install) {
2012 */ 2036 */
2013void FluxboxWindow::saveBlackboxAttribs() { 2037void FluxboxWindow::saveBlackboxAttribs() {
2014 for_each(m_clientlist.begin(), m_clientlist.end(), 2038 for_each(m_clientlist.begin(), m_clientlist.end(),
2015 FbTk::ChangeProperty( 2039 ChangeProperty(
2016 display, 2040 display,
2017 FbAtoms::instance()->getFluxboxAttributesAtom(), 2041 FbAtoms::instance()->getFluxboxAttributesAtom(),
2018 PropModeReplace, 2042 PropModeReplace,
@@ -2036,7 +2060,7 @@ void FluxboxWindow::setState(unsigned long new_state, bool setting_up) {
2036 state[1] = (unsigned long) None; 2060 state[1] = (unsigned long) None;
2037 2061
2038 for_each(m_clientlist.begin(), m_clientlist.end(), 2062 for_each(m_clientlist.begin(), m_clientlist.end(),
2039 FbTk::ChangeProperty(display, 2063 ChangeProperty(display,
2040 FbAtoms::instance()->getWMStateAtom(), 2064 FbAtoms::instance()->getWMStateAtom(),
2041 PropModeReplace, 2065 PropModeReplace,
2042 (unsigned char *)state, 2)); 2066 (unsigned char *)state, 2));