Merge branch 'dev' into hyprlock-keybinding

Author: rubiin

Configs/.config/menus/applications.menu

@@ -1,6 +1,6 @@
 
  <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+  "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
 
 <Menu>
 	<Name>Applications</Name>

Configs/.local/lib/hyde/globalcontrol.sh

@@ -439,7 +439,7 @@ get_rofi_pos() {
 #? handle pasting
 paste_string() {
     if ! command -v wtype >/dev/null; then exit 0; fi
-    if [ -t 0 ] || [ -t 1 ]; then return 0; fi
+    if [ -t 1 ]; then return 0; fi
     ignore_paste_file="$HYDE_STATE_HOME/ignore.paste"
 
     if [[ ! -e "${ignore_paste_file}" ]]; then

Configs/.local/lib/hyde/mediaplayer.py

@@ -71,32 +71,41 @@ def create_tooltip_text(
 
     return tooltip
 
-
-def write_output(track, artist, playing, player, tooltip_text):
-    logger.info("Writing output")
-
+def format_artist_track(artist, track, playing, max_length):
     # Use the appropriate prefix based on playback status
     prefix = prefix_playing if playing else prefix_paused
-    max_length = max_length_module
-
-    # Calculate the total length and truncate track if necessary
-    total_length = len(track) + len(artist)
-    if total_length > max_length:
-        available_length = max(0, max_length - len(artist))
-        track = (
-            f"{track[:available_length]}…" if len(track) > available_length else track
-        )
+    prefix_separator = "  "
+    separator = "  "
+    full_length = len(artist + track)
 
-    # Generate the "text" based on the presence of track and artist
     if track and not artist:
-        output_text = f"{prefix}  <b>{track}</b>"
+        if len(track) != track[:max_length]:
+            track = track[:max_length].rstrip() + "…"
+        output_text = f"{prefix}{prefix_separator}<b>{track}</b>"
     elif track and artist:
-        output_text = f"{prefix}  <i>{artist}</i>  <b>{track}</b>"
+        if full_length > max_length:
+            # proportion how to share max length between track and artist
+            artist_weight = 0.65
+            track_weight = 1 - artist_weight
+            artist_limit = int(max_length * artist_weight)
+            track_limit = int(max_length * track_weight)
+
+            if len(artist) != artist[:artist_limit]:
+                artist = artist[:artist_limit].rstrip() + "…"
+            if len(track) != track[:track_limit]:
+                track = track[:track_limit].rstrip() + "…"
+
+        output_text = f"{prefix}{prefix_separator}<i>{artist}</i>{separator}<b>{track}</b>"
     else:
         output_text = "<b>Nothing playing</b>"
+    return output_text
+
+
+def write_output(track, artist, playing, player, tooltip_text):
+    logger.info("Writing output")
 
     output_data = {
-        "text": output_text,
+        "text": format_artist_track(artist, track, playing, max_length_module),
         "class": "custom-" + player.props.player_name,
         "alt": player.props.player_name,
         "tooltip": tooltip_text,