From 52816e1bef60b0fdd59b40ec3f4a0f47188c0129 Mon Sep 17 00:00:00 2001 From: teramako Date: Sat, 11 Dec 2010 02:20:06 +0900 Subject: move all commands to sub-command of :panorama command * add main-command :panorama * move all the other commands to sub-command --- panorama.js | 343 +++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 222 insertions(+), 121 deletions(-) (limited to 'panorama.js') diff --git a/panorama.js b/panorama.js index fe879ae..71d7a98 100644 --- a/panorama.js +++ b/panorama.js @@ -2,7 +2,7 @@ * Use at your OWN RISK. */ let INFO = <> -

Switch to previous group.

+

Main Command

- :mkgroup :mkg - :mkgroup! GroupName + :panorama :tabview :tabcandy + :panorama SubCommand + :tabview SubCommand + :tabcandy SubCommand + +

See the following SubCommands.

+ + +

SubCommands

+ + mkgroup mkg + mkgroup! GroupName

Create new tab group named GroupName. And then, switch to the group.

If specified !, move the current tab to the group.

 - :stash :stashtogroup - :stashtogroup! GroupName + stash stashtogroup + stashtogroup! GroupName

Stash the current tab to GroupName.

Caution: connnot stash AppTab (pinned tab)

 - :switchgroup :swg - :switchgroup GroupName - :swg GroupName - :countswitchgroup - :countswg + switchgroup swg + switchgroup GroupName + swg GroupName + countswitchgroup + countswg

Switch group to GroupName

 - :rmgroup :rmg - :rmggroup! GroupName + rmgroup rmg + rmggroup! GroupName

remove group. The current group is used if ommited GroupName

 - :pullgroup :pull - :pullgroup buffer + pullgroup pull + pullgroup buffer

pull a tab from the other group

 @@ -510,127 +521,217 @@ let (cmd = commands.get("buffer")) { cmd.completer = function (context) completion.buffer(context, completion.buffer.ALL); } -/** - * make a group and switch to the group - * if add ! (bang), take up the current tab to the group - */ -commands.addUserCommand(["mkg[roup]"], "create Group", - function (args) { - let groupName = args.literalArg; - let group = createGroup(groupName); - let currentTab = tabs.getTab(); - if (args.bang) { - if (!currentTab.pinned) - TV.moveTabTo(currentTab, group.id); - } - let apps = appTabs, - child = group.getChild(0); - if (child) { - tabView.GroupItems.setActiveGroupItem(group); - tabView.UI.goToTab(child.tab); - } else if (apps.length == 0) { - group.newTab(); - } else { - tabView.GroupItems.setActiveGroupItem(group); - tabView.UI.goToTab(currentTab.pinned ? currentTab : apps[apps.length - 1]); - } - }, { - argCount: "1", - bang: true, - literal: 0, - }, true); - -commands.addUserCommand(["switchgruop", "swg"], "Switch Group", - function (args) { - if (args.count > 0) { - switchToGroup("+" + args.count, true); - } else { - switchToGroup(args.literalArg); - } - }, { - argCount: "?", - count: true, - literal: 0, - completer: function (context) completion.tabgroup(context, true), - }, true); - -commands.addUserCommand(["stash[togroup]"], "Stash the current tab to other group", - function (args) { - let currentTab = tabs.getTab(); - if (currentTab.pinned) { - liberator.echoerr("Connot stash an AppTab"); - return; - } - let groupName = args.literalArg; - let group = getGroupByName(groupName)[0]; - if (!group) { +let subCmds = [ + /** + * SubCommand help {{{ + */ + new Command(["help"], "Show Help", + function (args) { + let list = template.genericOutput("Panorama Help", +
{ template.map(subCmds, function(cmd) <>
{cmd.names.join(", ")}
{cmd.description}
) }
+ ); + commandline.echo(list, commandline.HL_NORMAL); + }, {}, true) // }}} + , + /** + * SubCommad mkgroup {{{ + * make a group and switch to the group + * if bang(!) exists, take up the current tab to the group + */ + new Command(["mkg[roup]"], "create Group", + function (args) { + let groupName = args.literalArg; + let group = createGroup(groupName); + let currentTab = tabs.getTab(); if (args.bang) { - group = createGroup(groupName); + if (!currentTab.pinned) + TV.moveTabTo(currentTab, group.id); + } + let apps = appTabs, + child = group.getChild(0); + if (child) { + tabView.GroupItems.setActiveGroupItem(group); + tabView.UI.goToTab(child.tab); + } else if (apps.length == 0) { + group.newTab(); } else { - liberator.echoerr("No such group: " + groupName.quote() + ". if want create, add \"!\""); - return; + tabView.GroupItems.setActiveGroupItem(group); + tabView.UI.goToTab(currentTab.pinned ? currentTab : apps[apps.length - 1]); } - } - TV.moveTabTo(currentTab, group.id); - } ,{ - argCount: "1", - bang: true, - literal: 0, - completer: function (context) completion.tabgroup(context, true), - }, true); - -commands.addUserCommand(["rmg[roup]"], "close all tabs in the group", - function (args) { - let groupName = args.literalArg; - const GI = tabView.GroupItems; - let activeGroup = GI.getActiveGroupItem(); - let group = groupName ? getGroupByName(groupName)[0] : activeGroup; - liberator.assert(group, "No such group: " + groupName); - - if (group === activeGroup) { - if (gBrowser.visibleTabs.length < gBrowser.tabs.length) { - switchToGroup("+1", true); + }, { + argCount: "1", + bang: true, + literal: 0, + }, true) /// }}} + , + /** + * SubCommand switchgroup {{{ + * swtich to the {group} + * if {count} exists, switch to relative {count} + */ + new Command(["switchgruop", "swg"], "Switch Group", + function (args) { + if (args.count > 0) { + switchToGroup("+" + args.count, true); } else { - let apps = appTabs; - let gb = gBrowser; - let vtabs = gb.visibleTabs; - if (apps.length == 0) { - // 最後尾にabout:blankなタブをフォアグランドに開く - gb.loadOneTab("about:blank", { inBackground: false, relatedToCurrent: false }); + switchToGroup(args.literalArg); + } + }, { + argCount: "?", + count: true, + literal: 0, + completer: function (context) completion.tabgroup(context, true), + }, true) // }}} + , + /** + * SubCommand stashgroup {{{ + * stash the current tab to other {group} + * if bang(!) exists and {group} doesn't exists, + * create {group} and stash + */ + new Command(["stash[togroup]"], "Stash the current tab to other group", + function (args) { + let currentTab = tabs.getTab(); + if (currentTab.pinned) { + liberator.echoerr("Connot stash an AppTab"); + return; + } + let groupName = args.literalArg; + let group = getGroupByName(groupName)[0]; + if (!group) { + if (args.bang) { + group = createGroup(groupName); } else { - // AppTabがあればそれをとりあえず選択しておく - gb.mTabContainer.selectedIndex = apps.length -1; + liberator.echoerr("No such group: " + groupName.quote() + ". if want create, add \"!\""); + return; } - for (let i = vtabs.length -1, tab; (tab = vtabs[i]) && !tab.pinned; i--) { - gb.removeTab(tab); + } + TV.moveTabTo(currentTab, group.id); + } ,{ + argCount: "1", + bang: true, + literal: 0, + completer: function (context) completion.tabgroup(context, true), + }, true) // }}} + , + /** + * SubCommand rmgroup {{{ + * remove {group} + * if {group} is ommited, remove the current group + */ + new Command(["rmg[roup]"], "close all tabs in the group", + function (args) { + let groupName = args.literalArg; + const GI = tabView.GroupItems; + let activeGroup = GI.getActiveGroupItem(); + let group = groupName ? getGroupByName(groupName)[0] : activeGroup; + liberator.assert(group, "No such group: " + groupName); + + if (group === activeGroup) { + if (gBrowser.visibleTabs.length < gBrowser.tabs.length) { + switchToGroup("+1", true); + } else { + let apps = appTabs; + let gb = gBrowser; + let vtabs = gb.visibleTabs; + if (apps.length == 0) { + // 最後尾にabout:blankなタブをフォアグランドに開く + gb.loadOneTab("about:blank", { inBackground: false, relatedToCurrent: false }); + } else { + // AppTabがあればそれをとりあえず選択しておく + gb.mTabContainer.selectedIndex = apps.length -1; + } + for (let i = vtabs.length -1, tab; (tab = vtabs[i]) && !tab.pinned; i--) { + gb.removeTab(tab); + } + return; } - return; } - } - group.closeAll(); - }, { - argCount: "?", - literal: 0, - completer: function (context) completion.tabgroup(context, false), - }, true); + group.closeAll(); + }, { + argCount: "?", + literal: 0, + completer: function (context) completion.tabgroup(context, false), + }, true) // }}} + , + /** + * SubCommand pulltab {{{ + * pull a tab from the other group + */ + new Command(["pull[tab]"], "pull a tab from the other group", + function (args) { + const GI = tabView.GroupItems; + let activeGroup = GI.getActiveGroupItem(); + liberator.assert(activeGroup, "Cannot move to the current"); + let arg = args.literalArg; + if (!arg) + return; + let tab = searchTab(arg); + liberator.assert(tab, "No such tab: " + arg); + TV.moveTabTo(tab, activeGroup.id); + gBrowser.mTabContainer.selectedItem = tab; + }, { + argCount: "1", + literal: 0, + completer: function (context) completion.buffer(context, completion.buffer.GROUPS | completion.buffer.ORPHANS), + }, true) // }}} +]; -commands.addUserCommand(["pull[tab]"], "pull a tab from the other group", +/** + * MainCommand panorama {{{ + */ +commands.addUserCommand(["panorama", "tabview", "tabcandy"], "Parnorama", function (args) { - const GI = tabView.GroupItems; - let activeGroup = GI.getActiveGroupItem(); - liberator.assert(activeGroup, "Cannot move to the current"); - let arg = args.literalArg; - if (!arg) + // show help, call SubCommand help + if (args.length < 1 || args["-help"]) { + subCmds[0].execute(); return; - let tab = searchTab(arg); - liberator.assert(tab, "No such tab: " + arg); - TV.moveTabTo(tab, activeGroup.id); - gBrowser.mTabContainer.selectedItem = tab; + } + // delegate subcommand + let [count, subCmdName, bang, subArgs] = commands.parseCommand(args.literalArg); + let cmd = subCmds.filter(function(c) c.hasName(subCmdName))[0]; + liberator.assert(cmd, "No such sub-command: " + subCmdName); + cmd.execute(subArgs, bang, count, {}); }, { - argCount: "1", + argCount: "*", + bang: true, literal: 0, - completer: function (context) completion.buffer(context, completion.buffer.GROUPS | completion.buffer.ORPHANS), + options: [ + [["-help", "-h"], commands.OPTION_NOARG], + ], + completer: function (context) { + let [count, subCmdName, bang, args] = commands.parseCommand(context.filter); + let [, prefix, junk] = context.filter.match(/^(:*\d*)\w*(.?)/) || []; + context.advance(prefix.length); + if (!junk) { + context.title = ["Panorama SubCommands"]; + context.keys = { text: "longNames", description: "description" }; + context.completions = [k for ([, k] in Iterator(subCmds))]; + return; + } + + let cmd = subCmds.filter(function(c) c.hasName(subCmdName))[0]; + if (!cmd) { + context.highlight(0, subCmdName.length, "SPELLCHECK"); + return; + } + [prefix] = context.filter.match(/^(?:\w*[\s!]|!)\s*/); + let cmdContext = context.fork(subCmdName, prefix.length); + let argContext = context.fork("args", prefix.length); + args = cmd.parseArgs(cmdContext.filter, argContext, { count: count, bang: bang }); + if (args) { + args.count = count; + args.bang = bang; + if (!args.completeOpt && cmd.completer) { + cmdContext.advance(args.completeStart); + cmdContext.quote = args.quote; + cmdContext.filter = args.completeFilter; + cmd.completer.call(cmd, cmdContext, args); + } + } + }, }, true); +// }}} // }}} -- cgit v1.2.3