Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

window: properly ignore all non-printable char codes (ctrl-?, F?, etc.)

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-07-16 01:52:42 +02:00
parent 7b8a286c49
commit 6313139566
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/window.cpp
View File

@@ -497,14 +497,6 @@ std::string Window::GetString(const std::string &base, size_t length, size_t wid
prefresh(itsWindow, 0, 0, itsStartY, itsStartX, itsStartY+itsHeight-1, itsStartX+itsWidth-1); prefresh(itsWindow, 0, 0, itsStartY, itsStartX, itsStartY+itsHeight-1, itsStartX+itsWidth-1);
ReadKey(input); ReadKey(input);
// these key codes are special and should be ignored
if (input >= KEY_CTRL_A
&& input != KEY_CTRL_H
&& input != KEY_ENTER
&& input != KEY_CTRL_U
&& input <= KEY_CTRL_Z)
continue;
switch (input) switch (input)
{ {
case ERR: case ERR:
@@ -599,30 +591,34 @@ std::string Window::GetString(const std::string &base, size_t length, size_t wid
if (int(mbrtowc(&wc_in, tmp_in.c_str(), MB_CUR_MAX, 0)) < 0) if (int(mbrtowc(&wc_in, tmp_in.c_str(), MB_CUR_MAX, 0)) < 0)
break; break;
if (wcwidth(wc_in) > 1) int wcwidth_res = wcwidth(wc_in);
if (wcwidth_res > 1)
block_scrolling = 1; block_scrolling = 1;
if ((real_x-minx)+beginning >= tmp->length()) if (wcwidth_res > 0) // is char printable? we want to ignore things like Ctrl-?, Fx etc.
{ {
tmp->push_back(wc_in); if ((real_x-minx)+beginning >= tmp->length())
if (!beginning)
{ {
real_x++; tmp->push_back(wc_in);
x += wcwidth(wc_in); if (!beginning)
} {
beginning++; real_x++;
gotoend = 1; x += wcwidth(wc_in);
} }
else
{
tmp->insert(tmp->begin()+(real_x-minx)+beginning, wc_in);
if (x < maxx)
{
real_x++;
x += wcwidth(wc_in);
}
else if (beginning < maxbeginning)
beginning++; beginning++;
gotoend = 1;
}
else
{
tmp->insert(tmp->begin()+(real_x-minx)+beginning, wc_in);
if (x < maxx)
{
real_x++;
x += wcwidth(wc_in);
}
else if (beginning < maxbeginning)
beginning++;
}
} }
tmp_in.clear(); tmp_in.clear();
} }