1 files changed, 49 insertions, 23 deletions

diff --git a/src/Rootmenu.cc b/src/Rootmenu.cc
index c86879f..513a971 100644
--- a/src/Rootmenu.cc
+++ b/src/Rootmenu.cc
@@ -19,8 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// stupid macros needed to access some functions in version 2 of the GNU C
-// library
+//Use GNU extensions
 #ifndef   _GNU_SOURCE
 #define   _GNU_SOURCE
 #endif // _GNU_SOURCE
@@ -51,12 +50,15 @@
 #endif // MAXPATHLEN
 
 
-Rootmenu::Rootmenu(BScreen *scrn) : Basemenu(scrn) {
+Rootmenu::Rootmenu(BScreen *scrn)
+: Basemenu(scrn),
+  auto_group_window(0)
+{
   screen = scrn;  
 }
 
 
-void Rootmenu::itemSelected(int button, int index) {
+void Rootmenu::itemSelected(int button, unsigned int index) {
         
         Fluxbox *fluxbox = Fluxbox::instance();
         
@@ -65,8 +67,8 @@ void Rootmenu::itemSelected(int button, int index) {
 
                 if (item->function()) {
                         switch (item->function()) {
-                        case BScreen::Execute:
-                                if (item->exec()) {
+                        case BScreen::EXECUTE:
+                                if (item->exec().size()) {
                                         #ifndef    __EMX__
                                         char displaystring[MAXPATHLEN];
                                         sprintf(displaystring, "DISPLAY=%s",
@@ -74,42 +76,66 @@ void Rootmenu::itemSelected(int button, int index) {
                                         sprintf(displaystring + strlen(displaystring) - 1, "%d",
                                                 screen->getScreenNumber());
 
-                                        bexec(item->exec(), displaystring);
+                                        screen->setAutoGroupWindow(useAutoGroupWindow());
+
+                                        bexec(item->exec().c_str(), displaystring);
+
                                         #else //   __EMX__
-                                        spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", item->exec(), NULL);
+                                        spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", item->exec().c_str(), NULL);
                                         #endif // !__EMX__
                                 }
                                 break;
 
-                        case BScreen::Restart:
+                        case BScreen::RESTART:
                                 fluxbox->restart();
                                 break;
 
-                        case BScreen::RestartOther:
-                                if (item->exec())
-                                        fluxbox->restart(item->exec());
+                        case BScreen::RESTARTOTHER:
+                                if (item->exec().size())
+                                        fluxbox->restart(item->exec().c_str());
                                 break;
 
-                        case BScreen::Exit:
+                        case BScreen::EXIT:
                                 fluxbox->shutdown();
-                                break;
+                        break;
 
-                        case BScreen::SetStyle:
-                                if (item->exec()) {
-                                        fluxbox->saveStyleFilename(item->exec());
-                                        fluxbox->reconfigureTabs(); //TODO
+                        case BScreen::SETSTYLE:
+                                if (item->exec().size()) {
+                                        fluxbox->saveStyleFilename(item->exec().c_str());
+                                        fluxbox->reconfigureTabs();
                                 }
-
-                        case BScreen::Reconfigure:
+                                fluxbox->reconfigure();
+                                fluxbox->save_rc();
+                        break;
+                        case BScreen::RECONFIGURE:
                                 fluxbox->reconfigure();
                                 return;
                         }
-
                         if (! (screen->getRootmenu()->isTorn() || isTorn()) &&
-                                        item->function() != BScreen::Reconfigure &&
-                                        item->function() != BScreen::SetStyle)
+                                        item->function() != BScreen::RECONFIGURE &&
+                                        item->function() != BScreen::SETSTYLE)
                                 hide();
                 }
         }
 }
 
+void Rootmenu::setAutoGroupWindow(Window window)
+{
+        auto_group_window = window;
+}
+
+Window Rootmenu::useAutoGroupWindow()
+{
+        // Return and clear the auto-grouping state.
+        Window w = auto_group_window;
+        if (w)
+                auto_group_window = 0;  // clear it immediately
+        // If not set check the parent and the parent's parent, ...
+        else {
+                // TODO: dynamic_cast throws std::bad_cast!
+                Rootmenu *p = dynamic_cast<Rootmenu*>(parent());
+                if (p)
+                        w = p->useAutoGroupWindow();
+        }
+        return w;
+}