Handle display resolution changes

lesderid · Jan 11, 2021 · 10c6d69 · 10c6d69
1 parent 075f767
commit 10c6d69
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 18 deletions.
diff --git a/src/keynavish/commands.d b/src/keynavish/commands.d
@@ -34,13 +34,17 @@ private void redrawWindow()
 
 private void start()
 {
+    import core.sys.windows.windows : MoveWindow;
+
+    resetGrid();
+    MoveWindow(windowHandle, 0, 0, grid.rect.width, grid.rect.height, false);
+
     showWindow();
 }
 
 private void end()
 {
     hideWindow();
-    resetGrid();
 }
 
 private void toggleStart()
@@ -140,6 +144,8 @@ private void move(Direction direction, string arg)
 
     if (!active) return;
 
+    auto resolution = deviceResolution;
+
     auto value = getCutMoveValue(direction, arg != null ? arg : "1");
 
     Grid newGrid = grid;
@@ -157,10 +163,10 @@ private void move(Direction direction, string arg)
         case down:
             newGrid.rect.top += value;
             newGrid.rect.bottom += value;
-            if (newGrid.rect.bottom > screenHeight)
+            if (newGrid.rect.bottom > resolution.height)
             {
-                newGrid.rect.top -= (newGrid.rect.bottom - screenHeight);
-                newGrid.rect.bottom = screenHeight;
+                newGrid.rect.top -= (newGrid.rect.bottom - resolution.height);
+                newGrid.rect.bottom = resolution.height;
             }
             break;
         case left:
@@ -175,10 +181,10 @@ private void move(Direction direction, string arg)
         case right:
             newGrid.rect.left += value;
             newGrid.rect.right += value;
-            if (newGrid.rect.right > screenWidth)
+            if (newGrid.rect.right > resolution.width)
             {
-                newGrid.rect.left -= (newGrid.rect.right - screenWidth);
-                newGrid.rect.right = screenWidth;
+                newGrid.rect.left -= (newGrid.rect.right - resolution.width);
+                newGrid.rect.right = resolution.width;
             }
             break;
     }
@@ -195,13 +201,15 @@ private void warp()
 
     if (!active) return;
 
+    auto resolution = deviceResolution;
+
     auto middleX = grid.rect.left + grid.rect.width / 2;
     auto middleY = grid.rect.top + grid.rect.height / 2;
 
     INPUT input;
     input.type = INPUT_MOUSE;
-    input.mi.dx = middleX * 65536 / screenWidth;
-    input.mi.dy = middleY * 65536 / screenHeight;
+    input.mi.dx = middleX * 65536 / resolution.width;
+    input.mi.dy = middleY * 65536 / resolution.height;
     input.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE | draggingFlag;
     SendInput(1, &input, INPUT.sizeof);
 }

diff --git a/src/keynavish/grid.d b/src/keynavish/grid.d
@@ -2,6 +2,7 @@ module keynavish.grid;
 
 import core.sys.windows.windows : RECT, HDC, HPEN;
 import std.container : SList;
+import std.typecons : Tuple;
 import keynavish;
 
 struct Grid
@@ -16,8 +17,19 @@ private SList!Grid gridStack;
 
 HPEN pen;
 
-int screenWidth;
-int screenHeight;
+@property
+Tuple!(int, "width", int, "height") deviceResolution()
+{
+    import core.sys.windows.windows : GetDC, GetDeviceCaps, HORZRES, VERTRES;
+
+    auto rootDeviceContext = GetDC(null);
+
+    auto resolution = typeof(return)();
+    resolution.width = GetDeviceCaps(rootDeviceContext, HORZRES);
+    resolution.height = GetDeviceCaps(rootDeviceContext, VERTRES);
+
+    return resolution;
+}
 
 const(Grid) grid()
 {
@@ -42,7 +54,9 @@ void tryPopGrid()
 
 void resetGrid()
 {
-    grid_.rect = RECT(0, 0, screenWidth, screenHeight);
+    auto resolution = deviceResolution;
+
+    grid_.rect = RECT(0, 0, resolution.width, resolution.height);
     grid_.rows = 2;
     grid_.columns = 2;
     gridStack = typeof(gridStack)();

diff --git a/src/keynavish/main.d b/src/keynavish/main.d
@@ -35,10 +35,6 @@ static this()
     registerKeyboardHook();
 
     pen = CreatePen(PS_SOLID, penWidth, penColour);
-
-    auto rootDeviceContext = GetDC(null);
-    screenWidth = GetDeviceCaps(rootDeviceContext, HORZRES);
-    screenHeight = GetDeviceCaps(rootDeviceContext, VERTRES);
 }
 
 extern(C)

diff --git a/src/keynavish/window.d b/src/keynavish/window.d
@@ -22,14 +22,16 @@ void registerWindowClass()
 
 void createWindow()
 {
+    auto resolution = deviceResolution;
+
     windowHandle = CreateWindowEx(WS_EX_LAYERED | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE | WS_EX_TRANSPARENT,
                                   windowClassName.ptr,
                                   programName.ptr,
                                   WS_POPUP,
                                   0,
                                   0,
-                                  screenWidth,
-                                  screenHeight,
+                                  resolution.width,
+                                  resolution.height,
                                   null,
                                   null,
                                   GetModuleHandle(null),