Merge pull request #498 from RedBearAK/dev_beta

Too many things to name

cosmic-dbus-service/toshy_cosmic_dbus_service.py

@@ -184,6 +184,7 @@ def __init__(self):
 
         self.wdw_handles_dct                    = {}
         self.cosmic_to_foreign_map              = {}
+        self.active_foreign_handle              = None
         self.active_app_class                   = ERR_NO_COSMIC_APP_CLASS
         self.active_wdw_title                   = ERR_NO_COSMIC_WDW_TITLE
 
@@ -278,11 +279,17 @@ def handle_app_id_change(self, handle, app_id):
         if handle not in self.wdw_handles_dct:
             self.wdw_handles_dct[handle] = {}
         self.wdw_handles_dct[handle]['app_id'] = app_id
+        # Deal with possible out-of-order Wayland events
+        if handle == self.active_foreign_handle:
+            self.active_app_class = app_id
 
     def handle_title_change(self, handle, title):
         if handle not in self.wdw_handles_dct:
             self.wdw_handles_dct[handle] = {}
         self.wdw_handles_dct[handle]['title'] = title
+        # Deal with possible out-of-order Wayland events
+        if handle == self.active_foreign_handle:
+            self.active_wdw_title = title
 
     def handle_window_closed(self, handle):
         """Remove window from local state."""
@@ -340,6 +347,7 @@ def handle_state_change(self, handle, states_bytes):
         if ZcosmicToplevelHandleV1.state.activated.value in state_values:
 
             if self.cosmic_protocol_ver >= 2:
+                self.active_foreign_handle = foreign_handle
                 self.active_app_class = self.wdw_handles_dct[foreign_handle]['app_id']
                 self.active_wdw_title = self.wdw_handles_dct[foreign_handle]['title']
 

lib/env_context.py

@@ -9,7 +9,7 @@
 from typing import Dict
 
 # ENV_CONTEXT module version:
-__version__ = '20241210'
+__version__ = '20250118'
 
 VERBOSE = True
 FLUSH = True
@@ -105,8 +105,13 @@ def read_release_files(self) -> Dict[str, str]:
         return contents
 
     def is_process_running(self, process_name):
+        """Utility function to check if process is running, case-insensitive where supported"""
+        cmd = ['pgrep', '-x', '-i', process_name]
+        if self.DISTRO_ID == "centos" and self.DISTRO_VER == "7":
+            # CentOS 7 complains about "-i" being invalid option, so remove it
+            cmd = ['pgrep', '-x', process_name]
         try:
-            subprocess.check_output(['pgrep', '-x', process_name])
+            subprocess.check_output(cmd)
             return True
         except subprocess.CalledProcessError:
             return False
@@ -342,6 +347,11 @@ def get_desktop_environment(self):
             os.environ.get("DESKTOP_SESSION")
         )
 
+        # If it's a colon-separated list in XDG_CURRENT_DESKTOP,
+        # the first entry is the primary desktop environment
+        if _desktop_env and ':' in _desktop_env:
+            _desktop_env = _desktop_env.split(':')[0]
+
         # Check for Qtile if the environment variables were not set/empty
         if not _desktop_env and self.is_qtile_running():
             _desktop_env = 'qtile'
@@ -546,24 +556,26 @@ def get_window_manager(self):
             # Older GNOME may have 'mutter' integrated into 'gnome-shell' process
             'gnome': [
                 'mutter',
-                'gnome-shell'
+                'gnome-shell',
             ],
 
             # LXQt often uses OpenBox, but can use a number of different WMs in X11 or Wayland
             'lxqt': [
-                'openbox',
-                'labwc',
-                'sway',
-                'hyprland',
-                'kwin_wayland',
-                'wayfire',
-                'river'
+                'openbox',          # X11/Xorg window manager
+                'labwc',            # Wayland compositor
+                'sway',             # Wayland compositor
+                'hyprland',         # Wayland compositor
+                'kwin_wayland',     # Wayland compositor
+                'wayfire',          # Wayland compositor
+                'river',            # Wayland compositor
+                'niri',             # Wayland compositor
             ],
 
             'awesome':          'awesome',
             'cinnamon':         'cinnamon',
             'cosmic':           'cosmic-comp',
             'dwm':              'dwm',
+            'hyprland':         'Hyprland',     # the process name is capitalized (this is unusual)
             'i3':               'i3',
             'i3-gaps':          'i3',
             'miracle-wm':       'miracle-wm',

scripts/bin/toshy-gui.sh

@@ -19,4 +19,7 @@ fi
 # shellcheck disable=SC1091
 source "$HOME/.config/toshy/.venv/bin/activate"
 
+# Set the process name for the Toshy Preferences GUI app launcher process
+echo "toshy-pref-stub" > /proc/$$/comm
+
 python3 "$HOME/.config/toshy/toshy_gui.py"

scripts/bin/toshy-services-disable.sh

@@ -37,6 +37,14 @@ else
 fi
 
 
+# This script is pointless if the system doesn't support "user" systemd services (e.g., CentOS 7)
+if ! systemctl --user list-unit-files &>/dev/null; then
+    echo "ERROR: Systemd user services are probably not supported here."
+    echo
+    exit 1
+fi
+
+
 echo -e "\nDisabling Toshy systemd services..."
 
 systemctl --user disable toshy-cosmic-dbus.service

scripts/bin/toshy-services-enable.sh

@@ -37,6 +37,14 @@ else
 fi
 
 
+# This script is pointless if the system doesn't support "user" systemd services (e.g., CentOS 7)
+if ! systemctl --user list-unit-files &>/dev/null; then
+    echo "ERROR: Systemd user services are probably not supported here."
+    echo
+    exit 1
+fi
+
+
 echo -e "\nRe-enabling Toshy systemd services..."
 
 systemctl --user reenable toshy-cosmic-dbus.service

scripts/bin/toshy-services-log.sh

@@ -9,12 +9,6 @@ if [[ $EUID -eq 0 ]]; then
     exit 1
 fi
 
-# # Check if $USER and $HOME environment variables are not empty
-# if [[ -z $USER ]] || [[ -z $HOME ]]; then
-#     echo "\$USER and/or \$HOME environment variables are not set. We need them."
-#     exit 1
-# fi
-
 
 # Check if systemd is actually the init system
 if [[ $(ps -p 1 -o comm=) == "systemd" ]]; then
@@ -52,6 +46,10 @@ trap 'clean_exit' SIGINT
 echo "Showing systemd journal messages for Toshy services (since last boot):"
 
 
+# Set the process name for the Toshy services log process
+echo "toshy-svcs-log" > /proc/$$/comm
+
+
 # Check if stdbuf is available and set the appropriate command
 # Hopefully this may stop certain terminals from holding back journal
 # output and showing new output in large bursts.
@@ -66,4 +64,36 @@ fi
 # -n100 to show the last 100 lines (max) of existing log output
 # journalctl --user -n100 -b -f -u toshy-config -u toshy-session-monitor -u toshy-kde-dbus
 # newer(?) syntax to do the same thing? 
-${STDBUF_CMD} journalctl -n100 -b -f --user-unit 'toshy-*'
+# ${STDBUF_CMD} journalctl -n100 -b -f --user-unit 'toshy-*'
+
+# Had trouble with Tumbleweed not wanting to show any output at all when using the wildcard, so...
+
+# Start building the command with the basic parameters
+cmd_base="${STDBUF_CMD} journalctl -n200 -b -f"
+
+# First get all the Toshy service names into an array
+# Backslashes not required inside parentheses in bash?
+if systemctl --user list-unit-files &>/dev/null; then
+    mapfile -t toshy_services < <(
+        systemctl --user list-unit-files |
+        grep -i toshy |
+        grep -v generated |
+        awk '{print $1}'
+    )
+else
+    # Handle systems without user service support (e.g., CentOS 7)
+    echo "ERROR: Systemd user services are probably not supported here."
+    echo
+    exit 1
+fi
+
+# Add each service to the base command
+cmd_units=""
+for service in "${toshy_services[@]}"; do
+    cmd_units+=" --user-unit $service"
+done
+
+# Combine and execute
+full_cmd="${cmd_base}${cmd_units}"
+# echo "Executing: $full_cmd"
+eval "$full_cmd"

scripts/bin/toshy-services-restart.sh

@@ -38,6 +38,14 @@ else
 fi
 
 
+# This script is pointless if the system doesn't support "user" systemd services (e.g., CentOS 7)
+if ! systemctl --user list-unit-files &>/dev/null; then
+    echo "ERROR: Systemd user services are probably not supported here."
+    echo
+    exit 1
+fi
+
+
 echo -e "\nRestarting Toshy systemd services..."
 
 systemctl --user restart toshy-cosmic-dbus.service

scripts/bin/toshy-services-start.sh

@@ -37,6 +37,14 @@ else
 fi
 
 
+# This script is pointless if the system doesn't support "user" systemd services (e.g., CentOS 7)
+if ! systemctl --user list-unit-files &>/dev/null; then
+    echo "ERROR: Systemd user services are probably not supported here."
+    echo
+    exit 1
+fi
+
+
 echo -e "\nStarting Toshy systemd services..."
 
 systemctl --user start toshy-cosmic-dbus.service

scripts/bin/toshy-services-status.sh

@@ -36,6 +36,13 @@ else
     exit 0
 fi
 
+# This script is pointless if the system doesn't support "user" systemd services (e.g., CentOS 7)
+if ! systemctl --user list-unit-files &>/dev/null; then
+    echo "ERROR: Systemd user services are probably not supported here."
+    echo
+    exit 1
+fi
+
 
 export SYSTEMD_PAGER=""
 

scripts/bin/toshy-services-stop.sh

@@ -38,6 +38,14 @@ else
 fi
 
 
+# This script is pointless if the system doesn't support "user" systemd services (e.g., CentOS 7)
+if ! systemctl --user list-unit-files &>/dev/null; then
+    echo "ERROR: Systemd user services are probably not supported here."
+    echo
+    exit 1
+fi
+
+
 echo "Stopping Toshy systemd services..."
 
 systemctl --user stop toshy-cosmic-dbus.service

scripts/bin/toshy-systemd-remove.sh

@@ -26,6 +26,14 @@ else
 fi
 
 
+# This script is pointless if the system doesn't support "user" systemd services (e.g., CentOS 7)
+if ! systemctl --user list-unit-files &>/dev/null; then
+    echo "ERROR: Systemd user services are probably not supported here."
+    echo
+    exit 1
+fi
+
+
 
 LOCAL_BIN_PATH="$HOME/.local/bin"
 USER_SYSD_PATH="$HOME/.config/systemd/user"

scripts/bin/toshy-systemd-setup.sh

@@ -25,6 +25,15 @@ else
     exit 0
 fi
 
+
+# This script is pointless if the system doesn't support "user" systemd services (e.g., CentOS 7)
+if ! systemctl --user list-unit-files &>/dev/null; then
+    echo "ERROR: Systemd user services are probably not supported here."
+    echo
+    exit 1
+fi
+
+
 LOCAL_BIN_PATH="$HOME/.local/bin"
 USER_SYSD_PATH="$HOME/.config/systemd/user"
 TOSHY_CFG_PATH="$HOME/.config/toshy"

scripts/bin/toshy-tray.sh

@@ -19,4 +19,7 @@ fi
 # shellcheck disable=SC1091
 source "$HOME/.config/toshy/.venv/bin/activate"
 
+# Set the process name for the Toshy Tray app launcher process
+echo "toshy-tray-stub" > /proc/$$/comm
+
 python3 "$HOME/.config/toshy/toshy_tray.py"