Skip to content

feat: SG-43509: Add rebind and rebindRegex commands #1284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tjjackson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: SG-43509: Add rebind and rebindRegex commands #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions src/lib/app/MuTwkApp/CommandsModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ namespace TwkApp
new Function(c, "unbindRegex", CommandsModule::unbindRegex, None, Return, "void", Parameters,
new Param(c, "modeName", "string"), new Param(c, "tableName", "string"), new Param(c, "eventName", "string"), End),

new Function(c, "rebind", CommandsModule::rebind, None, Return, "void", Parameters, new Param(c, "modeName", "string"),
new Param(c, "tableName", "string"), new Param(c, "oldEventName", "string"),
new Param(c, "newEventName", "string"), End),

new Function(c, "rebindRegex", CommandsModule::rebindRegex, None, Return, "void", Parameters,
new Param(c, "modeName", "string"), new Param(c, "tableName", "string"), new Param(c, "oldEventPattern", "string"),
new Param(c, "newEventPattern", "string"), End),

new Function(c, "setEventTableBBox", CommandsModule::setTableBBox, None, Return, "void", Parameters,
new Param(c, "modeName", "string"), new Param(c, "tableName", "string"), new Param(c, "min", "vector float[2]"),
new Param(c, "max", "vector float[2]"), End),
Expand Down Expand Up @@ -563,6 +571,84 @@ namespace TwkApp
}
}

NODE_IMPLEMENTATION(CommandsModule::rebind, void)
{
Process* p = NODE_THREAD.process();
Document* d = currentDocument();

String* modeName = NODE_ARG_OBJECT(0, StringType::String);
String* tableName = NODE_ARG_OBJECT(1, StringType::String);
String* oldEventName = NODE_ARG_OBJECT(2, StringType::String);
String* newEventName = NODE_ARG_OBJECT(3, StringType::String);

if (!modeName || !tableName || !oldEventName || !newEventName)
{
throwBadArgumentException(NODE_THIS, NODE_THREAD, "Nil argument to function");
}

if (Mode* mode = d->findModeByName(modeName->c_str()))
{
if (EventTable* table = mode->findTableByName(tableName->c_str()))
{
table->rebind(oldEventName->c_str(), newEventName->c_str());
//
// currentDocument has a copy of this table, so invalidate
// that copy.
//
d->invalidateEventTables();
}
else
{
string msg = "No table named " + string(tableName->c_str());
throwBadArgumentException(NODE_THIS, NODE_THREAD, msg);
}
}
else
{
string msg = "No mode named " + string(modeName->c_str());
throwBadArgumentException(NODE_THIS, NODE_THREAD, msg);
}
}

NODE_IMPLEMENTATION(CommandsModule::rebindRegex, void)
{
Process* p = NODE_THREAD.process();
Document* d = currentDocument();

String* modeName = NODE_ARG_OBJECT(0, StringType::String);
String* tableName = NODE_ARG_OBJECT(1, StringType::String);
String* oldEventPattern = NODE_ARG_OBJECT(2, StringType::String);
String* newEventPattern = NODE_ARG_OBJECT(3, StringType::String);

if (!modeName || !tableName || !oldEventPattern || !newEventPattern)
{
throwBadArgumentException(NODE_THIS, NODE_THREAD, "Nil argument to function");
}

if (Mode* mode = d->findModeByName(modeName->c_str()))
{
if (EventTable* table = mode->findTableByName(tableName->c_str()))
{
table->rebindRegex(oldEventPattern->c_str(), newEventPattern->c_str());
//
// currentDocument has a copy of this table, so invalidate
// that copy.
//
d->invalidateEventTables();
}
else
{
string msg = "No table named " + string(tableName->c_str());
throwBadArgumentException(NODE_THIS, NODE_THREAD, msg);
}
}
else
{
string msg = "No mode named " + string(modeName->c_str());
throwBadArgumentException(NODE_THIS, NODE_THREAD, msg);
}
}

NODE_IMPLEMENTATION(CommandsModule::bindings, Mu::Pointer)
{
Process* p = NODE_THREAD.process();
Expand Down
2 changes: 2 additions & 0 deletions src/lib/app/MuTwkApp/MuTwkApp/CommandsModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ namespace TwkApp
static NODE_DECLARATION(bindRegex, void);
static NODE_DECLARATION(unbind, void);
static NODE_DECLARATION(unbindRegex, void);
static NODE_DECLARATION(rebind, void);
static NODE_DECLARATION(rebindRegex, void);
static NODE_DECLARATION(setTableBBox, void);
static NODE_DECLARATION(pushEventTable, void);
static NODE_DECLARATION(popEventTable, void);
Expand Down
28 changes: 28 additions & 0 deletions src/lib/app/TwkApp/EventTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,34 @@ namespace TwkApp
}
}

void EventTable::rebind(const std::string& oldEvent, const std::string& newEvent)
{
BindingMap::iterator i = m_map.find(oldEvent);

if (i != m_map.end())
{
Action* action = i->second;
m_map.erase(i);
unbind(newEvent);
m_map[newEvent] = action;
}
}

void EventTable::rebindRegex(const std::string& oldEventRegex, const std::string& newEventRegex)
{
for (int i = 0; i < m_reBindings.size(); i++)
{
if (m_reBindings[i].first.pattern() == oldEventRegex)
{
Action* action = m_reBindings[i].second;
m_reBindings.erase(m_reBindings.begin() + i);
unbindRegex(newEventRegex);
m_reBindings.push_back(RegExBinding(newEventRegex, action));
break;
}
}
}

static void deleteAction(EventTable::Binding& b) { delete b.second; }

void EventTable::clear()
Expand Down
9 changes: 9 additions & 0 deletions src/lib/app/TwkApp/TwkApp/EventTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@ namespace TwkApp
void unbind(const std::string& event);
void unbindRegex(const std::string& eventRegex);

//
// Move an existing event to a new event. The action currently bound
// to oldEvent is re-bound to newEvent (replacing any existing binding
// there) and the oldEvent binding is removed.
//

void rebind(const std::string& oldEvent, const std::string& newEvent);
void rebindRegex(const std::string& oldEventRegex, const std::string& newEventRegex);

//
// ROI
//
Expand Down
12 changes: 12 additions & 0 deletions src/lib/app/mu_rvui/commands.mud
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,18 @@ Removes the regular expression event binding from the given mode's
event table.
"""

rebind """
Reassign an existing event binding to a new event in the given mode's
event table.
"""

rebindRegex """
Reassign an existing regular expression event binding to a new event
in the given mode's event table.

See also: rebind()
"""

setEventTableBBox """
Set the bounding box for the given mode's event table.
"""
Expand Down
2 changes: 2 additions & 0 deletions src/lib/app/py_rvui/rv_commands_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@
"sourceMediaRepsAndNodes",
"devicePixelRatio",
"waitForProgressiveLoading",
"rebind",
"rebindRegex",
]


Expand Down
Loading