pyvda 0.3.2__tar.gz → 0.4.0__tar.gz

{pyvda-0.3.2 → pyvda-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyvda
-Version: 0.3.2
+Version: 0.4.0
 Summary: Python implementation of the VirtualDesktopAccessor for manipulating Windows 10 virtual desktops.
 Home-page: https://github.com/mrob95/py-VirtualDesktopAccessor
 Author: Mike Roberts
@@ -14,7 +14,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 
 # Python Virtual Desktop Accessor
-Python module providing programmatic access to most of the settings accessed through the [Windows 10 task view](https://en.wikipedia.org/wiki/Task_View).
+Python module providing programmatic access to most of the settings accessed through the [Windows task view](https://en.wikipedia.org/wiki/Task_View).
 Including switching virtual desktops, moving windows between virtual desktops, pinning windows and listing the windows on a desktop.
 
 Originally based on https://github.com/Ciantic/VirtualDesktopAccessor.

{pyvda-0.3.2 → pyvda-0.4.0}/README.md

@@ -1,5 +1,5 @@
 # Python Virtual Desktop Accessor
-Python module providing programmatic access to most of the settings accessed through the [Windows 10 task view](https://en.wikipedia.org/wiki/Task_View).
+Python module providing programmatic access to most of the settings accessed through the [Windows task view](https://en.wikipedia.org/wiki/Task_View).
 Including switching virtual desktops, moving windows between virtual desktops, pinning windows and listing the windows on a desktop.
 
 Originally based on https://github.com/Ciantic/VirtualDesktopAccessor.

{pyvda-0.3.2 → pyvda-0.4.0}/pyvda/__init__.py

@@ -34,8 +34,6 @@ Example
     AppView.current().pin()
 """
 
-__version__ = "0.3.2"
-
 import platform
 import os
 
@@ -62,3 +60,5 @@ from .pyvda import (
     get_virtual_desktops,
     set_wallpaper_for_all_desktops,
 )
+
+from ._version import __version__

pyvda-0.4.0/pyvda/_version.py

@@ -0,0 +1 @@
+__version__ = "0.4.0"

{pyvda-0.3.2 → pyvda-0.4.0}/pyvda/com_defns.py

@@ -34,18 +34,45 @@ from comtypes import (
 )
 from .winstring import HSTRING
 
-if not os.getenv("READTHEDOCS"):
+
+def get_windows_build() -> int:
+    """From cpython source:
+
+        The members are named: major, minor, build, platform, service_pack,
+        service_pack_major, service_pack_minor, suite_mask, product_type and
+        platform_version. For backward compatibility, only the first 5 items
+        are available by indexing. All elements are numbers, except
+        service_pack and platform_type which are strings, and platform_version
+        which is a 3-tuple. Platform is always 2. Product_type may be 1 for a
+        workstation, 2 for a domain controller, 3 for a server.
+        Platform_version is a 3-tuple containing a version number that is
+        intended for identifying the OS rather than feature detection.
+
+    In https://github.com/mrob95/pyvda/issues/11 we switched to using
+    `platform_version` for feature detection, but this is not reliable
+    on new versions of Windows 11.
+    """
     winver = sys.getwindowsversion()
-    major, minor, build = winver.platform_version or winver[:3]
+    build = winver.build
+    # dodgy workaround for https://github.com/mrob95/pyvda/issues/11
+    if build < 10000 and winver.platform_version[2] > 10000:
+        build = winver.platform_version[2]
+    return build
+
+
+if not os.getenv("READTHEDOCS"):
+    build = get_windows_build()
     BUILD_OVER_20231 = build >= 20231
     BUILD_OVER_21313 = build >= 21313
     BUILD_OVER_22449 = build >= 22449
     BUILD_OVER_22621 = build >= 22621
+    BUILD_OVER_22631 = build >= 22631
 else:
     BUILD_OVER_20231 = False
     BUILD_OVER_21313 = False
     BUILD_OVER_22449 = False
     BUILD_OVER_22621 = False
+    BUILD_OVER_22631 = False
 
 
 CLSID_ImmersiveShell = GUID("{C2F03A33-21F5-47FA-B4BB-156362A2F239}")
@@ -165,8 +192,9 @@ IApplicationView._methods_ = [
     STDMETHOD(HRESULT, "GetPersistingStateName", (POINTER(PWSTR),)),
 ]
 
-# No change for 22449
-if BUILD_OVER_22621:
+if BUILD_OVER_22631:
+    GUID_IVirtualDesktop = GUID("{3F07F4BE-B107-441A-AF0F-39D82529072C}")
+elif BUILD_OVER_22621:
     GUID_IVirtualDesktop = GUID("{3F07F4BE-B107-441A-AF0F-39D82529072C}")
 elif BUILD_OVER_21313:
     GUID_IVirtualDesktop = GUID("{536D3495-B208-4CC9-AE26-DE8111275BF8}")
@@ -211,8 +239,9 @@ class IVirtualDesktop2(IUnknown):
     ]
 
 
-# Same GUID for 22449
-if BUILD_OVER_22621:
+if BUILD_OVER_22631:
+    GUID_IVirtualDesktopManagerInternal = GUID("{4970BA3D-FD4E-4647-BEA3-D89076EF4B9C}")
+elif BUILD_OVER_22621:
     GUID_IVirtualDesktopManagerInternal = GUID("{A3175F2D-239C-4BD2-8AA0-EEBA8B0B138E}")
 elif BUILD_OVER_21313:
     GUID_IVirtualDesktopManagerInternal = GUID("{B2F925B9-5A0F-4D2E-9F4D-2B1507593C10}")
@@ -224,6 +253,32 @@ else:
 # HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{F31574D6-B682-4CDC-BD56-1827860ABEC6}
 class IVirtualDesktopManagerInternal(IUnknown):
     _iid_ = GUID_IVirtualDesktopManagerInternal
+    if BUILD_OVER_22631:
+        _methods_ = [
+            COMMETHOD([], HRESULT, "GetCount",  (["out"], POINTER(UINT), "pCount"),),
+            STDMETHOD(HRESULT, "MoveViewToDesktop", (POINTER(IApplicationView), POINTER(IVirtualDesktop))),
+            STDMETHOD(HRESULT, "CanViewMoveDesktops", (POINTER(IApplicationView), POINTER(UINT))),
+            COMMETHOD([], HRESULT, "GetCurrentDesktop", (["out"], POINTER(POINTER(IVirtualDesktop)), "pDesktop"),),
+            COMMETHOD([], HRESULT, "GetDesktops", (["out"], POINTER(POINTER(IObjectArray)), "array")),
+            STDMETHOD(HRESULT, "GetAdjacentDesktop", (POINTER(IVirtualDesktop), AdjacentDesktop, POINTER(POINTER(IVirtualDesktop)),)),
+            STDMETHOD(HRESULT, "SwitchDesktop", (POINTER(IVirtualDesktop),)),
+            STDMETHOD(HRESULT, "Unknown1", (POINTER(IVirtualDesktop),)),
+            COMMETHOD([], HRESULT, "CreateDesktopW", (["out"], POINTER(POINTER(IVirtualDesktop)), "pDesktop"),),
+            STDMETHOD(HRESULT, "MoveDesktop", (POINTER(IVirtualDesktop), HWND, INT)),
+            COMMETHOD([], HRESULT, "RemoveDesktop", (["in"], POINTER(IVirtualDesktop), "destroyDesktop"), (["in"], POINTER(IVirtualDesktop), "fallbackDesktop")),
+            COMMETHOD([], HRESULT, "FindDesktop", (["in"], POINTER(GUID), "pGuid"), (["out"], POINTER(POINTER(IVirtualDesktop)), "pDesktop")),
+            STDMETHOD(HRESULT, "Unknown2", (POINTER(IVirtualDesktop), POINTER(POINTER(IObjectArray)), POINTER(POINTER(IObjectArray)))),
+            COMMETHOD([], HRESULT, "SetName", (["in"], POINTER(IVirtualDesktop), "pDesktop"), (["in"], HSTRING, "name")),
+            COMMETHOD([], HRESULT, "SetWallpaper", (["in"], POINTER(IVirtualDesktop), "pDesktop"), (["in"], HSTRING, "path")),
+            COMMETHOD([], HRESULT, "SetWallpaperForAllDesktops", (["in"], HSTRING, "path")),
+            COMMETHOD([], HRESULT, "CopyDesktopState", (["in"], POINTER(IApplicationView), "pView0"), (["in"], POINTER(IApplicationView), "pView0")),
+
+            COMMETHOD([], HRESULT, "Unknown3", (["in"], HSTRING, "a1"), (["out"], POINTER(POINTER(IVirtualDesktop)), "out")),
+            STDMETHOD(HRESULT, "pDesktop", (POINTER(IVirtualDesktop),)),
+            STDMETHOD(HRESULT, "Unknown5", (POINTER(IVirtualDesktop),)),
+            COMMETHOD([], HRESULT, "Unknown6", (["out"], POINTER(POINTER(IVirtualDesktop)), "pDesktop"),),
+            STDMETHOD(HRESULT, "Unknown7"),
+        ]
     if BUILD_OVER_22621:
         _methods_ = [
             COMMETHOD([], HRESULT, "GetCount",  (["out"], POINTER(UINT), "pCount"),),

{pyvda-0.3.2 → pyvda-0.4.0}/pyvda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyvda
-Version: 0.3.2
+Version: 0.4.0
 Summary: Python implementation of the VirtualDesktopAccessor for manipulating Windows 10 virtual desktops.
 Home-page: https://github.com/mrob95/py-VirtualDesktopAccessor
 Author: Mike Roberts
@@ -14,7 +14,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 
 # Python Virtual Desktop Accessor
-Python module providing programmatic access to most of the settings accessed through the [Windows 10 task view](https://en.wikipedia.org/wiki/Task_View).
+Python module providing programmatic access to most of the settings accessed through the [Windows task view](https://en.wikipedia.org/wiki/Task_View).
 Including switching virtual desktops, moving windows between virtual desktops, pinning windows and listing the windows on a desktop.
 
 Originally based on https://github.com/Ciantic/VirtualDesktopAccessor.

{pyvda-0.3.2 → pyvda-0.4.0}/pyvda.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE.txt
 README.md
 setup.py
 pyvda/__init__.py
+pyvda/_version.py
 pyvda/com_defns.py
 pyvda/pyvda.py
 pyvda/utils.py
@@ -10,4 +11,5 @@ pyvda.egg-info/PKG-INFO
 pyvda.egg-info/SOURCES.txt
 pyvda.egg-info/dependency_links.txt
 pyvda.egg-info/requires.txt
-pyvda.egg-info/top_level.txt
+pyvda.egg-info/top_level.txt
+tests/test_desktop_functions.py

{pyvda-0.3.2 → pyvda-0.4.0}/setup.py

@@ -1,13 +1,18 @@
 from setuptools import setup, find_packages
 import os
-import pyvda
 
 def read(*names):
     return open(os.path.join(os.path.dirname(__file__), *names)).read()
 
+# done this way to avoid importing the package during setup
+def get_version():
+    contents = read("pyvda", "_version.py").strip()
+    version = contents.rpartition(" ")[2].strip('"')
+    return version
+
 setup(
     name="pyvda",
-    version=pyvda.__version__,
+    version=get_version(),
     description="Python implementation of the VirtualDesktopAccessor for manipulating Windows 10 virtual desktops.",
     author="Mike Roberts",
     author_email="mike.roberts.2k10@googlemail.com",
@@ -24,4 +29,3 @@ setup(
                    "Programming Language :: Python :: 3.7",
                   ],
 )
-

pyvda-0.4.0/tests/test_desktop_functions.py

@@ -0,0 +1,131 @@
+from comtypes import CoInitializeEx, COINIT_MULTITHREADED
+from typing import Optional
+from pyvda import (
+    AppView,
+    VirtualDesktop,
+    get_virtual_desktops,
+    get_apps_by_z_order,
+)
+import time
+import win32gui
+import threading
+
+current_window = AppView.current()
+current_desktop = VirtualDesktop.current()
+
+def test_move_and_go():
+    current_window.move(VirtualDesktop(1))
+
+    VirtualDesktop(1).go()
+    current_desktop_number = VirtualDesktop.current().number
+    assert current_desktop_number == 1, f"Wanted 1, got {current_desktop_number}"
+
+    current_window_desktop_number = current_window.desktop.number
+    assert current_window_desktop_number == 1, f"Wanted 1, got {current_window_desktop_number}"
+
+    current_window.move(current_desktop)
+    current_desktop.go()
+
+def test_pin_app():
+    assert not current_window.is_app_pinned()
+    current_window.pin_app()
+    assert current_window.is_app_pinned()
+    current_window.unpin_app()
+    assert not current_window.is_app_pinned()
+
+def test_pin_window():
+    assert not current_window.is_pinned()
+    current_window.pin()
+    assert current_window.is_pinned()
+    current_window.unpin()
+    assert not current_window.is_pinned()
+
+def test_z_order():
+    apps = get_apps_by_z_order()
+    assert apps[0] == AppView.current()
+
+    assert len(get_apps_by_z_order(False, False)) > len(apps)
+
+def test_switch_focus():
+    apps = get_apps_by_z_order()
+    if len(apps) == 1:
+        raise Exception("For testing purposes, open another window!")
+
+    ts = apps[0].get_activation_timestamp()
+
+    apps[1].set_focus()
+    time.sleep(1)
+    assert AppView.current() == apps[1]
+    apps[0].switch_to()
+    time.sleep(1)
+    assert AppView.current() == apps[0]
+
+    assert apps[0].get_activation_timestamp() > ts
+
+def test_visibility():
+    cur = AppView.current()
+    assert cur.is_shown_in_switchers()
+    assert cur.is_visible()
+
+def test_current():
+    count = len(get_virtual_desktops())
+    current = VirtualDesktop.current().number
+    assert 0 < current <= count, f"Current desktop number {current} is outside of expected range 0-{count}"
+
+    hwnd = win32gui.GetForegroundWindow()
+    assert AppView(hwnd) == AppView.current()
+    assert AppView(hwnd).is_on_current_desktop()
+
+def test_create_and_remove_desktop():
+    old_count = len(get_virtual_desktops())
+    new = VirtualDesktop.create()
+    new_count = len(get_virtual_desktops())
+    expected_count = old_count + 1
+    assert new_count == expected_count, f"Wanted {expected_count}, got {new_count}"
+    new.go()
+
+    new.remove(fallback=VirtualDesktop(1))
+    new_count = len(get_virtual_desktops())
+    assert new_count == old_count, f"Wanted {new_count}, got {new_count}"
+    fellback = VirtualDesktop.current().number
+    assert fellback == 1, f"Wanted 1, got {fellback}"
+
+    time.sleep(1) # Got to wait for the animation before we can return
+    current_desktop.go()
+
+def test_desktop_names():
+    current_name = current_desktop.name
+    test_name = "pyvda testing"
+    current_desktop.rename(test_name)
+    assert current_desktop.name == test_name, f"Wanted '{test_name}', got '{current_desktop.name}'"
+    current_desktop.rename(current_name)
+    assert current_desktop.name == current_name, f"Wanted '{current_name}', got '{current_desktop.name}'"
+
+def test_move_and_go_threads():
+    error: Optional[Exception] = None
+    def f():
+        nonlocal error
+        try:
+            test_move_and_go()
+        except Exception as e:
+            error = e
+    t = threading.Thread(target=f)
+    t.start()
+    t.join()
+    if error is not None:
+        raise error
+
+def test_initialisation_with_com_mta():
+    error: Optional[Exception] = None
+    def f():
+        nonlocal error
+        try:
+            CoInitializeEx(COINIT_MULTITHREADED)
+            test_move_and_go()
+        except Exception as e:
+            error = e
+    t = threading.Thread(target=f)
+    t.start()
+    t.join()
+    if error is not None:
+        raise error