empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Fix command history

Browse source
This commit is contained in:
Ilari Liusvaara 2012-01-13 23:28:45 +02:00
parent 0a17ffdc3e
commit 07f0969ba5
3 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1-β7
1-β8

1
include/plat-sdl/platform.hpp
View file

@ -215,6 +215,7 @@ private:
uint32_t autorepeating_key;
int autorepeat_phase; //0 => Off, 1 => First, 2 => Subsequent.
uint32_t autorepeat_counter;
std::vector<uint32_t> saved_codepoints;
std::vector<uint32_t> codepoints;
size_t cursor_pos;
bool overwrite_mode;

28
src/plat-sdl/commandline.cpp
View file

@ -1,6 +1,7 @@
#include "plat-sdl/platform.hpp"
#include <sstream>
#define MAXHISTORY 1000
namespace
{
@ -24,7 +25,10 @@ std::string commandline_model::key(uint32_t k) throw(std::bad_alloc)
case SPECIAL_NOOP:
return "";
case SPECIAL_ACK:
history.push_front(codepoints);
history_itr = history.end();
history.push_back(codepoints);
if(history.size() > MAXHISTORY)
history.pop_front();
ret = read_command();
enabled_flag = false;
return ret;
@ -186,12 +190,30 @@ void commandline_model::handle_cow()
void commandline_model::scroll_history_up()
{
std::list<std::vector<uint32_t>>::iterator tmp;
if(history_itr == history.end())
//Save the current commandline.
saved_codepoints = codepoints;
if(history_itr == history.begin())
//At the begnning.
return;
history_itr--;
codepoints = *history_itr;
if(cursor_pos > codepoints.size())
cursor_pos = codepoints.size();
}
void commandline_model::scroll_history_down()
{
std::list<std::vector<uint32_t>>::iterator tmp;
if(history_itr == history.end())
//At the end.
return;
history_itr++;
if(history_itr == history.end())
codepoints = saved_codepoints;
else
codepoints = *history_itr;
if(cursor_pos > codepoints.size())
cursor_pos = codepoints.size();
}
void commandline_model::delete_codepoint(size_t idx)