[ros-diffs] [ekohl] 26295: Change keyboard settings on-the-fly to make the preview work properly.

Author: ekohl
Date: Mon Apr  9 17:26:55 2007
New Revision: 26295

URL: http://svn.reactos.org/svn/reactos?rev=26295&view=rev
Log:
Change keyboard settings on-the-fly to make the preview work properly.

Modified:
    trunk/reactos/dll/cpl/main/keyboard.c

Modified: trunk/reactos/dll/cpl/main/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/keyboard.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/main/keyboard.c (original)
+++ trunk/reactos/dll/cpl/main/keyboard.c Mon Apr  9 17:26:55 2007
@@ -39,7 +39,9 @@
 typedef struct _SPEED_DATA
 {
     INT nKeyboardDelay;
+    INT nOrigKeyboardDelay;
     DWORD dwKeyboardSpeed;
+    DWORD dwOrigKeyboardSpeed;
     UINT uCaretBlinkTime;
     UINT uOrigCaretBlinkTime;
     BOOL fShowCursor;
@@ -73,6 +75,8 @@
                 pSpeedData->nKeyboardDelay = 2;
             }
 
+            pSpeedData->nOrigKeyboardDelay = pSpeedData->nKeyboardDelay;
+
             /* Get current keyboard delay */
             if (!SystemParametersInfo(SPI_GETKEYBOARDSPEED,
                                       sizeof(DWORD),
@@ -81,6 +85,8 @@
             {
                 pSpeedData->dwKeyboardSpeed = 31;
             }
+
+            pSpeedData->dwOrigKeyboardSpeed = pSpeedData->dwKeyboardSpeed;
 
             pSpeedData->fShowCursor = TRUE;
             GetWindowRect(GetDlgItem(hwndDlg, IDC_TEXT_CURSOR_BLINK),
&pSpeedData->rcCursor);
@@ -117,11 +123,19 @@
                         case TB_BOTTOM:
                         case TB_ENDTRACK:
                             pSpeedData->nKeyboardDelay = 3 -
(INT)SendDlgItemMessage(hwndDlg, IDC_SLIDER_REPEAT_DELAY, TBM_GETPOS, 0, 0);
+                            SystemParametersInfo(SPI_SETKEYBOARDDELAY,
+                                                 pSpeedData->nKeyboardDelay,
+                                                 0,
+                                                 0);
                             PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                             break;
 
                         case TB_THUMBTRACK:
                             pSpeedData->nKeyboardDelay = 3 - (INT)HIWORD(wParam);
+                            SystemParametersInfo(SPI_SETKEYBOARDDELAY,
+                                                 pSpeedData->nKeyboardDelay,
+                                                 0,
+                                                 0);
                             PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                             break;
                 }
@@ -138,11 +152,19 @@
                         case TB_BOTTOM:
                         case TB_ENDTRACK:
                             pSpeedData->dwKeyboardSpeed =
(DWORD)SendDlgItemMessage(hwndDlg, IDC_SLIDER_REPEAT_RATE, TBM_GETPOS, 0, 0);
+                            SystemParametersInfo(SPI_SETKEYBOARDSPEED,
+                                                 pSpeedData->dwKeyboardSpeed,
+                                                 0,
+                                                 0);
                             PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                             break;
 
                         case TB_THUMBTRACK:
                             pSpeedData->dwKeyboardSpeed = (DWORD)HIWORD(wParam);
+                            SystemParametersInfo(SPI_SETKEYBOARDSPEED,
+                                                 pSpeedData->dwKeyboardSpeed,
+                                                 0,
+                                                 0);
                             PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                             break;
                 }
@@ -203,11 +225,11 @@
             switch(lpnm->code)
             {
                 case PSN_APPLY:
+                    /* Set the new keyboard settings */
                     SystemParametersInfo(SPI_SETKEYBOARDDELAY,
                                          pSpeedData->nKeyboardDelay,
                                          0,
                                          0);
-
                     SystemParametersInfo(SPI_SETKEYBOARDSPEED,
                                          pSpeedData->dwKeyboardSpeed,
                                          0,
@@ -215,7 +237,16 @@
                     return TRUE;
 
                 case PSN_RESET:
+                    /* Restore the original settings */
                     SetCaretBlinkTime(pSpeedData->uOrigCaretBlinkTime);
+                    SystemParametersInfo(SPI_SETKEYBOARDDELAY,
+                                         pSpeedData->nOrigKeyboardDelay,
+                                         0,
+                                         0);
+                    SystemParametersInfo(SPI_SETKEYBOARDSPEED,
+                                         pSpeedData->dwOrigKeyboardSpeed,
+                                         0,
+                                         0);
                     break;
 
                 default: