Split IRC-name lightness, and add chat preview

Author: gwigz

indra/newview/alavatargroups.cpp

@@ -337,7 +337,7 @@ bool ALAvatarGroups::getIRCNameColor(const LLChat& chat, const LLUIColor& chat_c
         return false;
     }
 
-    color = dimNameColor(chat_color.get());
+    color = nameColor(chat_color.get());
     return true;
 }
 
@@ -357,7 +357,7 @@ bool ALAvatarGroups::getIRCNameTagColor(const LLUUID& id, LLColor4& color)
     if (id.notNull() && id != gAgentID
         && RlvActions::canShowName(RlvActions::SNC_DEFAULT, id))
     {
-        color = dimNameColor(deterministicAgentColor(id));
+        color = nameColor(deterministicAgentColor(id));
         return true;
     }
 
@@ -376,17 +376,19 @@ LLColor4 ALAvatarGroups::deterministicAgentColor(const LLUUID& id)
     return color;
 }
 
-LLColor4 ALAvatarGroups::dimNameColor(const LLColor4& color)
+LLColor4 ALAvatarGroups::nameColor(const LLColor4& color)
 {
-    static LLCachedControl<F32> scale(gSavedSettings, "AlchemyChatIRCNameLightnessScale", 0.8f);
+    static LLCachedControl<F32> name_lightness(gSavedSettings, "AlchemyChatIRCNameLightness", 0.7f);
 
+    // Keep the chat color's hue and saturation, but give the name its own
+    // independent lightness rather than dimming relative to the chat lightness.
     F32 hue = 0.f;
     F32 saturation = 0.f;
     F32 lightness = 0.f;
     color.calcHSL(&hue, &saturation, &lightness);
 
     LLColor4 result;
-    result.setHSL(hue, saturation, lightness * scale());
+    result.setHSL(hue, saturation, name_lightness());
     result.mV[VALPHA] = 1.f;
 
     return result;

indra/newview/alavatargroups.h

@@ -67,5 +67,5 @@ class ALAvatarGroups final : public LLSingleton < ALAvatarGroups >
 
 private:
     LLColor4 deterministicAgentColor(const LLUUID& id);
-    LLColor4 dimNameColor(const LLColor4& color);
+    LLColor4 nameColor(const LLColor4& color);
 };

indra/newview/app_settings/settings_alchemy.xml

@@ -431,16 +431,16 @@
             <key>Value</key>
             <real>0.9</real>
         </map>
-        <key>AlchemyChatIRCNameLightnessScale</key>
+        <key>AlchemyChatIRCNameLightness</key>
         <map>
             <key>Comment</key>
-            <string>Scales the lightness of the displayed name relative to its IRC-style chat color (0-1).</string>
+            <string>Lightness of the displayed name in IRC-style chat colors; shares the chat color's hue and saturation (0-1).</string>
             <key>Persist</key>
             <integer>1</integer>
             <key>Type</key>
             <string>F32</string>
             <key>Value</key>
-            <real>0.8</real>
+            <real>0.7</real>
         </map>
         <key>AlchemyChatMarkUnnamedObjects</key>
         <map>

indra/newview/llfloaterpreference.cpp

@@ -34,7 +34,12 @@
 
 #include "llfloaterpreference.h"
 
+#include "alavatargroups.h"
 #include "llaudioengine.h"
+#include "llchat.h"
+#include "llstyle.h"
+#include "lluicolortable.h"
+#include "llviewerchat.h"
 #include "message.h"
 #include "llfloaterautoreplacesettings.h"
 #include "llagent.h"
@@ -74,6 +79,7 @@
 #include "llscrolllistitem.h"
 #include "llsliderctrl.h"
 #include "lltabcontainer.h"
+#include "lltextbox.h"
 #include "lltrans.h"
 #include "lluri.h"
 #include "llviewercontrol.h"
@@ -3066,6 +3072,162 @@ class LLPanelPreferencePrivacy : public LLPanelPreference
 static LLPanelInjector<LLPanelPreferenceGraphics> t_pref_graph("panel_preference_graphics");
 static LLPanelInjector<LLPanelPreferencePrivacy> t_pref_privacy("panel_preference_privacy");
 static LLPanelInjector<LLPanelPreferenceSound> t_pref_sound("panel_preference_sound");
+static LLPanelInjector<LLPanelPreferenceColors> t_pref_colors("panel_preference_colors");
+
+bool LLPanelPreferenceColors::postBuild()
+{
+    mPreviewBox = getChild<LLTextBox>("irc_chat_preview");
+    updatePreview();
+    return LLPanelPreference::postBuild();
+}
+
+void LLPanelPreferenceColors::draw()
+{
+    // The chat-color swatches commit straight into LLUIColorTable (no settings
+    // signal to listen to), so poll a cheap signature of everything the preview
+    // depends on and re-render only when it actually changes.
+    static const char* const color_names[] = {
+        "UserChatColor", "AgentChatColor", "FriendChatColor", "SystemChatColor",
+        "ObjectChatColor", "llOwnerSayChatColor", "LindenChatColor", "HTMLLinkColor",
+    };
+    std::string signature;
+    for (const char* name : color_names)
+    {
+        const LLColor4& c = LLUIColorTable::instance().getColor(name).get();
+        signature += llformat("%.3f,%.3f,%.3f;", c.mV[VRED], c.mV[VGREEN], c.mV[VBLUE]);
+    }
+    signature += llformat("%d;%.3f;%.3f;%.3f;%d",
+        gSavedSettings.getBOOL("AlchemyChatIRCColorsEnabled") ? 1 : 0,
+        gSavedSettings.getF32("AlchemyChatIRCAgentSaturation"),
+        gSavedSettings.getF32("AlchemyChatIRCAgentLightness"),
+        gSavedSettings.getF32("AlchemyChatIRCNameLightness"),
+        gSavedSettings.getBOOL("Use24HourClock") ? 1 : 0);
+
+    if (signature != mPreviewSignature)
+    {
+        mPreviewSignature = signature;
+        updatePreview();
+    }
+
+    LLPanelPreference::draw();
+}
+
+void LLPanelPreferenceColors::updatePreview()
+{
+    if (!mPreviewBox)
+        return;
+
+    // One line per chat category the panel above exposes. Each carries the base
+    // color the real getChatColor() switch would pick (friend/Linden can't be
+    // detected from a fake id, so we set it explicitly), plus a stable id so the
+    // per-avatar IRC color stays constant between refreshes. The IRC override and
+    // name dimming are then applied through the real ALAvatarGroups calls, so the
+    // preview tracks the live colors and settings exactly like in-world local chat.
+    enum EKind { K_SYSTEM, K_SELF, K_RESIDENT, K_FRIEND, K_LINDEN, K_OBJECT, K_OWNER };
+    static const struct
+    {
+        EKind       kind;
+        const char* color;  // base text color name
+        const char* id;     // stable per-avatar id (empty for system/self)
+        S32         hour;    // mock 24h timestamp, formatted per Use24HourClock
+        S32         minute;
+        const char* name;   // speaker name ("" hides the name prefix)
+        const char* text;
+    } samples[] = {
+        { K_SYSTEM,   "SystemChatColor",     "",                                     13, 42, "",                        "Welcome to Quirk Island. Mind the dancing llamas." },
+        { K_SELF,     "UserChatColor",       "",                                     13, 43, "You",                     "ok who moved my virtual cheese" },
+        { K_RESIDENT, "AgentChatColor",      "a1a1a1a1-0000-0000-0000-000000000001", 13, 44, "Bartholomew Bumblecrash", "anyone else seeing the sky do the wobble thing?" },
+        { K_RESIDENT, "AgentChatColor",      "f6f6f6f6-0000-0000-0000-000000000006", 13, 45, "Wandering Pixel",         "https://marketplace.secondlife.com/" },
+        { K_FRIEND,   "FriendChatColor",     "b2b2b2b2-0000-0000-0000-000000000002", 13, 46, "Glittertoes McSparkle",   "omg hi!! brb taming a baby dragon" },
+        { K_LINDEN,   "LindenChatColor",     "c3c3c3c3-0000-0000-0000-000000000003", 13, 47, "Governor Linden",         "Rolling restart in 5, hold onto your hats." },
+        { K_OBJECT,   "ObjectChatColor",     "d4d4d4d4-0000-0000-0000-000000000004", 13, 48, "Object",                  "Welcome to Help Island!" },
+        { K_OWNER,    "llOwnerSayChatColor", "e5e5e5e5-0000-0000-0000-000000000005", 13, 49, "Animation HUD",           "2,167 bytes free :)" },
+    };
+
+    static const LLUIColor time_color = LLUIColorTable::instance().getColor("ChatHeaderTimestampColor");
+    const bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+
+    mPreviewBox->setText(LLStringUtil::null);   // clear before re-appending
+
+    bool prepend_newline = false;  // newline before every line except the first
+    for (const auto& s : samples)
+    {
+        LLChat chat;
+        chat.mFromName = s.name;
+        chat.mText     = s.text;
+        switch (s.kind)
+        {
+        case K_SYSTEM:
+            chat.mSourceType = CHAT_SOURCE_SYSTEM;
+            break;
+        case K_SELF:
+            chat.mSourceType = CHAT_SOURCE_AGENT;
+            chat.mFromID     = gAgentID;
+            break;
+        case K_OBJECT:
+            chat.mSourceType = CHAT_SOURCE_OBJECT;
+            chat.mFromID     = LLUUID(s.id);
+            break;
+        case K_OWNER:
+            chat.mSourceType = CHAT_SOURCE_OBJECT;
+            chat.mChatType   = CHAT_TYPE_OWNER;
+            chat.mFromID     = LLUUID(s.id);
+            break;
+        default:  // resident / friend / Linden are all "other agents"
+            chat.mSourceType = CHAT_SOURCE_AGENT;
+            chat.mFromID     = LLUUID(s.id);
+            break;
+        }
+
+        // Base category color, then the live IRC overrides (mirrors getChatColor +
+        // getIRCNameColor in llchathistory.cpp). getIRCChatColor only recolors other
+        // agents, so self/system/object/owner keep their configured color. Names are
+        // clickable SLURLs in chat, so by default they take the link color; when IRC
+        // coloring is on, getIRCNameColor overrides that with the dimmed per-avatar color.
+        LLUIColor txt_color = LLUIColorTable::instance().getColor(s.color);
+        ALAvatarGroups::instance().getIRCChatColor(chat, txt_color);
+
+        LLUIColor name_color = LLUIColorTable::instance().getColor("HTMLLinkColor");
+        ALAvatarGroups::instance().getIRCNameColor(chat, txt_color, name_color);
+
+        // Timestamp prefix, like nearby chat: "[hh:mm] ", honoring the
+        // Use24HourClock pref the way LLFloaterIMSessionTab::appendTime() does.
+        std::string time_str;
+        if (use_24h)
+        {
+            time_str = llformat("%d:%02d", s.hour, s.minute);
+        }
+        else
+        {
+            S32 h12 = s.hour % 12;
+            if (h12 == 0) h12 = 12;
+            time_str = llformat("%d:%02d %s", h12, s.minute, s.hour < 12 ? "AM" : "PM");
+        }
+
+        LLStyle::Params time_style;
+        time_style.color(time_color);
+        time_style.readonly_color(time_color);
+        mPreviewBox->appendText("[" + time_str + "] ", prepend_newline, time_style);
+        prepend_newline = false;  // keep the rest of the line attached to the timestamp
+
+        if (!chat.mFromName.empty())
+        {
+            LLStyle::Params name_style;
+            name_style.color(name_color);
+            name_style.readonly_color(name_color);
+            mPreviewBox->appendText(chat.mFromName + ": ", prepend_newline, name_style);
+        }
+
+        // parse_urls is set on the widget, so any URL in the text is linkified
+        // (and colored HTMLLinkColor) automatically by appendText.
+        LLStyle::Params text_style;
+        text_style.color(txt_color);
+        text_style.readonly_color(txt_color);
+        mPreviewBox->appendText(chat.mText, prepend_newline, text_style);
+
+        prepend_newline = true;
+    }
+}
 
 bool LLPanelPreferenceSound::postBuild()
 {

indra/newview/llfloaterpreference.h

@@ -388,6 +388,27 @@ class LLPanelPreferenceSound : public LLPanelPreference
     boost::signals2::scoped_connection mDevicesChangedConn;
 };
 
+// Colors > Chat preferences panel. Renders a live mock-chat preview that
+// re-colors whenever a chat-color swatch or any AlchemyChatIRC* setting
+// changes, using the real chat-color path so it matches in-world local chat.
+class LLPanelPreferenceColors : public LLPanelPreference
+{
+    LOG_CLASS(LLPanelPreferenceColors);
+public:
+    bool postBuild() override;
+    void draw() override;
+
+private:
+    void updatePreview();
+
+    LLTextBox* mPreviewBox = nullptr;
+
+    // Signature of the colors/settings the preview depends on. The chat-color
+    // swatches commit straight into LLUIColorTable (no settings signal), so
+    // draw() polls this and re-renders only when it actually changes.
+    std::string mPreviewSignature;
+};
+
 class LLPanelPreferenceControls : public LLPanelPreference, public LLKeyBindResponderInterface
 {
     LOG_CLASS(LLPanelPreferenceControls);

indra/newview/skins/default/xui/en/floater_preferences.xml

@@ -144,7 +144,7 @@
          help_topic="preferences_msgs_tab"
          name="msgs" />
         <panel
-		 class="panel_preference"
+		 class="panel_preference_colors"
          filename="panel_preferences_colors.xml"
          label="Colors"
          layout="topleft"