Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed warnings.

Browse Source 
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19151 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-10-30 12:53:08 +00:00
parent 976db206e6
commit 3f2cb12385
1 changed files with 46 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/add-ons/input_server/methods/canna/CannaInterface.cpp
View File

@ -271,32 +271,25 @@ CannaInterface::ConvertSpecial( char ch, uint32 mod, int32 key )
#ifdef DEBUG #ifdef DEBUG
SERIAL_PRINT(( "CannaInterface: ConvertSpecial ch = 0x%x, mod = 0x%x, key = 0x%x\n", ch, mod, key )); SERIAL_PRINT(( "CannaInterface: ConvertSpecial ch = 0x%x, mod = 0x%x, key = 0x%x\n", ch, mod, key ));
#endif #endif
if ( mod & B_CONTROL_KEY ) // if control key is held down, do not convert special key if (mod & B_CONTROL_KEY) {
{ // if control key is held down, do not convert special key
switch ( ch ) switch (ch) {
{
case B_UP_ARROW: case B_UP_ARROW:
return CANNA_KEY_Cntrl_Up; return CANNA_KEY_Cntrl_Up;
break;
case B_DOWN_ARROW: case B_DOWN_ARROW:
return CANNA_KEY_Cntrl_Down; return CANNA_KEY_Cntrl_Down;
break;
case B_RIGHT_ARROW: case B_RIGHT_ARROW:
return CANNA_KEY_Cntrl_Right; return CANNA_KEY_Cntrl_Right;
break;
case B_LEFT_ARROW: case B_LEFT_ARROW:
return CANNA_KEY_Cntrl_Left; return CANNA_KEY_Cntrl_Left;
break;
default: default:
return (uint8)ch; return ch;
} }
} }
switch ( ch ) switch (ch) {
{
case B_FUNCTION_KEY: case B_FUNCTION_KEY:
switch( key ) switch (key) {
{
case B_F1_KEY: case B_F1_KEY:
case B_F2_KEY: case B_F2_KEY:
case B_F3_KEY: case B_F3_KEY:
@ -310,75 +303,59 @@ SERIAL_PRINT(( "CannaInterface: ConvertSpecial ch = 0x%x, mod = 0x%x, key = 0x%x
case B_F11_KEY: case B_F11_KEY:
case B_F12_KEY: case B_F12_KEY:
return (int)CANNA_KEY_F1 + (int)key - (int)B_F1_KEY; return (int)CANNA_KEY_F1 + (int)key - (int)B_F1_KEY;
break;
} }
break; break;
case B_INSERT: case B_INSERT:
return CANNA_KEY_Insert; return CANNA_KEY_Insert;
break;
case B_PAGE_UP: case B_PAGE_UP:
return CANNA_KEY_Rollup; return CANNA_KEY_Rollup;
break;
case B_PAGE_DOWN: case B_PAGE_DOWN:
return CANNA_KEY_Rolldown; return CANNA_KEY_Rolldown;
break;
case B_UP_ARROW: case B_UP_ARROW:
if (mod & B_SHIFT_KEY /* shifted */ ) if (mod & B_SHIFT_KEY /* shifted */ )
return CANNA_KEY_Shift_Up; return CANNA_KEY_Shift_Up;
else
return CANNA_KEY_Up; return CANNA_KEY_Up;
break;
case B_DOWN_ARROW: case B_DOWN_ARROW:
if (mod & B_SHIFT_KEY /* shifted */ ) if (mod & B_SHIFT_KEY /* shifted */ )
return CANNA_KEY_Shift_Down; return CANNA_KEY_Shift_Down;
else
return CANNA_KEY_Down; return CANNA_KEY_Down;
break;
case B_RIGHT_ARROW: case B_RIGHT_ARROW:
if (mod & B_SHIFT_KEY /* shifted */ ) if (mod & B_SHIFT_KEY /* shifted */ )
return CANNA_KEY_Shift_Right; return CANNA_KEY_Shift_Right;
else
return CANNA_KEY_Right; return CANNA_KEY_Right;
break;
case B_LEFT_ARROW: case B_LEFT_ARROW:
if (mod & B_SHIFT_KEY /* shifted */ ) if (mod & B_SHIFT_KEY /* shifted */ )
return CANNA_KEY_Shift_Left; return CANNA_KEY_Shift_Left;
else
return CANNA_KEY_Left; return CANNA_KEY_Left;
break;
case B_END: case B_END:
return CANNA_KEY_Help; return CANNA_KEY_Help;
break;
case B_HOME: case B_HOME:
return CANNA_KEY_Home; return CANNA_KEY_Home;
break;
default:
return (int)ch;
break;
} }
return ch;
} }
int int
CannaInterface::ConvertArrowKey(int key) CannaInterface::ConvertArrowKey(int key)
{ {
switch ( key ) switch (key) {
{
case CANNA_KEY_Up: case CANNA_KEY_Up:
return CANNA_KEY_Left; return CANNA_KEY_Left;
break;
case CANNA_KEY_Down: case CANNA_KEY_Down:
return CANNA_KEY_Right; return CANNA_KEY_Right;
break;
case CANNA_KEY_Shift_Up: case CANNA_KEY_Shift_Up:
return CANNA_KEY_Up; return CANNA_KEY_Up;
break;
case CANNA_KEY_Shift_Down: case CANNA_KEY_Shift_Down:
return CANNA_KEY_Down; return CANNA_KEY_Down;
break;
case CANNA_KEY_Right: case CANNA_KEY_Right:
return (uint8)B_RETURN; return (uint8)B_RETURN;
break;
default: default:
return key; return key;
} }
@ -617,14 +594,12 @@ SERIAL_PRINT(( "CannaInterface: GenerateKouhoStr() revPos = %d, revLen = %d, mod
|| (current_mode == CANNA_MODE_TourokuHinshiMode || (current_mode == CANNA_MODE_TourokuHinshiMode
&& kouhoRevLine != -1) && kouhoRevLine != -1)
|| current_mode == CANNA_MODE_TourokuDicMode || current_mode == CANNA_MODE_TourokuDicMode
|| current_mode == CANNA_MODE_BushuMode ) || current_mode == CANNA_MODE_BushuMode) {
{
// remove first index // remove first index
memmove(kouhoUTF, kouhoUTF + 2, kouhoUTFLen - 1); memmove(kouhoUTF, kouhoUTF + 2, kouhoUTFLen - 1);
// convert full-space to LF // convert full-space to LF
while( index = strstr( kouhoUTF, "\xe3\x80\x80" ) ) while ((index = strstr(kouhoUTF, "\xe3\x80\x80")) != NULL) {
{
*index = '\x0a'; *index = '\x0a';
len = strlen(index); len = strlen(index);
memmove(index + 1, index + 5, len - 4); memmove(index + 1, index + 5, len - 4);
@ -632,11 +607,11 @@ SERIAL_PRINT(( "CannaInterface: GenerateKouhoStr() revPos = %d, revLen = %d, mod
kouhoUTFLen = strlen(kouhoUTF); kouhoUTFLen = strlen(kouhoUTF);
} }
if ( current_mode == CANNA_MODE_KigoMode ) if (current_mode == CANNA_MODE_KigoMode) {
{
char num[5]; char num[5];
for ( long i = 0 ; i < 4 ; i++ ) for (long i = 0; i < 4; i++) {
num[i] = kouhoUTF[i + 3]; num[i] = kouhoUTF[i + 3];
}
num[4] = '\0'; num[4] = '\0';
strcat(infoUTF, num); strcat(infoUTF, num);
kouhoUTFLen -= 9; kouhoUTFLen -= 9;
@ -647,11 +622,9 @@ SERIAL_PRINT(( "CannaInterface: GenerateKouhoStr() revPos = %d, revLen = %d, mod
|| current_mode == CANNA_MODE_MountDicMode || current_mode == CANNA_MODE_MountDicMode
|| current_mode == CANNA_MODE_RussianMode || current_mode == CANNA_MODE_RussianMode
|| current_mode == CANNA_MODE_LineMode || current_mode == CANNA_MODE_LineMode
|| current_mode == CANNA_MODE_GreekMode ) || current_mode == CANNA_MODE_GreekMode) {
{
//convert full-space to LF //convert full-space to LF
while( index = strstr( kouhoUTF, "\xe3\x80\x80" ) ) while ((index = strstr(kouhoUTF, "\xe3\x80\x80")) != NULL) {
{
*index = '\x0a'; *index = '\x0a';
len = strlen(index); len = strlen(index);
memmove(index + 1, index + 3, len - 2); memmove(index + 1, index + 3, len - 2);