[Deinterlace-checkins] CVS: DScaler/DScaler DScaler.cpp,1.357,1.358

[Rob M. <rob...@us...>]

Update of /cvsroot/deinterlace/DScaler/DScaler
In directory sc8-pr-cvs1:/tmp/cvs-serv9977/DScaler

Modified Files:
	DScaler.cpp 
Log Message:
Added option to disable the keyboard lock for dialog boxes.

Index: DScaler.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/DScaler.cpp,v
retrieving revision 1.357
retrieving revision 1.358
diff -C2 -r1.357 -r1.358
*** DScaler.cpp	11 Nov 2003 21:26:44 -0000	1.357
--- DScaler.cpp	18 Nov 2003 16:36:33 -0000	1.358
***************
*** 68,71 ****
--- 68,74 ----
  //
  // $Log$
+ // Revision 1.358  2003/11/18 16:36:33  robmuller
+ // Added option to disable the keyboard lock for dialog boxes.
+ //
  // Revision 1.357  2003/11/11 21:26:44  robmuller
  // Exclude some more when WANT_DSHOW_SUPPORT is not defined.
***************
*** 1223,1226 ****
--- 1226,1230 ----
  
  BOOL bKeyboardLock = FALSE;
+ BOOL bKeyboardLockMainWindowOnly = FALSE;
  HHOOK hKeyboardHook = NULL;
  
***************
*** 2162,2171 ****
      if(code >= 0 && bKeyboardLock)
      {
!         // if it is not Ctrl+Shift+L do not pass the message to the rest of the hook chain 
!         // or the target window procedure
!         if(!((char)wParam == 'L' && GetKeyState(VK_SHIFT) < 0 && GetKeyState(VK_CONTROL) < 0))
!         {
!             return 1;
!         }
      }
     	return CallNextHookEx(hKeyboardHook, code, wParam, lParam);
--- 2166,2178 ----
      if(code >= 0 && bKeyboardLock)
      {
! 		if(!(bKeyboardLockMainWindowOnly && hWnd != GetFocus()))
! 		{
! 			// if it is not Ctrl+Shift+L do not pass the message to the rest of the hook chain 
! 			// or the target window procedure
! 			if(!((char)wParam == 'L' && GetKeyState(VK_SHIFT) < 0 && GetKeyState(VK_CONTROL) < 0))
! 			{
! 				return 1;
! 			}
! 		}
      }
     	return CallNextHookEx(hKeyboardHook, code, wParam, lParam);
***************
*** 6785,6788 ****
--- 6792,6801 ----
      },
      {
+         "Keyboard lock affects main window only", ONOFF, 0, (long*)&bKeyboardLockMainWindowOnly,
+         FALSE, 0, 1, 1, 1,
+         NULL,
+         "MainWindow", "KeyboardLockMainWindowOnly", NULL,
+     },
+     {
          "Disable Screensaver", YESNO, 0, (long*)&bScreensaverOff,
          TRUE, 0, 1, 1, 1,
***************
*** 6960,6968 ****
  {
      // Other Settings
!     SETTING* OtherSettings[6] =
      {
          &DScalerSettings[DISPLAYSPLASHSCREEN    ],
          &DScalerSettings[AUTOHIDECURSOR         ],
          &DScalerSettings[LOCKKEYBOARD           ],
          &DScalerSettings[SCREENSAVEROFF         ],
          &DScalerSettings[SINGLEKEYTELETEXTTOGGLE],
--- 6973,6982 ----
  {
      // Other Settings
!     SETTING* OtherSettings[7] =
      {
          &DScalerSettings[DISPLAYSPLASHSCREEN    ],
          &DScalerSettings[AUTOHIDECURSOR         ],
          &DScalerSettings[LOCKKEYBOARD           ],
+         &DScalerSettings[LOCKKEYBOARDMAINWINDOWONLY],
          &DScalerSettings[SCREENSAVEROFF         ],
          &DScalerSettings[SINGLEKEYTELETEXTTOGGLE],