mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25091) -Codechange: Call keycodes by their name.

release/1.4
frosch 2013-03-17 13:05:18 +00:00
parent 19b18d7822
commit 1ddf5a0786
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/textbuf.cpp
View File

@ -98,13 +98,13 @@ void Textbuf::DelChar(bool backspace)
/** /**
* Delete a character from a textbuffer, either with 'Delete' or 'Backspace' * Delete a character from a textbuffer, either with 'Delete' or 'Backspace'
* The character is delete from the position the caret is at * The character is delete from the position the caret is at
* @param delmode Type of deletion, either WKC_BACKSPACE or WKC_DELETE * @param keycode Type of deletion, either WKC_BACKSPACE or WKC_DELETE
* @return Return true on successful change of Textbuf, or false otherwise * @return Return true on successful change of Textbuf, or false otherwise
*/ */
bool Textbuf::DeleteChar(int delmode) bool Textbuf::DeleteChar(uint16 keycode)
{ {
if (delmode == WKC_BACKSPACE || delmode == WKC_DELETE) { if (keycode == WKC_BACKSPACE || keycode == WKC_DELETE) {
bool backspace = delmode == WKC_BACKSPACE; bool backspace = keycode == WKC_BACKSPACE;
if (CanDelChar(backspace)) { if (CanDelChar(backspace)) {
this->DelChar(backspace); this->DelChar(backspace);
return true; return true;
@ -112,8 +112,8 @@ bool Textbuf::DeleteChar(int delmode)
return false; return false;
} }
if (delmode == (WKC_CTRL | WKC_BACKSPACE) || delmode == (WKC_CTRL | WKC_DELETE)) { if (keycode == (WKC_CTRL | WKC_BACKSPACE) || keycode == (WKC_CTRL | WKC_DELETE)) {
bool backspace = delmode == (WKC_CTRL | WKC_BACKSPACE); bool backspace = keycode == (WKC_CTRL | WKC_BACKSPACE);
if (!CanDelChar(backspace)) return false; if (!CanDelChar(backspace)) return false;
WChar c = this->GetNextDelChar(backspace); WChar c = this->GetNextDelChar(backspace);
@ -276,12 +276,12 @@ WChar Textbuf::MoveCaretRight()
/** /**
* Handle text navigation with arrow keys left/right. * Handle text navigation with arrow keys left/right.
* This defines where the caret will blink and the next character interaction will occur * This defines where the caret will blink and the next character interaction will occur
* @param navmode Direction in which navigation occurs (WKC_CTRL |) WKC_LEFT, (WKC_CTRL |) WKC_RIGHT, WKC_END, WKC_HOME * @param keycode Direction in which navigation occurs (WKC_CTRL |) WKC_LEFT, (WKC_CTRL |) WKC_RIGHT, WKC_END, WKC_HOME
* @return Return true on successful change of Textbuf, or false otherwise * @return Return true on successful change of Textbuf, or false otherwise
*/ */
bool Textbuf::MovePos(int navmode) bool Textbuf::MovePos(uint16 keycode)
{ {
switch (navmode) { switch (keycode) {
case WKC_LEFT: case WKC_LEFT:
if (this->CanMoveCaretLeft()) { if (this->CanMoveCaretLeft()) {
this->MoveCaretLeft(); this->MoveCaretLeft();

8
src/textbuf_type.h
View File

@ -36,10 +36,12 @@ struct Textbuf {
void CDECL Print(const char *format, ...) WARN_FORMAT(2, 3); void CDECL Print(const char *format, ...) WARN_FORMAT(2, 3);
void DeleteAll(); void DeleteAll();
bool DeleteChar(int delmode);
bool InsertChar(uint32 key);
bool InsertClipboard(); bool InsertClipboard();
bool MovePos(int navmode);
bool InsertChar(uint32 key);
bool DeleteChar(uint16 keycode);
bool MovePos(uint16 keycode);
bool HandleCaret(); bool HandleCaret();
void UpdateSize(); void UpdateSize();