diff options
39 files changed, 87 insertions, 82 deletions
diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh index a304995..7e461ca 100644 --- a/nls/fluxbox-nls.hh +++ b/nls/fluxbox-nls.hh | |||
@@ -253,6 +253,6 @@ enum { | |||
253 | 253 | ||
254 | }; // end enum | 254 | }; // end enum |
255 | 255 | ||
256 | }; // end namespace FBNLS | 256 | } // end namespace FBNLS |
257 | 257 | ||
258 | #endif // FLUXBOX_NLS_HH | 258 | #endif // FLUXBOX_NLS_HH |
diff --git a/src/ButtonTool.hh b/src/ButtonTool.hh index 4339722..484fea6 100644 --- a/src/ButtonTool.hh +++ b/src/ButtonTool.hh | |||
@@ -31,7 +31,7 @@ class ButtonTheme; | |||
31 | namespace FbTk { | 31 | namespace FbTk { |
32 | class Button; | 32 | class Button; |
33 | class ImageControl; | 33 | class ImageControl; |
34 | }; | 34 | } |
35 | 35 | ||
36 | class ButtonTool: public GenericTool { | 36 | class ButtonTool: public GenericTool { |
37 | public: | 37 | public: |
diff --git a/src/ClientMenu.cc b/src/ClientMenu.cc index 0da3773..71f322c 100644 --- a/src/ClientMenu.cc +++ b/src/ClientMenu.cc | |||
@@ -77,7 +77,7 @@ private: | |||
77 | Focusable &m_client; | 77 | Focusable &m_client; |
78 | }; | 78 | }; |
79 | 79 | ||
80 | }; // end anonymous namespace | 80 | } // end anonymous namespace |
81 | 81 | ||
82 | ClientMenu::ClientMenu(BScreen &screen, Focusables &clients, | 82 | ClientMenu::ClientMenu(BScreen &screen, Focusables &clients, |
83 | bool listen_for_iconlist_changes): | 83 | bool listen_for_iconlist_changes): |
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc index 6cb5c08..2575a39 100644 --- a/src/CurrentWindowCmd.cc +++ b/src/CurrentWindowCmd.cc | |||
@@ -109,7 +109,7 @@ REGISTER_COMMAND_PARSER(movetabright, createCurrentWindowCmd, void); | |||
109 | REGISTER_COMMAND_PARSER(detachclient, createCurrentWindowCmd, void); | 109 | REGISTER_COMMAND_PARSER(detachclient, createCurrentWindowCmd, void); |
110 | REGISTER_COMMAND_PARSER(windowmenu, createCurrentWindowCmd, void); | 110 | REGISTER_COMMAND_PARSER(windowmenu, createCurrentWindowCmd, void); |
111 | 111 | ||
112 | }; // end anonymous namespace | 112 | } // end anonymous namespace |
113 | 113 | ||
114 | void WindowHelperCmd::execute() { | 114 | void WindowHelperCmd::execute() { |
115 | if (WindowCmd<void>::window() || FocusControl::focusedFbWindow()) | 115 | if (WindowCmd<void>::window() || FocusControl::focusedFbWindow()) |
@@ -201,7 +201,7 @@ FbTk::Command<void> *parseFocusCmd(const string &command, const string &args, | |||
201 | REGISTER_COMMAND_PARSER(activate, parseFocusCmd, void); | 201 | REGISTER_COMMAND_PARSER(activate, parseFocusCmd, void); |
202 | REGISTER_COMMAND_PARSER(focus, parseFocusCmd, void); | 202 | REGISTER_COMMAND_PARSER(focus, parseFocusCmd, void); |
203 | 203 | ||
204 | }; // end anonymous namespace | 204 | } // end anonymous namespace |
205 | 205 | ||
206 | void SetHeadCmd::real_execute() { | 206 | void SetHeadCmd::real_execute() { |
207 | int num = m_head; | 207 | int num = m_head; |
diff --git a/src/Ewmh.cc b/src/Ewmh.cc index b64a95d..82653a5 100644 --- a/src/Ewmh.cc +++ b/src/Ewmh.cc | |||
@@ -288,7 +288,7 @@ void extractNetWmIcon(Atom net_wm_icon, WinClient& winclient) { | |||
288 | winclient.setIcon(icon); | 288 | winclient.setIcon(icon); |
289 | } | 289 | } |
290 | 290 | ||
291 | }; // end anonymous namespace | 291 | } // end anonymous namespace |
292 | 292 | ||
293 | class Ewmh::EwmhAtoms { | 293 | class Ewmh::EwmhAtoms { |
294 | public: | 294 | public: |
@@ -1535,3 +1535,4 @@ void Ewmh::updateFrameExtents(FluxboxWindow &win) { | |||
1535 | (unsigned char *)extents, 4); | 1535 | (unsigned char *)extents, 4); |
1536 | } | 1536 | } |
1537 | } | 1537 | } |
1538 | |||
diff --git a/src/FbCommands.cc b/src/FbCommands.cc index 3c69386..26a431a 100644 --- a/src/FbCommands.cc +++ b/src/FbCommands.cc | |||
@@ -466,7 +466,7 @@ void SetResourceValueDialogCmd::execute() { | |||
466 | 466 | ||
467 | FbTk::FbWindow *win = new CommandDialog(*screen, "Type resource name and the value", "SetResourceValue "); | 467 | FbTk::FbWindow *win = new CommandDialog(*screen, "Type resource name and the value", "SetResourceValue "); |
468 | win->show(); | 468 | win->show(); |
469 | }; | 469 | } |
470 | 470 | ||
471 | REGISTER_UNTRUSTED_COMMAND_WITH_ARGS(bindkey, FbCommands::BindKeyCmd, void); | 471 | REGISTER_UNTRUSTED_COMMAND_WITH_ARGS(bindkey, FbCommands::BindKeyCmd, void); |
472 | 472 | ||
diff --git a/src/FbTk/Color.cc b/src/FbTk/Color.cc index 2cd4278..b2d61ec 100644 --- a/src/FbTk/Color.cc +++ b/src/FbTk/Color.cc | |||
@@ -37,7 +37,7 @@ inline unsigned char maxValue(unsigned short colval) { | |||
37 | return colval == 65535 ? 0xFF : static_cast<unsigned char>(colval/0xFF); | 37 | return colval == 65535 ? 0xFF : static_cast<unsigned char>(colval/0xFF); |
38 | } | 38 | } |
39 | 39 | ||
40 | }; | 40 | } |
41 | 41 | ||
42 | namespace FbTk { | 42 | namespace FbTk { |
43 | 43 | ||
@@ -184,4 +184,4 @@ void Color::setRGB(unsigned short red, unsigned short green, unsigned short blue | |||
184 | m_blue = blue; | 184 | m_blue = blue; |
185 | } | 185 | } |
186 | 186 | ||
187 | }; | 187 | } |
diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc index 3670703..b0c9d70 100644 --- a/src/FbTk/FbPixmap.cc +++ b/src/FbTk/FbPixmap.cc | |||
@@ -66,7 +66,7 @@ void checkAtoms() { | |||
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
69 | }; // end of anonymous namespace | 69 | } // end of anonymous namespace |
70 | 70 | ||
71 | FbPixmap::FbPixmap():m_pm(0), | 71 | FbPixmap::FbPixmap():m_pm(0), |
72 | m_width(0), m_height(0), | 72 | m_width(0), m_height(0), |
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index 2ef24fa..fb0ad1d 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.cc | |||
@@ -87,7 +87,7 @@ FbWindow::FbWindow(int screen_num, | |||
87 | create(RootWindow(display(), screen_num), | 87 | create(RootWindow(display(), screen_num), |
88 | x, y, width, height, eventmask, | 88 | x, y, width, height, eventmask, |
89 | override_redirect, save_unders, depth, class_type); | 89 | override_redirect, save_unders, depth, class_type); |
90 | }; | 90 | } |
91 | 91 | ||
92 | FbWindow::FbWindow(const FbWindow &parent, | 92 | FbWindow::FbWindow(const FbWindow &parent, |
93 | int x, int y, unsigned int width, unsigned int height, | 93 | int x, int y, unsigned int width, unsigned int height, |
@@ -105,7 +105,7 @@ FbWindow::FbWindow(const FbWindow &parent, | |||
105 | override_redirect, save_unders, depth, class_type); | 105 | override_redirect, save_unders, depth, class_type); |
106 | 106 | ||
107 | 107 | ||
108 | }; | 108 | } |
109 | 109 | ||
110 | FbWindow::FbWindow(Window client): | 110 | FbWindow::FbWindow(Window client): |
111 | FbDrawable(), | 111 | FbDrawable(), |
@@ -686,4 +686,4 @@ bool operator == (Window win, const FbWindow &fbwin) { | |||
686 | return win == fbwin.window(); | 686 | return win == fbwin.window(); |
687 | } | 687 | } |
688 | 688 | ||
689 | }; | 689 | } |
diff --git a/src/FbTk/FileUtil.hh b/src/FbTk/FileUtil.hh index fea1c1f..d031a6e 100644 --- a/src/FbTk/FileUtil.hh +++ b/src/FbTk/FileUtil.hh | |||
@@ -58,7 +58,7 @@ namespace FileUtil { | |||
58 | /// copies file 'from' to 'to' | 58 | /// copies file 'from' to 'to' |
59 | bool copyFile(const char* from, const char* to); | 59 | bool copyFile(const char* from, const char* to); |
60 | 60 | ||
61 | }; // end of File namespace | 61 | } // end of File namespace |
62 | 62 | ||
63 | /// Wrapper class for DIR * routines | 63 | /// Wrapper class for DIR * routines |
64 | class Directory : private FbTk::NotCopyable { | 64 | class Directory : private FbTk::NotCopyable { |
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc index f0951ff..cbd8250 100644 --- a/src/FbTk/Font.cc +++ b/src/FbTk/Font.cc | |||
@@ -100,7 +100,7 @@ void resetEffects(FbTk::Font& font) { | |||
100 | font.setShadowOffX(2); | 100 | font.setShadowOffX(2); |
101 | } | 101 | } |
102 | 102 | ||
103 | }; // end nameless namespace | 103 | } // end nameless namespace |
104 | 104 | ||
105 | 105 | ||
106 | 106 | ||
@@ -301,5 +301,5 @@ void Font::drawText(const FbDrawable &w, int screen, GC gc, | |||
301 | 301 | ||
302 | } | 302 | } |
303 | 303 | ||
304 | }; | 304 | } |
305 | 305 | ||
diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc index 0c7b5fc..070672e 100644 --- a/src/FbTk/Image.cc +++ b/src/FbTk/Image.cc | |||
@@ -59,7 +59,7 @@ FbTk::ImageXPM xpm_loader; | |||
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | 61 | ||
62 | }; // end of anonymous namespace | 62 | } // end of anonymous namespace |
63 | 63 | ||
64 | namespace FbTk { | 64 | namespace FbTk { |
65 | 65 | ||
diff --git a/src/FbTk/Image.hh b/src/FbTk/Image.hh index 3c731ad..f828d10 100644 --- a/src/FbTk/Image.hh +++ b/src/FbTk/Image.hh | |||
@@ -50,7 +50,7 @@ namespace Image { | |||
50 | void removeAllSearchPaths(); | 50 | void removeAllSearchPaths(); |
51 | /// locates an image in the search path | 51 | /// locates an image in the search path |
52 | std::string locateFile(const std::string &filename); | 52 | std::string locateFile(const std::string &filename); |
53 | }; | 53 | } |
54 | 54 | ||
55 | /// common interface for all image classes | 55 | /// common interface for all image classes |
56 | class ImageBase { | 56 | class ImageBase { |
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc index 067bcde..39fb4a7 100644 --- a/src/FbTk/ImageControl.cc +++ b/src/FbTk/ImageControl.cc | |||
@@ -94,7 +94,7 @@ inline unsigned long bsqrt(unsigned long x) { | |||
94 | } | 94 | } |
95 | } | 95 | } |
96 | 96 | ||
97 | }; // end anonymous namespace | 97 | } // end anonymous namespace |
98 | 98 | ||
99 | struct ImageControl::Cache { | 99 | struct ImageControl::Cache { |
100 | Pixmap pixmap; | 100 | Pixmap pixmap; |
diff --git a/src/FbTk/ImageImlib2.cc b/src/FbTk/ImageImlib2.cc index 9983604..5bac7a4 100644 --- a/src/FbTk/ImageImlib2.cc +++ b/src/FbTk/ImageImlib2.cc | |||
@@ -35,7 +35,7 @@ typedef ScreenImlibContextContainer::iterator ScreenImlibContext; | |||
35 | 35 | ||
36 | ScreenImlibContextContainer contexts; | 36 | ScreenImlibContextContainer contexts; |
37 | 37 | ||
38 | }; // anon namespace | 38 | } // anon namespace |
39 | 39 | ||
40 | 40 | ||
41 | namespace FbTk { | 41 | namespace FbTk { |
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc index 0bfa38e..0578b9c 100644 --- a/src/FbTk/KeyUtil.cc +++ b/src/FbTk/KeyUtil.cc | |||
@@ -55,7 +55,7 @@ const struct t_modlist modlist[] = { | |||
55 | {0, 0} | 55 | {0, 0} |
56 | }; | 56 | }; |
57 | 57 | ||
58 | }; | 58 | } |
59 | 59 | ||
60 | namespace FbTk { | 60 | namespace FbTk { |
61 | 61 | ||
diff --git a/src/FbTk/LogicCommands.cc b/src/FbTk/LogicCommands.cc index e1ea5b8..b3abe31 100644 --- a/src/FbTk/LogicCommands.cc +++ b/src/FbTk/LogicCommands.cc | |||
@@ -77,7 +77,7 @@ REGISTER_COMMAND_PARSER(and, parseLogicCommand, bool); | |||
77 | REGISTER_COMMAND_PARSER(or, parseLogicCommand, bool); | 77 | REGISTER_COMMAND_PARSER(or, parseLogicCommand, bool); |
78 | REGISTER_COMMAND_PARSER(xor, parseLogicCommand, bool); | 78 | REGISTER_COMMAND_PARSER(xor, parseLogicCommand, bool); |
79 | 79 | ||
80 | }; // end anonymous namespace | 80 | } // end anonymous namespace |
81 | 81 | ||
82 | Command<void> *IfCommand::parse(const std::string &command, const std::string &args, | 82 | Command<void> *IfCommand::parse(const std::string &command, const std::string &args, |
83 | bool trusted) { | 83 | bool trusted) { |
diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc index 555e5f5..0b7a6b8 100644 --- a/src/FbTk/MacroCommand.cc +++ b/src/FbTk/MacroCommand.cc | |||
@@ -66,7 +66,7 @@ Command<void> *parseMacroCmd(const std::string &command, const std::string &args | |||
66 | REGISTER_COMMAND_PARSER(macrocmd, parseMacroCmd, void); | 66 | REGISTER_COMMAND_PARSER(macrocmd, parseMacroCmd, void); |
67 | REGISTER_COMMAND_PARSER(togglecmd, parseMacroCmd, void); | 67 | REGISTER_COMMAND_PARSER(togglecmd, parseMacroCmd, void); |
68 | 68 | ||
69 | }; // end anonymous namespace | 69 | } // end anonymous namespace |
70 | 70 | ||
71 | void MacroCommand::add(RefCount<Command<void> > &com) { | 71 | void MacroCommand::add(RefCount<Command<void> > &com) { |
72 | m_commandlist.push_back(com); | 72 | m_commandlist.push_back(com); |
diff --git a/src/FbTk/MultLayers.hh b/src/FbTk/MultLayers.hh index 2e3915d..2a979be 100644 --- a/src/FbTk/MultLayers.hh +++ b/src/FbTk/MultLayers.hh | |||
@@ -67,5 +67,5 @@ private: | |||
67 | int m_lock; | 67 | int m_lock; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | }; | 70 | } |
71 | #endif // FBTK_MULTLAYERS_HH | 71 | #endif // FBTK_MULTLAYERS_HH |
diff --git a/src/FbTk/Observer.cc b/src/FbTk/Observer.cc index 85af7fd..dcd115f 100644 --- a/src/FbTk/Observer.cc +++ b/src/FbTk/Observer.cc | |||
@@ -28,4 +28,4 @@ Observer::~Observer() { | |||
28 | Subject::removeObserver(this); // make sure no subject has this observer attached | 28 | Subject::removeObserver(this); // make sure no subject has this observer attached |
29 | } | 29 | } |
30 | 30 | ||
31 | }; | 31 | } |
diff --git a/src/FbTk/Parser.cc b/src/FbTk/Parser.cc index 9e08a53..0555a1a 100644 --- a/src/FbTk/Parser.cc +++ b/src/FbTk/Parser.cc | |||
@@ -23,4 +23,4 @@ | |||
23 | 23 | ||
24 | namespace FbTk { | 24 | namespace FbTk { |
25 | const Parser::Item Parser::s_empty_item("", ""); | 25 | const Parser::Item Parser::s_empty_item("", ""); |
26 | }; | 26 | } |
diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc index 6bb63aa..e7e2563 100644 --- a/src/FbTk/Shape.cc +++ b/src/FbTk/Shape.cc | |||
@@ -103,7 +103,7 @@ struct CornerPixmaps { | |||
103 | // unfortunately, we need a separate pixmap per screen | 103 | // unfortunately, we need a separate pixmap per screen |
104 | std::vector<CornerPixmaps> s_corners; | 104 | std::vector<CornerPixmaps> s_corners; |
105 | 105 | ||
106 | }; // end of anonymous namespace | 106 | } // end of anonymous namespace |
107 | 107 | ||
108 | Shape::Shape(FbWindow &win, int shapeplaces): | 108 | Shape::Shape(FbWindow &win, int shapeplaces): |
109 | m_win(&win), | 109 | m_win(&win), |
diff --git a/src/FbTk/SignalHandler.cc b/src/FbTk/SignalHandler.cc index ea0f86f..a0a4c4c 100644 --- a/src/FbTk/SignalHandler.cc +++ b/src/FbTk/SignalHandler.cc | |||
@@ -36,7 +36,7 @@ SignalHandler &SignalHandler::instance() { | |||
36 | return singleton; | 36 | return singleton; |
37 | } | 37 | } |
38 | 38 | ||
39 | bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh, | 39 | bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh, |
40 | SignalEventHandler **oldhandler_ret) { | 40 | SignalEventHandler **oldhandler_ret) { |
41 | // must be less than NSIG | 41 | // must be less than NSIG |
42 | if (signum >= NSIG) | 42 | if (signum >= NSIG) |
@@ -45,18 +45,18 @@ bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh, | |||
45 | // get old signal handler for this signum | 45 | // get old signal handler for this signum |
46 | if (oldhandler_ret != 0) | 46 | if (oldhandler_ret != 0) |
47 | *oldhandler_ret = s_signal_handler[signum]; | 47 | *oldhandler_ret = s_signal_handler[signum]; |
48 | 48 | ||
49 | struct sigaction sa; | 49 | struct sigaction sa; |
50 | // set callback | 50 | // set callback |
51 | sa.sa_handler = SignalHandler::handleSignal; | 51 | sa.sa_handler = SignalHandler::handleSignal; |
52 | sigemptyset (&sa.sa_mask); | 52 | sigemptyset (&sa.sa_mask); |
53 | sa.sa_flags = 0; | 53 | sa.sa_flags = 0; |
54 | 54 | ||
55 | if (sigaction(signum, &sa, 0) == -1) | 55 | if (sigaction(signum, &sa, 0) == -1) |
56 | return false; | 56 | return false; |
57 | 57 | ||
58 | s_signal_handler[signum] = eh; | 58 | s_signal_handler[signum] = eh; |
59 | 59 | ||
60 | return true; | 60 | return true; |
61 | } | 61 | } |
62 | 62 | ||
@@ -69,4 +69,5 @@ void SignalHandler::handleSignal(int signum) { | |||
69 | } | 69 | } |
70 | } | 70 | } |
71 | 71 | ||
72 | }; | 72 | } |
73 | |||
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc index 992678a..bf8a110 100644 --- a/src/FbTk/Transparent.cc +++ b/src/FbTk/Transparent.cc | |||
@@ -103,7 +103,7 @@ Picture createAlphaPic(Window drawable, unsigned char alpha) { | |||
103 | return alpha_pic; | 103 | return alpha_pic; |
104 | } | 104 | } |
105 | #endif // HAVE_XRENDER | 105 | #endif // HAVE_XRENDER |
106 | }; | 106 | } |
107 | 107 | ||
108 | namespace FbTk { | 108 | namespace FbTk { |
109 | 109 | ||
diff --git a/src/FbTk/XFontImp.cc b/src/FbTk/XFontImp.cc index a94aa75..257a2a0 100644 --- a/src/FbTk/XFontImp.cc +++ b/src/FbTk/XFontImp.cc | |||
@@ -410,4 +410,4 @@ bool XFontImp::validOrientation(FbTk::Orientation orient) { | |||
410 | return m_rotfonts[orient] != 0; | 410 | return m_rotfonts[orient] != 0; |
411 | } | 411 | } |
412 | 412 | ||
413 | }; | 413 | } |
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc index 872a24b..3ce913d 100644 --- a/src/FbTk/XmbFontImp.cc +++ b/src/FbTk/XmbFontImp.cc | |||
@@ -158,7 +158,8 @@ XFontSet createFontSet(const char *fontname, bool& utf8mode) { | |||
158 | return fs; | 158 | return fs; |
159 | } | 159 | } |
160 | 160 | ||
161 | }; | 161 | } |
162 | |||
162 | namespace FbTk { | 163 | namespace FbTk { |
163 | 164 | ||
164 | XmbFontImp::XmbFontImp(const char *filename, bool utf8) : m_fontset(0), m_setextents(0), m_utf8mode(utf8) { | 165 | XmbFontImp::XmbFontImp(const char *filename, bool utf8) : m_fontset(0), m_setextents(0), m_utf8mode(utf8) { |
diff --git a/src/FocusControl.cc b/src/FocusControl.cc index 701373b..bf79d3e 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc | |||
@@ -62,20 +62,20 @@ bool doSkipWindow(const Focusable &win, const ClientPattern *pat) { | |||
62 | return false; // else don't skip | 62 | return false; // else don't skip |
63 | } | 63 | } |
64 | 64 | ||
65 | }; // end anonymous namespace | 65 | } // end anonymous namespace |
66 | 66 | ||
67 | FocusControl::FocusControl(BScreen &screen): | 67 | FocusControl::FocusControl(BScreen &screen): |
68 | m_screen(screen), | 68 | m_screen(screen), |
69 | m_focus_model(screen.resourceManager(), | 69 | m_focus_model(screen.resourceManager(), |
70 | CLICKFOCUS, | 70 | CLICKFOCUS, |
71 | screen.name()+".focusModel", | 71 | screen.name()+".focusModel", |
72 | screen.altName()+".FocusModel"), | 72 | screen.altName()+".FocusModel"), |
73 | m_tab_focus_model(screen.resourceManager(), | 73 | m_tab_focus_model(screen.resourceManager(), |
74 | CLICKTABFOCUS, | 74 | CLICKTABFOCUS, |
75 | screen.name()+".tabFocusModel", | 75 | screen.name()+".tabFocusModel", |
76 | screen.altName()+".TabFocusModel"), | 76 | screen.altName()+".TabFocusModel"), |
77 | m_focus_new(screen.resourceManager(), true, | 77 | m_focus_new(screen.resourceManager(), true, |
78 | screen.name()+".focusNewWindows", | 78 | screen.name()+".focusNewWindows", |
79 | screen.altName()+".FocusNewWindows"), | 79 | screen.altName()+".FocusNewWindows"), |
80 | m_focused_list(screen), m_creation_order_list(screen), | 80 | m_focused_list(screen), m_creation_order_list(screen), |
81 | m_focused_win_list(screen), m_creation_order_win_list(screen), | 81 | m_focused_win_list(screen), m_creation_order_win_list(screen), |
@@ -85,7 +85,7 @@ FocusControl::FocusControl(BScreen &screen): | |||
85 | m_ignore_mouse_x(-1), m_ignore_mouse_y(-1) { | 85 | m_ignore_mouse_x(-1), m_ignore_mouse_y(-1) { |
86 | 86 | ||
87 | m_cycling_window = m_focused_list.clientList().end(); | 87 | m_cycling_window = m_focused_list.clientList().end(); |
88 | 88 | ||
89 | } | 89 | } |
90 | 90 | ||
91 | void FocusControl::cycleFocus(const FocusableList &window_list, | 91 | void FocusControl::cycleFocus(const FocusableList &window_list, |
@@ -252,7 +252,7 @@ Focusable *FocusControl::lastFocusedWindow(int workspace) { | |||
252 | if (workspace < 0 || workspace >= (int) m_screen.numberOfWorkspaces()) | 252 | if (workspace < 0 || workspace >= (int) m_screen.numberOfWorkspaces()) |
253 | return m_focused_list.clientList().front(); | 253 | return m_focused_list.clientList().front(); |
254 | 254 | ||
255 | Focusables::iterator it = m_focused_list.clientList().begin(); | 255 | Focusables::iterator it = m_focused_list.clientList().begin(); |
256 | Focusables::iterator it_end = m_focused_list.clientList().end(); | 256 | Focusables::iterator it_end = m_focused_list.clientList().end(); |
257 | for (; it != it_end; ++it) { | 257 | for (; it != it_end; ++it) { |
258 | if ((*it)->fbwindow() && (*it)->acceptsFocus() && | 258 | if ((*it)->fbwindow() && (*it)->acceptsFocus() && |
@@ -307,11 +307,11 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) { | |||
307 | 307 | ||
308 | // we scan through the list looking for the window that is "closest" | 308 | // we scan through the list looking for the window that is "closest" |
309 | // in the given direction | 309 | // in the given direction |
310 | 310 | ||
311 | FluxboxWindow *foundwin = 0; | 311 | FluxboxWindow *foundwin = 0; |
312 | int weight = 999999, exposure = 0; // extreme values | 312 | int weight = 999999, exposure = 0; // extreme values |
313 | int borderW = win.frame().window().borderWidth(), | 313 | int borderW = win.frame().window().borderWidth(), |
314 | top = win.y() + borderW, | 314 | top = win.y() + borderW, |
315 | bottom = win.y() + win.height() + borderW, | 315 | bottom = win.y() + win.height() + borderW, |
316 | left = win.x() + borderW, | 316 | left = win.x() + borderW, |
317 | right = win.x() + win.width() + borderW; | 317 | right = win.x() + win.width() + borderW; |
@@ -319,17 +319,17 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) { | |||
319 | Workspace::Windows &wins = m_screen.currentWorkspace()->windowList(); | 319 | Workspace::Windows &wins = m_screen.currentWorkspace()->windowList(); |
320 | Workspace::Windows::iterator it = wins.begin(); | 320 | Workspace::Windows::iterator it = wins.begin(); |
321 | for (; it != wins.end(); ++it) { | 321 | for (; it != wins.end(); ++it) { |
322 | if ((*it) == &win | 322 | if ((*it) == &win |
323 | || (*it)->isIconic() | 323 | || (*it)->isIconic() |
324 | || (*it)->isFocusHidden() | 324 | || (*it)->isFocusHidden() |
325 | || !(*it)->acceptsFocus()) | 325 | || !(*it)->acceptsFocus()) |
326 | continue; // skip self | 326 | continue; // skip self |
327 | 327 | ||
328 | // we check things against an edge, and within the bounds (draw a picture) | 328 | // we check things against an edge, and within the bounds (draw a picture) |
329 | int edge=0, upper=0, lower=0, oedge=0, oupper=0, olower=0; | 329 | int edge=0, upper=0, lower=0, oedge=0, oupper=0, olower=0; |
330 | 330 | ||
331 | int otop = (*it)->y() + borderW, | 331 | int otop = (*it)->y() + borderW, |
332 | // 2 * border = border on each side | 332 | // 2 * border = border on each side |
333 | obottom = (*it)->y() + (*it)->height() + borderW, | 333 | obottom = (*it)->y() + (*it)->height() + borderW, |
334 | oleft = (*it)->x() + borderW, | 334 | oleft = (*it)->x() + borderW, |
335 | // 2 * border = border on each side | 335 | // 2 * border = border on each side |
@@ -371,7 +371,7 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) { | |||
371 | break; | 371 | break; |
372 | } | 372 | } |
373 | 373 | ||
374 | if (oedge < edge) | 374 | if (oedge < edge) |
375 | continue; // not in the right direction | 375 | continue; // not in the right direction |
376 | 376 | ||
377 | if (olower <= upper || oupper >= lower) { | 377 | if (olower <= upper || oupper >= lower) { |
@@ -396,7 +396,7 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) { | |||
396 | } // else not improvement | 396 | } // else not improvement |
397 | } | 397 | } |
398 | 398 | ||
399 | if (foundwin) | 399 | if (foundwin) |
400 | foundwin->focus(); | 400 | foundwin->focus(); |
401 | 401 | ||
402 | } | 402 | } |
@@ -516,7 +516,7 @@ void FocusControl::revertFocus(BScreen &screen) { | |||
516 | * assumption: client has focus | 516 | * assumption: client has focus |
517 | */ | 517 | */ |
518 | void FocusControl::unfocusWindow(WinClient &client, | 518 | void FocusControl::unfocusWindow(WinClient &client, |
519 | bool full_revert, | 519 | bool full_revert, |
520 | bool unfocus_frame) { | 520 | bool unfocus_frame) { |
521 | // go up the transient tree looking for a focusable window | 521 | // go up the transient tree looking for a focusable window |
522 | 522 | ||
@@ -547,8 +547,8 @@ void FocusControl::setFocusedWindow(WinClient *client) { | |||
547 | return; | 547 | return; |
548 | 548 | ||
549 | BScreen *screen = client ? &client->screen() : 0; | 549 | BScreen *screen = client ? &client->screen() : 0; |
550 | BScreen *old_screen = | 550 | BScreen *old_screen = |
551 | FocusControl::focusedWindow() ? | 551 | FocusControl::focusedWindow() ? |
552 | &FocusControl::focusedWindow()->screen() : 0; | 552 | &FocusControl::focusedWindow()->screen() : 0; |
553 | 553 | ||
554 | #ifdef DEBUG | 554 | #ifdef DEBUG |
@@ -567,10 +567,10 @@ void FocusControl::setFocusedWindow(WinClient *client) { | |||
567 | 567 | ||
568 | if (client && client->fbwindow() && !client->fbwindow()->isIconic()) { | 568 | if (client && client->fbwindow() && !client->fbwindow()->isIconic()) { |
569 | // screen should be ok | 569 | // screen should be ok |
570 | s_focused_fbwindow = client->fbwindow(); | 570 | s_focused_fbwindow = client->fbwindow(); |
571 | s_focused_window = client; // update focused window | 571 | s_focused_window = client; // update focused window |
572 | s_expecting_focus = 0; | 572 | s_expecting_focus = 0; |
573 | s_focused_fbwindow->setCurrentClient(*client, | 573 | s_focused_fbwindow->setCurrentClient(*client, |
574 | false); // don't set inputfocus | 574 | false); // don't set inputfocus |
575 | s_focused_fbwindow->setFocusFlag(true); // set focus flag | 575 | s_focused_fbwindow->setFocusFlag(true); // set focus flag |
576 | 576 | ||
@@ -604,9 +604,9 @@ std::string FbTk::Resource<FocusControl::FocusModel>::getString() const { | |||
604 | template<> | 604 | template<> |
605 | void FbTk::Resource<FocusControl::FocusModel>:: | 605 | void FbTk::Resource<FocusControl::FocusModel>:: |
606 | setFromString(char const *strval) { | 606 | setFromString(char const *strval) { |
607 | if (strcasecmp(strval, "MouseFocus") == 0) | 607 | if (strcasecmp(strval, "MouseFocus") == 0) |
608 | m_value = FocusControl::MOUSEFOCUS; | 608 | m_value = FocusControl::MOUSEFOCUS; |
609 | else if (strcasecmp(strval, "ClickToFocus") == 0) | 609 | else if (strcasecmp(strval, "ClickToFocus") == 0) |
610 | m_value = FocusControl::CLICKFOCUS; | 610 | m_value = FocusControl::CLICKFOCUS; |
611 | else | 611 | else |
612 | setDefaultValue(); | 612 | setDefaultValue(); |
@@ -630,9 +630,11 @@ setFromString(char const *strval) { | |||
630 | 630 | ||
631 | if (strcasecmp(strval, "SloppyTabFocus") == 0 ) | 631 | if (strcasecmp(strval, "SloppyTabFocus") == 0 ) |
632 | m_value = FocusControl::MOUSETABFOCUS; | 632 | m_value = FocusControl::MOUSETABFOCUS; |
633 | else if (strcasecmp(strval, "ClickToTabFocus") == 0) | 633 | else if (strcasecmp(strval, "ClickToTabFocus") == 0) |
634 | m_value = FocusControl::CLICKTABFOCUS; | 634 | m_value = FocusControl::CLICKTABFOCUS; |
635 | else | 635 | else |
636 | setDefaultValue(); | 636 | setDefaultValue(); |
637 | } | 637 | } |
638 | |||
638 | } // end namespace FbTk | 639 | } // end namespace FbTk |
640 | |||
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc index c84372f..90d4728 100644 --- a/src/IconbarTool.cc +++ b/src/IconbarTool.cc | |||
@@ -241,7 +241,7 @@ private: | |||
241 | Focusable &m_win; | 241 | Focusable &m_win; |
242 | }; | 242 | }; |
243 | 243 | ||
244 | }; // end anonymous namespace | 244 | } // end anonymous namespace |
245 | 245 | ||
246 | IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, | 246 | IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, |
247 | FbTk::ThemeProxy<IconbarTheme> &focused_theme, | 247 | FbTk::ThemeProxy<IconbarTheme> &focused_theme, |
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc index 7a2e9b4..63691af 100644 --- a/src/MenuCreator.cc +++ b/src/MenuCreator.cc | |||
@@ -364,7 +364,7 @@ bool getStart(FbMenuParser &parser, string &label, FbTk::StringConvertor &labelc | |||
364 | return true; | 364 | return true; |
365 | } | 365 | } |
366 | 366 | ||
367 | }; // end of anonymous namespace | 367 | } // end of anonymous namespace |
368 | 368 | ||
369 | FbMenu *MenuCreator::createMenu(const string &label, int screen_number) { | 369 | FbMenu *MenuCreator::createMenu(const string &label, int screen_number) { |
370 | BScreen *screen = Fluxbox::instance()->findScreen(screen_number); | 370 | BScreen *screen = Fluxbox::instance()->findScreen(screen_number); |
diff --git a/src/Remember.cc b/src/Remember.cc index 6a611bf..2eb39d4 100644 --- a/src/Remember.cc +++ b/src/Remember.cc | |||
@@ -337,7 +337,7 @@ FbTk::Menu *createRememberMenu(BScreen &screen) { | |||
337 | 337 | ||
338 | menu->updateMenu(); | 338 | menu->updateMenu(); |
339 | return menu; | 339 | return menu; |
340 | }; | 340 | } |
341 | 341 | ||
342 | // offset is the offset in the string that we start looking from | 342 | // offset is the offset in the string that we start looking from |
343 | // return true if all ok, false on error | 343 | // return true if all ok, false on error |
@@ -395,7 +395,7 @@ bool handleStartupItem(const string &line, int offset) { | |||
395 | tmp_exec_cmd->execute(); | 395 | tmp_exec_cmd->execute(); |
396 | delete tmp_exec_cmd; | 396 | delete tmp_exec_cmd; |
397 | return true; | 397 | return true; |
398 | }; | 398 | } |
399 | 399 | ||
400 | 400 | ||
401 | 401 | ||
@@ -609,7 +609,7 @@ Application* findMatchingPatterns(ClientPattern *pat, Remember::Patterns *patlis | |||
609 | return 0; | 609 | return 0; |
610 | } | 610 | } |
611 | 611 | ||
612 | }; // end anonymous namespace | 612 | } // end anonymous namespace |
613 | 613 | ||
614 | /*------------------------------------------------------------------*\ | 614 | /*------------------------------------------------------------------*\ |
615 | \*------------------------------------------------------------------*/ | 615 | \*------------------------------------------------------------------*/ |
diff --git a/src/Remember.hh b/src/Remember.hh index fb58a5e..0adbfa9 100644 --- a/src/Remember.hh +++ b/src/Remember.hh | |||
@@ -41,7 +41,7 @@ class Application; | |||
41 | 41 | ||
42 | namespace FbTk { | 42 | namespace FbTk { |
43 | class AutoReloadHelper; | 43 | class AutoReloadHelper; |
44 | }; | 44 | } |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * Class Remember is an atomhandler to avoid interfering with | 47 | * Class Remember is an atomhandler to avoid interfering with |
diff --git a/src/Slit.cc b/src/Slit.cc index 10fec24..bcc2051 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -215,7 +215,7 @@ private: | |||
215 | Slit::Placement m_place; | 215 | Slit::Placement m_place; |
216 | }; | 216 | }; |
217 | 217 | ||
218 | }; // End anonymous namespace | 218 | } // End anonymous namespace |
219 | 219 | ||
220 | unsigned int Slit::s_eventmask = SubstructureRedirectMask | ButtonPressMask | | 220 | unsigned int Slit::s_eventmask = SubstructureRedirectMask | ButtonPressMask | |
221 | EnterWindowMask | LeaveWindowMask | ExposureMask; | 221 | EnterWindowMask | LeaveWindowMask | ExposureMask; |
diff --git a/src/ToolFactory.cc b/src/ToolFactory.cc index be83616..84184eb 100644 --- a/src/ToolFactory.cc +++ b/src/ToolFactory.cc | |||
@@ -66,7 +66,7 @@ private: | |||
66 | Toolbar &m_tbar; | 66 | Toolbar &m_tbar; |
67 | }; | 67 | }; |
68 | 68 | ||
69 | }; | 69 | } |
70 | 70 | ||
71 | ToolFactory::ToolFactory(BScreen &screen):m_screen(screen), | 71 | ToolFactory::ToolFactory(BScreen &screen):m_screen(screen), |
72 | m_clock_theme(screen.screenNumber(), "toolbar.clock", "Toolbar.Clock"), | 72 | m_clock_theme(screen.screenNumber(), "toolbar.clock", "Toolbar.Clock"), |
diff --git a/src/ToolFactory.hh b/src/ToolFactory.hh index 3d99785..7550f48 100644 --- a/src/ToolFactory.hh +++ b/src/ToolFactory.hh | |||
@@ -35,7 +35,7 @@ class Toolbar; | |||
35 | 35 | ||
36 | namespace FbTk { | 36 | namespace FbTk { |
37 | class FbWindow; | 37 | class FbWindow; |
38 | }; | 38 | } |
39 | 39 | ||
40 | /// creates toolbaritems | 40 | /// creates toolbaritems |
41 | class ToolFactory:private FbTk::NotCopyable { | 41 | class ToolFactory:private FbTk::NotCopyable { |
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index dbe5e5c..e64d74e 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc | |||
@@ -177,7 +177,7 @@ private: | |||
177 | Toolbar::Placement m_place; | 177 | Toolbar::Placement m_place; |
178 | }; | 178 | }; |
179 | 179 | ||
180 | }; // end anonymous | 180 | } // end anonymous |
181 | 181 | ||
182 | // toolbar frame | 182 | // toolbar frame |
183 | Toolbar::Frame::Frame(FbTk::EventHandler &evh, int screen_num): | 183 | Toolbar::Frame::Frame(FbTk::EventHandler &evh, int screen_num): |
diff --git a/src/Window.cc b/src/Window.cc index 3ec91ec..dc4015a 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -259,7 +259,7 @@ private: | |||
259 | int m_mode; | 259 | int m_mode; |
260 | }; | 260 | }; |
261 | 261 | ||
262 | }; | 262 | } |
263 | 263 | ||
264 | 264 | ||
265 | int FluxboxWindow::s_num_grabs = 0; | 265 | int FluxboxWindow::s_num_grabs = 0; |
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc index dbcc5dd..d72ef13 100644 --- a/src/WorkspaceCmd.cc +++ b/src/WorkspaceCmd.cc | |||
@@ -189,7 +189,7 @@ REGISTER_COMMAND_PARSER(prevwindow, parseWindowList, void); | |||
189 | REGISTER_COMMAND_PARSER(prevgroup, parseWindowList, void); | 189 | REGISTER_COMMAND_PARSER(prevgroup, parseWindowList, void); |
190 | REGISTER_COMMAND_PARSER(arrangewindows, parseWindowList, void); | 190 | REGISTER_COMMAND_PARSER(arrangewindows, parseWindowList, void); |
191 | 191 | ||
192 | }; // end anonymous namespace | 192 | } // end anonymous namespace |
193 | 193 | ||
194 | void AttachCmd::execute() { | 194 | void AttachCmd::execute() { |
195 | BScreen *screen = Fluxbox::instance()->keyScreen(); | 195 | BScreen *screen = Fluxbox::instance()->keyScreen(); |
@@ -318,7 +318,7 @@ REGISTER_COMMAND_PARSER(rightworkspace, parseIntCmd, void); | |||
318 | REGISTER_COMMAND_PARSER(leftworkspace, parseIntCmd, void); | 318 | REGISTER_COMMAND_PARSER(leftworkspace, parseIntCmd, void); |
319 | REGISTER_COMMAND_PARSER(workspace, parseIntCmd, void); | 319 | REGISTER_COMMAND_PARSER(workspace, parseIntCmd, void); |
320 | 320 | ||
321 | }; // end anonymous namespace | 321 | } // end anonymous namespace |
322 | 322 | ||
323 | void NextWorkspaceCmd::execute() { | 323 | void NextWorkspaceCmd::execute() { |
324 | BScreen *screen = Fluxbox::instance()->mouseScreen(); | 324 | BScreen *screen = Fluxbox::instance()->mouseScreen(); |
diff --git a/util/fbsetroot.hh b/util/fbsetroot.hh index 5a4400f..3cc931b 100644 --- a/util/fbsetroot.hh +++ b/util/fbsetroot.hh | |||
@@ -27,7 +27,7 @@ namespace FbTk { | |||
27 | 27 | ||
28 | class ImageControl; | 28 | class ImageControl; |
29 | 29 | ||
30 | }; | 30 | } |
31 | 31 | ||
32 | class fbsetroot : public FbTk::App { | 32 | class fbsetroot : public FbTk::App { |
33 | public: | 33 | public: |
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc index 77b3ff7..40962da 100644 --- a/util/fluxbox-update_configs.cc +++ b/util/fluxbox-update_configs.cc | |||
@@ -463,7 +463,7 @@ set<string> modified_files; | |||
463 | // we may want to put a size limit on this cache, so it doesn't grow too big | 463 | // we may want to put a size limit on this cache, so it doesn't grow too big |
464 | map<string,string> file_cache; | 464 | map<string,string> file_cache; |
465 | 465 | ||
466 | }; | 466 | } |
467 | 467 | ||
468 | // returns the contents of the file given, either from the cache or by reading | 468 | // returns the contents of the file given, either from the cache or by reading |
469 | // the file from disk | 469 | // the file from disk |