aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-26 21:44:55 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-26 21:44:55 (GMT)
commitf3790fb3e4105b815308aee9249b2fd342e2d82b (patch)
tree56074207e3682811a1cee68bb9d46d2d934e88a0
parentb2546389a50ff370036590d799cfb640329160c5 (diff)
downloadfluxbox_paul-f3790fb3e4105b815308aee9249b2fd342e2d82b.zip
fluxbox_paul-f3790fb3e4105b815308aee9249b2fd342e2d82b.tar.bz2
revert previous patch until it can be fixed
-rw-r--r--src/FbTk/DefaultValue.hh82
-rw-r--r--src/FbTk/Makefile.am2
-rw-r--r--src/Window.cc4
-rw-r--r--src/Window.hh8
4 files changed, 5 insertions, 91 deletions
diff --git a/src/FbTk/DefaultValue.hh b/src/FbTk/DefaultValue.hh
deleted file mode 100644
index a89ad0a..0000000
--- a/src/FbTk/DefaultValue.hh
+++ /dev/null
@@ -1,82 +0,0 @@
1// DefaultValue.hh
2// Copyright (c) 2007 Fluxbox Team (fluxgen at fluxbox dot org)
3//
4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation
7// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8// and/or sell copies of the Software, and to permit persons to whom the
9// Software is furnished to do so, subject to the following conditions:
10//
11// The above copyright notice and this permission notice shall be included in
12// all copies or substantial portions of the Software.
13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE.
21
22#ifndef FBTK_DEFAULTVALUE_HH
23#define FBTK_DEFAULTVALUE_HH
24
25namespace FbTk {
26
27// classes for overriding default values without having to listen for changes
28template <typename T>
29class DefaultValue {
30public:
31 DefaultValue(const T &def):
32 m_default(def), m_actual(def), m_use_default(true) { }
33
34 inline const T &get() const { return m_use_default ? m_default : m_actual; }
35 inline void set(const T &val) { m_use_default = false; m_actual = val; }
36 inline void restoreDefault() { m_use_default = true; }
37 inline void isDefault() const { return m_use_default; }
38
39 inline DefaultValue<T> &operator =(const T &val) {
40 set(val); return *this;
41 }
42
43 inline operator T() const { return get(); }
44
45private:
46 const T &m_default;
47 T m_actual;
48 bool m_use_default;
49};
50
51// designed for use with built-in types T, thus no need to return references
52template <typename T, typename Receiver>
53class DefaultAccessor {
54public:
55 typedef T (Receiver:: *Accessor)() const;
56 DefaultAccessor(const Receiver &r, Accessor a):
57 m_receiver(r), m_accessor(a), m_actual((r.*a)()),
58 m_use_default(true) { }
59
60 inline const T get() const {
61 return m_use_default ? (m_receiver.*m_accessor)() : m_actual;
62 }
63 inline void set(const T &val) { m_use_default = false; m_actual = val; }
64 inline void restoreDefault() { m_use_default = true; }
65 inline void isDefault() const { return m_use_default; }
66
67 inline DefaultAccessor<T, Receiver> &operator =(const T &val) {
68 set(val); return *this;
69 }
70
71 inline operator T() const { return get(); }
72
73private:
74 const Receiver &m_receiver;
75 Accessor &m_accessor;
76 T m_actual;
77 bool m_use_default;
78};
79
80}; // end namespace FbTk
81
82#endif // FBTK_DEFAULTVALUE_HH
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 0de5475..081bd07 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -16,7 +16,7 @@ imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc
16endif 16endif
17 17
18libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \ 18libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
19 ObjectRegistry.hh DefaultValue.hh \ 19 ObjectRegistry.hh \
20 FileUtil.hh FileUtil.cc \ 20 FileUtil.hh FileUtil.cc \
21 EventHandler.hh EventManager.hh EventManager.cc \ 21 EventHandler.hh EventManager.hh EventManager.cc \
22 FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \ 22 FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \
diff --git a/src/Window.cc b/src/Window.cc
index 8126e9e..5eb380e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -264,8 +264,8 @@ FluxboxWindow::FluxboxWindow(WinClient &client, FbWinFrameTheme &tm,
264 m_toggled_decos(false), 264 m_toggled_decos(false),
265 m_icon_hidden(false), 265 m_icon_hidden(false),
266 m_focus_hidden(false), 266 m_focus_hidden(false),
267 m_focus_new(screen().focusControl(), &FocusControl::focusNew), 267 m_focus_new(screen().focusControl().focusNew()),
268 m_mouse_focus(screen().focusControl(), &FocusControl::isMouseFocus), 268 m_mouse_focus(screen().focusControl().isMouseFocus()),
269 m_click_focus(true), 269 m_click_focus(true),
270 m_old_pos_x(0), m_old_pos_y(0), 270 m_old_pos_x(0), m_old_pos_y(0),
271 m_old_width(1), m_old_height(1), 271 m_old_width(1), m_old_height(1),
diff --git a/src/Window.hh b/src/Window.hh
index 5dbe055..d0db606 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -27,7 +27,6 @@
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
29 29
30#include "FbTk/DefaultValue.hh"
31#include "FbTk/Timer.hh" 30#include "FbTk/Timer.hh"
32#include "FbTk/Subject.hh" 31#include "FbTk/Subject.hh"
33#include "FbTk/Observer.hh" 32#include "FbTk/Observer.hh"
@@ -50,7 +49,6 @@ class WinClient;
50class FbWinFrameTheme; 49class FbWinFrameTheme;
51class BScreen; 50class BScreen;
52class FbWinFrame; 51class FbWinFrame;
53class FocusControl;
54 52
55namespace FbTk { 53namespace FbTk {
56class TextButton; 54class TextButton;
@@ -611,10 +609,8 @@ private:
611 609
612 bool m_icon_hidden; ///< if the window is in the iconbar 610 bool m_icon_hidden; ///< if the window is in the iconbar
613 bool m_focus_hidden; ///< if the window is in the NextWindow list 611 bool m_focus_hidden; ///< if the window is in the NextWindow list
614 /// if the window is normally focused when mapped 612 bool m_focus_new; ///< if the window is normally focused when mapped
615 FbTk::DefaultAccessor<bool, FocusControl> m_focus_new; 613 bool m_mouse_focus; ///< if the window is focused with EnterNotify
616 /// if the window is focused with EnterNotify
617 FbTk::DefaultAccessor<bool, FocusControl> m_mouse_focus;
618 bool m_click_focus; ///< if the window is focused by clicking 614 bool m_click_focus; ///< if the window is focused by clicking
619 int m_old_pos_x, m_old_pos_y; ///< old position so we can restore from maximized 615 int m_old_pos_x, m_old_pos_y; ///< old position so we can restore from maximized
620 unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state 616 unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state