zfc9000: comparison sources/interface.cpp

-:20ca0a6be175
+:9b6a0daedfc0
 		return COLOR_PAIR(1 + (int(fg) * NUM_COLORS) + int(bg));
 }
 // -------------------------------------------------------------------------------------------------
 //
-const String& Interface::getCurrentInput()
+const std::string& Interface::getCurrentInput()
 {
 	return m_inputHistory[m_inputCursor];
 }
 // -------------------------------------------------------------------------------------------------
 }
 // -------------------------------------------------------------------------------------------------
 // A version of current_input() that allows changing the contents of it.
 //
-String& Interface::getEditableInput()
+std::string& Interface::getEditableInput()
 {
 	detachInput();
 	return m_inputHistory[m_inputCursor];
 }
 	}
 }
 // -------------------------------------------------------------------------------------------------
 //
-String Interface::getPromptString()
+std::string Interface::getPromptString()
 {
-	String prompt;
+	std::string prompt;
 	switch (m_inputState)
 	{
 	case INPUTSTATE_NORMAL: prompt = ">"; break;
 	case INPUTSTATE_ADDRESS: prompt = "address:"; break;
 	m_needRefresh = true;
 }
 // -------------------------------------------------------------------------------------------------
 //
-void Interface::setTitle(const String& title)
+void Interface::setTitle(const std::string& title)
 {
 	m_title = title;
 	renderTitlebar();
 }
 		attroff(promptColor);
 		m_needRefresh = true;
 		return;
 	}
-	String prompt = getPromptString();
+	std::string prompt = getPromptString();
 	int displayLength = COLS - prompt.length() - 2;
-	String displayString = getCurrentInput();
+	std::string displayString = getCurrentInput();
 	int y = LINES - 2;
 	// If we're inputting a password, replace it with asterisks
 	if (m_inputState == INPUTSTATE_PASSWORD)
 	{
 // -------------------------------------------------------------------------------------------------
 //
 void Interface::updateStatusBar()
 {
-	String text;
+	std::string text;
 	switch (m_session.getState())
 	{
 	case RCON_DISCONNECTED:
 		text = "Disconnected.";
 		text = "Connecting to " + m_session.address().to_string(IPAddress::WITH_PORT) + "...";
 		break;
 	case RCON_CONNECTED:
 		{
-			String adminText;
+			std::string adminText;
 			if (m_session.getAdminCount() == 0)
 			{
 				adminText = "No other admins";
 			}
 // -------------------------------------------------------------------------------------------------
 //
 int Interface::findPreviousWord()
 {
-	const String& input = getCurrentInput();
+	const std::string& input = getCurrentInput();
 	int pos = m_cursorPosition;
 	// Move past whitespace
 	while (pos > 0 and isspace(input[pos - 1]))
 		pos--;
 // -------------------------------------------------------------------------------------------------
 //
 int Interface::findNextWord()
 {
-	const String& input = getCurrentInput();
+	const std::string& input = getCurrentInput();
 	int pos = m_cursorPosition;
 	// Move past current whitespace
 	while (pos < static_cast<signed>(input.length()) and isspace(input[pos]))
 		pos++;
 		return;
 	if (m_cursorPosition > a and m_cursorPosition <= b)
 		m_cursorPosition = a;
-	String& input = getEditableInput();
+	std::string& input = getEditableInput();
 	m_pasteBuffer = mid(input, a, b);
 	input = remove_range(input, a, b - a);
 	m_needInputRender = true;
 }
 	case KEY_BACKSPACE:
 	case '\b':
 		if (m_cursorPosition > 0)
 		{
-			String& input = getEditableInput();
+			std::string& input = getEditableInput();
 			input.erase(input.begin() + m_cursorPosition);
 			m_cursorPosition -= 1;
 			m_needInputRender = true;
 		}
 		break;
 	case KEY_DC:
 	case 'D' - 'A' + 1: // readline ^D
 		if (m_cursorPosition < static_cast<signed>(getCurrentInput().length()))
 		{
-			String& input = getEditableInput();
+			std::string& input = getEditableInput();
 			input.erase(input.begin() + m_cursorPosition);
 			m_needInputRender = true;
 		}
 		break;
 			if (m_inputState == INPUTSTATE_NORMAL
 				and m_cursorPosition > 0
 				and(space == -1 or space >= m_cursorPosition))
 			{
-				String start = mid(getCurrentInput(), 0, m_cursorPosition);
+				std::string start = mid(getCurrentInput(), 0, m_cursorPosition);
 				m_session.requestTabCompletion(start);
 			}
 		}
 		break;
 // -------------------------------------------------------------------------------------------------
 //
 void Interface::vprint(const char* fmtstr, va_list args)
 {
-	String message;
+	std::string message;
 	message = vsprintf(fmtstr, args);
 	printToConsole(message);
 }
 // -------------------------------------------------------------------------------------------------
 	va_end(args);
 }
 // -------------------------------------------------------------------------------------------------
 //
-void Interface::printToConsole(String message)
+void Interface::printToConsole(std::string message)
 {
 	// Zandronum sometimes sends color codes as "\\c" and sometimes as "\x1C".
 	// Let's correct that on our end and hope this won't cause conflicts.
 	replace_all(message, "\\c", "\x1C");
 			time_t now;
 			time(&now);
 			char timestamp[32];
 			strftime(timestamp, sizeof timestamp, "[%H:%M:%S] ", localtime(&now));
-			for (char ch : String(timestamp))
+			for (char ch : std::string(timestamp))
 				zfc::last(m_outputLines).addChar(ch);
 		}
 		// Remove some lines if there's too many of them. 20,000 should be enough, I hope.
 		while (m_outputLines.size() > 20000)
 	m_needOutputRender = true;
 }
 // -------------------------------------------------------------------------------------------------
 //
-void Interface::connect(String address, String password)
+void Interface::connect(std::string address, std::string password)
 {
 	try
 	{
 		m_remoteAddress = IPAddress::from_string(address);
 	}
 	m_session.connect(m_remoteAddress);
 }
 // -------------------------------------------------------------------------------------------------
 //
-void Interface::setPlayerNames(const StringList& names)
+void Interface::setPlayerNames(const std::vector<std::string>& names)
 {
 	m_playerNames.clear();
-	for (const String& name : names)
+	for (const std::string& name : names)
 	{
 		ColoredLine coloredname;
 		coloredname.addString(name);
 		coloredname.finalize();
 		m_playerNames.push_back(coloredname);
 	m_needNicklistRender = true;
 }
 // -------------------------------------------------------------------------------------------------
 //
-void Interface::tabComplete(const String& part, String complete)
+void Interface::tabComplete(const std::string& part, std::string complete)
 {
-	String& input = getEditableInput();
+	std::string& input = getEditableInput();
 	if (starts_with(input, part))
 	{
 		if (input[part.length()] != ' ')
 			complete += ' ';
 	}
 }
 // -------------------------------------------------------------------------------------------------
 //
-void Interface::handleCommand(const String& input)
+void Interface::handleCommand(const std::string& input)
 {
 	if (input[0] != '/')
 		return;
-	StringList args = split(right(input, input.length() - 1), " ");
+	std::vector<std::string> args = split(right(input, input.length() - 1), " ");
-	String command = to_lowercase(args[0]);
+	std::string command = to_lowercase(args[0]);
 	args.erase(args.begin());
 	if (command == "connect")
 	{
 		if (args.size() != 2)

Mercurial > zfc9000 / file comparison

comparison: sources/interface.cpp

sources/interface.cpp