M src/FbCommandFactory.cc → src/FbCommandFactory.cc

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbCommandFactory.cc,v 1.24 2003/12/20 17:42:04 fluxgen Exp $
+// $Id: FbCommandFactory.cc,v 1.25 2004/01/16 11:41:38 fluxgen Exp $
 
 #include "FbCommandFactory.hh"
 
@@ -119,6 +119,7 @@ "showdesktop",
         "stick",
         "stickwindow",
         "toggledecor",
+        "windowmenu",
         "workspace",
         "workspacemenu",
         ""
@@ -246,6 +247,8 @@ else if (command == "movetabright")
         return new CurrentWindowCmd(&FluxboxWindow::moveClientRight);
     else if (command == "detachclient")
         return new CurrentWindowCmd(&FluxboxWindow::detachCurrentClient);
+    else if (command == "windowmenu")
+        return new CurrentWindowCmd(&FluxboxWindow::popupMenu);
     // 
     // Workspace commands
     //

M src/Toolbar.cc → src/Toolbar.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.136 2004/01/13 14:41:32 rathnor Exp $
+// $Id: Toolbar.cc,v 1.137 2004/01/16 11:41:38 fluxgen Exp $
 
 #include "Toolbar.hh"
 
@@ -493,6 +493,7 @@ y = screen().height() - menu().height();
 
         menu().move(x, y);
         menu().show();
+        menu().grabInputFocus();
     } else
         menu().hide();
 	

M src/Window.cc → src/Window.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.259 2003/12/31 00:36:16 fluxgen Exp $
+// $Id: Window.cc,v 1.260 2004/01/16 11:41:38 fluxgen Exp $
 
 #include "Window.hh"
 
@@ -1925,6 +1925,7 @@
     m_windowmenu.move(menu_x, menu_y);
     m_windowmenu.show();		
     m_windowmenu.raise();
+    m_windowmenu.grabInputFocus();
 }
 
 /**