aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makemodule.am2
-rw-r--r--src/SpacerTool.cc39
-rw-r--r--src/SpacerTool.hh52
-rw-r--r--src/ToolFactory.cc11
4 files changed, 104 insertions, 0 deletions
diff --git a/src/Makemodule.am b/src/Makemodule.am
index fedddb2..0156c90 100644
--- a/src/Makemodule.am
+++ b/src/Makemodule.am
@@ -102,6 +102,8 @@ TOOLBAR_SOURCE = \
102 src/GenericTool.hh \ 102 src/GenericTool.hh \
103 src/IconbarTool.cc \ 103 src/IconbarTool.cc \
104 src/IconbarTool.hh \ 104 src/IconbarTool.hh \
105 src/SpacerTool.cc \
106 src/SpacerTool.hh \
105 src/ToolFactory.cc \ 107 src/ToolFactory.cc \
106 src/ToolFactory.hh \ 108 src/ToolFactory.hh \
107 src/ToolTheme.cc \ 109 src/ToolTheme.cc \
diff --git a/src/SpacerTool.cc b/src/SpacerTool.cc
new file mode 100644
index 0000000..a6b42a3
--- /dev/null
+++ b/src/SpacerTool.cc
@@ -0,0 +1,39 @@
1// SpacerTool.cc for Fluxbox
2// Copyright (c) 2016 Thomas Lübking <thomas.luebking@gmail.com>
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#include "SpacerTool.hh"
23
24SpacerTool::SpacerTool(int size):
25 ToolbarItem(size < 0 ? RELATIVE : FIXED), m_size(size) {
26}
27
28SpacerTool::~SpacerTool() {
29
30}
31
32unsigned int SpacerTool::width() const {
33 return ((orientation() & 1) || m_size < 0) ? 0 : m_size;
34}
35
36unsigned int SpacerTool::height() const {
37 return ((orientation() & 1) && m_size > -1) ? m_size : 0;
38}
39
diff --git a/src/SpacerTool.hh b/src/SpacerTool.hh
new file mode 100644
index 0000000..1e29b45
--- /dev/null
+++ b/src/SpacerTool.hh
@@ -0,0 +1,52 @@
1// SpacerTool.hh for Fluxbox
2// Copyright (c) 2016 Thomas Lübking <thomas.luebking@gmail.com>
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 SPACERTOOL_HH
23#define SPACERTOOL_HH
24
25#include "ToolbarItem.hh"
26
27
28class SpacerTool: public ToolbarItem {
29public:
30 SpacerTool(int size = -1);
31 virtual ~SpacerTool();
32 void move(int x, int y) {}
33 void resize(unsigned int x, unsigned int y) {}
34 void moveResize(int x, int y,
35 unsigned int width, unsigned int height) {}
36 void show() {}
37 void hide() {}
38
39 unsigned int width() const;
40 unsigned int height() const;
41 unsigned int borderWidth() const {return 0;}
42
43 void parentMoved() {}
44 void updateSizing() {}
45
46 virtual void renderTheme(int alpha) {}
47
48private:
49 int m_size;
50};
51
52#endif // SPACERTOOL_HH
diff --git a/src/ToolFactory.cc b/src/ToolFactory.cc
index 60b283c..a033656 100644
--- a/src/ToolFactory.cc
+++ b/src/ToolFactory.cc
@@ -29,6 +29,7 @@
29#endif 29#endif
30#include "IconbarTool.hh" 30#include "IconbarTool.hh"
31#include "WorkspaceNameTool.hh" 31#include "WorkspaceNameTool.hh"
32#include "SpacerTool.hh"
32#include "ArrowButton.hh" 33#include "ArrowButton.hh"
33 34
34// Themes 35// Themes
@@ -98,6 +99,16 @@ ToolbarItem *ToolFactory::create(const std::string &name, const FbTk::FbWindow &
98#endif 99#endif
99 } else if (name == "clock") { 100 } else if (name == "clock") {
100 item = new ClockTool(parent, m_clock_theme, screen(), tbar.menu()); 101 item = new ClockTool(parent, m_clock_theme, screen(), tbar.menu());
102 } else if (name.find("spacer") == 0) {
103 int size = -1;
104 if (name.size() > 6) { // spacer_20 creates a 20px spacer
105 if (name.at(6) != '_')
106 return 0;
107 size = atoi(name.substr(7, std::string::npos).c_str());
108 if (size < 1)
109 return 0;
110 }
111 item = new SpacerTool(size);
101 } else { 112 } else {
102 113
103 std::string cmd_str = name; 114 std::string cmd_str = name;