Redesigned code that did region and pixel calculation.

Removed code that was only patching what was not correct.
Now all code follow the same rules to calculate the size of the region.
As far as I have tested it all applicable region options grab the correct screen area, report the correct sizing in the progress monitor and the video file reports the same size either.

Author: janhgm

CamStudio/CamLib/CamRect.cpp

@@ -28,12 +28,12 @@ void NormalizeRect(LPRECT prc)
 
 void FixRectSizePos(LPRECT prc, int maxxScreen, int maxyScreen, int minxScreen, int minyScreen)
 {
-	TRACE( _T("## FixRectSizePos # PRE  # prc: top=%d bottom=%d left=%d right=%d\n"), prc->top, prc->bottom, prc->left, prc->right );
+	// TRACE( _T("## FixRectSizePos # PRE  # prc: top=%d bottom=%d left=%d right=%d\n"), prc->top, prc->bottom, prc->left, prc->right );
 	NormalizeRect(prc);
 
 	int width = prc->right - prc->left + 1;
 	int height = prc->bottom - prc->top + 1;
-	TRACE( _T("## FixRectSizePos #      # prc: width=%d height=%d \n"), width, height );
+	// TRACE( _T("## FixRectSizePos #      # prc: width=%d height=%d \n"), width, height );
 
 	//check that rectangle isn't too wide
 	if (width > abs(maxxScreen-minxScreen)) {
@@ -68,5 +68,5 @@ void FixRectSizePos(LPRECT prc, int maxxScreen, int maxyScreen, int minxScreen,
 			prc->bottom = maxyScreen - 1;
 		}
 	}
-	TRACE( _T("## FixRectSizePos # POST # prc: top=%d bottom=%d left=%d right=%d\n"), prc->top, prc->bottom, prc->left, prc->right );
+	//TRACE( _T("## FixRectSizePos # POST # prc: top=%d bottom=%d left=%d right=%d\n"), prc->top, prc->bottom, prc->left, prc->right );
 }

CamStudio/Recorder/FixedRegion.cpp

@@ -32,6 +32,8 @@ CFixedRegionDlg::CFixedRegionDlg(CWnd* pParent /*=NULL*/)
 , m_iWidth(1)
 , m_iHeight(1)
 {
+	// TRACE ( _T("## Why are m_itop and m_ileft defined here as 1,1 instead of 0,0. Not correct I beieve\n") );
+
 	//{{AFX_DATA_INIT(CFixedRegionDlg)
 	// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
@@ -84,7 +86,8 @@ void CFixedRegionDlg::OnOK()
 	// Not Correct, one to high because MinXY is zero an MaxXY is width/height no of pixels.
 	int maxWidth = abs(maxxScreen - minxScreen);   // Assuming number first pixel is one not zero.
 	int maxHeight = abs(maxyScreen - minyScreen);
-
+	// TRACE(_T("## CFixedRegionDlg::OnOK / maxWidth=[%d], maxHeight=[%d]\n"), maxWidth, maxHeight );
+	
 	if (m_iWidth < 0)
 	{
 		MessageOut(m_hWnd, IDS_STRING_WIDTHGREATER, IDS_STRING_NOTE,MB_OK | MB_ICONEXCLAMATION);
@@ -143,7 +146,7 @@ void CFixedRegionDlg::OnOK()
 			if (m_iWidth <= 0)
 			{
 				//TODO -- where did these constants came from? Get rid of 'em, put 'em in an ini or #define them somewhere
-				//Answer: See struct sRegionOpts in Profile.h
+				//Answer: See struct sRegionOpts in Profile.h. An area of 240x320 is defined there.
 				m_iLeft = minxScreen + 100;
 				m_iWidth = 320;
 			}
@@ -156,28 +159,16 @@ void CFixedRegionDlg::OnOK()
 			if (m_iHeight <= 0)
 			{
 				//TODO -- where did these constants come from? Get rid of 'em, put 'em in an ini or #define them somewhere
-				//Answer: See struct sRegionOpts in Profile.h
+				//Answer: See struct sRegionOpts in Profile.h. An area of 240x320 is defined there.
 				m_iTop = minyScreen + 100;
 				m_iHeight = 240;
 			}
 			MessageOut(m_hWnd,IDS_STRING_VALUEEXCEEDHEIGHT, IDS_STRING_NOTE, MB_OK | MB_ICONEXCLAMATION, m_iHeight);
 		}
 	}
 
-/*************************
-
-	// First thing we will do nist to get it coorect with the technical region measurements guidelines before we will apply the user viewpoint/
-    // TOP-LEFT = 0.0 ; BOTTOM-RIGHT= HScrSize-1:HScrSize-1 ; Width= Diff Right-Left =>  200-50=150  (Area is 151 pixels but 'our' width is 150)
-
-	// Check that if start values are not set by user they should be one not zero
-	if ( m_iLeft == 0 ) {
-		m_iLeft = 1 ;
-	}
-	if ( m_iTop == 0 ) {
-		m_iTop = 1 ;
-	}
-*/
-	TRACE(_T("## CFixedRegionDlg::OnOK / L=%d, T=%d, W=%d, H=%d\n"), m_iLeft, m_iTop, m_iWidth, m_iHeight );
+	// Technical pixel coordinates are applicable.  Top-Left = 0:0 not 1:1 What user often think it is.
+	// TRACE(_T("## CFixedRegionDlg::OnOK / L=%d, T=%d, W=%d, H=%d\n"), m_iLeft, m_iTop, m_iWidth, m_iHeight );
 
 	cRegionOpts.m_iCaptureLeft = m_iLeft;
 	cRegionOpts.m_iCaptureTop = m_iTop;
@@ -199,7 +190,7 @@ BOOL CFixedRegionDlg::OnInitDialog()
 	m_iHeight = cRegionOpts.m_iCaptureHeight;
 	UpdateData(FALSE);
 
-	TRACE(_T("## CFixedRegionDlg::OnInitDialog / L=%d, T=%d, W=%d, H=%d\n"), m_iLeft, m_iTop, m_iWidth, m_iHeight );
+	// TRACE(_T("## CFixedRegionDlg::OnInitDialog / L=%d, T=%d, W=%d, H=%d\n"), m_iLeft, m_iTop, m_iWidth, m_iHeight );
 
 	m_ctrlEditPosX.EnableWindow(TRUE);
 	m_ctrlEditPosY.EnableWindow(TRUE);
@@ -237,7 +228,7 @@ LRESULT CFixedRegionDlg::OnRegionUpdate(WPARAM /*wParam*/, LPARAM /*lParam*/)
 	m_iWidth	= rectUse.Width();
 	m_iHeight	= rectUse.Height();
 
-	TRACE(_T("## CFixedRegionDlg::OnRegionUpdate / L=%d, T=%d, W=%d, H=%d\n"), m_iLeft, m_iTop, m_iWidth, m_iHeight );
+	//TRACE(_T("## CFixedRegionDlg::OnRegionUpdate / L=%d, T=%d, W=%d, H=%d\n"), m_iLeft, m_iTop, m_iWidth, m_iHeight );
 
 	UpdateData(FALSE);
 

CamStudio/Recorder/FlashingWnd.cpp

@@ -16,8 +16,12 @@ static char THIS_FILE[] = __FILE__;
 
 namespace {	// annonymous
 
-const int THICKNESS			= 8;
 const int SMALLTHICKNESS	= 4;
+const int THICKNESS			= 8;
+
+const int DOUBLESMALLTHICKNESS	= 8;
+const int DOUBLETHICKNESS	= 16;
+
 const int SIDELEN			= 12;
 const int SIDELEN2			= 24;
 
@@ -103,42 +107,32 @@ void CFlashingWnd::SetUpRegion(const CRect& cRect, int type)
 	//
 	///////////////////////////////////////////////////
 	CRgn wndRgn;	
+	CRgn rgnTemp;
 
 	m_cRect = cRect;
+	// TRACE( _T("## CFlashingWnd::SetUpRegion / m_cRect before / L=%d R=%d T=%d B=%d / W=%d H=%d\n"), m_cRect.left , m_cRect.right , m_cRect.top , m_cRect.bottom, m_cRect.Width(), m_cRect.Height() );
 
-	// The Width shown here is one to less. Not good.
-	TRACE( _T("## CFlashingWnd::SetUpRegion / m_cRect before / L=%d R=%d T=%d B=%d / W=%d H=%d\n"), m_cRect.left , m_cRect.right , m_cRect.top , m_cRect.bottom, m_cRect.Width(), m_cRect.Height() );
-	// Jaho. Why do we reduce the frame here, because the Width and Height are set wrong ???
-	// HIER_BEN_IK
-//#define JAHO_TEST_CRECT_RIGHT_VALUES
-#ifndef JAHO_TEST_CRECT_RIGHT_VALUES
-	// As it was before
-	m_cRect.right--;
-	m_cRect.bottom--;
-#else
-	m_cRect.left--;
-	m_cRect.top--;
-#endif
-	TRACE( _T("## CFlashingWnd::SetUpRegion / m_cRect after  / L=%d R=%d T=%d B=%d / W=%d H=%d\n"), m_cRect.left , m_cRect.right , m_cRect.top , m_cRect.bottom, m_cRect.Width(), m_cRect.Height() );
+	// Type=0 stands for ...
 	if (type == 0) {
-		wndRgn.CreateRectRgn(0, 0, m_cRect.Width() + THICKNESS + THICKNESS, m_cRect.Height() + THICKNESS + THICKNESS);
 
-		CRgn rgnTemp;
 		CRgn rgnTemp2;
 		CRgn rgnTemp3;
-		rgnTemp.CreateRectRgn(THICKNESS, THICKNESS, m_cRect.Width() + THICKNESS + 1, m_cRect.Height() + THICKNESS + 1);
-		rgnTemp2.CreateRectRgn(0, SIDELEN2, m_cRect.Width()+THICKNESS+THICKNESS, m_cRect.Height() - SIDELEN + 1);
-		rgnTemp3.CreateRectRgn(SIDELEN2,0, m_cRect.Width() - SIDELEN + 1, m_cRect.Height() + THICKNESS + THICKNESS);
+		// ToDo: Check if all +1 are applied correctly. Parameters in function below are not checked.
+        // Check if we have forgotten to apply a few or don't we need them (the +1's) at all.?
+		wndRgn.CreateRectRgn(   0         , 0         , m_cRect.Width() + DOUBLETHICKNESS , m_cRect.Height() + DOUBLETHICKNESS  );
+		rgnTemp.CreateRectRgn(  THICKNESS , THICKNESS , m_cRect.Width() + THICKNESS + 1   , m_cRect.Height() + THICKNESS + 1    );
+		rgnTemp2.CreateRectRgn( 0         , SIDELEN2  , m_cRect.Width() + DOUBLETHICKNESS , m_cRect.Height() - SIDELEN + 1      );
+		rgnTemp3.CreateRectRgn( SIDELEN2  , 0         , m_cRect.Width() - SIDELEN + 1     , m_cRect.Height() + DOUBLETHICKNESS  );
 
 		wndRgn.CombineRgn(&wndRgn,&rgnTemp,RGN_DIFF);
 		wndRgn.CombineRgn(&wndRgn,&rgnTemp2,RGN_DIFF);
 		wndRgn.CombineRgn(&wndRgn,&rgnTemp3,RGN_DIFF);
 
-		wndRgn.OffsetRgn( m_cRect.left-THICKNESS, m_cRect.top-THICKNESS );
+		wndRgn.OffsetRgn( m_cRect.left - THICKNESS   , m_cRect.top - THICKNESS );
 	} else {
-		wndRgn.CreateRectRgn(0, 0, m_cRect.Width() + SMALLTHICKNESS + SMALLTHICKNESS, m_cRect.Height() + SMALLTHICKNESS + SMALLTHICKNESS);
-		CRgn rgnTemp;
-		rgnTemp.CreateRectRgn(SMALLTHICKNESS, SMALLTHICKNESS, m_cRect.Width()+SMALLTHICKNESS+1, m_cRect.Height() + SMALLTHICKNESS + 1);
+		
+		wndRgn.CreateRectRgn(  0             , 0             , m_cRect.Width() + DOUBLESMALLTHICKNESS , m_cRect.Height() + DOUBLESMALLTHICKNESS);
+		rgnTemp.CreateRectRgn( SMALLTHICKNESS, SMALLTHICKNESS, m_cRect.Width() + SMALLTHICKNESS + 1   , m_cRect.Height() + SMALLTHICKNESS + 1);
 
 		wndRgn.CombineRgn(&wndRgn, &rgnTemp, RGN_DIFF);
 

CamStudio/Recorder/RecorderVersionReleaseInfo.h

@@ -8,6 +8,6 @@
 #define  CURRENT_VERSION_NUMBER  "2.6"
 // Add ++ to releasenumber to indicate that executable is from revision xxx or higher
 // Update versionnumber and remove ++ when official Camstudio release will be created
-#define  CURRENT_SVN_RELEASE_NUMBER  "270"
+#define  CURRENT_SVN_RELEASE_NUMBER  "272"
 
 #endif // !defined(_RECORDERVERSIONRELEASEINFO__INCLUDED_)

CamStudio/Recorder/RecorderView.cpp

@@ -651,8 +651,6 @@ void CRecorderView::OnPaint()
 		dcBits.CreateCompatibleDC(&dc);
 		CBitmap bitmap;
 
-		TRACE( _T("## CRecorderView::OnPaint / rectClient.Width()=%d\n") , rectClient.Width() );
-
 		bitmap.CreateCompatibleBitmap(&dc, rectClient.Width(), rectClient.Height());
 		CBitmap *pOldBitmap = dcBits.SelectObject(&bitmap);
 
@@ -1224,87 +1222,88 @@ void CRecorderView::OnRecord()
 	fActualRate = 0.0;
 	fTimeLength = 0.0;
 
-// HIER_BEN_IK
-// Todo: Sizing van rc checked. One pixel gets dropped:  100x100 => 99x99
-	TRACE("## Here it possible goed wrong with the sizing\n");
+	// r272: How we define rect cshecked and changed because some pixel gots dropped:  100x100 => 99x99
+	// rcUse is the rect that will be used in the end to define the size of the recording. 
+	// BTW. rcUse is also used to store previous values.
+	// A Full screen area is 0, 0 to MaxX-1, MaxY-1
 
+	// TRACE( _T("## CRecorderView::OnRecord /CAPTURE_FIXED/ before / cRegionOpts / T=%d, L=%d, B=.. , R=.. , W=%d, H=%d \n"), cRegionOpts.m_iCaptureTop, cRegionOpts.m_iCaptureLeft, cRegionOpts.m_iCaptureWidth, cRegionOpts.m_iCaptureHeight );
 	switch (cRegionOpts.m_iMouseCaptureMode)
 	{
 	case CAPTURE_FIXED:
+		// Applicable when Option region is set as 'Fixed Region'
+
+
+		rc = CRect(cRegionOpts.m_iCaptureTop,
+			       cRegionOpts.m_iCaptureLeft, 
+				   cRegionOpts.m_iCaptureLeft + cRegionOpts.m_iCaptureWidth  - 1 , 
+				   cRegionOpts.m_iCaptureTop  + cRegionOpts.m_iCaptureHeight - 1 );  
+
+		// TRACE( _T("## CRecorderView::OnRecord /CAPTURE_FIXED/ before / rc / T=%d, L=%d, B=%d, R=%d \n"), rc.top, rc.left, rc.bottom, rc.right );
+
 		if (cRegionOpts.m_bFixedCapture) {
-			// Full screan area :  0:0 to MaxX-1:MaxY-1
-			rc.top = cRegionOpts.m_iCaptureTop;	
-			rc.left = cRegionOpts.m_iCaptureLeft;
-			rc.right = cRegionOpts.m_iCaptureLeft + cRegionOpts.m_iCaptureWidth - 1;
-			rc.bottom = cRegionOpts.m_iCaptureTop + cRegionOpts.m_iCaptureHeight - 1;
-			// TODOMON 0s are no good anymore .. compare to minx / miny
-			if (rc.top < 0)
+			// Applicable when Option region is set as 'Fixed Region' and retangle offset is fixed either.
+			
+			// I don't expect that code below is ever invoked...! Hence, dead code
+			if (rc.top < 0) {
+				TRACE( _T("## CRecorderView::OnRecord rc.top<0  [%d]\n"), rc.top);
 				rc.top = 0;
-			if (rc.left < 0)
+			}
+			if (rc.left < 0) {
+				TRACE( _T("## CRecorderView::OnRecord rc.left<0  [%d]\n"), rc.left);
 				rc.left = 0;
-			if (maxxScreen <= rc.right)
-				rc.right = maxxScreen - 1;
-			if (maxyScreen <= rc.bottom)
-				rc.bottom = maxyScreen - 1;
+			}
+			if (maxxScreen <= rc.right) {
+				TRACE( _T("## CRecorderView::OnRecord maxxScreen<rc.right  [%d]\n"), rc.right);
+				rc.right = maxxScreen - 1;  //ok
+			}
+			if (maxyScreen <= rc.bottom) {
+				TRACE( _T("## CRecorderView::OnRecord maxyScreen<rc.bottom<0  [%d]\n"), rc.bottom);
+				rc.bottom = maxyScreen - 1; //ok
+			}
 
 			//using protocols for iMouseCaptureMode==0
 			old_rcClip = rcClip = rc;
 			old_rcClip.NormalizeRect();
 			rcUse = old_rcClip;
 			::PostMessage (hWndGlobal, WM_USER_RECORDSTART, 0, (LPARAM) 0);
 
-				TRACE( _T("## CRecorderView::OnRecord /0001/ T=%d, L=%d, B=%d, R=%d \n"), rc.top, rc.left, rc.bottom, rc.right );
-				TRACE( _T("## CRecorderView::OnRecord /0001/ MinX=%d, MinY=%d, MaxX=%d, MaxY=%d \n"), minxScreen, minyScreen, maxxScreen, maxyScreen );
-
-		} else {
-			rc = CRect(0, 0, cRegionOpts.m_iCaptureWidth, cRegionOpts.m_iCaptureHeight);
-			rc.right--;
-			rc.bottom--;
+		} else { 
+			// Applicable when Option region is set as 'Fixed Region' but retangle offset is floating.
+			// Floating Retangle. Drag the retangle first to its position...
 
 			::ShowWindow(hMouseCaptureWnd,SW_SHOW);
 			::UpdateWindow(hMouseCaptureWnd);
 
 			InitDrawShiftWindow(); //will affect rc implicity
-				TRACE(_T("## CRecorderView::OnRecord /0002/ T=%d, L=%d, B=%d, R=%d \n"), rc.top, rc.left, rc.bottom, rc.right );
-				TRACE(_T("## CRecorderView::OnRecord /0002/ MinX=%d, MinY=%d, MaxX=%d, MaxY=%d \n"), minxScreen, minyScreen, maxxScreen, maxyScreen );
 		}
 		break;
-	case CAPTURE_VARIABLE:
+	case CAPTURE_VARIABLE: 
+		// Applicable when Option region is set as 'Region'
 		::ShowWindow(hMouseCaptureWnd, SW_SHOW);
 		::UpdateWindow(hMouseCaptureWnd);
 		InitSelectRegionWindow(); //will affect rc implicity
-				TRACE(_T("## CRecorderView::OnRecord /0003/ T=%d, L=%d, B=%d, R=%d \n"), rc.top, rc.left, rc.bottom, rc.right );
-				TRACE(_T("## CRecorderView::OnRecord /0003/ MinX=%d, MinY=%d, MaxX=%d, MaxY=%d \n"), minxScreen, minyScreen, maxxScreen, maxyScreen );
 		break;
-	case CAPTURE_FULLSCREEN:
-		m_basicMsg = new CBasicMessage();
-		m_basicMsg->Create(CBasicMessage::IDD);
-		m_basicMsg->SetText(_T("Click on monitor to be captured."));
-		m_basicMsg->ShowWindow(SW_SHOW);
-		SetCapture();
-	//	m_basicMsg.DoModal();
-				TRACE(_T("## CRecorderView::OnRecord /0004/ T=%d, L=%d, B=%d, R=%d \n"), rc.top, rc.left, rc.bottom, rc.right );
-				TRACE(_T("## CRecorderView::OnRecord /0004/ MinX=%d, MinY=%d, MaxX=%d, MaxY=%d \n"), minxScreen, minyScreen, maxxScreen, maxyScreen );
-		break;
-	case CAPTURE_ALLSCREENS:
-		rcUse = CRect(minxScreen, minyScreen, maxxScreen, maxyScreen);
-		rcUse.right--;
-		rcUse.bottom--;
+
+	case CAPTURE_ALLSCREENS: 
+		// Applicable when Option region is set as 'Full Screen'
+		rcUse = CRect(minxScreen, minyScreen, maxxScreen - 1 , maxyScreen - 1);
 		::PostMessage(hWndGlobal, WM_USER_RECORDSTART, 0, (LPARAM) 0);
-				TRACE(_T("## CRecorderView::OnRecord /0005/ T=%d, L=%d, B=%d, R=%d \n"), rc.top, rc.left, rc.bottom, rc.right );
-				TRACE(_T("## CRecorderView::OnRecord /0005/ MinX=%d, MinY=%d, MaxX=%d, MaxY=%d \n"), minxScreen, minyScreen, maxxScreen, maxyScreen );
 		break;
+
 	case CAPTURE_WINDOW:
+	case CAPTURE_FULLSCREEN:
+		// Applicable when Option region is set as 'Window' and as 'Full Screen'
 		m_basicMsg = new CBasicMessage();
 		m_basicMsg->Create(CBasicMessage::IDD);
 		m_basicMsg->SetText(_T("Click on window to be captured."));
 		m_basicMsg->ShowWindow(SW_SHOW);
 		//m_basicMsg.DoModal();
 		SetCapture();
-				TRACE(_T("## CRecorderView::OnRecord /0006/ T=%d, L=%d, B=%d, R=%d \n"), rc.top, rc.left, rc.bottom, rc.right );
-				TRACE(_T("## CRecorderView::OnRecord /0006/ MinX=%d, MinY=%d, MaxX=%d, MaxY=%d \n"), minxScreen, minyScreen, maxxScreen, maxyScreen );
 		break;
 	}
+	// TRACE(_T("## CRecorderView::OnRecord / after / rc / T=%d, L=%d, B=%d, R=%d \n"), rc.top, rc.left, rc.bottom, rc.right );
+	// TRACE(_T("## CRecorderView::OnRecord / after / MinX=%d, MinY=%d, MaxX=%d, MaxY=%d \n"), minxScreen, minyScreen, maxxScreen, maxyScreen );
 }
 
 void CRecorderView::OnStop()
@@ -3726,16 +3725,10 @@ UINT CRecorderView::RecordVideo()
 			strTempVideoAviFilePath.Format("%s\\%s-%s-%d.%s", (LPCSTR)csTempFolder, TEMPFILETAGINDICATOR, (LPCSTR)csStartTime, rand(), "avi" );
 		}
 	}
-	//TRACE("## CRecorderView::RecordAVIThread  Final Temp.Avi file=[%s]\n", strTempVideoAviFilePath.GetString()  );
-
-	//int top = rcUse.top;
-	//int left = rcUse.left;
-	//int width = rcUse.right - rcUse.left + 1;
-	//int height = rcUse.bottom - rcUse.top + 1;
-	//int fps = cVideoOpts.m_iFramesPerSecond;
+	//TRACE(_T("## CRecorderView::RecordAVIThread  Final Temp.Avi file=[%s]\n"), strTempVideoAviFilePath.GetString()  );
+	//TRACE(_T("## CRecorderView::RecordVideo rcUse / T=%d, L=%d, B=%d, R=%d \n"), rcUse.top, rcUse.left, rcUse.bottom, rcUse.right );
 
 	return RecordVideo(rcUse, cVideoOpts.m_iFramesPerSecond, strTempVideoAviFilePath) ? 0UL : 1UL;
-	//return RecordVideo(top, left, width, height, fps, strTempVideoAviFilePath) ? 0UL : 1UL;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -4146,7 +4139,8 @@ bool CRecorderView::RecordVideo(CRect rectFrame, int fps, const char *szVideoFil
 		//	}
 		//}
 
-		if ((0 == frametime) || (oldframetime < frametime)) {
+	
+		if ( ( frametime == 0 ) || ( oldframetime < frametime ) ) {
 			//ver 1.8
 			//if (iShiftType == 1) {
 			//	if (frametime == 0) {