fixed #24 region rectangle not working as expected on machines which have the 2e monitor as main desktop.

Author: stevenhoving

CamCapture/CMakeLists.txt

@@ -24,6 +24,7 @@ set(ANNOTATIONS_SOURCE
 
 set(CAPTURE_SOURCE
     src/cam_capture.cpp
+    src/cam_virtual_screen_info.cpp
 )
 
 set(CAPTURE_INCLUDE
@@ -38,6 +39,7 @@ set(CAPTURE_INCLUDE
     include/CamCapture/cam_point.h
     include/CamCapture/cam_size.h
     include/CamCapture/cam_stop_watch.h
+    include/CamCapture/cam_virtual_screen_info.h
 )
 
 source_group(src FILES

CamCapture/include/CamCapture/cam_capture.h

@@ -19,6 +19,7 @@
 
 #include "cam_rect.h"
 #include "cam_annotarion.h"
+#include "cam_virtual_screen_info.h"
 
 #include <windows.h>
 #include <memory>
@@ -58,6 +59,7 @@ class cam_capture_source
 
 protected:
     void _draw_annotations(const cam::rect<int> &capture_rect);
+    auto _translate_from_virtual(const POINT &mouse_position) -> point<int>;
 
 private:
     BITMAPINFO bitmap_info_;
@@ -66,6 +68,7 @@ class cam_capture_source
     HDC desktop_dc_;
     HDC memory_dc_;
     cam::rect<int> src_rect_;
+    cam::virtual_screen_info virtual_screen_info_;
 
     unsigned char *bitmap_data_{nullptr};
     cam_frame frame_;

CamCapture/include/CamCapture/cam_point.h

@@ -28,16 +28,26 @@ class point
     {
     }
 
-    constexpr T x() const noexcept
+    constexpr auto x() const noexcept -> T
     {
         return x_;
     }
 
-    constexpr T y() const noexcept
+    constexpr void x(const T new_x) noexcept
+    {
+        x_ = new_x;
+    }
+
+    constexpr auto y() const noexcept -> T
     {
         return y_;
     }
 
+    constexpr void y(const T new_y) noexcept
+    {
+        y_ = new_y;
+    }
+
 private:
     T x_{ static_cast<T>(0) };
     T y_{ static_cast<T>(0) };

CamStudioRecorder/virtual_screen_info.h …ude/CamCapture/cam_virtual_screen_info.hCamStudioRecorder/virtual_screen_info.h renamed to CamCapture/include/CamCapture/cam_virtual_screen_info.h CamStudioRecorder/virtual_screen_info.h renamed to CamCapture/include/CamCapture/cam_virtual_screen_info.h

@@ -2,6 +2,8 @@
 
 #include <CamCapture/cam_rect.h>
 
+namespace cam
+{
 struct virtual_screen_info
 {
     // the virtual screen rect
@@ -13,3 +15,4 @@ struct virtual_screen_info
 };
 
 virtual_screen_info get_virtual_screen_info();
+} // namespace cam

CamCapture/src/cam_capture.cpp

@@ -39,13 +39,11 @@ cam_capture_source::cam_capture_source(HWND hwnd, const cam::rect<int> & /*view*
     , src_rect_()
     , annotations_()
     , stopwatch_(std::make_unique<cam::stop_watch>())
+    , virtual_screen_info_(cam::get_virtual_screen_info())
 {
     if (hwnd == nullptr)
     {
-        src_rect_.left_ = ::GetSystemMetrics(SM_XVIRTUALSCREEN);
-        src_rect_.top_ = ::GetSystemMetrics(SM_YVIRTUALSCREEN);
-        src_rect_.right_ = src_rect_.left_ + ::GetSystemMetrics(SM_CXVIRTUALSCREEN);
-        src_rect_.bottom_ = src_rect_.top_ + ::GetSystemMetrics(SM_CYVIRTUALSCREEN);
+        src_rect_ = virtual_screen_info_.size;
     }
     else
     {
@@ -137,12 +135,11 @@ void cam_capture_source::_draw_annotations(const cam::rect<int> &capture_rect)
     {
         POINT pt;
         ::GetCursorPos(&pt);
+        const auto mouse_point = _translate_from_virtual(pt);
 
         Gdiplus::Graphics canvas(memory_dc_);
         canvas.SetSmoothingMode(Gdiplus::SmoothingMode::SmoothingModeAntiAlias);
 
-        point<int> mouse_point(pt.x, pt.y);
-
         const auto mouse_event_count = mouse_hook::get().get_mouse_events_count();
         if (mouse_event_count > 0)
         {
@@ -184,3 +181,14 @@ void cam_capture_source::_draw_annotations(const cam::rect<int> &capture_rect)
             annotation->draw(canvas, draw_data);
     }
 }
+
+auto cam_capture_source::_translate_from_virtual(const POINT &mouse_position) -> point<int>
+{
+    // virtual dataspace can be negative, but the target dataspace is always positive.
+    const auto screen_rect = virtual_screen_info_.size;
+    auto result = point<int>(mouse_position.x, mouse_position.y);
+    result.x(result.x() - screen_rect.left());
+    result.y(result.y() - screen_rect.top());
+
+    return result;
+}

CamStudioRecorder/virtual_screen_info.cpp …mCapture/src/cam_virtual_screen_info.cppCamStudioRecorder/virtual_screen_info.cpp renamed to CamCapture/src/cam_virtual_screen_info.cpp CamStudioRecorder/virtual_screen_info.cpp renamed to CamCapture/src/cam_virtual_screen_info.cpp

@@ -1,7 +1,10 @@
-#include "stdafx.h"
-#include "virtual_screen_info.h"
+#include "cam_virtual_screen_info.h"
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+namespace cam
+{
+
 virtual_screen_info get_virtual_screen_info()
 {
     virtual_screen_info result{};
@@ -20,4 +23,6 @@ virtual_screen_info get_virtual_screen_info()
     result.size = { min_x, min_y, min_x + max_x, min_y + max_y };
     result.monitor_count = monitor_count;
     return result;
-}
+}
+
+} // namespace cam

CamStudioRecorder/CMakeLists.txt

@@ -56,8 +56,6 @@ set(RECORDER_NEW_SOURCE
     settings_model.h
     settings_model.cpp
     settings_table.h
-    virtual_screen_info.cpp
-    virtual_screen_info.h
 )
 
 set(RECORDER_UTILITY_SOURCE

CamStudioRecorder/FixedRegionDlg.cpp

@@ -16,7 +16,7 @@
 
 IMPLEMENT_DYNAMIC(CFixedRegionDlg, CDialog)
 
-CFixedRegionDlg::CFixedRegionDlg(CWnd *pParent, virtual_screen_info screen_info, settings_model &settings)
+CFixedRegionDlg::CFixedRegionDlg(CWnd *pParent, cam::virtual_screen_info screen_info, settings_model &settings)
     : CDialog(CFixedRegionDlg::IDD, pParent)
     , capture_rect_(0, 0, 0, 0)
     , settings_(settings)
@@ -286,6 +286,3 @@ void CFixedRegionDlg::OnEnKillfocusHeight()
         set_window_text(height_text_edit_ctrl_, std::to_wstring(capture_rect_.height()));
     }
 }
-
-
-

CamStudioRecorder/FixedRegionDlg.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "virtual_screen_info.h"
+#include <CamCapture/cam_virtual_screen_info.h>
 #include <CamCapture/cam_rect.h>
 #include <memory>
 
@@ -11,7 +11,7 @@ class CFixedRegionDlg : public CDialog
 {
     DECLARE_DYNAMIC(CFixedRegionDlg)
 public:
-    explicit CFixedRegionDlg(CWnd *pParent, virtual_screen_info screen_info, settings_model &settings);
+    explicit CFixedRegionDlg(CWnd *pParent, cam::virtual_screen_info screen_info, settings_model &settings);
 
     enum
     {
@@ -35,7 +35,7 @@ class CFixedRegionDlg : public CDialog
     cam::rect<int> capture_rect_;
 
     settings_model &settings_;
-    virtual_screen_info screen_info_;
+    cam::virtual_screen_info screen_info_;
 
     std::unique_ptr<mouse_capture_ui> capture_;
 

CamStudioRecorder/RecorderView.cpp

@@ -108,7 +108,7 @@ END_EVENTSINK_MAP()
 CRecorderView::CRecorderView()
     : CView()
 {
-    virtual_screen_info_ = get_virtual_screen_info();
+    virtual_screen_info_ = cam::get_virtual_screen_info();
     mouse_hook_ = std::make_unique<mouse_hook>();
 
     video_settings_model_ = std::make_unique<video_settings_model>();