Author: hbelusca Date: Mon Apr 1 17:26:53 2013 New Revision: 58634
URL: http://svn.reactos.org/svn/reactos?rev=58634&view=rev Log: [CONSRV] Allow passing into quick-edit and insert mode via the console properties dialog. Also make the context menu working.
Modified: branches/ros-csrss/dll/cpl/console/options.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c branches/ros-csrss/win32ss/user/consrv/settings.c
Modified: branches/ros-csrss/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/option... ============================================================================== --- branches/ros-csrss/dll/cpl/console/options.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/options.c [iso-8859-1] Mon Apr 1 17:26:53 2013 @@ -105,48 +105,48 @@ } case IDC_CHECK_QUICK_EDIT: { - lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); + lResult = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); if (lResult == BST_CHECKED) { pConInfo->ci.QuickEdit = FALSE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } else if (lResult == BST_UNCHECKED) { pConInfo->ci.QuickEdit = TRUE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_CHECK_INSERT_MODE: { - lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); + lResult = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); if (lResult == BST_CHECKED) { pConInfo->ci.InsertMode = FALSE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } else if (lResult == BST_UNCHECKED) { pConInfo->ci.InsertMode = TRUE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_CHECK_DISCARD_DUPLICATES: { - lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); + lResult = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); if (lResult == BST_CHECKED) { pConInfo->ci.HistoryNoDup = FALSE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } else if (lResult == BST_UNCHECKED) { pConInfo->ci.HistoryNoDup = TRUE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break;
Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/fr... ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Mon Apr 1 17:26:53 2013 @@ -1529,6 +1529,7 @@ } }
+ case WM_COMMAND: case WM_SYSCOMMAND: { Result = GuiConsoleHandleSysMenuCommand(GuiData, wParam, lParam);
Modified: branches/ros-csrss/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/se... ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] Mon Apr 1 17:26:53 2013 @@ -451,6 +451,23 @@ BOOL SizeChanged = FALSE;
/* + * Apply full-screen mode. + */ + if (ConsoleInfo->FullScreen) + Console->ActiveBuffer->DisplayMode |= CONSOLE_FULLSCREEN_MODE; + else + Console->ActiveBuffer->DisplayMode &= ~CONSOLE_FULLSCREEN_MODE; + // TODO: Apply it really + + /* + * Apply terminal-edition settings: + * - QuickEdit and Insert modes, + * - history settings. + */ + Console->QuickEdit = ConsoleInfo->QuickEdit; + Console->InsertMode = ConsoleInfo->InsertMode; + + /* * Apply foreground and background colors for both screen and popup * and copy the new palette. */