Lyrics editor improvements (Taiko2k#2256)

* visible indicator for which column is active + new rect_abs function

* fixup! visible indicator for which column is active + new rect_abs function

* optimization

* getting tired. starting 2 work on save box

* exhausting myself

* part 1 of save box done. switching gears

* column labels basics

* minor optimization

* starting to work on better text cursor behavior

* continued improvements

* new edit handling is complete i think

* time button refinements

* replace all humiliation

* icon changes, hacky workaround for text display bug, text edit fix for small window mode

* (mostly) fix time display desync bug

* beginnings of multiline text box

* major progress on multiline text box

* mlt

* no idea what i'm doing

* progress

* text highlighting basics

* multiline text box is alpha ready

* starting to move back towards the editor

* major highlight progress

* yeah

* don't remenbver what i did employers don't read these please

* we are starting our final descent into pr airport

* further refinements

* ctrl text editing with line breax

* abject misery back 2 drawing board. cool new ddt function

* i think i've saved it i think all the text editing and highlighting is actually working again

* regular typing and deleting fixed. found bug where you can't edit the very first character

* possibly actually fixed but i dont believe it

* Sloptimization™

* my brain is leaking out my ears

* cleanup

* one final nut to crack before i'm done

* slop appeasement

* fixed a severe and perplexing buggit add .git add .git add .! i think i'm genuinely ready now

* final cleanup

* styles and types

* tiny spacing change

* chaunge logge

* final

Author: rexendevar

CHANGELOG.md

@@ -2,6 +2,12 @@
 Changelog
 ---------
 
+### v11.1.2
+
+ - Revamps & refinements to both synced and static lyrics editors
+ - Fixed bug that caused GNOME to occasionally crash when Tauon did
+
+
 ### v11.1.1
 
  - Fixed seek and volume bars ignoring theme transparency (Carbon, Neon Love, Sunken)
@@ -11,6 +17,7 @@ Changelog
 ### v11.1.0
 
  - Added new Frost UI backround mode
+ - Improved touch support
  - Combined visualiser and top panel menu
  - Fixed columns auto resize
  - Fixed synced lyrics not showing in lyrics widget

src/tauon/__main__.py

@@ -662,3 +662,4 @@ def polyline(points: list[tuple[float, float]]) -> None:
 			open_crash_log(crash_log_path)
 		elif buttonid.value == BUTTON_ID_QUIT:
 			pass
+		sdl3.SDL_Quit()

src/tauon/t_modules/t_draw.py

@@ -175,6 +175,8 @@ def __init__(self, renderer: sdl3.LP_SDL_Renderer) -> None:
 
 		self.was_truncated = False
 
+		self._locate_cache: dict[tuple[str, int], Pango.Layout] = {}
+
 	def load_image(self, g: BytesIO) -> sdl3.LP_SDL_Surface:
 		size = g.getbuffer().nbytes
 		pointer = ctypes.c_void_p(ctypes.addressof(ctypes.c_char.from_buffer(g.getbuffer())))
@@ -259,6 +261,24 @@ def rect(self, rectangle: tuple[int, int, int, int], colour: ColourRGBA) -> None
 		# else:
 		# 	sdl3.SDL_RenderDrawRect(self.renderer, self.sdlrect)
 
+	def rect_abs(self, rectangle: tuple[int, int, int, int], colour: ColourRGBA) -> None:
+		"""x1, y1, x2, y2"""
+		sdl3.SDL_SetRenderDrawColor(self.renderer, colour.r, colour.g, colour.b, colour.a)
+
+		x1 = min(rectangle[0], rectangle[2])
+		y1 = min(rectangle[1], rectangle[3])
+		x2 = max(rectangle[0], rectangle[2])
+		y2 = max(rectangle[1], rectangle[3])
+		self.sdlrect.x = float(x1)
+		self.sdlrect.y = float(y1)
+		self.sdlrect.w = float(x2-x1)
+		self.sdlrect.h = float(y2-y1)
+
+		# if fill:
+		sdl3.SDL_RenderFillRect(self.renderer, self.sdlrect)
+		# else:
+		# 	sdl3.SDL_RenderDrawRect(self.renderer, self.sdlrect)
+
 	def bordered_rect(
 		self, rectangle: tuple[int, int, int, int], fill_colour: ColourRGBA, outer_colour: ColourRGBA, border_size: int
 	) -> None:
@@ -618,7 +638,7 @@ def __draw_text_cairo(
 				layout.set_text(text, -1)
 			except Exception:
 				logging.exception(f"Text error on text: {text}")
-				layout.set_text(text.encode("utf-8", "replace").decode("utf-8"), -1)
+				layout.set_text(text.encode("utf-8", "replace").decode(), -1)
 
 			# logging.info(layout.get_direction(0))
 
@@ -759,3 +779,78 @@ def text(
 				)
 
 		return self.__draw_text_cairo(location, text, colour, font, max_w, bg, align, real_bg=real_bg, key=key)
+
+	def get_wrapped_lines(self, text: str, font: int, max_x: int) -> list[str]:
+		"""this function is 95% Genuine Slop™
+		imagines a beautiful world where the input text is wrapped and returns the separated lines as they would appear"""
+		if not text:
+			return []
+
+		if font not in self.f_dict:
+			logging.info(f"Font not loaded: {font!s}")
+			return [text]
+
+		max_x += 12
+		max_x = round(max_x)
+
+		layout = self.layout
+		layout.set_auto_dir(False)
+		layout.set_font_description(self._font_description(font))
+		layout.set_wrap(Pango.WrapMode.WORD_CHAR)
+		layout.set_ellipsize(Pango.EllipsizeMode.NONE)
+		layout.set_width(max_x * 1000)
+		layout.set_height(-1)
+
+		all_lines: list[str] = []
+
+		# Split on real newlines ourselves so Pango only ever wraps a single
+		# paragraph at a time — that way every line it returns is a soft wrap,
+		# and every boundary between paragraphs is unambiguously a real \n.
+		for paragraph in text.split("\n"):
+			if paragraph == "":
+				all_lines.append("\n")
+				continue
+
+			try:
+				layout.set_text(paragraph, -1)
+			except Exception:
+				logging.exception(f"Text error on text: {paragraph}")
+				paragraph = paragraph.encode(encoding="replace").decode()
+				layout.set_text(paragraph, -1)
+
+			encoded = paragraph.encode()
+			for i, line in enumerate(layout.get_lines_readonly()):
+				start = line.start_index
+				end = start + line.length
+				if i == 0 and all_lines:
+					all_lines.append('\n' + encoded[start:end].decode())
+				else:
+					all_lines.append(encoded[start:end].decode())
+
+		return all_lines
+
+	def measure_and_locate(self, text: str, font: int, x_pixels: float, y_pixels: float = 0) -> tuple[float, int, bool]:
+		"""this function is 100% Genuine Slop™
+		provides a faster way of setting your cursor position based on mouse position"""
+		key = (text, font)
+		layout = self._locate_cache.get(key)
+		if layout is None:
+			layout = PangoCairo.create_layout(self.context)
+			layout.set_font_description(self._font_description(font))
+			layout.set_width(-1)
+			layout.set_text(text, -1)
+			self._locate_cache[key] = layout
+			# simple bound so this doesn't grow forever
+			if len(self._locate_cache) > 64:
+				self._locate_cache.pop(next(iter(self._locate_cache)))
+
+		full_w_pango, _ = layout.get_size()
+		full_w_px = full_w_pango / Pango.SCALE
+
+		inside, index, trailing = layout.xy_to_index(
+			round(x_pixels * Pango.SCALE),
+			round(y_pixels * Pango.SCALE),
+		)
+		char_index = len(text.encode()[:index].decode())
+
+		return full_w_px, char_index, bool(trailing)