The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2024-11-25 12:56:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

If the keyboard is used for input, ignore where the ENTER key is pressed

Browse Source
This commit is contained in:
simon.kagstrom 2010-01-24 09:00:51 +00:00
parent a8c01b1783
commit 55724b0817
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
virtual_keyboard.cpp
View File

@ -84,6 +84,7 @@ VirtualKeyboard::VirtualKeyboard(Font *font) : GuiView(), ListenerManager()
this->sel_x = 0; this->sel_x = 0;
this->sel_y = 0; this->sel_y = 0;
this->shift_on = false; this->shift_on = false;
this->kbd_only_input = false;
this->is_active = false; this->is_active = false;
this->buf_head = 0; this->buf_head = 0;
@ -283,6 +284,8 @@ void VirtualKeyboard::activate()
this->is_active = true; this->is_active = true;
memset(this->buf, 0, sizeof(struct virtkey) * this->buf_len); memset(this->buf, 0, sizeof(struct virtkey) * this->buf_len);
this->buf_head = 0; this->buf_head = 0;
this->kbd_only_input = false;
} }
@ -403,14 +406,21 @@ void VirtualKeyboard::pushEvent(SDL_Event *ev)
case SDLK_RIGHT: case SDLK_RIGHT:
case SDLK_PAGEDOWN: case SDLK_PAGEDOWN:
case SDLK_PAGEUP: case SDLK_PAGEUP:
case SDLK_RETURN:
case SDLK_HOME: case SDLK_HOME:
case SDLK_ESCAPE: case SDLK_ESCAPE:
/* Handle via the standard widget implementation (except for space) */ /* Handle via the standard widget implementation (except for space) */
this->kbd_only_input = false;
Widget::pushEvent(ev); Widget::pushEvent(ev);
return; return;
case SDLK_RETURN:
if (this->kbd_only_input)
this->done();
else
Widget::pushEvent(ev);
return;
case SDLK_SPACE ... SDLK_z: case SDLK_SPACE ... SDLK_z:
Widget::pushEvent((event_t)(ev->key.keysym.sym)); Widget::pushEvent((event_t)(ev->key.keysym.sym));
this->kbd_only_input = true;
default: default:
break; break;
} }

2
virtual_keyboard.hh
View File

@ -89,6 +89,8 @@ private:
int sel_y; int sel_y;
bool shift_on; bool shift_on;
bool kbd_only_input;
bool is_active; bool is_active;
struct virtkey *buf; struct virtkey *buf;
unsigned buf_head; unsigned buf_head;