MCL/sf/os/fshell: comparison plugins/consoles/vt100cons/src/vt100/vtc

equal deleted inserted replaced

-:a6fec624de6c
+:706c7a69e448
 	iClientRequestStatus = &aStatus;
 	*iClientRequestStatus = KRequestPending;
 	if (iKeyCodePending)
 		{
 		iKeyCodePending = EFalse;
-		CompleteKeyPressRequest(iPendingKeyCode);
+		CompleteReadRequest(iPendingKeyCode);
 		}
 	else if (iInputError)
 		{
-		CompleteKeyPressRequest(iInputError);
+		CompleteReadRequest(iInputError);
 		iInputError = KErrNone;
 		}
 	else
 		{
-		ReadKeyPress();
+		ProcessInputBuffer();
 		}
 	}
 EXPORT_C void CVtConsoleInputController::CancelGetKeyPress()
 	{
 	Cancel();
 	if (iClientRequestStatus)
 		{
-		CompleteKeyPressRequest(KErrCancel);
+		CompleteReadRequest(KErrCancel);
 		}
 	}
 EXPORT_C void CVtConsoleInputController::SetMode(ConsoleMode::TMode aMode)
 	{
 	Reset();
 	iMode = aMode;
 	}
-void CVtConsoleInputController::ReadKeyPress()
+void CVtConsoleInputController::ProcessInputBuffer()
 	{
 	iEscapeTimer->Cancel();
 	while (iClientRequestStatus && (iBufPos < iBuf.Length()))
 		{
 		TUint8 c = iBuf[iBufPos++];
 		if (iMode == ConsoleMode::EBinary)
 			{
-			CompleteKeyPressRequest((TKeyCode)c);
+			CompleteReadRequest((TKeyCode)c);
 			}
 		else
 			{
 			switch (iState)
 				{
 						iEscapeTimer->Start(KEscapeTimeoutMicros, KEscapeTimeoutMicros, TCallBack(EscapeTimeoutS, this));
 						}
 					}
 				else
 					{
-					CompleteKeyPressRequest((TKeyCode)c);
+					CompleteReadRequest((TKeyCode)c);
 					}
 				break;
 			case EWaitingForEscapeChar2:
 				if (c == KEscapeChar2)
 					{
 					{
 					iState = EWaitingForEscapeChar3Func;
 					}
 				else
 					{
-					CompleteKeyPressRequest(EKeyEscape, (TKeyCode)c);
+					CompleteReadRequest(EKeyEscape, (TKeyCode)c);
 					iState = ENormal;
 					}
 				break;
 			case EWaitingForEscapeChar3:
 				if (c >= '0' && c <= '9')
 					}
 				else
 					{
 					// Gone off the rails, bail
 					iState = ENormal;
-					CompleteKeyPressRequest((TKeyCode)c);
+					CompleteReadRequest((TKeyCode)c);
 					}
 				break;
 				}
 			}
 		}
-	ReadInput();
+	RequestInput();
 	}
-void CVtConsoleInputController::CompleteKeyPressRequest(TInt aError)
+void CVtConsoleInputController::CompleteReadRequest(TInt aError)
 	{
 	ASSERT(iClientKeyPress && iClientRequestStatus);
 	iClientKeyPress = NULL;
 	User::RequestComplete(iClientRequestStatus, aError);
 	}
-void CVtConsoleInputController::CompleteKeyPressRequest(TKeyCode aKeyCode)
+void CVtConsoleInputController::CompleteReadRequest(TKeyCode aKeyCode)
 	{
 	ASSERT(iClientKeyPress && iClientRequestStatus);
 	iClientKeyPress->iCode = (TKeyCode)aKeyCode;
 	iClientKeyPress->iModifiers = 0;
 	iClientKeyPress = NULL;
 	User::RequestComplete(iClientRequestStatus, KErrNone);
 	}
-void CVtConsoleInputController::CompleteKeyPressRequest(TKeyCode aKeyCode1, TKeyCode aKeyCode2)
+void CVtConsoleInputController::CompleteReadRequest(TKeyCode aKeyCode1, TKeyCode aKeyCode2)
 	{
 	ASSERT(!iKeyCodePending);
 	// Store the second key-code in a member variable to be used the next time GetKeyPress is called.
 	iKeyCodePending = ETrue;
 	iPendingKeyCode = aKeyCode2;
-	CompleteKeyPressRequest(aKeyCode1);
+	CompleteReadRequest(aKeyCode1);
 	}
 void CVtConsoleInputController::Reset()
 	{
 	Cancel();
 	iEscapeTimer->Cancel();
 	iState = ENormal;
 	iKeyCodePending = EFalse;
 	}
-void CVtConsoleInputController::ReadInput()
+void CVtConsoleInputController::RequestInput()
 	{
 	if (iClientRequestStatus && !IsActive()) // Note, if the escape timer expired we could already be active.
 		{
 		ASSERT(iBufPos == iBuf.Length());
 		iBufPos = 0;
 	{
 	TInt err = iStatus.Int();
 #ifdef FSHELL_PLATFORM_OPP
 	if (err == KErrAbort)
 		{
-		ReadInput();
+		RequestInput();
 		return;
 		}
 #endif
 	if (err == KErrNone)
 		{
-		ReadKeyPress();
+		ProcessInputBuffer();
 		}
 	else if (iClientRequestStatus)
 		{
-		CompleteKeyPressRequest(err);
+		CompleteReadRequest(err);
 		}
 	else
 		{
 		// Report the error next time the client requests a key.
 		iInputError = err;
 	iState = ENormal;
 	for (TInt j = 0; j < aMappingCount; ++j)
 		{
 		if (aChar == aMappings[j].iEscapeChar)
 			{
-			CompleteKeyPressRequest(aMappings[j].iKeyCode);
+			CompleteReadRequest(aMappings[j].iKeyCode);
 			return;
 			}
 		}
 	}
 TInt CVtConsoleInputController::EscapeTimeout()
 	{
 	ASSERT(iState == EWaitingForEscapeChar2);
 	iState = ENormal;
-	CompleteKeyPressRequest(EKeyEscape);
+	CompleteReadRequest(EKeyEscape);
 	return KErrNone;
 	}
 TInt CVtConsoleInputController::EscapeTimeoutS(TAny* aSelf)
 	{
 	for (TInt j = 0; j < KNumExtendedEscapeMappings; ++j)
 		{
 		const TLongerEscapeMapping& mapping = KExtendedEscapeMappings[j];
 		if (escape1 == mapping.iEscapeChar1 && escape2 == mapping.iEscapeChar2)
 			{
-			CompleteKeyPressRequest(mapping.iKeyCode);
+			CompleteReadRequest(mapping.iKeyCode);
 			return;
 			}
 		}
 	}

changeset 83	706c7a69e448
parent 0	7f656887cf89