From 98bcddaecdb9a42864970d81a74e2db8a4328ca8 Mon Sep 17 00:00:00 2001
From: Roberto Alsina <ralsina@netmanagers.com.ar>
Date: Fri, 31 Jan 2020 20:55:28 -0300
Subject: [PATCH] Orientation fixes

---
 main.py | 9 ++++++++-
 main.ui | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index 317d1df..9d40e9f 100644
--- a/main.py
+++ b/main.py
@@ -18,6 +18,8 @@ def gen_xrandr_from_data(data):
         cli.append(f'--pos {int(mon["pos_x"])}x{int(mon["pos_y"])}')
         cli.append(f'--mode {mon["current_mode"]}')
         mod_x, mod_y = [int(n) for n in mon["current_mode"].split("x")]
+        if mon["orientation"] in (1,3):
+            mod_x, mod_y = mod_y, mod_x
         cli.append(f'--scale {mon["res_x"]/mod_x}x{mon["res_y"]/mod_y}')
         cli.append(f"--rotate {['normal', 'left', 'inverted', 'right'][mon['orientation']]}")
         if mon["primary"]:
@@ -84,6 +86,7 @@ class Window(QObject):
         ui.show()
         self.ui.setWindowTitle('Display Configuration')
         self.ui.screenCombo.currentTextChanged.connect(self.monitor_selected)
+        self.ui.orientationCombo.currentIndexChanged.connect(self.orientation_changed)
         self.xrandr_info = {}
         self.get_xrandr_info()
         self.orig_xrandr_info = deepcopy(self.xrandr_info)
@@ -96,6 +99,9 @@ class Window(QObject):
         self.ui.resetButton.clicked.connect(self.do_reset)
         self.ui.cancelButton.clicked.connect(self.ui.reject)
 
+    def orientation_changed(self):
+        print('Orientation: ', self.ui.orientationCombo.currentIndex())
+
     def do_reset(self):
         for n in self.xrandr_info:
             self.xrandr_info[n].update(self.orig_xrandr_info[n])
@@ -107,7 +113,8 @@ class Window(QObject):
 
     def do_apply(self):
         cli = gen_xrandr_from_data(self.xrandr_info)
-        subprocess.check_call(shlex.split(cli))
+        print(cli)
+        # subprocess.check_call(shlex.split(cli))
 
     def fill_ui(self):
         """Load data from xrandr and setup the whole thing."""
diff --git a/main.ui b/main.ui
index fe93469..4bb1c0f 100644
--- a/main.ui
+++ b/main.ui
@@ -80,7 +80,7 @@
        </item>
        <item>
         <property name="text">
-         <string>Left (90° cw)</string>
+         <string>Left (90° ccw)</string>
         </property>
        </item>
        <item>
@@ -90,7 +90,7 @@
        </item>
        <item>
         <property name="text">
-         <string>Right (90° ccw)</string>
+         <string>Right (90° cw)</string>
         </property>
        </item>
       </widget>