1 files changed, 179 insertions, 198 deletions

diff --git a/src/Windowmenu.cc b/src/Windowmenu.cc
index 159f090..a6611a0 100644
--- a/src/Windowmenu.cc
+++ b/src/Windowmenu.cc
@@ -1,3 +1,5 @@
+// Windowmenu.cc for Fluxbox
+// Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org)
 // Windowmenu.cc for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,14 +21,15 @@
 // 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
-#ifndef   _GNU_SOURCE
-#define   _GNU_SOURCE
+// $Id: Windowmenu.cc,v 1.17 2002/08/31 10:42:25 fluxgen Exp $
+
+//use GNU extensions
+#ifndef  _GNU_SOURCE
+#define  _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
 #endif // HAVE_CONFIG_H
 
 #include "i18n.hh"
@@ -36,254 +39,231 @@
 #include "Windowmenu.hh"
 #include "Workspace.hh"
 
-#ifdef    STDC_HEADERS
-#  include <string.h>
+#ifdef STDC_HEADERS
+#include <string.h>
 #endif // STDC_HEADERS
 
 
-Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()) {
-  window = win;
-  screen = window->getScreen();
+Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()),
+window(win),
+screen(window->getScreen()){
 
-  setTitleVisibility(False);
-  setMovable(False);
-  setInternalMenu();
+        setTitleVisibility(False);
+        setMovable(False);
+        setInternalMenu();
         
         I18n *i18n = I18n::instance();
         
-  sendToMenu = new SendtoWorkspacemenu(this);
-  sendGroupToMenu = new SendGroupToWorkspacemenu(this);
-        
+        sendToMenu = new SendtoWorkspacemenu(this);
+        sendGroupToMenu = new SendGroupToWorkspacemenu(this);
+        using namespace FBNLS;  
         insert(i18n->getMessage(
-#ifdef    NLS
-                          WindowmenuSet, WindowmenuSendTo,
-#else // !NLS
-                          0, 0,
-#endif // NLS
-                          "Send To ..."),
+                WindowmenuSet, WindowmenuSendTo,
+                "Send To ..."),
          sendToMenu);
          
         insert(i18n->getMessage(
-#ifdef    NLS
-                          WindowmenuSet, WindowmenuSendGroupTo,
-#else // !NLS
-                          0, 0,
-#endif // NLS
-                          "Send Group To ..."),
-         sendGroupToMenu);
+                WindowmenuSet, WindowmenuSendGroupTo,
+                "Send Group To ..."),
+        sendGroupToMenu);
          
-  insert(i18n->getMessage(
-#ifdef    NLS
-                          WindowmenuSet, WindowmenuShade,
-#else // !NLS
-                          0, 0,
-#endif // NLS
-                          "Shade"),
-         BScreen::WindowShade);
-  insert(i18n->getMessage(
-#ifdef    NLS
-                          WindowmenuSet, WindowmenuIconify,
-#else // !NLS
-                          0, 0,
-#endif // NLS
-                          "Iconify"),
-         BScreen::WindowIconify);
-  insert(i18n->getMessage(
-#ifdef    NLS
-                          WindowmenuSet, WindowmenuMaximize,
-#else // !NLS
-                          0, 0,
-#endif // NLS
-                          "Maximize"),
-         BScreen::WindowMaximize);
-  insert(i18n->getMessage(
-#ifdef    NLS
-                          WindowmenuSet, WindowmenuRaise,
-#else // !NLS
-                          0, 0,
-#endif // NLS
-                          "Raise"),
-         BScreen::WindowRaise);
-  insert(i18n->getMessage(
-#ifdef    NLS
-                          WindowmenuSet, WindowmenuLower,
-#else // !NLS
-                          0, 0,
-#endif // NLS
-                          "Lower"),
-         BScreen::WindowLower);
-  insert(i18n->getMessage(
-#ifdef    NLS
-                          WindowmenuSet, WindowmenuStick,
-#else // !NLS
-                          0, 0,
-#endif // NLS
-                          "Stick"),
-         BScreen::WindowStick);
-  insert(i18n->getMessage(
-#ifdef    NLS
-                          WindowmenuSet, WindowmenuKillClient,
-#else // !NLS
-                          0, 0,
-#endif // NLS
-                          "Kill Client"),
-         BScreen::WindowKill);
-  insert(i18n->getMessage(
-#ifdef    NLS
-                          WindowmenuSet, WindowmenuClose,
-#else // !NLS
-                          0, 0,
-#endif // NLS
-                          "Close"),
-         BScreen::WindowClose);
-
-        //TODO: nls
-  insert("Tab", BScreen::WindowTab);
-         
-  update();
+        insert(i18n->getMessage(
+                WindowmenuSet, WindowmenuShade,
+                "Shade"),
+         BScreen::WINDOWSHADE);
+        insert(i18n->getMessage(
+                WindowmenuSet, WindowmenuIconify,
+                "Iconify"),
+         BScreen::WINDOWICONIFY);
+        insert(i18n->getMessage(
+                WindowmenuSet, WindowmenuMaximize,
+                "Maximize"),
+         BScreen::WINDOWMAXIMIZE);
+        insert(i18n->getMessage(
+                WindowmenuSet, WindowmenuRaise,
+                "Raise"),
+         BScreen::WINDOWRAISE);
+        insert(i18n->getMessage(
+                WindowmenuSet, WindowmenuLower,
+                "Lower"),
+         BScreen::WINDOWLOWER);
+        insert(i18n->getMessage(
+                WindowmenuSet, WindowmenuStick,
+                "Stick"),
+         BScreen::WINDOWSTICK);
+        insert(i18n->getMessage(
+                WindowmenuSet, WindowmenuKillClient,
+                "Kill Client"),
+         BScreen::WINDOWKILL);
+        insert(i18n->getMessage(
+                WindowmenuSet, WindowmenuClose,
+                "Close"),
+         BScreen::WINDOWCLOSE);
+        insert(i18n->getMessage(
+                WindowmenuSet, WindowmenuTab,
+                "Tab"),
+         BScreen::WINDOWTAB);
+
+        update();
+
+        setItemEnabled(2, window->hasTitlebar());
+        setItemEnabled(3, window->isIconifiable());
+        setItemEnabled(4, window->isMaximizable());
+        setItemEnabled(9, window->isClosable());
+        setItemEnabled(10, true); //we should always be able to enable the tab
 
-  setItemEnabled(1, window->hasTitlebar());
-  setItemEnabled(2, window->isIconifiable());
-  setItemEnabled(3, window->isMaximizable());
-  setItemEnabled(8, window->isClosable());
-        setItemEnabled(9, window->hasTab());
 }
 
 
 Windowmenu::~Windowmenu(void) {
-  delete sendToMenu;
+        delete sendToMenu;
         delete sendGroupToMenu;
 }
 
 
 void Windowmenu::show(void) {
-  if (isItemEnabled(1)) setItemSelected(1, window->isShaded());
-  if (isItemEnabled(3)) setItemSelected(3, window->isMaximized());
-  if (isItemEnabled(6)) setItemSelected(6, window->isStuck());
+        if (isItemEnabled(2)) setItemSelected(2, window->isShaded());
+        if (isItemEnabled(4)) setItemSelected(4, window->isMaximized());
+        if (isItemEnabled(7)) setItemSelected(7, window->isStuck());
 
-  Basemenu::show();
+        Basemenu::show();
 }
 
 
-void Windowmenu::itemSelected(int button, int index) {
-  BasemenuItem *item = find(index);
-
-  switch (item->function()) {
-  case BScreen::WindowShade:
-    hide();
-                if (window->getTab())
+void Windowmenu::itemSelected(int button, unsigned int index) {
+        BasemenuItem *item = find(index);
+        hide();
+        switch (item->function()) {
+        case BScreen::WINDOWSHADE:
+                if (window->isIconic())
+                        break;
+                        
+                window->shade();
+                if (window->hasTab())
                         window->getTab()->shade();
-    window->shade();
-    break;
-
-  case BScreen::WindowIconify:
-    hide();
-    window->iconify();
-    break;
-
-  case BScreen::WindowMaximize:
-    hide();
-    window->maximize((unsigned int) button);
-    break;
-
-  case BScreen::WindowClose:
-    hide();
-    window->close();
-    break;
-
-  case BScreen::WindowRaise:
-    hide();
-    screen->getWorkspace(window->getWorkspaceNumber())->raiseWindow(window);
-    break;
-
-  case BScreen::WindowLower:
-    hide();
-    screen->getWorkspace(window->getWorkspaceNumber())->lowerWindow(window);
-    break;
-
-  case BScreen::WindowStick:
-    hide();
-    window->stick();
-    break;
-
-  case BScreen::WindowKill:
-    hide();
-    XKillClient(screen->getBaseDisplay()->getXDisplay(),
-                window->getClientWindow());
-    break;
-        case BScreen::WindowTab:
-                hide();
+        break;
+
+        case BScreen::WINDOWICONIFY:
+                if (!window->isIconic())
+                        window->iconify();
+                else
+                        window->deiconify(); // restore window
+                        
+        break;
+
+        case BScreen::WINDOWMAXIMIZE:
+                window->maximize((unsigned int) button);
+        break;
+
+        case BScreen::WINDOWCLOSE:
+                window->close();
+        break;
+
+        case BScreen::WINDOWRAISE:
+                if (window->isIconic())
+                        break;
+
+                if (window->hasTab())
+                        window->getTab()->raise(); //raise tabs
+                screen->getWorkspace(window->getWorkspaceNumber())->raiseWindow(window);
+        break;
+
+        case BScreen::WINDOWLOWER:
+                if (window->isIconic())
+                        break;
+
+                screen->getWorkspace(window->getWorkspaceNumber())->lowerWindow(window);
+                if (window->hasTab())
+                        window->getTab()->lower(); //lower tabs AND all it's windows
+                break;
+
+        case BScreen::WINDOWSTICK:
+                window->stick();
+                break;
+
+        case BScreen::WINDOWKILL:
+                XKillClient(screen->getBaseDisplay()->getXDisplay(),
+                                                                window->getClientWindow());
+                break;
+        case BScreen::WINDOWTAB:
                 window->setTab(!window->hasTab());
                 break;
-  }
+        }
 }
 
 
 void Windowmenu::reconfigure(void) {
-  setItemEnabled(1, window->hasTitlebar());
-  setItemEnabled(2, window->isIconifiable());
-  setItemEnabled(3, window->isMaximizable());
-  setItemEnabled(8, window->isClosable());
+        setItemEnabled(1, window->hasTitlebar());
+        setItemEnabled(2, window->isIconifiable());
+        setItemEnabled(3, window->isMaximizable());
+        setItemEnabled(8, window->isClosable());
 
-  sendToMenu->reconfigure();
+        sendToMenu->reconfigure();
         sendGroupToMenu->reconfigure();
         
-  Basemenu::reconfigure();
+        Basemenu::reconfigure();
 }
 
 
 Windowmenu::SendtoWorkspacemenu::SendtoWorkspacemenu(Windowmenu *w)
-  : Basemenu(w->screen)
+        : Basemenu(w->screen)
 {
-  windowmenu = w;
+        windowmenu = w;
 
-  setTitleVisibility(False);
-  setMovable(False);
-  setInternalMenu();
-  update();
+        setTitleVisibility(False);
+        setMovable(False);
+        setInternalMenu();
+        update();
 }
 
 
-void Windowmenu::SendtoWorkspacemenu::itemSelected(int button, int index) {
-  if (button > 2) return;
+void Windowmenu::SendtoWorkspacemenu::itemSelected(int button, unsigned int index) {
+        if (button > 2) return;
 
-  if (index <= windowmenu->screen->getCount()) {
-    if (index == windowmenu->screen->getCurrentWorkspaceID()) return;
-    if (windowmenu->window->isStuck()) windowmenu->window->stick();
+        if (index <= windowmenu->screen->getCount()) {
+                
+                // no need to send it to a workspace it already exist on
+                if (index == windowmenu->screen->getCurrentWorkspaceID())
+                        return;
+
+                // if the window is stuck then unstick it
+                if (windowmenu->window->isStuck())
+                        windowmenu->window->stick();
 
-    if (button == 1) windowmenu->window->withdraw();
-    windowmenu->screen->reassociateWindow(windowmenu->window, index, True);
-                if (windowmenu->window->getTab()) {
-                        windowmenu->window->getTab()->disconnect();
-                        windowmenu->window->getTab()->setPosition();
+                if (button == 1) { // send to workspace without changing workspace
+                        windowmenu->screen->sendToWorkspace(index,
+                                windowmenu->window, false);
+                } else if (button == 2) { // send to workspace and change workspace
+                        windowmenu->screen->sendToWorkspace(index,
+                                windowmenu->window, true);
                 }
-    if (button == 2) windowmenu->screen->changeWorkspaceID(index);
-  }
-  hide();
+        }
+
+        hide();
 }
 
 
 void Windowmenu::SendtoWorkspacemenu::update(void) {
-  int i, r = getCount();
-
-  if (getCount() != 0)
-    for (i = 0; i < r; ++i)
-      remove(0);
+        unsigned int i, r = numberOfItems();
 
-  for (i = 0; i < windowmenu->screen->getCount(); ++i)
-    insert(windowmenu->screen->getWorkspace(i)->getName());
+        if (numberOfItems() != 0) {
+                for (i = 0; i < r; ++i)
+                        remove(0);
+        }
+        for (i = 0; i < windowmenu->screen->getCount(); ++i)
+                insert(windowmenu->screen->getWorkspace(i)->name().c_str());
 
-  Basemenu::update();
+        Basemenu::update();
 }
 
 
 void Windowmenu::SendtoWorkspacemenu::show(void) {
-  update();
+        update();
 
-  Basemenu::show();
+        Basemenu::show();
 }
 
-void Windowmenu::SendGroupToWorkspacemenu::itemSelected(int button, int index) {
+void Windowmenu::SendGroupToWorkspacemenu::itemSelected(int button, unsigned int index) {
         if (button > 2)
                 return;
 
@@ -294,15 +274,16 @@ void Windowmenu::SendGroupToWorkspacemenu::itemSelected(int button, int index) {
                         getWindowMenu()->window->stick();
 
                 if (button == 1) {
+                        // TODO: use reassociateGroup from BScreen instead
                         if (getWindowMenu()->window->hasTab()) {
                                 for (Tab *first = Tab::getFirst(getWindowMenu()->window->getTab());
-                                                        first!=0; first=first->next()) {
-                                                first->withdraw();
-                                                first->getWindow()->withdraw();
-                                                getWindowMenu()->screen->reassociateWindow(first->getWindow(), index, True);
+                                                first!=0; first=first->next()) {
+                                        first->withdraw();
+                                        first->getWindow()->withdraw();
+                                        getWindowMenu()->screen->reassociateWindow(first->getWindow(), index, True);
                                         
                                 }
-                        } else  {
+                        } else  {
                                 getWindowMenu()->window->withdraw();
                                 getWindowMenu()->screen->reassociateWindow(getWindowMenu()->window, index, True);
                         }