all repos — fluxbox @ 4d01d1b748a99f1380a582874ab46e900fc7eca2

custom fork of the fluxbox windowmanager

add back Workspace<n> keys with deprecated message
rathnor rathnor
commit

4d01d1b748a99f1380a582874ab46e900fc7eca2

parent

97ef84da598aed61a6cb57a62796f302043181e8

2 files changed, 24 insertions(+), 1 deletions(-)

jump to
M ChangeLogChangeLog

@@ -1,6 +1,9 @@

(Format: Year/Month/Day) Changes for 0.9.10: *04/08/29: + * Add back Workspace<n> actions with deprecated message (Simon) + - need transition time, remove when 1.0 has been widely used for a while + FbCommandFactory.cc * More random render fixes (Simon) (font alignment in menu, menu optimisation, toolbar font/render) FbTk/Menu.cc FbTk/MenuItem.cc FbTk/XftFontImp.cc
M src/FbCommandFactory.ccsrc/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.32 2004/06/07 11:46:04 rathnor Exp $ +// $Id: FbCommandFactory.cc,v 1.33 2004/08/29 09:08:29 rathnor Exp $ #include "FbCommandFactory.hh"

@@ -129,6 +129,20 @@ "stickwindow",

"toggledecor", "windowmenu", "workspace", + /* NOTE: The following are DEPRECATED and subject to removal */ + "workspace1", + "workspace2", + "workspace3", + "workspace4", + "workspace5", + "workspace6", + "workspace7", + "workspace8", + "workspace9", + "workspace10", + "workspace11", + "workspace12", + /* end note */ "workspacemenu", "" };

@@ -278,6 +292,12 @@ int num = 1; // workspaces appear 1-indexed to the user

if (!arguments.empty()) num = atoi(arguments.c_str()); return new JumpToWorkspaceCmd(num-1); + } if (command.substr(0, 9) == "workspace" && command[9] >= '0' && command[9] <= '9') { + cerr<<"*** WARNING: 'Workspace<n>' actions are deprecated! Use 'Workspace <n>' instead"<<endl; + int num = 1; + num = atoi(command.substr(9).c_str()); + return new JumpToWorkspaceCmd(num-1); + } else if (command == "nextwindow") return new NextWindowCmd(atoi(arguments.c_str())); else if (command == "prevwindow")