summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-19 08:07:47 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-19 08:07:47 (GMT)
commit0d544fbe4ff6b8d630a4249f800459f03497dfa5 (patch)
tree49f02370f73f535f33f8646865fc14ec9a10383a
parent176865bf931d4c2b2db4ce31700b5106d571cb61 (diff)
downloadfluxbox_lack-0d544fbe4ff6b8d630a4249f800459f03497dfa5.zip
fluxbox_lack-0d544fbe4ff6b8d630a4249f800459f03497dfa5.tar.bz2
check apps file settings after ewmh and gnome
-rw-r--r--src/Window.cc1
-rw-r--r--src/fluxbox.cc14
2 files changed, 8 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 7c36329..c9ab1b2 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -562,6 +562,7 @@ void FluxboxWindow::init() {
562 setMaximizedState(tmp); 562 setMaximizedState(tmp);
563 } 563 }
564 564
565 m_workspacesig.notify();
565 566
566 struct timeval now; 567 struct timeval now;
567 gettimeofday(&now, NULL); 568 gettimeofday(&now, NULL);
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 2ff0b55..9deb39b 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -391,19 +391,19 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
391 391
392 m_keyscreen = m_mousescreen = m_screen_list.front(); 392 m_keyscreen = m_mousescreen = m_screen_list.front();
393 393
394 // parse apps file after creating screens but before creating windows
395#ifdef REMEMBER
396 addAtomHandler(new Remember(), "remember"); // for remembering window attribs
397#endif // REMEMBER
398 // ewmh handler needs to be added after apps file handler, or else some
399 // window properties are set incorrectly on new windows
400 // this dependency should probably be made more robust
401#ifdef USE_NEWWMSPEC 394#ifdef USE_NEWWMSPEC
402 addAtomHandler(new Ewmh(), "ewmh"); // for Extended window manager atom support 395 addAtomHandler(new Ewmh(), "ewmh"); // for Extended window manager atom support
403#endif // USE_NEWWMSPEC 396#endif // USE_NEWWMSPEC
404#ifdef USE_GNOME 397#ifdef USE_GNOME
405 addAtomHandler(new Gnome(), "gnome"); // for gnome 1 atom support 398 addAtomHandler(new Gnome(), "gnome"); // for gnome 1 atom support
406#endif //USE_GNOME 399#endif //USE_GNOME
400 // parse apps file after creating screens (so we can tell if it's a restart
401 // for [startup] items) but before creating windows
402 // this needs to be after ewmh and gnome, so state atoms don't get
403 // overwritten before they're applied
404#ifdef REMEMBER
405 addAtomHandler(new Remember(), "remember"); // for remembering window attribs
406#endif // REMEMBER
407 407
408 // init all "screens" 408 // init all "screens"
409 ScreenList::iterator it = m_screen_list.begin(); 409 ScreenList::iterator it = m_screen_list.begin();