aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-12-16 23:36:06 (GMT)
committerfluxgen <fluxgen>2003-12-16 23:36:06 (GMT)
commit90ff80f89b990fcdf98d8c28b4d85a4420a8e213 (patch)
tree0761fc0b38fd787e988ea673f48f0740075c9b2e
parent72b878f78c0df0a54cf8e9f04bb2e22dd6715658 (diff)
downloadfluxbox-90ff80f89b990fcdf98d8c28b4d85a4420a8e213.zip
fluxbox-90ff80f89b990fcdf98d8c28b4d85a4420a8e213.tar.bz2
cleaning
-rw-r--r--src/FbCommands.hh4
-rw-r--r--src/FbWinFrame.hh6
-rw-r--r--src/Keys.hh10
-rw-r--r--src/Shape.hh6
-rw-r--r--src/Toolbar.hh4
-rw-r--r--src/Window.hh3
-rw-r--r--src/fluxbox.cc7
7 files changed, 18 insertions, 22 deletions
diff --git a/src/FbCommands.hh b/src/FbCommands.hh
index d77bbf7..fc97791 100644
--- a/src/FbCommands.hh
+++ b/src/FbCommands.hh
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbCommands.hh,v 1.13 2003/12/03 22:13:21 fluxgen Exp $ 22// $Id: FbCommands.hh,v 1.14 2003/12/16 23:35:00 fluxgen Exp $
23 23
24// \file contains basic commands to restart, reconfigure, execute command and exit fluxbox 24// \file contains basic commands to restart, reconfigure, execute command and exit fluxbox
25 25
@@ -98,6 +98,6 @@ public:
98 void execute(); 98 void execute();
99}; 99};
100 100
101}; // end namespace FbCommands 101} // end namespace FbCommands
102 102
103#endif // FBCOMMANDS_HH 103#endif // FBCOMMANDS_HH
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index f1db3fe..f1a7d3f 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrame.hh,v 1.25 2003/12/09 08:48:08 rathnor Exp $ 22// $Id: FbWinFrame.hh,v 1.26 2003/12/16 23:34:36 fluxgen Exp $
23 23
24#ifndef FBWINFRAME_HH 24#ifndef FBWINFRAME_HH
25#define FBWINFRAME_HH 25#define FBWINFRAME_HH
@@ -46,7 +46,7 @@ class ImageControl;
46class Command; 46class Command;
47class Button; 47class Button;
48class Texture; 48class Texture;
49}; 49}
50 50
51/// holds a window frame with a client window 51/// holds a window frame with a client window
52/// (see: <a href="fluxbox_fbwinframe.png">image</a>) 52/// (see: <a href="fluxbox_fbwinframe.png">image</a>)
@@ -295,7 +295,7 @@ private:
295 class ThemeListener: public FbTk::Observer { 295 class ThemeListener: public FbTk::Observer {
296 public: 296 public:
297 ThemeListener(FbWinFrame &frame):m_frame(frame) { } 297 ThemeListener(FbWinFrame &frame):m_frame(frame) { }
298 void update(FbTk::Subject *subj) { 298 void update(FbTk::Subject *) {
299 m_frame.reconfigure(); 299 m_frame.reconfigure();
300 } 300 }
301 private: 301 private:
diff --git a/src/Keys.hh b/src/Keys.hh
index cc51218..b04cdc8 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Keys.hh,v 1.29 2003/10/05 07:19:36 rathnor Exp $ 22// $Id: Keys.hh,v 1.30 2003/12/16 23:32:29 fluxgen Exp $
23 23
24#ifndef KEYS_HH 24#ifndef KEYS_HH
25#define KEYS_HH 25#define KEYS_HH
@@ -28,11 +28,9 @@
28#include <vector> 28#include <vector>
29#include <X11/Xlib.h> 29#include <X11/Xlib.h>
30 30
31#include "NotCopyable.hh" 31#include "FbTk/NotCopyable.hh"
32#include "RefCount.hh" 32#include "FbTk/RefCount.hh"
33namespace FbTk { 33#include "FbTk/Command.hh"
34class Command;
35};
36 34
37class Keys:private FbTk::NotCopyable { 35class Keys:private FbTk::NotCopyable {
38public: 36public:
diff --git a/src/Shape.hh b/src/Shape.hh
index 1232117..0bc037f 100644
--- a/src/Shape.hh
+++ b/src/Shape.hh
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Shape.hh,v 1.2 2003/08/24 15:02:15 fluxgen Exp $ 22// $Id: Shape.hh,v 1.3 2003/12/16 23:32:02 fluxgen Exp $
23 23
24#ifndef SHAPE_HH 24#ifndef SHAPE_HH
25#define SHAPE_HH 25#define SHAPE_HH
@@ -28,7 +28,7 @@
28 28
29namespace FbTk { 29namespace FbTk {
30class FbWindow; 30class FbWindow;
31}; 31}
32 32
33/// creates round corners on windows 33/// creates round corners on windows
34class Shape { 34class Shape {
@@ -38,7 +38,7 @@ public:
38 BOTTOMRIGHT = 0x01, 38 BOTTOMRIGHT = 0x01,
39 TOPRIGHT = 0x02, 39 TOPRIGHT = 0x02,
40 BOTTOMLEFT = 0x04, 40 BOTTOMLEFT = 0x04,
41 TOPLEFT = 0x08, 41 TOPLEFT = 0x08
42 }; 42 };
43 43
44 Shape(FbTk::FbWindow &win, int shapeplaces); 44 Shape(FbTk::FbWindow &win, int shapeplaces);
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index a2cacd9..57d4bd6 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.hh,v 1.50 2003/12/08 17:29:44 fluxgen Exp $ 25// $Id: Toolbar.hh,v 1.51 2003/12/16 23:33:21 fluxgen Exp $
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
@@ -50,7 +50,7 @@ class ToolbarItem;
50 50
51namespace FbTk { 51namespace FbTk {
52class ImageControl; 52class ImageControl;
53}; 53}
54 54
55/// The toolbar. 55/// The toolbar.
56/// Handles iconbar, workspace name view and clock view 56/// Handles iconbar, workspace name view and clock view
diff --git a/src/Window.hh b/src/Window.hh
index 6418347..d8a1ec5 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.hh,v 1.101 2003/12/07 17:47:42 fluxgen Exp $ 25// $Id: Window.hh,v 1.102 2003/12/16 23:28:36 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -387,7 +387,6 @@ private:
387 void updateMWMHintsFromClient(WinClient &client); 387 void updateMWMHintsFromClient(WinClient &client);
388 void updateBlackboxHintsFromClient(const WinClient &client); 388 void updateBlackboxHintsFromClient(const WinClient &client);
389 void saveBlackboxAttribs(); 389 void saveBlackboxAttribs();
390 void setNetWMAttributes();
391 void associateClientWindow(bool use_attrs = false, int x = 0, int y = 0, unsigned int width = 1, unsigned int height = 1); 390 void associateClientWindow(bool use_attrs = false, int x = 0, int y = 0, unsigned int width = 1, unsigned int height = 1);
392 391
393 void restoreGravity(); 392 void restoreGravity();
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 5290cf1..26bf782 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.206 2003/12/09 12:28:24 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.207 2003/12/16 23:36:06 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -368,7 +368,7 @@ void copyFile(const std::string &from, const std::string &to) {
368 } 368 }
369} 369}
370 370
371}; 371} // end anonymous
372 372
373static int handleXErrors(Display *d, XErrorEvent *e) { 373static int handleXErrors(Display *d, XErrorEvent *e) {
374#ifdef DEBUG 374#ifdef DEBUG
@@ -1983,7 +1983,7 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
1983#endif // DEBUG 1983#endif // DEBUG
1984 BScreen *old_screen = 0, *screen = 0; 1984 BScreen *old_screen = 0, *screen = 0;
1985 WinClient *old_client = 0; 1985 WinClient *old_client = 0;
1986 Workspace *old_wkspc = 0, *wkspc = 0; 1986 Workspace *old_wkspc = 0;
1987 1987
1988 if (m_focused_window != 0) { 1988 if (m_focused_window != 0) {
1989 // check if m_focused_window is valid 1989 // check if m_focused_window is valid
@@ -2024,7 +2024,6 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
2024 m_focused_window = 0; // the window pointer wasn't valid, mark no window focused 2024 m_focused_window = 0; // the window pointer wasn't valid, mark no window focused
2025 } else { 2025 } else {
2026 screen = *winscreen; 2026 screen = *winscreen;
2027 wkspc = screen->getWorkspace(win->workspaceNumber());
2028 m_focused_window = client; // update focused window 2027 m_focused_window = client; // update focused window
2029 win->setCurrentClient(*client, false); // don't setinputfocus 2028 win->setCurrentClient(*client, false); // don't setinputfocus
2030 win->setFocusFlag(true); // set focus flag 2029 win->setFocusFlag(true); // set focus flag