i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check keys against "raw_char" instead of "key"

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22512 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2007-10-12 09:44:32 +00:00
parent cbcae6ef9b
commit 9d12401dcf
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/TermView.cpp
+10 -15
View File
@@ -1486,32 +1486,27 @@ TermView::KeyDown(const char *bytes, int32 numBytes)
fShell->Signal(SIGINT); fShell->Signal(SIGINT);
} }
//printf("rawKey: %c\n", (char)rawChar);
// Terminal filters RET, ENTER, F1...F12, and ARROW key code. // Terminal filters RET, ENTER, F1...F12, and ARROW key code.
// TODO: Cleanup // TODO: Cleanup
if (numBytes == 1) { if (numBytes == 1) {
switch (*bytes) { switch (*bytes) {
case B_RETURN: case B_RETURN:
if (key == RETURN_KEY || key == ENTER_KEY) { if (rawChar == B_RETURN) {
char c = 0x0d; char c = 0x0d;
fShell->Write(&c, 1); fShell->Write(&c, 1);
return; return;
} else {
fShell->Write(bytes, numBytes);
return;
} }
break; break;
case B_LEFT_ARROW: case B_LEFT_ARROW:
if (key == LEFT_ARROW_KEY) { if (rawChar == B_LEFT_ARROW) {
fShell->Write(LEFT_ARROW_KEY_CODE, sizeof(LEFT_ARROW_KEY_CODE) - 1); fShell->Write(LEFT_ARROW_KEY_CODE, sizeof(LEFT_ARROW_KEY_CODE) - 1);
return; return;
} }
break; break;
case B_RIGHT_ARROW: case B_RIGHT_ARROW:
if (key == RIGHT_ARROW_KEY) { if (rawChar == B_RIGHT_ARROW) {
fShell->Write(RIGHT_ARROW_KEY_CODE, sizeof(RIGHT_ARROW_KEY_CODE) - 1); fShell->Write(RIGHT_ARROW_KEY_CODE, sizeof(RIGHT_ARROW_KEY_CODE) - 1);
return; return;
} }
@@ -1525,7 +1520,7 @@ TermView::KeyDown(const char *bytes, int32 numBytes)
} }
return; return;
} }
if (key == UP_ARROW_KEY) { if (rawChar == B_UP_ARROW) {
fShell->Write(UP_ARROW_KEY_CODE, sizeof(UP_ARROW_KEY_CODE) - 1); fShell->Write(UP_ARROW_KEY_CODE, sizeof(UP_ARROW_KEY_CODE) - 1);
return; return;
} }
@@ -1538,28 +1533,28 @@ TermView::KeyDown(const char *bytes, int32 numBytes)
return; return;
} }
if (key == DOWN_ARROW_KEY) { if (rawChar == B_DOWN_ARROW) {
fShell->Write(DOWN_ARROW_KEY_CODE, sizeof(DOWN_ARROW_KEY_CODE) - 1); fShell->Write(DOWN_ARROW_KEY_CODE, sizeof(DOWN_ARROW_KEY_CODE) - 1);
return; return;
} }
break; break;
case B_INSERT: case B_INSERT:
if (key == INSERT_KEY) { if (rawChar == B_INSERT) {
fShell->Write(INSERT_KEY_CODE, sizeof(INSERT_KEY_CODE) - 1); fShell->Write(INSERT_KEY_CODE, sizeof(INSERT_KEY_CODE) - 1);
return; return;
} }
break; break;
case B_HOME: case B_HOME:
if (key == HOME_KEY) { if (rawChar == B_HOME) {
fShell->Write(HOME_KEY_CODE, sizeof(HOME_KEY_CODE) - 1); fShell->Write(HOME_KEY_CODE, sizeof(HOME_KEY_CODE) - 1);
return; return;
} }
break; break;
case B_END: case B_END:
if (key == END_KEY) { if (rawChar == B_END) {
fShell->Write(END_KEY_CODE, sizeof(END_KEY_CODE) - 1); fShell->Write(END_KEY_CODE, sizeof(END_KEY_CODE) - 1);
return; return;
} }
@@ -1573,7 +1568,7 @@ TermView::KeyDown(const char *bytes, int32 numBytes)
} }
return; return;
} }
if (key == PAGE_UP_KEY) { if (rawChar == B_PAGE_UP) {
fShell->Write(PAGE_UP_KEY_CODE, sizeof(PAGE_UP_KEY_CODE) - 1); fShell->Write(PAGE_UP_KEY_CODE, sizeof(PAGE_UP_KEY_CODE) - 1);
return; return;
} }
@@ -1586,7 +1581,7 @@ TermView::KeyDown(const char *bytes, int32 numBytes)
return; return;
} }
if (key == PAGE_DOWN_KEY) { if (rawChar == B_PAGE_DOWN) {
fShell->Write(PAGE_DOWN_KEY_CODE, sizeof(PAGE_DOWN_KEY_CODE) - 1); fShell->Write(PAGE_DOWN_KEY_CODE, sizeof(PAGE_DOWN_KEY_CODE) - 1);
return; return;
} }