switch back to using a style stack

sproctor · sproctor · commit 9fb1d9e467c8 · 2025-01-23T09:28:04.000-05:00
diff --git a/core/src/commonMain/kotlin/warlockfe/warlock3/core/text/WarlockStyle.kt b/core/src/commonMain/kotlin/warlockfe/warlock3/core/text/WarlockStyle.kt
@@ -13,5 +13,6 @@ data class WarlockStyle(val name: String, val annotation: Pair<String, String>?
         val Thought = WarlockStyle("thought")
         val Watching = WarlockStyle("watching")
         val Whisper = WarlockStyle("whisper")
+        val Default = WarlockStyle("")
     }
 }
diff --git a/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/network/StormfrontClient.kt b/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/network/StormfrontClient.kt
@@ -8,6 +8,7 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.plus
 import kotlinx.collections.immutable.toPersistentHashSet
+import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -73,15 +74,16 @@ import warlockfe.warlock3.stormfront.protocol.StormfrontModeEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontNavEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontOutputEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontParseErrorEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPopStyleEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontProgressBarEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontPromptEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontPropertyEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontProtocolHandler
+import warlockfe.warlock3.stormfront.protocol.StormfrontPushStyleEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontRoundTimeEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontSettingsInfoEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontStreamEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontStreamWindowEvent
-import warlockfe.warlock3.stormfront.protocol.StormfrontStyleEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontTimeEvent
 import warlockfe.warlock3.stormfront.protocol.StormfrontUnhandledTagEvent
 import warlockfe.warlock3.stormfront.stream.StormfrontWindow
@@ -94,6 +96,7 @@ import java.net.Socket
 import java.net.SocketException
 import java.net.SocketTimeoutException
 import java.nio.charset.Charset
+import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.max
 
@@ -240,7 +243,7 @@ class StormfrontClient(
     private var parseText = true
 
     private var currentStream: TextStream = mainStream
-    private var currentStyle: WarlockStyle? = null
+    private val styleStack = Stack<WarlockStyle>()
 
     // Output style is for echo style! Not received text
     private var outputStyle: WarlockStyle? = null
@@ -337,12 +340,15 @@ class StormfrontClient(
                                     is StormfrontOutputEvent ->
                                         outputStyle = event.style
 
-                                    is StormfrontStyleEvent ->
-                                        currentStyle = event.style
+                                    is StormfrontPushStyleEvent ->
+                                        styleStack.push(event.style)
+
+                                    StormfrontPopStyleEvent ->
+                                        styleStack.pop()
 
                                     is StormfrontPromptEvent -> {
                                         currentTypeAhead.update { max(0, it - 1) }
-                                        currentStyle = null
+                                        styleStack.clear()
                                         currentStream = mainStream
                                         if (!isPrompting) {
                                             mainStream.appendPartial(
@@ -418,7 +424,7 @@ class StormfrontClient(
 
                                     is StormfrontComponentDefinitionEvent -> {
                                         // Should not happen on main stream, so don't clear prompt
-                                        val styles = currentStyle?.let { persistentListOf(it) } ?: persistentListOf()
+                                        val styles = styleStack.toPersistentList()
                                         bufferText(
                                             text = StyledString(
                                                 persistentListOf(
@@ -535,7 +541,7 @@ class StormfrontClient(
 
     private fun bufferText(text: StyledString) {
         var styledText = text
-        currentStyle?.let { styledText = styledText.applyStyle(it) }
+        styleStack.asReversed().forEach { styledText = styledText.applyStyle(it) }
         outputStyle?.let { styledText = styledText.applyStyle(it) }
         buffer = buffer?.plus(styledText) ?: styledText
     }
diff --git a/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/StormfrontEvent.kt b/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/StormfrontEvent.kt
@@ -14,7 +14,8 @@ data class StormfrontClearStreamEvent(val id: String) : StormfrontEvent
 data class StormfrontModeEvent(val id: String?) : StormfrontEvent
 data class StormfrontAppEvent(val character: String?, val game: String?) : StormfrontEvent
 data class StormfrontOutputEvent(val style: WarlockStyle?) : StormfrontEvent
-data class StormfrontStyleEvent(val style: WarlockStyle?) : StormfrontEvent
+data class StormfrontPushStyleEvent(val style: WarlockStyle) : StormfrontEvent
+data object StormfrontPopStyleEvent : StormfrontEvent
 data class StormfrontPromptEvent(val text: String) : StormfrontEvent
 data class StormfrontTimeEvent(val time: String) : StormfrontEvent
 data class StormfrontRoundTimeEvent(val time: String) : StormfrontEvent
diff --git a/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/AHandler.kt b/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/AHandler.kt
@@ -1,9 +1,11 @@
 package warlockfe.warlock3.stormfront.protocol.elements
 
 import warlockfe.warlock3.core.text.WarlockStyle
-import warlockfe.warlock3.stormfront.protocol.*
+import warlockfe.warlock3.stormfront.protocol.BaseElementListener
+import warlockfe.warlock3.stormfront.protocol.StartElement
 import warlockfe.warlock3.stormfront.protocol.StormfrontEvent
-import warlockfe.warlock3.stormfront.protocol.StormfrontStyleEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPopStyleEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPushStyleEvent
 
 class AHandler : BaseElementListener() {
     override fun startElement(element: StartElement): StormfrontEvent {
@@ -14,10 +16,10 @@ class AHandler : BaseElementListener() {
             // TODO handle GS stuff here
             null
         }
-        return StormfrontStyleEvent(WarlockStyle.Link(action))
+        return StormfrontPushStyleEvent(WarlockStyle.Link(action))
     }
 
     override fun endElement(): StormfrontEvent {
-        return StormfrontStyleEvent(null)
+        return StormfrontPopStyleEvent
     }
 }
diff --git a/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/BHandler.kt b/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/BHandler.kt
@@ -1,16 +1,18 @@
 package warlockfe.warlock3.stormfront.protocol.elements
 
 import warlockfe.warlock3.core.text.WarlockStyle
-import warlockfe.warlock3.stormfront.protocol.*
+import warlockfe.warlock3.stormfront.protocol.BaseElementListener
+import warlockfe.warlock3.stormfront.protocol.StartElement
 import warlockfe.warlock3.stormfront.protocol.StormfrontEvent
-import warlockfe.warlock3.stormfront.protocol.StormfrontStyleEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPopStyleEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPushStyleEvent
 
 class BHandler : BaseElementListener() {
     override fun startElement(element: StartElement): StormfrontEvent {
-        return StormfrontStyleEvent(WarlockStyle.Bold)
+        return StormfrontPushStyleEvent(WarlockStyle.Bold)
     }
 
     override fun endElement(): StormfrontEvent {
-        return StormfrontStyleEvent(null)
+        return StormfrontPopStyleEvent
     }
 }
diff --git a/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/PopBoldHandler.kt b/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/PopBoldHandler.kt
@@ -1,11 +1,12 @@
 package warlockfe.warlock3.stormfront.protocol.elements
 
-import warlockfe.warlock3.stormfront.protocol.*
+import warlockfe.warlock3.stormfront.protocol.BaseElementListener
+import warlockfe.warlock3.stormfront.protocol.StartElement
 import warlockfe.warlock3.stormfront.protocol.StormfrontEvent
-import warlockfe.warlock3.stormfront.protocol.StormfrontStyleEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPopStyleEvent
 
 class PopBoldHandler  : BaseElementListener() {
     override fun startElement(element: StartElement): StormfrontEvent {
-        return StormfrontStyleEvent(null)
+        return StormfrontPopStyleEvent
     }
 }
diff --git a/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/PresetHandler.kt b/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/PresetHandler.kt
@@ -1,17 +1,19 @@
 package warlockfe.warlock3.stormfront.protocol.elements
 
 import warlockfe.warlock3.core.text.WarlockStyle
-import warlockfe.warlock3.stormfront.protocol.*
+import warlockfe.warlock3.stormfront.protocol.BaseElementListener
+import warlockfe.warlock3.stormfront.protocol.StartElement
 import warlockfe.warlock3.stormfront.protocol.StormfrontEvent
-import warlockfe.warlock3.stormfront.protocol.StormfrontStyleEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPopStyleEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPushStyleEvent
 
 class PresetHandler : BaseElementListener() {
-    override fun startElement(element: StartElement): StormfrontStyleEvent {
+    override fun startElement(element: StartElement): StormfrontEvent {
         val style = element.attributes["id"]?.let { WarlockStyle(it) }
-        return StormfrontStyleEvent(style)
+        return StormfrontPushStyleEvent(style ?: WarlockStyle.Default)
     }
 
     override fun endElement(): StormfrontEvent {
-        return StormfrontStyleEvent(null)
+        return StormfrontPopStyleEvent
     }
 }
diff --git a/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/PushBoldHandler.kt b/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/PushBoldHandler.kt
@@ -4,10 +4,10 @@ import warlockfe.warlock3.core.text.WarlockStyle
 import warlockfe.warlock3.stormfront.protocol.BaseElementListener
 import warlockfe.warlock3.stormfront.protocol.StartElement
 import warlockfe.warlock3.stormfront.protocol.StormfrontEvent
-import warlockfe.warlock3.stormfront.protocol.StormfrontStyleEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPushStyleEvent
 
 class PushBoldHandler() : BaseElementListener() {
     override fun startElement(element: StartElement): StormfrontEvent {
-        return StormfrontStyleEvent(WarlockStyle.Bold)
+        return StormfrontPushStyleEvent(WarlockStyle.Bold)
     }
 }
diff --git a/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/StyleHandler.kt b/stormfront/src/main/kotlin/warlockfe/warlock3/stormfront/protocol/elements/StyleHandler.kt
@@ -3,11 +3,17 @@ package warlockfe.warlock3.stormfront.protocol.elements
 import warlockfe.warlock3.core.text.WarlockStyle
 import warlockfe.warlock3.stormfront.protocol.BaseElementListener
 import warlockfe.warlock3.stormfront.protocol.StartElement
-import warlockfe.warlock3.stormfront.protocol.StormfrontStyleEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPopStyleEvent
+import warlockfe.warlock3.stormfront.protocol.StormfrontPushStyleEvent
 
 class StyleHandler : BaseElementListener() {
-    override fun startElement(element: StartElement): StormfrontStyleEvent {
-        val style = element.attributes["id"]?.let { WarlockStyle(it) }
-        return StormfrontStyleEvent(style)
+    override fun startElement(element: StartElement): StormfrontPushStyleEvent {
+        return element.attributes["id"]
+            ?.let { WarlockStyle(it) }
+            .let { StormfrontPushStyleEvent(it ?: WarlockStyle.Default) }
+    }
+
+    override fun endElement(): StormfrontPopStyleEvent {
+        return StormfrontPopStyleEvent
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ data class WarlockStyle(val name: String, val annotation: Pair<String, String>?`
`13`	`13`	`val Thought = WarlockStyle("thought")`
`14`	`14`	`val Watching = WarlockStyle("watching")`
`15`	`15`	`val Whisper = WarlockStyle("whisper")`
	`16`	`+ val Default = WarlockStyle("")`
`16`	`17`	`}`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`	`package warlockfe.warlock3.stormfront.protocol.elements`
`2`	`2`
`3`	`3`	`import warlockfe.warlock3.core.text.WarlockStyle`
`4`		`-import warlockfe.warlock3.stormfront.protocol.*`
	`4`	`+import warlockfe.warlock3.stormfront.protocol.BaseElementListener`
	`5`	`+import warlockfe.warlock3.stormfront.protocol.StartElement`
`5`	`6`	`import warlockfe.warlock3.stormfront.protocol.StormfrontEvent`
`6`		`-import warlockfe.warlock3.stormfront.protocol.StormfrontStyleEvent`
	`7`	`+import warlockfe.warlock3.stormfront.protocol.StormfrontPopStyleEvent`
	`8`	`+import warlockfe.warlock3.stormfront.protocol.StormfrontPushStyleEvent`
`7`	`9`
`8`	`10`	`class AHandler : BaseElementListener() {`
`9`	`11`	`override fun startElement(element: StartElement): StormfrontEvent {`
`@@ -14,10 +16,10 @@ class AHandler : BaseElementListener() {`
`14`	`16`	`// TODO handle GS stuff here`
`15`	`17`	`null`
`16`	`18`	`}`
`17`		`- return StormfrontStyleEvent(WarlockStyle.Link(action))`
	`19`	`+ return StormfrontPushStyleEvent(WarlockStyle.Link(action))`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`override fun endElement(): StormfrontEvent {`
`21`		`- return StormfrontStyleEvent(null)`
	`23`	`+ return StormfrontPopStyleEvent`
`22`	`24`	`}`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`package warlockfe.warlock3.stormfront.protocol.elements`
`2`	`2`
`3`		`-import warlockfe.warlock3.stormfront.protocol.*`
	`3`	`+import warlockfe.warlock3.stormfront.protocol.BaseElementListener`
	`4`	`+import warlockfe.warlock3.stormfront.protocol.StartElement`
`4`	`5`	`import warlockfe.warlock3.stormfront.protocol.StormfrontEvent`
`5`		`-import warlockfe.warlock3.stormfront.protocol.StormfrontStyleEvent`
	`6`	`+import warlockfe.warlock3.stormfront.protocol.StormfrontPopStyleEvent`
`6`	`7`
`7`	`8`	`class PopBoldHandler : BaseElementListener() {`
`8`	`9`	`override fun startElement(element: StartElement): StormfrontEvent {`
`9`		`- return StormfrontStyleEvent(null)`
	`10`	`+ return StormfrontPopStyleEvent`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@ import warlockfe.warlock3.core.text.WarlockStyle`
`4`	`4`	`import warlockfe.warlock3.stormfront.protocol.BaseElementListener`
`5`	`5`	`import warlockfe.warlock3.stormfront.protocol.StartElement`
`6`	`6`	`import warlockfe.warlock3.stormfront.protocol.StormfrontEvent`
`7`		`-import warlockfe.warlock3.stormfront.protocol.StormfrontStyleEvent`
	`7`	`+import warlockfe.warlock3.stormfront.protocol.StormfrontPushStyleEvent`
`8`	`8`
`9`	`9`	`class PushBoldHandler() : BaseElementListener() {`
`10`	`10`	`override fun startElement(element: StartElement): StormfrontEvent {`
`11`		`- return StormfrontStyleEvent(WarlockStyle.Bold)`
	`11`	`+ return StormfrontPushStyleEvent(WarlockStyle.Bold)`
`12`	`12`	`}`
`13`	`13`	`}`