Skip to content

Commit

Permalink
Merge branch 'development' into MUSHclient
Browse files Browse the repository at this point in the history
  • Loading branch information
fiendish committed Apr 2, 2018
2 parents c67214a + ee77e6f commit 48aa23b
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 15 deletions.
4 changes: 4 additions & 0 deletions MUSHclient/AardwolfPackageChanges.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Aardwolf Client Package Major Changes List

r1981 snapshot
- new feature: The communication log's storeFromOutside function now lets you set the tab index or name where you want your message to go. It defaults to the first tab.
- new feature: functions findTab, nameTab, and getNamedTab added to the communication log plugin to, respectively, find the index of a named tab, programmatically name a tab, and programmatically add a new named tab if one doesn't already exist with the given name.

r1980 snapshot
- bug fix: Fix a couple plugin load order issues between the Bigmap plugin and the GMCP mapper plugin.
- bug fix: Fix a situation where the GMCP mapper wouldn't let you change the scan depth.
Expand Down
39 changes: 24 additions & 15 deletions MUSHclient/worlds/plugins/aard_channels_fiendish.xml
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ function nameTab(tab, name)
end
end
function addNamedTab(name)
function getNamedTab(name)
local existing = findTab(name)
if existing then
return existing
Expand Down Expand Up @@ -720,16 +720,23 @@ end
-- Example: CallPlugin("b555825a4a5700c35fa80780","storeFromOutside","HELLO@RHello@Mhello@x215hello@x66HELLO", 1)
-- Example: CallPlugin("b555825a4a5700c35fa80780","storeFromOutside","HELLO@RHello@Mhello@x215hello@x66HELLO", "Q/A")
function storeFromOutside(msg, tab)
if type(tab) == "string" then
tab = findTab(tab)
end
if tab == nil then
tab = 1
elseif type(tab) == "string" then
tab = findTab(tab)
end
if storeTab(ColoursToStyles(msg), tab) then
drawTabs()
if tab then
local should_redraw = storeTab(ColoursToStyles(msg), tab)
if should_redraw == true then
drawTabs()
end
end
if should_redraw ~= nil then
return true -- stored
end
return false -- not stored
end
-- stolen from Mendaloth
Expand Down Expand Up @@ -760,17 +767,19 @@ function filter_as_needed(msg)
end
function storeTab(styles, tab)
tabs_rects[tab]:addStyles(styles)
if tab == current_tab then
tabs_rects[tab]:draw()
tabs_scrollbars[tab]:draw()
else
if not tabs_activity[tab] then
tabs_activity[tab] = true
return true
if (tab >= 1) and (tab <= num_tabs) then
tabs_rects[tab]:addStyles(styles)
if tab == current_tab then
tabs_rects[tab]:draw()
tabs_scrollbars[tab]:draw()
else
if not tabs_activity[tab] then
tabs_activity[tab] = true
return true
end
end
return false
end
return false
end
function storeNonChannel(styles, nonchan)
Expand Down

0 comments on commit 48aa23b

Please sign in to comment.