[hbelusca] 69431: [NTVDM] Usability fixes (part 2): - Properly keep the mouse show state across screenbuffer switches. - Use unicode strings for the disk menu items. See r69428.
3 Oct
2015
3 Oct
'15
3:06 p.m.
Author: hbelusca
Date: Sat Oct 3 15:06:24 2015
New Revision: 69431
URL: http://svn.reactos.org/svn/reactos?rev=69431&view=rev
Log:
[NTVDM]
Usability fixes (part 2):
- Properly keep the mouse show state across screenbuffer switches.
- Use unicode strings for the disk menu items.
See r69428.
Modified:
trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c
trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sat Oct 3
15:06:24 2015
@@ -961,12 +961,9 @@
{
ASSERT(ScreenBuffer);
- /* Set the active buffer */
+ /* Set the active buffer and reattach the VDM UI to it */
SetConsoleActiveScreenBuffer(ScreenBuffer);
-
- /* Reinitialize the VDM menu */
- DestroyVdmMenu();
- CreateVdmMenu(ScreenBuffer);
+ ConsoleReattach(ScreenBuffer);
}
static BOOL VgaEnterGraphicsMode(PCOORD Resolution)
Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sat Oct 3 15:06:24 2015
@@ -163,19 +163,20 @@
UpdateVdmMenuDisks(VOID)
{
UINT_PTR ItemID;
+ UNICODE_STRING ValueString;
USHORT i;
- CHAR szNoMedia[100];
- CHAR szMenuString1[256], szMenuString2[256];
+ WCHAR szNoMedia[100];
+ WCHAR szMenuString1[256], szMenuString2[256];
/* Update the disks menu items */
- LoadStringA(GetModuleHandle(NULL),
+ LoadStringW(GetModuleHandle(NULL),
IDS_NO_MEDIA,
szNoMedia,
ARRAYSIZE(szNoMedia));
- LoadStringA(GetModuleHandle(NULL),
+ LoadStringW(GetModuleHandle(NULL),
IDS_VDM_MOUNT_FLOPPY,
szMenuString1,
ARRAYSIZE(szMenuString1));
@@ -188,10 +189,15 @@
GlobalSettings.FloppyDisks[i].Buffer &&
GlobalSettings.FloppyDisks[i].Buffer != '\0')
{
+ /* Convert the ANSI string to UNICODE */
+ RtlAnsiStringToUnicodeString(&ValueString,
&GlobalSettings.FloppyDisks[i], TRUE);
+
/* Update item text */
- _snprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i,
GlobalSettings.FloppyDisks[i].Buffer);
- szMenuString2[ARRAYSIZE(szMenuString2) - 1] = ANSI_NULL;
- ModifyMenuA(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID,
szMenuString2);
+ _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i,
ValueString.Buffer);
+ szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL;
+ ModifyMenuW(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID,
szMenuString2);
+
+ RtlFreeUnicodeString(&ValueString);
/* Enable the eject item */
EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_ENABLED);
@@ -199,9 +205,9 @@
else
{
/* Update item text */
- _snprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i,
szNoMedia);
- szMenuString2[ARRAYSIZE(szMenuString2) - 1] = ANSI_NULL;
- ModifyMenuA(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID,
szMenuString2);
+ _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i,
szNoMedia);
+ szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL;
+ ModifyMenuW(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID,
szMenuString2);
/* Disable the eject item */
EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_GRAYED);
@@ -209,46 +215,27 @@
}
}
-static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr)
-{
- if (ShowPtr)
- {
- /* Be sure the cursor will be shown */
- while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ;
- }
- else
- {
- /* Be sure the cursor will be hidden */
- while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ;
- }
-}
-
static VOID
UpdateVdmMenu(VOID)
{
- // This is a temporary HACK until I find the most elegant way
- // to synchronize mouse cursor display with console screenbuffer switches.
- ShowHideMousePointer(CurrentConsoleOutput, ShowPointer);
-
UpdateVdmMenuMouse();
UpdateVdmMenuDisks();
}
-/*static*/ VOID
+static VOID
CreateVdmMenu(HANDLE ConOutHandle)
{
HMENU hVdmSubMenu;
- UINT_PTR ItemID = ID_VDM_DRIVES;
+ UINT_PTR ItemID;
UINT Pos;
+ USHORT i;
WCHAR szNoMedia[100];
WCHAR szMenuString1[256], szMenuString2[256];
hConsoleMenu = ConsoleMenuControl(ConOutHandle,
ID_SHOWHIDE_MOUSE,
- ID_VDM_DRIVES + 4);
+ ID_VDM_DRIVES + (2 *
ARRAYSIZE(GlobalSettings.FloppyDisks)));
if (hConsoleMenu == NULL) return;
-
- CurrentConsoleOutput = ConOutHandle;
/* Get the position where we are going to insert our menu items */
VdmMenuPos = GetMenuItemCount(hConsoleMenu);
@@ -273,30 +260,32 @@
szMenuString1,
ARRAYSIZE(szMenuString1));
- /* Drive 0 -- Mount */
- _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 0,
szNoMedia);
- szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL;
- InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 0,
szMenuString2);
-
- /* Drive 1 -- Mount */
- _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 1,
szNoMedia);
- szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL;
- InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 2,
szMenuString2);
+ /* Drive 'x' -- Mount */
+ for (i = 0; i < ARRAYSIZE(GlobalSettings.FloppyDisks); ++i)
+ {
+ ItemID = ID_VDM_DRIVES + (2 * i);
+
+ /* Add the item */
+ _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i,
szNoMedia);
+ szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL;
+ InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID,
szMenuString2);
+ }
LoadStringW(GetModuleHandle(NULL),
IDS_VDM_EJECT_FLOPPY,
szMenuString1,
ARRAYSIZE(szMenuString1));
- /* Drive 0 -- Eject */
- _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 0);
- szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL;
- InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 1,
szMenuString2);
-
- /* Drive 1 -- Eject */
- _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 1);
- szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL;
- InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 3,
szMenuString2);
+ /* Drive 'x' -- Eject */
+ for (i = 0; i < ARRAYSIZE(GlobalSettings.FloppyDisks); ++i)
+ {
+ ItemID = ID_VDM_DRIVES + (2 * i);
+
+ /* Add the item */
+ _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i);
+ szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL;
+ InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 1,
szMenuString2);
+ }
/* Refresh the menu state */
UpdateVdmMenu();
@@ -304,7 +293,7 @@
}
}
-/*static*/ VOID
+static VOID
DestroyVdmMenu(VOID)
{
UINT i = 0;
@@ -317,8 +306,20 @@
} while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL &&
Items[i].uCmdID == 0));
DrawMenuBar(hConsoleWnd);
-
- CurrentConsoleOutput = INVALID_HANDLE_VALUE;
+}
+
+static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr)
+{
+ if (ShowPtr)
+ {
+ /* Be sure the cursor will be shown */
+ while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ;
+ }
+ else
+ {
+ /* Be sure the cursor will be hidden */
+ while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ;
+ }
}
static VOID EnableExtraHardware(HANDLE ConsoleInput)
@@ -867,6 +868,17 @@
SetConsoleMode(ConsoleInput , OrgConsoleInputMode );
}
+VOID
+ConsoleReattach(HANDLE ConOutHandle)
+{
+ DestroyVdmMenu();
+ CurrentConsoleOutput = ConOutHandle;
+ CreateVdmMenu(ConOutHandle);
+
+ /* Synchronize mouse cursor display with console screenbuffer switches */
+ ShowHideMousePointer(CurrentConsoleOutput, ShowPointer);
+}
+
static BOOL
ConsoleInit(VOID)
{
Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sat Oct 3 15:06:24 2015
@@ -100,14 +100,11 @@
IN LPCSTR Format, ...);
/*static*/ VOID
-CreateVdmMenu(HANDLE ConOutHandle);
-/*static*/ VOID
-DestroyVdmMenu(VOID);
-/*static*/ VOID
UpdateVdmMenuDisks(VOID);
BOOL ConsoleAttach(VOID);
VOID ConsoleDetach(VOID);
+VOID ConsoleReattach(HANDLE ConOutHandle);
VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent);
VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent);
3371
days inactive
3371
days old
0 comments
1 participants
participants (1)
-
hbelusca＠svn.reactos.org