Merge pull request 'Focus correct sddm-greeter window ID if we have more than one' (#4) from bugfix/3-delay-sddm-check-til-xauth into master

Reviewed-on: #4

main.py

@@ -6,12 +6,14 @@ import sys
 import time
 import cec
 import logging
+import inflect
 from rich import traceback
 from rich.console import Console
 from rich.logging import RichHandler
 from inotify_simple import INotify, flags
 traceback.install()
 console = Console()
+p = inflect.engine()
 
 
 FORMAT = "%(message)s"
@@ -21,6 +23,7 @@ logging.basicConfig(
     )]
 )
 log = logging.getLogger("rich")
+log.setLevel("DEBUG")
 
 
 # Vars
@@ -53,6 +56,100 @@ log.debug(f"Printing environment vars ...")
 log.debug(os.environ)
 
 
+def x_focus_window(window_id: str) -> bool:
+    log.debug(f"Focusing window ID {window_id} ...")
+    try:
+        subprocess.run(
+            ["xdotool", "windowfocus", window_id],
+            check=True,
+            stdout=subprocess.PIPE,
+            encoding="utf-8")
+        log.info(f"Two 'sddm-greeter' windows detected one of which had focus, changed focus to the other one.")
+        return True
+    except subprocess.CalledProcessError as x_focus_window_error:
+        log.warning(f"Failed to focus window ID {window_id}, we'll not try again")
+        log.warning(x_focus_window_error)
+        return False
+
+
+def sddm_greeter_window_ids() -> list:
+    sddm_check_attempt = 1
+    sddm_check_attempts_max = 2
+    sddm_check_sleep = 2
+    while sddm_check_attempt <= sddm_check_attempts_max:
+        log.debug(f"Checking if 'sddm-greeter' window exists "
+                  f"({sddm_check_attempt} of {sddm_check_attempts_max}) ...")
+        try:
+            dm_windows = subprocess.run(
+                ["xdotool", "search", "--onlyvisible", "--classname", "sddm-greeter"],
+                check=True,
+                capture_output=True,
+                encoding="utf-8")
+            return dm_windows.stdout.splitlines()
+        except subprocess.CalledProcessError as xdotool_error:
+            if sddm_check_attempt < sddm_check_attempts_max:
+                log.debug(f"No 'sddm-greeter' window, checking again in "
+                          f"""{sddm_check_sleep} {p.plural("second", sddm_check_sleep)} ...""")
+                sddm_check_attempt += 1
+                time.sleep(sddm_check_sleep)
+            else:
+                log.debug(f"No 'sddm-greeter' window exists, doing nothing")
+                log.debug(xdotool_error)
+                return []
+
+
+def sddm_change_focus_if_two_windows() -> bool:
+    dm_windows = sddm_greeter_window_ids()
+    if not dm_windows:
+        return False
+    else:
+        sddm_focus_attempt = 1
+        sddm_focus_attempt_max = 2
+        sddm_focus_sleep = 2
+        sddm_window_count_attempt = 1
+        sddm_window_count_attempt_max = 2
+        while sddm_focus_attempt <= sddm_focus_attempt_max:
+            log.debug(f"Checking if 'sddm-greeter' window has focus "
+                      f"({sddm_focus_attempt} of {sddm_focus_attempt_max}) ...")
+            try:
+                x_window_focus = subprocess.run(
+                    ["xdotool", "getwindowfocus"],
+                    check=True,
+                    capture_output=True,
+                    encoding="utf-8")
+                x_window_id_has_focus = x_window_focus.stdout.splitlines()[0]
+                if x_window_id_has_focus in dm_windows:
+                    log.debug(f"An 'sddm-greeter' window has focus")
+                    if len(dm_windows) > 1:
+                        if len(dm_windows) == 2:
+                            log.debug(f"We're assuming we have to focus the other one")
+                            log.debug(f"From list of 'sddm-greeter' window IDs ({dm_windows}) remove the one that has "
+                                      f"focus ({x_window_id_has_focus})")
+                            dm_windows.remove(x_window_id_has_focus)
+                            x_focus_window(dm_windows[0])
+                            return True
+                        else:
+                            log.warning(f"Number of 'sddm-greeter' windows ({len(dm_windows)}) unexpected, "
+                                        f"not doing anything")
+                            return False
+                    else:
+                        log.debug(f"No other 'sddm-greeter' windows exist, checking again ...")
+                        sddm_window_count_attempt += 1
+                        if sddm_window_count_attempt == sddm_window_count_attempt_max:
+                            log.debug(f"No other 'sddm-greeter' windows exist, no need to focus anything")
+                            return False
+            except subprocess.CalledProcessError as xdotool_error:
+                if sddm_focus_attempt < sddm_focus_attempt_max:
+                    log.debug(f"Unable to get ID of focused window, checking again in "
+                              f"""{sddm_focus_sleep} {p.plural("second", sddm_focus_sleep)} ...""")
+                    sddm_focus_attempt += 1
+                    time.sleep(sddm_focus_sleep)
+                else:
+                    log.warning(f"Unable to get ID of focused window")
+                    log.warning(xdotool_error)
+                    return False
+
+
 def propagate_keypress(cec_key_id: int) -> None:
     log.info(f"""Key press '{xdo_map[cec_key_id]["human_readable"]}' detected (CEC key ID '{cec_key_id}')""")
     subprocess.run(["xdotool", "key", xdo_map[cec_key_id]["xdo"]], check=True)
@@ -101,6 +198,7 @@ def signal_handler(rx_signal: int, frame) -> None:
 def set_xauth_env(file_abs_path: str) -> None:
     os.environ["XAUTHORITY"] = file_abs_path
     log.debug(f"""Env variable 'XAUTHORITY' set to '{os.environ["XAUTHORITY"]}'""")
+    sddm_change_focus_if_two_windows()
 
 
 signal.signal(signal.SIGINT, signal_handler)
@@ -125,9 +223,9 @@ xdo_map = {
 }
 
 
-set_xauth_env(xauth_abs_path)
 os.environ["DISPLAY"] = ":0"
 log.debug(f"""Env variable 'DISPLAY' set to '{os.environ["DISPLAY"]}'""")
+set_xauth_env(xauth_abs_path)
 
 
 log.debug(f"Activating event handlers ...")

requirements.in

@@ -1,3 +1,4 @@
 cec
 inotify_simple
-rich
+rich
+inflect

requirements.txt

@@ -10,6 +10,10 @@ colorama==0.4.4
     # via rich
 commonmark==0.9.1
     # via rich
+inflect==5.4.0
+    # via -r requirements.in
+inotify-simple==1.3.5
+    # via -r requirements.in
 pygments==2.11.2
     # via rich
 rich==11.2.0