summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fluxbox.cc22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index e9e8f29..dbde663 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,9 +22,9 @@
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.53 2002/04/20 10:27:13 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.54 2002/04/28 18:57:10 fluxgen Exp $
26 26
27//Use some GNU extensions 27//Use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
29#define _GNU_SOURCE 29#define _GNU_SOURCE
30#endif // _GNU_SOURCE 30#endif // _GNU_SOURCE
@@ -62,7 +62,6 @@
62#include <X11/extensions/shape.h> 62#include <X11/extensions/shape.h>
63#endif // SHAPE 63#endif // SHAPE
64 64
65
66#ifdef HAVE_STDIO_H 65#ifdef HAVE_STDIO_H
67# include <stdio.h> 66# include <stdio.h>
68#endif // HAVE_STDIO_H 67#endif // HAVE_STDIO_H
@@ -1463,7 +1462,6 @@ bool Fluxbox::checkGnomeAtoms(XClientMessageEvent &ce) {
1463 FluxboxWindow *win = 0; 1462 FluxboxWindow *win = 0;
1464 win = searchWindow(ce.window); 1463 win = searchWindow(ce.window);
1465 screen = searchScreen(ce.window); 1464 screen = searchScreen(ce.window);
1466
1467 if (ce.message_type == getGnomeWorkspaceAtom()) { 1465 if (ce.message_type == getGnomeWorkspaceAtom()) {
1468 #ifdef DEBUG 1466 #ifdef DEBUG
1469 cerr<<__FILE__<<"("<<__LINE__<<"): Got workspace atom="<<ce.data.l[0]<<endl; 1467 cerr<<__FILE__<<"("<<__LINE__<<"): Got workspace atom="<<ce.data.l[0]<<endl;
@@ -1479,7 +1477,6 @@ bool Fluxbox::checkGnomeAtoms(XClientMessageEvent &ce) {
1479 screen->changeWorkspaceID(ce.data.l[0]); 1477 screen->changeWorkspaceID(ce.data.l[0]);
1480 return true; 1478 return true;
1481 } else if (win) { 1479 } else if (win) {
1482
1483 if (ce.message_type == getGnomeStateAtom()) { 1480 if (ce.message_type == getGnomeStateAtom()) {
1484 #ifdef DEBUG 1481 #ifdef DEBUG
1485 cerr<<__FILE__<<"("<<__LINE__<<"): _WIN_STATE"<<endl; 1482 cerr<<__FILE__<<"("<<__LINE__<<"): _WIN_STATE"<<endl;
@@ -1691,17 +1688,16 @@ void Fluxbox::shutdown(void) {
1691 1688
1692 XSetInputFocus(getXDisplay(), PointerRoot, None, CurrentTime); 1689 XSetInputFocus(getXDisplay(), PointerRoot, None, CurrentTime);
1693 1690
1691 //send shutdown to all screens
1694 std::list<BScreen *>::iterator it = screenList.begin(); 1692 std::list<BScreen *>::iterator it = screenList.begin();
1695 std::list<BScreen *>::iterator it_end = screenList.end(); 1693 std::list<BScreen *>::iterator it_end = screenList.end();
1696 for (; it != it_end; ++it) { 1694 for (; it != it_end; ++it) {
1697 if(*it) { 1695 if(*it)
1698 (*it)->shutdown(); 1696 (*it)->shutdown();
1699 }
1700 } 1697 }
1701 1698
1702 XSync(getXDisplay(), False); 1699 XSync(getXDisplay(), False);
1703 1700
1704 save_rc();
1705} 1701}
1706 1702
1707//------ save_rc -------- 1703//------ save_rc --------
@@ -2243,8 +2239,6 @@ void Fluxbox::reconfigure(void) {
2243 2239
2244 2240
2245void Fluxbox::real_reconfigure(void) { 2241void Fluxbox::real_reconfigure(void) {
2246 BaseDisplay::GrabGuard gg(*this);
2247 grab();
2248 2242
2249 XrmDatabase new_blackboxrc = (XrmDatabase) 0; 2243 XrmDatabase new_blackboxrc = (XrmDatabase) 0;
2250 2244
@@ -2273,9 +2267,8 @@ void Fluxbox::real_reconfigure(void) {
2273 2267
2274 std::list<BScreen *>::iterator sit = screenList.begin(); 2268 std::list<BScreen *>::iterator sit = screenList.begin();
2275 std::list<BScreen *>::iterator sit_end = screenList.end(); 2269 std::list<BScreen *>::iterator sit_end = screenList.end();
2276 for (; sit != sit_end; ++sit) { 2270 for (; sit != sit_end; ++sit)
2277 (*sit)->reconfigure(); 2271 (*sit)->reconfigure();
2278 }
2279 2272
2280 //reconfigure keys 2273 //reconfigure keys
2281 char *keyfilename = StringUtil::expandFilename(m_rc_keyfile->c_str()); 2274 char *keyfilename = StringUtil::expandFilename(m_rc_keyfile->c_str());
@@ -2285,7 +2278,6 @@ void Fluxbox::real_reconfigure(void) {
2285 //reconfigure tabs 2278 //reconfigure tabs
2286 reconfigureTabs(); 2279 reconfigureTabs();
2287 2280
2288 ungrab();
2289} 2281}
2290 2282
2291//------------- reconfigureTabs ---------- 2283//------------- reconfigureTabs ----------
@@ -2293,8 +2285,8 @@ void Fluxbox::real_reconfigure(void) {
2293// --------------------------------------- 2285// ---------------------------------------
2294void Fluxbox::reconfigureTabs(void) { 2286void Fluxbox::reconfigureTabs(void) {
2295 //tab reconfiguring 2287 //tab reconfiguring
2296 std::map<Window, Tab *>::iterator it = tabSearch.begin(); 2288 TabList::iterator it = tabSearch.begin();
2297 std::map<Window, Tab *>::iterator it_end = tabSearch.end(); 2289 TabList::iterator it_end = tabSearch.end();
2298 //setting all to unconfigured 2290 //setting all to unconfigured
2299 for (; it != it_end; ++it) { 2291 for (; it != it_end; ++it) {
2300 it->second->setConfigured(false); 2292 it->second->setConfigured(false);