diff --git a/build/mqtt_srv/Analysis-00.toc b/build/mqtt_srv/Analysis-00.toc index e46c489..a8b248f 100644 --- a/build/mqtt_srv/Analysis-00.toc +++ b/build/mqtt_srv/Analysis-00.toc @@ -229,6 +229,8 @@ 'PYMODULE'), ('threading', '/usr/lib/python3.10/threading.py', 'PYMODULE'), ('_threading_local', '/usr/lib/python3.10/_threading_local.py', 'PYMODULE'), + ('tracemalloc', '/usr/lib/python3.10/tracemalloc.py', 'PYMODULE'), + ('_py_abc', '/usr/lib/python3.10/_py_abc.py', 'PYMODULE'), ('getpass', '/usr/lib/python3.10/getpass.py', 'PYMODULE'), ('nturl2path', '/usr/lib/python3.10/nturl2path.py', 'PYMODULE'), ('ftplib', '/usr/lib/python3.10/ftplib.py', 'PYMODULE'), @@ -236,8 +238,6 @@ ('shlex', '/usr/lib/python3.10/shlex.py', 'PYMODULE'), ('mimetypes', '/usr/lib/python3.10/mimetypes.py', 'PYMODULE'), ('http.cookiejar', '/usr/lib/python3.10/http/cookiejar.py', 'PYMODULE'), - ('tracemalloc', '/usr/lib/python3.10/tracemalloc.py', 'PYMODULE'), - ('_py_abc', '/usr/lib/python3.10/_py_abc.py', 'PYMODULE'), ('stringprep', '/usr/lib/python3.10/stringprep.py', 'PYMODULE'), ('autorandr', '/home/jd/.local/lib/python3.10/site-packages/autorandr.py', @@ -377,6 +377,7 @@ ('urllib3.util.request', '/usr/lib/python3/dist-packages/urllib3/util/request.py', 'PYMODULE'), + ('brotli', '/usr/lib/python3/dist-packages/brotli.py', 'PYMODULE'), ('urllib3.util.queue', '/usr/lib/python3/dist-packages/urllib3/util/queue.py', 'PYMODULE'), @@ -1337,6 +1338,9 @@ ('simplejson/_speedups.cpython-310-x86_64-linux-gnu.so', '/usr/lib/python3/dist-packages/simplejson/_speedups.cpython-310-x86_64-linux-gnu.so', 'EXTENSION'), + ('_brotli.cpython-310-x86_64-linux-gnu.so', + '/usr/lib/python3/dist-packages/_brotli.cpython-310-x86_64-linux-gnu.so', + 'EXTENSION'), ('_cffi_backend.cpython-310-x86_64-linux-gnu.so', '/usr/lib/python3/dist-packages/_cffi_backend.cpython-310-x86_64-linux-gnu.so', 'EXTENSION'), @@ -1357,11 +1361,13 @@ 'EXTENSION'), ('liblzma.so.5', '/lib/x86_64-linux-gnu/liblzma.so.5', 'BINARY'), ('libbz2.so.1.0', '/lib/x86_64-linux-gnu/libbz2.so.1.0', 'BINARY'), - ('libssl.so.3', '/lib/x86_64-linux-gnu/libssl.so.3', 'BINARY'), ('libcrypto.so.3', '/lib/x86_64-linux-gnu/libcrypto.so.3', 'BINARY'), + ('libssl.so.3', '/lib/x86_64-linux-gnu/libssl.so.3', 'BINARY'), ('libmpdec.so.3', '/lib/x86_64-linux-gnu/libmpdec.so.3', 'BINARY'), - ('libtinfo.so.6', '/lib/x86_64-linux-gnu/libtinfo.so.6', 'BINARY'), ('libncursesw.so.6', '/lib/x86_64-linux-gnu/libncursesw.so.6', 'BINARY'), + ('libtinfo.so.6', '/lib/x86_64-linux-gnu/libtinfo.so.6', 'BINARY'), + ('libgcc_s.so.1', '/lib/x86_64-linux-gnu/libgcc_s.so.1', 'BINARY'), + ('libstdc++.so.6', '/lib/x86_64-linux-gnu/libstdc++.so.6', 'BINARY'), ('libffi.so.8', '/lib/x86_64-linux-gnu/libffi.so.8', 'BINARY'), ('libuuid.so.1', '/lib/x86_64-linux-gnu/libuuid.so.1', 'BINARY'), ('libpython3.10.so.1.0', @@ -1372,22 +1378,22 @@ [('base_library.zip', '/home/jd/projects/mqtt_srv/build/mqtt_srv/base_library.zip', 'DATA'), - ('cryptography-3.4.8.egg-info/not-zip-safe', - '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/not-zip-safe', - 'DATA'), ('certifi/cacert.pem', '/usr/lib/python3/dist-packages/certifi/cacert.pem', 'DATA'), - ('cryptography-3.4.8.egg-info/dependency_links.txt', - '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/dependency_links.txt', - 'DATA'), - ('cryptography-3.4.8.egg-info/requires.txt', - '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/requires.txt', + ('cryptography-3.4.8.egg-info/not-zip-safe', + '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/not-zip-safe', 'DATA'), ('cryptography-3.4.8.egg-info/top_level.txt', '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/top_level.txt', 'DATA'), ('cryptography-3.4.8.egg-info/PKG-INFO', '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/PKG-INFO', + 'DATA'), + ('cryptography-3.4.8.egg-info/requires.txt', + '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/requires.txt', + 'DATA'), + ('cryptography-3.4.8.egg-info/dependency_links.txt', + '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/dependency_links.txt', 'DATA')], []) diff --git a/build/mqtt_srv/EXE-00.toc b/build/mqtt_srv/EXE-00.toc index d53dbd4..26ab4e4 100644 --- a/build/mqtt_srv/EXE-00.toc +++ b/build/mqtt_srv/EXE-00.toc @@ -114,6 +114,9 @@ ('simplejson/_speedups.cpython-310-x86_64-linux-gnu.so', '/usr/lib/python3/dist-packages/simplejson/_speedups.cpython-310-x86_64-linux-gnu.so', 'EXTENSION'), + ('_brotli.cpython-310-x86_64-linux-gnu.so', + '/usr/lib/python3/dist-packages/_brotli.cpython-310-x86_64-linux-gnu.so', + 'EXTENSION'), ('_cffi_backend.cpython-310-x86_64-linux-gnu.so', '/usr/lib/python3/dist-packages/_cffi_backend.cpython-310-x86_64-linux-gnu.so', 'EXTENSION'), @@ -134,11 +137,13 @@ 'EXTENSION'), ('liblzma.so.5', '/lib/x86_64-linux-gnu/liblzma.so.5', 'BINARY'), ('libbz2.so.1.0', '/lib/x86_64-linux-gnu/libbz2.so.1.0', 'BINARY'), - ('libssl.so.3', '/lib/x86_64-linux-gnu/libssl.so.3', 'BINARY'), ('libcrypto.so.3', '/lib/x86_64-linux-gnu/libcrypto.so.3', 'BINARY'), + ('libssl.so.3', '/lib/x86_64-linux-gnu/libssl.so.3', 'BINARY'), ('libmpdec.so.3', '/lib/x86_64-linux-gnu/libmpdec.so.3', 'BINARY'), - ('libtinfo.so.6', '/lib/x86_64-linux-gnu/libtinfo.so.6', 'BINARY'), ('libncursesw.so.6', '/lib/x86_64-linux-gnu/libncursesw.so.6', 'BINARY'), + ('libtinfo.so.6', '/lib/x86_64-linux-gnu/libtinfo.so.6', 'BINARY'), + ('libgcc_s.so.1', '/lib/x86_64-linux-gnu/libgcc_s.so.1', 'BINARY'), + ('libstdc++.so.6', '/lib/x86_64-linux-gnu/libstdc++.so.6', 'BINARY'), ('libffi.so.8', '/lib/x86_64-linux-gnu/libffi.so.8', 'BINARY'), ('libuuid.so.1', '/lib/x86_64-linux-gnu/libuuid.so.1', 'BINARY'), ('libpython3.10.so.1.0', @@ -147,28 +152,28 @@ ('base_library.zip', '/home/jd/projects/mqtt_srv/build/mqtt_srv/base_library.zip', 'DATA'), - ('cryptography-3.4.8.egg-info/not-zip-safe', - '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/not-zip-safe', - 'DATA'), ('certifi/cacert.pem', '/usr/lib/python3/dist-packages/certifi/cacert.pem', 'DATA'), - ('cryptography-3.4.8.egg-info/dependency_links.txt', - '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/dependency_links.txt', - 'DATA'), - ('cryptography-3.4.8.egg-info/requires.txt', - '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/requires.txt', + ('cryptography-3.4.8.egg-info/not-zip-safe', + '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/not-zip-safe', 'DATA'), ('cryptography-3.4.8.egg-info/top_level.txt', '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/top_level.txt', 'DATA'), ('cryptography-3.4.8.egg-info/PKG-INFO', '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/PKG-INFO', + 'DATA'), + ('cryptography-3.4.8.egg-info/requires.txt', + '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/requires.txt', + 'DATA'), + ('cryptography-3.4.8.egg-info/dependency_links.txt', + '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/dependency_links.txt', 'DATA')], [], False, False, - 1702645014, + 1711464906, [('run', '/home/jd/.local/lib/python3.10/site-packages/PyInstaller/bootloader/Linux-64bit-intel/run', 'EXECUTABLE')]) diff --git a/build/mqtt_srv/PKG-00.toc b/build/mqtt_srv/PKG-00.toc index 3324abc..d71c549 100644 --- a/build/mqtt_srv/PKG-00.toc +++ b/build/mqtt_srv/PKG-00.toc @@ -107,6 +107,9 @@ ('simplejson/_speedups.cpython-310-x86_64-linux-gnu.so', '/usr/lib/python3/dist-packages/simplejson/_speedups.cpython-310-x86_64-linux-gnu.so', 'EXTENSION'), + ('_brotli.cpython-310-x86_64-linux-gnu.so', + '/usr/lib/python3/dist-packages/_brotli.cpython-310-x86_64-linux-gnu.so', + 'EXTENSION'), ('_cffi_backend.cpython-310-x86_64-linux-gnu.so', '/usr/lib/python3/dist-packages/_cffi_backend.cpython-310-x86_64-linux-gnu.so', 'EXTENSION'), @@ -127,11 +130,13 @@ 'EXTENSION'), ('liblzma.so.5', '/lib/x86_64-linux-gnu/liblzma.so.5', 'BINARY'), ('libbz2.so.1.0', '/lib/x86_64-linux-gnu/libbz2.so.1.0', 'BINARY'), - ('libssl.so.3', '/lib/x86_64-linux-gnu/libssl.so.3', 'BINARY'), ('libcrypto.so.3', '/lib/x86_64-linux-gnu/libcrypto.so.3', 'BINARY'), + ('libssl.so.3', '/lib/x86_64-linux-gnu/libssl.so.3', 'BINARY'), ('libmpdec.so.3', '/lib/x86_64-linux-gnu/libmpdec.so.3', 'BINARY'), - ('libtinfo.so.6', '/lib/x86_64-linux-gnu/libtinfo.so.6', 'BINARY'), ('libncursesw.so.6', '/lib/x86_64-linux-gnu/libncursesw.so.6', 'BINARY'), + ('libtinfo.so.6', '/lib/x86_64-linux-gnu/libtinfo.so.6', 'BINARY'), + ('libgcc_s.so.1', '/lib/x86_64-linux-gnu/libgcc_s.so.1', 'BINARY'), + ('libstdc++.so.6', '/lib/x86_64-linux-gnu/libstdc++.so.6', 'BINARY'), ('libffi.so.8', '/lib/x86_64-linux-gnu/libffi.so.8', 'BINARY'), ('libuuid.so.1', '/lib/x86_64-linux-gnu/libuuid.so.1', 'BINARY'), ('libpython3.10.so.1.0', @@ -140,23 +145,23 @@ ('base_library.zip', '/home/jd/projects/mqtt_srv/build/mqtt_srv/base_library.zip', 'DATA'), - ('cryptography-3.4.8.egg-info/not-zip-safe', - '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/not-zip-safe', - 'DATA'), ('certifi/cacert.pem', '/usr/lib/python3/dist-packages/certifi/cacert.pem', 'DATA'), - ('cryptography-3.4.8.egg-info/dependency_links.txt', - '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/dependency_links.txt', - 'DATA'), - ('cryptography-3.4.8.egg-info/requires.txt', - '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/requires.txt', + ('cryptography-3.4.8.egg-info/not-zip-safe', + '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/not-zip-safe', 'DATA'), ('cryptography-3.4.8.egg-info/top_level.txt', '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/top_level.txt', 'DATA'), ('cryptography-3.4.8.egg-info/PKG-INFO', '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/PKG-INFO', + 'DATA'), + ('cryptography-3.4.8.egg-info/requires.txt', + '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/requires.txt', + 'DATA'), + ('cryptography-3.4.8.egg-info/dependency_links.txt', + '/usr/lib/python3/dist-packages/cryptography-3.4.8.egg-info/dependency_links.txt', 'DATA')], False, False, diff --git a/build/mqtt_srv/PYZ-00.pyz b/build/mqtt_srv/PYZ-00.pyz index c3fb9f9..7f8cccc 100644 Binary files a/build/mqtt_srv/PYZ-00.pyz and b/build/mqtt_srv/PYZ-00.pyz differ diff --git a/build/mqtt_srv/PYZ-00.toc b/build/mqtt_srv/PYZ-00.toc index 61ccc56..ef8cc56 100644 --- a/build/mqtt_srv/PYZ-00.toc +++ b/build/mqtt_srv/PYZ-00.toc @@ -71,6 +71,7 @@ 'PYMODULE'), ('base64', '/usr/lib/python3.10/base64.py', 'PYMODULE'), ('bisect', '/usr/lib/python3.10/bisect.py', 'PYMODULE'), + ('brotli', '/usr/lib/python3/dist-packages/brotli.py', 'PYMODULE'), ('bz2', '/usr/lib/python3.10/bz2.py', 'PYMODULE'), ('calendar', '/usr/lib/python3.10/calendar.py', 'PYMODULE'), ('certifi', '/usr/lib/python3/dist-packages/certifi/__init__.py', 'PYMODULE'), diff --git a/build/mqtt_srv/mqtt_srv.pkg b/build/mqtt_srv/mqtt_srv.pkg index f2f803e..96e8e61 100644 Binary files a/build/mqtt_srv/mqtt_srv.pkg and b/build/mqtt_srv/mqtt_srv.pkg differ diff --git a/build/mqtt_srv/warn-mqtt_srv.txt b/build/mqtt_srv/warn-mqtt_srv.txt index 70874a7..a4c0fab 100644 --- a/build/mqtt_srv/warn-mqtt_srv.txt +++ b/build/mqtt_srv/warn-mqtt_srv.txt @@ -49,7 +49,6 @@ missing module named urlparse - imported by paho.mqtt.client (optional), request missing module named UserDict - imported by simplejson.ordered_dict (top-level) missing module named cStringIO - imported by simplejson.compat (conditional, optional) missing module named copy_reg - imported by cStringIO (top-level) -missing module named brotli - imported by urllib3.util.request (optional), urllib3.response (optional) missing module named Queue - imported by urllib3.util.queue (conditional), requests_toolbelt._compat (conditional) missing module named urllib3.packages.six - imported by urllib3.packages (top-level), urllib3.util.ssltransport (top-level) missing module named "'six.moves.urllib'.parse" - imported by urllib3.request (top-level), urllib3.poolmanager (top-level), urllib3.contrib.appengine (top-level) diff --git a/build/mqtt_srv/xref-mqtt_srv.html b/build/mqtt_srv/xref-mqtt_srv.html index 81e168c..f866d32 100644 --- a/build/mqtt_srv/xref-mqtt_srv.html +++ b/build/mqtt_srv/xref-mqtt_srv.html @@ -520,6 +520,16 @@ imported by: +
+ + _brotli /usr/lib/python3/dist-packages/_brotli.cpython-310-x86_64-linux-gnu.so
+imported by: + brotli + +
+ +
+
_bz2 /usr/lib/python3.10/lib-dynload/_bz2.cpython-310-x86_64-linux-gnu.so
@@ -2594,8 +2604,13 @@ imported by:
- brotli -MissingModule
+ brotli +SourceModule
+imports: + _brotli + +
+
imported by: urllib3.response • urllib3.util.request diff --git a/dist/mqtt_srv b/dist/mqtt_srv index 0e050f3..1c9b891 100755 Binary files a/dist/mqtt_srv and b/dist/mqtt_srv differ diff --git a/mqtt_srv.py b/mqtt_srv.py index b16d453..b941a51 100755 --- a/mqtt_srv.py +++ b/mqtt_srv.py @@ -471,7 +471,8 @@ def on_message(client, userdata, msg): if myObj["cmd"] == "nas_cmd": print("Executing NAS") - cmnd = "/share/ZFS530_DATA/.qpkg/QKVM/usr/bin/virsh domstate " + str(myObj["target"]) + #cmnd = "/share/ZFS530_DATA/.qpkg/QKVM/usr/bin/virsh domstate " + str(myObj["target"]) + cmnd = "/share/ZFS532_DATA/.qpkg/QKVM/usr/bin/virsh domstate " + str(myObj["target"]) print(cmnd) status, output = subprocess.getstatusoutput(cmnd) print(output) @@ -797,33 +798,23 @@ def on_message(client, userdata, msg): #xrandr --output DisplayPort-1 --primary --auto --mode 3440x1440 --output HDMI-A-0 --auto --left-of DVI-I-1-1 --mode 1920x1080 --output DisplayPort-0 --auto --left-of DisplayPort-1 --mode 2560x1440 --output DVI-I-1-1 --above DisplayPort-1 --mode 1920x1080 if myObj["target"] == "mid": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --off" + myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {left[0]} --off --output {tleft[0]} --off --output {tright[0]} --off" elif myObj["target"] == "left": - myCmd = f"xrandr --output {left[0]} --primary --auto --mode {left[1]} --output {right[0]} --off --output {mid[0]} --off" - elif myObj["target"] == "midleftright": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" - elif myObj["target"] == "midright": - myCmd = f"xrandr --output {right[0]} --primary --auto --mode {right[1]} --output {mid[0]} --auto --left-of {right[0]} --mode {mid[1]} --output {left[0]} --off" - elif myObj["target"] == "right": - myCmd = f"xrandr --output {right[0]} --primary --auto --mode {right[1]} --output {mid[0]} --off --output {left[0]} --off" - + myCmd = f"xrandr --output {left[0]} --primary --auto --mode {left[1]} --output {mid[0]} --off --output {tleft[0]} --off --output {tright[0]} --off" elif myObj["target"] == "all": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {tleft[0]}--auto --left-of {tright[0]} --mode {tright[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]} --output {tright[0]} --above {mid[0]} --mode {tright[1]}" + myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --pos 0x0 --output {tleft[0]} --auto --pos -1920x-1080 --mode {tleft[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]} --output {tright[0]} --above {mid[0]} --mode {tright[1]}" #myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" elif myObj["target"] == "midleft": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" + myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {tleft[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]} --output {tright[0]} --off" elif myObj["target"] == "midtop": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --off" - elif myObj["target"] == "midleftbuild": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" - elif myObj["target"] == "midbuild": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --off" - elif myObj["target"] == "midlefttop": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" - elif myObj["target"] == "build": - myCmd = f"xrandr --output {mid[0]} --off --output {right[0]} --off --output {left[0]} --off" - elif myObj["target"] == "leftright": - myCmd = f"xrandr --output {left[0]} --primary --auto --mode {left[1]} --output {mid[0]} --off --output {right[0]} --auto --right-of {left[0]} --mode {right[1]}" + myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {tright[0]} --auto --above {mid[0]} --mode {tright[1]} --output {left[0]} --off --output {tleft[0]} --off" + elif myObj["target"] == "midlefttleft": + myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --pos 0x0 --output {tright[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]} --output {tleft[0]} --auto --pos -1920x-1080 --mode {tleft[1]}" + elif myObj["target"] == "lefttlefttright": + myCmd = f"xrandr --output {mid[0]} --off --output {tleft[0]} --auto --pos 640x-1080 --mode {tright[1]} --output {left[0]} --primary --auto --mode {left[1]} --pos 0x0 --output {tright[0]} --right-of {tleft[0]} --mode {tright[1]}" + elif myObj["target"] == "lefttleft": + myCmd = f"xrandr --output {mid[0]} --off --output {tleft[0]} --auto --pos 640x-1080 --mode {tright[1]} --output {left[0]} --primary --auto --mode {left[1]} --pos 0x0 --output {tright[0]} --off" + else: pass diff --git a/mqtt_srv.pyw b/mqtt_srv.pyw index f392d46..e95993d 100755 --- a/mqtt_srv.pyw +++ b/mqtt_srv.pyw @@ -790,37 +790,30 @@ def on_message(client, userdata, msg): mon4 = "eDP-1-1" ''' right = ["HDMI-A-0", "1920x1080"] + tleft = ["HDMI-A-0", "1920x1080"] + tright = ["DVI-I-1-1", "1920x1080"] left = ["DisplayPort-0", "2560x1440"] mid = ["DisplayPort-1", "3440x1440"] - + #xrandr --output DisplayPort-1 --primary --auto --mode 3440x1440 --output HDMI-A-0 --auto --left-of DVI-I-1-1 --mode 1920x1080 --output DisplayPort-0 --auto --left-of DisplayPort-1 --mode 2560x1440 --output DVI-I-1-1 --above DisplayPort-1 --mode 1920x1080 if myObj["target"] == "mid": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --off" + myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {left[0]} --off --output {tleft[0]} --off --output {tright[0]} --off" elif myObj["target"] == "left": - myCmd = f"xrandr --output {left[0]} --primary --auto --mode {left[1]} --output {right[0]} --off --output {mid[0]} --off" - elif myObj["target"] == "midleftright": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" - elif myObj["target"] == "midright": - myCmd = f"xrandr --output {right[0]} --primary --auto --mode {right[1]} --output {mid[0]} --auto --left-of {right[0]} --mode {mid[1]} --output {left[0]} --off" - elif myObj["target"] == "right": - myCmd = f"xrandr --output {right[0]} --primary --auto --mode {right[1]} --output {mid[0]} --off --output {left[0]} --off" - - elif myObj["target"] == "all": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" + myCmd = f"xrandr --output {left[0]} --primary --auto --mode {left[1]} --output {mid[0]} --off --output {tleft[0]} --off --output {tright[0]} --off" + elif myObj["target"] == "all": + myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --pos 0x0 --output {tleft[0]} --auto --pos -1920x-1080 --mode {tleft[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]} --output {tright[0]} --above {mid[0]} --mode {tright[1]}" + #myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" elif myObj["target"] == "midleft": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" + myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {tleft[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]} --output {tright[0]} --off" elif myObj["target"] == "midtop": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --off" - elif myObj["target"] == "midleftbuild": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" - elif myObj["target"] == "midbuild": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --off" - elif myObj["target"] == "midlefttop": - myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}" - elif myObj["target"] == "build": - myCmd = f"xrandr --output {mid[0]} --off --output {right[0]} --off --output {left[0]} --off" - elif myObj["target"] == "leftright": - myCmd = f"xrandr --output {left[0]} --primary --auto --mode {left[1]} --output {mid[0]} --off --output {right[0]} --auto --right-of {left[0]} --mode {right[1]}" + myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {tright[0]} --auto --above {mid[0]} --mode {tright[1]} --output {left[0]} --off --output {tleft[0]} --off" + elif myObj["target"] == "midlefttleft": + myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --pos 0x0 --output {tright[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]} --output {tleft[0]} --auto --pos -1920x-1080 --mode {tleft[1]}" + elif myObj["target"] == "lefttlefttright": + myCmd = f"xrandr --output {mid[0]} --off --output {tleft[0]} --auto --pos 640x-1080 --mode {tright[1]} --output {left[0]} --primary --auto --mode {left[1]} --pos 0x0 --output {tright[0]} --right-of {tleft[0]} --mode {tright[1]}" + elif myObj["target"] == "lefttleft": + myCmd = f"xrandr --output {mid[0]} --off --output {tleft[0]} --auto --pos 640x-1080 --mode {tright[1]} --output {left[0]} --primary --auto --mode {left[1]} --pos 0x0 --output {tright[0]} --off" + else: pass