Legion DPI fix

caster/asynch/mouse/legion.py

@@ -4,9 +4,10 @@
 import sys
 import threading
 from ctypes import *
-
 from dragonfly import monitors
 
+#from dragonfly import monitors
+
 try:  # Style C -- may be imported into Caster, or externally
     BASE_PATH = os.path.realpath(__file__).split("\\caster")[0].replace("\\", "/")
     if BASE_PATH not in sys.path:
@@ -16,14 +17,15 @@
     from caster.lib import gdi, settings, utilities
 
 try:
-    from PIL import ImageGrab, ImageFilter
+    from PIL import ImageGrab, ImageFilter, Image
 except ImportError:
     utilities.availability_message("Legion", "PIL")
 '''
-Roughly determines the size of each rectangle (give or take a few pixels).
-Anything less than 60 starts to feel cluttered. 30 is the bare minimum before three digit numbers no longer fit.
+The screen will be divided into vertical columns of equal width.
+The width of each Legion box cannot exceed the width of the column.
+This way relative partitioning is achieved since larger resolutions 
+will be partitioned into columns of larger width.
 '''
-MAX_WIDTH = 60
 
 
 class Rectangle:
@@ -38,7 +40,8 @@ def __init__(self, grid_size=None, tirg=None, auto_quit=False):
         self.setup_xmlrpc_server()
         TkTransparent.__init__(self, settings.LEGION_TITLE, grid_size)
         self.attributes("-alpha", 0.7)
-
+        self.max_rectangle_width = int(
+            grid_size.width/settings.SETTINGS["miscellaneous"]["legion_vertical_columns"])
         self.tirg_positions = {}
         if tirg is not None:
             self.process_rectangles(tirg)
@@ -92,7 +95,7 @@ def split_rectangles(self):
         # Split larger rectangles into smaller ones to allow greater precision.
         rectangles_to_split = []
         for rect in self.tirg_rectangles:  # Collect all the rectangles that are too large.
-            if rect.x2 - rect.x1 >= MAX_WIDTH:
+            if rect.x2 - rect.x1 >= self.max_rectangle_width:
                 rectangles_to_split.append(rect)
         self.tirg_rectangles = [
             x for x in self.tirg_rectangles if x not in rectangles_to_split
@@ -103,7 +106,7 @@ def perform_split(self, rectangles_to_split):
         # Helper class for splitting larger rectangles to smaller ones.
         for rect in rectangles_to_split:
             width = rect.x2 - rect.x1
-            pieces = width/MAX_WIDTH
+            pieces = width/self.max_rectangle_width
             new_width = width/pieces
             for i in range(0, pieces):
                 r = Rectangle()
@@ -205,6 +208,11 @@ def main(argv):
     monitor = 1
     dimensions = None
     auto_quit = False
+
+    error_code = windll.shcore.SetProcessDpiAwareness(2)  #enable 1-1 pixel mapping
+    if error_code == -2147024891:
+        raise OSError("Failed to set app awareness")
+
     try:
         opts, args = getopt.getopt(argv, "ht:a:d:m:",
                                    ["tirg=", "dimensions=", "autoquit="])
@@ -229,6 +237,7 @@ def main(argv):
         if dimensions is None:
             r = monitors[int(monitor) - 1].rectangle
             dimensions = Dimensions(int(r.dx), int(r.dy), int(r.x), int(r.y))
+
         lg = LegionGrid(grid_size=dimensions, tirg=tirg, auto_quit=auto_quit)
     except Exception:
         utilities.simple_log(True)

caster/bin/inno/dragonfly_upgrade.bat

@@ -6,18 +6,26 @@ cd temp_dragonfly
 
 
 
-git clone https://github.com/t4ngo/dragonfly.git
+git clone --recursive https://github.com/Danesprite/dragonfly.git
+cd dragonfly
+python setup.py install
 
+echo ------------------------------------------
+echo         Dragonfly Upgrade Complete
+echo ------------------------------------------
 
+git submodule foreach python setup.py install
+
+
+echo ------------------------------------------
+echo         Dragonfly Submodules installed
+echo ------------------------------------------
+
+python -m pip install  .[sphinx]
 
-cd dragonfly\dragonfly
-xcopy /Y/E/Q * C:\Python27\Lib\site-packages\dragonfly 
 
 cd C:\
 rmdir /S/Q temp_dragonfly
 
-echo ------------------------------------------
-echo         Dragonfly Upgrade Complete
-echo ------------------------------------------
 
 pause

caster/doc/Installation.md

@@ -1,8 +1,10 @@
 # Installation
 
+- [Dragonfly](https://github.com/Danesprite/dragonfly)
+Follow the instructions in the readme to install danesprite's dragonfly fork. Alternatively, install caster using the YouTube video below and run `(Caster_installation_path)/bin/dragonfly_upgrade.bat` before restarting your voice recognition engine.
+
 ## YouTube Videos
 
-- [Dragonfly](https://www.youtube.com/watch?v=iNAsV4pcnEA)
 - [Caster](https://www.youtube.com/watch?v=wjSwB4cpMDI)
 
 ## Addendums

caster/lib/settings.py

@@ -146,6 +146,7 @@ def _find_natspeak():
         "integer_remap_crash_fix": False,
         "print_rdescripts": False,
         "history_playback_delay_secs": 1.0,
+        "legion_vertical_columns": 30,
     },
     "pronunciations": {
         "c++": "C plus plus",