FreeCalypso > hg > fc-tourmaline
diff src/ui/bmi/AUIEditor.c @ 92:c0052fe355d3
src/ui/bmi/*.[ch]: rm trailing white space
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sun, 08 Nov 2020 06:39:16 +0000 |
| parents | f4d125dbfff2 |
| children | 70ea7526b59e |
line wrap: on
line diff
--- a/src/ui/bmi/AUIEditor.c Sun Nov 08 05:12:05 2020 +0000 +++ b/src/ui/bmi/AUIEditor.c Sun Nov 08 06:39:16 2020 +0000 @@ -36,8 +36,8 @@ the softkeys. Mar 14, 2006 DR: OMAPS00061468 - x0035544. - Description: SAT 27.22.4.22.2 SET UP IDLE MODE TEXT (Icon support) fails - Solution : In the function AUI_edit_SetDefault() set the default value for + Description: SAT 27.22.4.22.2 SET UP IDLE MODE TEXT (Icon support) fails + Solution : In the function AUI_edit_SetDefault() set the default value for display_type to SAT_ICON_NONE. Jan 16, 2006 DR: OMAPS00061460 - Shashi Shekar B.S. @@ -53,23 +53,23 @@ Changed the long press of '*' key to display 'w'. Jul 22,2004 CRR:21605 xrashmic - SASKEN - Description: After deleting all the characters in the editor the case does not change to + Description: After deleting all the characters in the editor the case does not change to sentence case. Fix: After deleting a character, check if editor is empty and then set the case to sentence case only if the user has not modified the case. Jul 29, 2004 REF: CRR:20892 xrashmic - SASKEN - Description: By Long press on Left/Right key at 'Message Editor' screen, + Description: By Long press on Left/Right key at 'Message Editor' screen, cursor not scrolling continuously Fix: The Long press of left/right key is now handled in AUI_edit_KbdLongCB. The continuous long press of a key was being ignored for all keys. Now - only for left and right keys this is handled, for rest of the keys the continuos + only for left and right keys this is handled, for rest of the keys the continuos long press is ignored. - + 31/01/02 Original Condat(UK) BMI version. - + $End *******************************************************************************/ @@ -254,7 +254,7 @@ AUI_edit_SetTextStr(editor_info, TxtSoftOK, TxtDelete, TitleId, TitleString); AUI_edit_SetAltTextStr(editor_info, 0, NULL, TRUE, TxtSoftBack); /* create the dialog handler */ - return AUI_edit_Start(win, editor_info); /* start the common editor */ + return AUI_edit_Start(win, editor_info); /* start the common editor */ } @@ -263,7 +263,7 @@ $Function: AUI_edit_Create $Description: Create the editor. - + $Returns: Pointer to the editor's window. $Arguments: parent - The parent window. @@ -287,7 +287,7 @@ } /* Connect the dialog data to the MFW-window */ - + data->mmi_control.dialog = (T_DIALOG_FUNC)AUI_edit_ExecCb; /* Setup the destination for events */ data->mmi_control.data = data; data->parent = parent; @@ -299,7 +299,7 @@ data->editor = ATB_edit_Create(&data->editor_data.editor_attr,0); data->editor_data = *editor_data; - + // Jul 22,2004 CRR:21605 xrashmic - SASKEN // The initial value of this variable should be false. i.e the user has still not changed the case. CaseChanged=FALSE; @@ -307,7 +307,7 @@ AUI_edit_Init(data->win); SEND_EVENT(data->win, E_ED_INIT, 0, 0); - + /* Return window handle */ return data->win; @@ -319,7 +319,7 @@ $Function: AUI_edit_Init $Description: Initialise the editor. - + $Returns: Pointer to the editor's window. $Arguments: win - The editor window @@ -331,7 +331,7 @@ T_MFW_WIN *win_data = ((T_MFW_HDR *)win)->data; T_AUI_EDITOR_INFO *data = (T_AUI_EDITOR_INFO *)win_data->user; T_ATB_TEXT text={0,0,NULL}; - + TRACE_FUNCTION("AUI_edit_Init()"); data->editor->update = ED_UPDATE_FULL; @@ -341,7 +341,7 @@ data->hasTitle = FALSE; data->title.len = 0; /* Blank out title buffer */ - + if (data->editor_data.TitleId!=NULL) { data->hasTitle = TRUE; @@ -354,7 +354,7 @@ } /* If title exists, get its dcs and length */ - + if (data->hasTitle) { if (text.data[0]==0x80) @@ -372,17 +372,17 @@ { text.dcs = ATB_DCS_ASCII; } - + text.len = ATB_string_Length(&text); /* Allocate memory for the title and copy the text there */ data->title.data = (UBYTE *)ALLOC_MEMORY((text.len + 1)*ATB_string_Size(&text)); - + ATB_string_Copy(&data->title, &text); } - + /* Set up correct parameters for easytext */ - + #ifdef EASY_TEXT_ENABLED if (ATB_edit_Mode(data->editor, ED_MODE_ALPHA)) { @@ -391,7 +391,7 @@ data->predText.data = (UBYTE *)ALLOC_MEMORY((ED_PREDTEXT_MAX+1)*sizeof(UBYTE)); data->predText.dcs = ATB_DCS_ASCII; data->predText.len = 0; - + FFS_flashData.PredTextAvailable = TRUE; Initialize_Dict(Mmi_getCurrentLanguage()/*SPR1508*/, 0); ResetDictSearch(); @@ -399,15 +399,15 @@ #endif /* Initialise editor */ - + ATB_edit_Init(data->editor); /* Initialise text entry */ - + data->entry_data = AUI_entry_Create(data->win, data->editor, E_ED_UPDATE); - + /* If there's a timeout, create the timer */ - + if (data->editor_data.timeout && (data->editor_data.timeout != FOREVER)) { data->timer = tim_create(data->win, data->editor_data.timeout, (T_MFW_CB)AUI_edit_TimerCb); @@ -421,7 +421,7 @@ /* Title timer, if required, is set up in WinCb */ data->title_timer = NULL; - + return; } @@ -461,7 +461,7 @@ if (data) { /* Free memory allocated for easytext buffer */ - + #ifdef EASY_TEXT_ENABLED if (ATB_edit_Mode(data->editor, ED_MODE_ALPHA) && data->predText.data ) { @@ -489,16 +489,16 @@ tim_delete(data->title_timer); data->title_timer = NULL; } - + win_delete (data->win); /* Free editor memory */ - + AUI_entry_Destroy(data->entry_data); ATB_edit_Destroy(data->editor); FREE_MEMORY ((void *)data, sizeof (T_AUI_EDITOR_INFO)); } - + return; } @@ -508,11 +508,11 @@ $Function: AUI_edit_ExecCb $Description: Dialog function for editor. - + $Returns: None. $Arguments: None. - + *******************************************************************************/ static void AUI_edit_ExecCb(T_MFW_HND win, USHORT event, USHORT value, void *parameter) @@ -539,18 +539,18 @@ switch (event) { /* Initialise */ - + case E_ED_INIT: TRACE_EVENT("E_ED_INIT"); win_show(data->win); break; /* Destroy the editor */ - + case E_ED_DESTROY: - AUI_edit_Destroy(data->win); + AUI_edit_Destroy(data->win); break; - + /* De-initialise editor */ case E_ED_DEINIT: TRACE_EVENT("E_ED_DEINIT"); @@ -562,17 +562,17 @@ audio_StopSoundbyID( AUDIO_BUZZER, ringer ); vsi_t_sleep(0,10); /* small delay */ - #endif + #endif if (Callback) (Callback) (parent_win, Identifier, value); if(destroyEditor) - AUI_edit_Destroy(data->win); + AUI_edit_Destroy(data->win); break; /* Insert a character */ - + case E_ED_INSERT: alphachar = (USHORT)value; /* If value is set, insert character */ @@ -600,7 +600,7 @@ break; /* Update word wrap & redraw editor window */ - + case E_ED_UPDATE: //ATB_edit_Refresh(data->editor); /* SPR#2342 - SH */ win_show(data->win); @@ -647,13 +647,13 @@ USHORT titleHeight; USHORT textLen; - - - - + + + + T_DS_TEXTFORMAT format; BOOL showIcons; /* Flag that stores whether icons (e.g. alignment icons) should be shown */ - + USHORT leftSK; USHORT rightSK; USHORT textIndex; @@ -666,14 +666,14 @@ SHORT iconX; SHORT iconY; #endif - + #ifdef TRACE_AUIEditor TRACE_FUNCTION ("AUI_edit_WinCb()"); #endif if (!data) return MFW_EVENT_CONSUMED; - + switch(event) { case E_WIN_VISIBLE: /* window is visible */ @@ -683,7 +683,7 @@ #ifdef FF_MMI_SAT_ICON if (editor->attr->TitleIcon.data != NULL) { - if (editor->attr->TitleIcon.width > TITLE_ICON_WIDTH) + if (editor->attr->TitleIcon.width > TITLE_ICON_WIDTH) { titleIconWidth = TITLE_ICON_WIDTH; } @@ -691,7 +691,7 @@ { titleIconWidth = editor->attr->TitleIcon.width; } - } + } else { titleIconWidth = 0; @@ -700,24 +700,24 @@ textLen = data->editor->attr->text.len; ATB_edit_LineGet(data->editor, data->editor->winStartLine); - + if (editor->update==ED_UPDATE_TRIVIAL) editor->update = ED_UPDATE_DEFAULT; TRACE_EVENT("Updating whole screen."); - - - + + + /* Show the edited text */ /* Don't update editor text if in ED_UPDATE_PARTIAL */ - + if (editor->update!=ED_UPDATE_PARTIAL) { ATB_edit_Show(data->editor); } - + /* Set the colour for drawing title and scrollbar */ resources_setTitleColour(COLOUR_EDITOR); @@ -727,14 +727,14 @@ if (data->editor_data.zone_id & ZONE_TITLE) { dspl_Clear(0,0, SCREEN_SIZE_X-1, editY-1); - + /* Display the title, if it exists */ string.len = 0; string.dcs = ATB_DCS_ASCII; title.len = 0; title.dcs = ATB_DCS_ASCII; - + if (data->hasTitle) { title.data = data->title.data; @@ -757,7 +757,7 @@ case ED_CASEPREF_ALPHANUM_LC: string.data = (UBYTE *)ED_IND_LOWER; break; - + case ED_CASEPREF_ALPHANUM: if (ATB_edit_GetCase(editor)==ED_CASE_UPPER) string.data = (UBYTE *)ED_IND_UPPER; @@ -768,7 +768,7 @@ else string.data = (UBYTE *)ED_IND_NUM; break; - + case ED_CASEPREF_NUM: string.data = (UBYTE *)ED_IND_NUM; break; @@ -779,7 +779,7 @@ } string.len = ATB_string_Length(&string); - + #ifdef EASY_TEXT_ENABLED /* Display predicted word in header */ @@ -790,7 +790,7 @@ else string.data = (UBYTE *)ED_IND_LOWER; string.len = ATB_string_Length(&string); - + if(data->predText.len!=0) { title.data = data->predText.data; @@ -808,7 +808,7 @@ #else sprintf(lengthIndC, "%d", editor->attr->size-textLen-1); #endif - + title.data = (UBYTE *)lengthIndC; title.len = ATB_string_Length(&title); } @@ -819,11 +819,11 @@ stringWidth = 0; stringHeight = 0; showIcons = FALSE; - + if (string.len) { TRACE_EVENT("Displaying string on right"); - ATB_display_SetFormatAttr(&format, 0, FALSE); /* Set format to format at cursor */ + ATB_display_SetFormatAttr(&format, 0, FALSE); /* Set format to format at cursor */ stringWidth = ATB_display_StringWidth(&string, &format)+2; stringHeight = ATB_display_StringHeight(&string, &format); ATB_display_Text(SCREEN_SIZE_X-stringWidth+2,0, &format, &string); @@ -843,10 +843,10 @@ #endif /* Show icons to the left of the case indicator */ - + if (showIcons) { - + #ifdef EASY_TEXT_ENABLED /* Display ezitext icon to the left of the case indicator */ if(ATB_edit_Mode(editor, ED_MODE_PREDTEXT) && FFS_flashData.PredTextSelected == TRUE) @@ -860,14 +860,14 @@ if (stringHeight<Mmi_layout_line_height()) stringHeight = Mmi_layout_line_height(); } - + /* Draw the string to the left of the screen - the editor title, or the number of characters * remaining free in the buffer, or the predicted text word. */ titleWidth = 0; titleHeight = 0; - + if (title.len) { ATB_display_SetFormatAttr(&format, 0, FALSE); /* Clear format */ @@ -889,7 +889,7 @@ data->title_next_pos = 0; tim_start(data->title_timer); } - + titleWidth = 0; textIndex = data->title_pos; lastSpace = 0; @@ -902,7 +902,7 @@ if (character==UNICODE_SPACE) lastSpace = textIndex; } - + TRACE_EVENT_P1("Characters that fit: %d", textIndex); /* Calculate next start position */ @@ -912,14 +912,14 @@ else { /* Word wrap to last space, if there was one */ - + if (lastSpace>0) textIndex = lastSpace; data->title_next_pos = textIndex; } TRACE_EVENT_P1("Next position: %d", data->title_next_pos); - + newTitle.len = textIndex-data->title_pos; newTitle.data = (UBYTE *)ALLOC_MEMORY((newTitle.len+1)*ATB_string_Size(&title)); newTitle.dcs = title.dcs; @@ -956,7 +956,7 @@ #ifdef EASY_TEXT_ENABLED /* Provides a cursor in the predicted word, so the user can tell which of the characters * entered are being used to select the word. */ - + if(ATB_edit_Mode(editor, ED_MODE_PREDTEXT) && FFS_flashData.PredTextSelected && data->predText.len!=0) { ATB_display_Cursor(&data->predText, data->predTextChar.pos, ED_CURSOR_BLOCK, @@ -973,31 +973,31 @@ if (titleHeight == 0) titleHeight = TITLE_ICON_HEIGHT; - /* Display '?' icon if the size is bigger, + /* Display '?' icon if the size is bigger, else display the icon*/ if ((editor->attr->TitleIcon.width > TITLE_ICON_WIDTH) || (editor->attr->TitleIcon.height > TITLE_ICON_HEIGHT)) { - /* iconY calculates place hoilder to place the icon + /* iconY calculates place hoilder to place the icon at the center of the screen. */ iconX = 1; iconY = 1+ ((titleHeight-2) / 2) - (10 / 2); - dspl_BitBlt2(iconX, iconY, 8, + dspl_BitBlt2(iconX, iconY, 8, 10, (void*)SATIconQuestionMark, 0, BMP_FORMAT_256_COLOUR); } else { - /* iconY calculates place hoilder to place the icon + /* iconY calculates place hoilder to place the icon at the center of the screen. */ iconX = 1; iconY = 1+ ((titleHeight-2) / 2) - (editor->attr->TitleIcon.height / 2); - dspl_BitBlt2(iconX, iconY, editor->attr->TitleIcon.width, editor->attr->TitleIcon.height, + dspl_BitBlt2(iconX, iconY, editor->attr->TitleIcon.width, editor->attr->TitleIcon.height, (void*)editor->attr->TitleIcon.data, 0, BMP_FORMAT_256_COLOUR); } } -#endif +#endif /* Draw line on top */ - + if (stringHeight>titleHeight) titleHeight = stringHeight; @@ -1013,11 +1013,11 @@ } /* SCROLLBAR */ - + if (data->editor_data.zone_id & ZONE_SCROLLBAR) { dspl_Clear(editX+editWidth, editY, editX+editWidth+ED_SCROLLBAR_WIDTH-1, editY+editHeight-1); - + /* Vertical scrollbar - only show if editor is taller than view size */ if (editor->totalHeight > 0 && editor->viewHeight<editor->totalHeight) @@ -1075,14 +1075,14 @@ /* Finished drawing screen */ } break; - + default: return MFW_EVENT_PASSED; // break; // RAVI } data->editor->update = ED_UPDATE_DEFAULT; - + return MFW_EVENT_CONSUMED; } @@ -1096,7 +1096,7 @@ $Returns: None. $Arguments: event - the keyboard event - keyboard + keyboard *******************************************************************************/ @@ -1108,17 +1108,17 @@ #if (BOARD != 61) && defined(EASY_TEXT_ENABLED) T_ATB_TEXT *PredText = &data->predText; USHORT character; -#endif +#endif ED_RES result; - + TRACE_FUNCTION("AUI_edit_KbdCb()"); - + /* Suppress unwanted long keypresses */ data->doNextLongPress = TRUE; /* next Key_long event is correct */ /* Restart the timer */ - + if (data->timer !=NULL) { tim_stop(data->timer); @@ -1134,7 +1134,7 @@ switch (keyboard->code) { /* UP key */ - + case KCD_MNUUP: /* For DSample, up and down move cursor up and down a line in all modes */ #ifdef LSCREEN @@ -1156,7 +1156,7 @@ break; /* DOWN key */ - + case KCD_MNUDOWN: /* For DSample, up and down move cursor up and down a line in all modes */ #ifdef LSCREEN @@ -1181,7 +1181,7 @@ #ifdef LSCREEN /* MENU LEFT */ - + case KCD_MNULEFT: ATB_edit_MoveCursor(data->editor, ctrlLeft, TRUE); /* Move cursor left */ data->editor->update = ED_UPDATE_TRIVIAL; /* This flag speeds up update - no change to text */ @@ -1189,7 +1189,7 @@ break; /* MENU RIGHT */ - + case KCD_MNURIGHT: ATB_edit_MoveCursor(data->editor, ctrlRight, TRUE); /* Move cursor right */ data->editor->update = ED_UPDATE_TRIVIAL; /* This flag speeds up update - no change to text */ @@ -1198,7 +1198,7 @@ #endif /* LEFT SOFT KEY */ - + case KCD_LEFT: if (data->editor_data.editor_attr.text.len < data->editor_data.min_enter) { @@ -1239,7 +1239,7 @@ SEND_EVENT (win, E_ED_DEINIT, INFO_KCD_CALL, NULL); } break; - + /* RIGHT SOFT KEY */ case KCD_RIGHT: @@ -1263,7 +1263,7 @@ { result = ATB_edit_DeleteLeft(data->editor, TRUE); /* SPR#2342 - SH */ } - + /* If we delete from first character in the editor, exit editor */ if (result==ED_DONE) { @@ -1279,10 +1279,10 @@ /* Switch text mode: uppercase, lowercase */ case KCD_HASH: if (ATB_edit_Mode(data->editor, ED_MODE_ALPHA)) - { + { // Jul 22,2004 CRR:21605 xrashmic - SASKEN // The user has explicitly changed the case. When - // the editor becomes empty, we should not reset the + // the editor becomes empty, we should not reset the // case to sentence case CaseChanged=TRUE; switch(ATB_edit_GetCase(data->editor)) @@ -1290,7 +1290,7 @@ case ED_CASE_LOWER: // Jul 22,2004 CRR:21605 xrashmic - SASKEN // The user has changed the case to sentence case. - // when the editor becomes empty, we have to reset + // when the editor becomes empty, we have to reset // the case to sentence case. CaseChanged=FALSE; ATB_edit_SetCase(data->editor, ED_CASE_CAPS); @@ -1325,7 +1325,7 @@ break; case (KCD_STAR): - /* If we're in apha mode and not in read-only mode, display the symbol screen */ + /* If we're in apha mode and not in read-only mode, display the symbol screen */ if (ATB_edit_Mode(data->editor, ED_MODE_ALPHA) && !ATB_edit_Mode(data->editor, ED_MODE_READONLY)) { AUI_symbol_Start (data->win, E_ED_INSERT); @@ -1341,7 +1341,7 @@ break; /* KEY ENTRY 0 - 9 */ - + case KCD_0: case KCD_1: case KCD_2: @@ -1363,7 +1363,7 @@ #ifdef EASY_TEXT_ENABLED } else - + /* Short key press in EasyText */ { @@ -1383,7 +1383,7 @@ #endif data->editor->update = ED_UPDATE_TRIVIAL; /* This flag speeds up update */ win_show(data->win); - } + } break; case KCD_MNUDOWN: @@ -1436,13 +1436,13 @@ if (ATB_string_GetChar(PredText,0)!=UNICODE_STAR) { /* Capitalise first letter of words and the letter 'I' */ - + if (ATB_edit_CapitaliseWord(data->editor) || (PredText->len==1 && ATB_string_GetChar(PredText, 0)==ATB_char_Unicode('i'))) { ATB_string_SetChar(PredText, 0, ATB_edit_FindCapital(ATB_string_GetChar(PredText, 0)));/*SPR1508*/ } character = ATB_edit_GetCursorChar(data->editor, -1); - + if ( character != UNICODE_SPACE && character != UNICODE_EOLN) { ATB_string_MoveRight(PredText,0,1,ED_PREDTEXT_MAX); @@ -1510,7 +1510,7 @@ AUI_edit_ClearPredText(data); } if (DictAlphaKeyPress(keyboard->code,(char *)PredText->data)) - { + { PredText->len = ATB_string_Length(PredText); data->predTextChar.pos++; /* The keypress was used to find a word, advance cursor */ AUI_edit_CalcPredText(data); @@ -1554,7 +1554,7 @@ case KCD_0: case KCD_1: if (PredText->len!=0) - { + { if ((data->editor_data.editor_attr.text.len + PredText->len) < MAX_MSG_LEN) { /* If char b4 cursor full stop/question/exclamation (or last char space and char b4 full stop) */ @@ -1565,14 +1565,14 @@ character = ATB_edit_GetCursorChar(data->editor, -1); if (ATB_string_GetChar(PredText, 0) != UNICODE_STAR) - { + { if (keyboard->code == KCD_1) { /* Insert space at end of string */ ATB_string_SetChar(PredText, PredText->len, UNICODE_SPACE); PredText->len++; ATB_string_SetChar(PredText, PredText->len, UNICODE_EOLN); - + if ( character!=UNICODE_SPACE && character!=UNICODE_EOLN) { /* Insert space at start of string */ @@ -1588,7 +1588,7 @@ ATB_string_SetChar(PredText, PredText->len, UNICODE_SPACE); PredText->len++; ATB_string_SetChar(PredText, PredText->len, UNICODE_EOLN); - + if ( character!=UNICODE_SPACE && character!=UNICODE_EOLN) { /* Insert space at start of string */ @@ -1607,7 +1607,7 @@ break; /* Any key */ - + default: if (!ATB_edit_Mode(data->editor, ED_MODE_READONLY)) /* ignore normal keys if in read-only mode */ { @@ -1620,7 +1620,7 @@ } } #endif - + return MFW_EVENT_CONSUMED; } @@ -1634,7 +1634,7 @@ $Returns: None. $Arguments: event - the keyboard event - keyboard + keyboard *******************************************************************************/ @@ -1649,7 +1649,7 @@ #endif ED_RES result; - + #ifdef TRACE_AUIEditor TRACE_FUNCTION("AUI_edit_KbdLongCb()"); #endif @@ -1659,9 +1659,9 @@ if ( data->doNextLongPress ) data->doNextLongPress = FALSE; /* mark Key_long event as consumed but do current long press */ // Jul 29, 2004 REF: CRR:20892 xrashmic - SASKEN - // Description: By Long press on Left/Right key at 'Message Editor' screen, + // Description: By Long press on Left/Right key at 'Message Editor' screen, // cursor not scrolling continuously - // Fix: The continuous long press of a key was being ignored for all keys. + // Fix: The continuous long press of a key was being ignored for all keys. // Now only for left and right keys this is handled. else if(!(keyboard->code==KCD_MNULEFT ||keyboard->code== KCD_MNURIGHT)) { @@ -1669,7 +1669,7 @@ } /* Restart the timer */ - + if (data->timer !=NULL) { tim_stop(data->timer); @@ -1684,7 +1684,7 @@ switch (keyboard->code) { // Jul 29, 2004 REF: CRR:20892 xrashmic - SASKEN - // Description: By Long press on Left/Right key at 'Message Editor' screen, + // Description: By Long press on Left/Right key at 'Message Editor' screen, // cursor not scrolling continuously // Fix: The Long press of left/right key is now handled in AUI_edit_KbdLongCB. case KCD_MNULEFT: @@ -1699,7 +1699,7 @@ break; case KCD_RIGHT: - result = ATB_edit_ClearAll(data->editor); /* Otherwise, clear the editor */ + result = ATB_edit_ClearAll(data->editor); /* Otherwise, clear the editor */ /* If buffer is empty, right soft key causes exit from editor */ if (result==ED_DONE) @@ -1713,7 +1713,7 @@ break; /* KEY ENTRY 0 */ - + case KCD_0: /* Alpha mode: insert a '0' */ if (ATB_edit_Mode(data->editor, ED_MODE_ALPHA)) @@ -1756,9 +1756,9 @@ /* In alphanumeric mode, a long hold of # selects number case */ if (ATB_edit_GetCasePref(data->editor)==ED_CASEPREF_ALPHANUM) ATB_edit_SetCase(data->editor, ED_CASE_NUM); - else - { - /* MZ cq11414 add Wait Character */ + else + { + /* MZ cq11414 add Wait Character */ ATB_edit_DeleteLeft(data->editor, FALSE); //Sep 2, 2004 REF: CRR 21370 xkundadu @@ -1769,7 +1769,7 @@ break; /* KEY ENTRY 1 - 9 */ - + case KCD_1: case KCD_2: case KCD_3: @@ -1792,7 +1792,7 @@ break; } - + #ifdef EASY_TEXT_ENABLED } else @@ -1802,7 +1802,7 @@ switch (keyboard->code) { // Jul 29, 2004 REF: CRR:20892 xrashmic - SASKEN - // Description: By Long press on Left/Right key at 'Message Editor' + // Description: By Long press on Left/Right key at 'Message Editor' // screen, cursor not scrolling continuously // Fix: The Long press of left/right key is now handled in // AUI_edit_KbdLongCB. @@ -1810,7 +1810,7 @@ ATB_edit_MoveCursor(data->editor, ctrlLeft, TRUE); /* Move cursor left */ data->editor->update = ED_UPDATE_TRIVIAL; /* This flag speeds up update - no change to text */ win_show(data->win); - break; + break; case KCD_MNURIGHT: ATB_edit_MoveCursor(data->editor, ctrlRight, TRUE); /* Move cursor right */ data->editor->update = ED_UPDATE_TRIVIAL; /* This flag speeds up update - no change to text */ @@ -1887,12 +1887,12 @@ $Function: AUI_edit_TimerCb $Description: Callback function for the editor info timer. - + $Returns: None. $Arguments: event - the event type timer - the timer - + *******************************************************************************/ static int AUI_edit_TimerCb (T_MFW_EVENT event, T_MFW_TIM *timer) @@ -1925,18 +1925,18 @@ $Description: Callback function for the editor title timer. Recalculates title_pos so that the next part of the string is displayed. - + $Returns: None. $Arguments: event - the event type timer - the timer - + *******************************************************************************/ static int AUI_edit_TitleTimerCb (T_MFW_EVENT event, T_MFW_TIM *timer) { /* Use the mfwHeader property of the timer to get the window */ - T_MFW_HND win = mfw_parent(timer->mfwHeader); + T_MFW_HND win = mfw_parent(timer->mfwHeader); T_MFW_WIN *win_data = ((T_MFW_HDR *)win)->data; T_AUI_EDITOR_INFO *data = (T_AUI_EDITOR_INFO *)win_data->user; @@ -1944,7 +1944,7 @@ /* SPR#1597 - SH - Since there may be multiple timers running at once, only call win_show if the window is focussed. */ - + if (winIsFocussed(win)) { if (data->title_next_pos!=data->title_pos) @@ -1957,7 +1957,7 @@ tim_start(data->title_timer); } - + return MFW_EVENT_CONSUMED; } @@ -1971,7 +1971,7 @@ $Returns: None. $Arguments: data - The AUI editor data - + *******************************************************************************/ static void AUI_edit_CalcPredText(T_AUI_EDITOR_INFO *data) @@ -1987,7 +1987,7 @@ dummy.len = data->predTextChar.pos; data->predTextChar.lineWidth = ATB_display_StringWidth(&dummy, &data->predTextChar.format); data->predTextChar.lineHeight = ATB_display_StringHeight(&dummy, &data->predTextChar.format); - + /* Get width and height of current character */ character = ATB_string_GetChar(&data->predText, data->predTextChar.pos); data->predTextChar.width = ATB_display_GetCharWidth(character, &data->predTextChar.format); @@ -2006,7 +2006,7 @@ $Returns: None. $Arguments: data - The AUI editor data - + *******************************************************************************/ static void AUI_edit_ClearPredText(T_AUI_EDITOR_INFO *data) @@ -2023,13 +2023,13 @@ $Function: AUI_edit_InsertString $Description: Insert a string into the editor - + $Returns: Pointer to the editor's window. $Arguments: win - The editor window string - The string to insert dcs - The dcs of the string - + *******************************************************************************/ void AUI_edit_InsertString(T_MFW_HND win, UBYTE *string, T_ATB_DCS dcs) @@ -2041,7 +2041,7 @@ text.data = string; text.dcs = dcs; text.len = ATB_string_Length(&text); - + ATB_edit_InsertString(data->editor, &text); return; @@ -2053,12 +2053,12 @@ $Function: AUI_edit_InsertChar $Description: Insert a character into the editor - + $Returns: Pointer to the editor's window. $Arguments: win - The editor window character - The character to insert - + *******************************************************************************/ void AUI_edit_InsertChar(T_MFW_HND win, USHORT character) @@ -2075,7 +2075,7 @@ /******************************************************************************* $Function: AUI_edit_GetSpecificWindowSIze - + $Description: Sets up window size $Returns: None. @@ -2111,7 +2111,7 @@ //Positions for editor windows in mmismssend #define PHNO_EDITOR_SIZE 0, (Mmi_layout_line(1)+2), SCREEN_SIZE_X, 20 -//NB defines below used twice, second time START/SIZE_Y was same as START/SIZE_Y above +//NB defines below used twice, second time START/SIZE_Y was same as START/SIZE_Y above #define CENTRE_EDITOR_SIZE 0, Mmi_layout_line(1), SCREEN_SIZE_X, MNU3LINE+3 //And for MMIServices - moved here from mmiservices.c @@ -2145,21 +2145,21 @@ attr->win_size.sx = SCREEN_SIZE_X-attr->win_size.px; attr->win_size.sy = Mmi_layout_line_height()*2+4; break; - + case ZONE_BOTTOM_LINE: attr->win_size.px = 0; attr->win_size.py = SCREEN_SIZE_Y - Mmi_layout_line_height() - Mmi_layout_softkeyHeight(); attr->win_size.sx = SCREEN_SIZE_X-attr->win_size.px; attr->win_size.sy = Mmi_layout_line_height(); break; - + case ZONE_BOTTOM_LINE_FIND: //used for phonebook search - attr->win_size.px = dspl_GetTextExtent(MmiRsrcGetText(TxtFind),0); + attr->win_size.px = dspl_GetTextExtent(MmiRsrcGetText(TxtFind),0); attr->win_size.py = SCREEN_SIZE_Y - Mmi_layout_line_height() - Mmi_layout_softkeyHeight(); attr->win_size.sx = SCREEN_SIZE_X-attr->win_size.px; attr->win_size.sy = Mmi_layout_line_height(); break; - + #ifndef LSCREEN case BOOKDETAILS_EDITOR: setSize(&attr->win_size,BOOKDETAILS_EDITOR_SIZE); break; case NUMBER_EDITOR: setSize(&attr->win_size,NUMBER_EDITOR_SIZE); break; @@ -2171,15 +2171,15 @@ case SERVICE_CREATE_EDITOR: setSize(&attr->win_size,SERVICE_CREATE_EDITOR_SIZE); break; case PASSWORD_EDITOR: setSize(&attr->win_size,PASSWORD_EDITOR_SIZE); break; case EM_CREATE_EDITOR: setSize(&attr->win_size,EM_EDITOR_SIZE); break;/*SPR#1840*/ - - case WIN_DIALLING: - case WIN_DIALLING_CB: + + case WIN_DIALLING: + case WIN_DIALLING_CB: if (Mmi_getCurrentLanguage() == CHINESE_LANGUAGE) setSize(&attr->win_size,WIN_DIALLING_C_SIZE); else setSize(&attr->win_size,WIN_DIALLING_SIZE); break; - case WIN_DIALLING_SMS: + case WIN_DIALLING_SMS: if (Mmi_getCurrentLanguage() == CHINESE_LANGUAGE) { setSize(&attr->win_size,0,Mmi_layout_line_icons(1),SCREEN_SIZE_X,24);/*SPR#1840*/ @@ -2187,13 +2187,13 @@ else setSize(&attr->win_size,WIN_DIALLING_SIZE); break; - case WIN_DIALLING_SAT: + case WIN_DIALLING_SAT: if (Mmi_getCurrentLanguage() == CHINESE_LANGUAGE) setSize(&attr->win_size,WIN_DIALLING_C_SIZE); else setSize(&attr->win_size,WIN_DIALLING_SIZE); break; - + case PHNO_EDITOR: setSize(&attr->win_size,PHNO_EDITOR_SIZE); break; case CENTRE_EDITOR: setSize(&attr->win_size,CENTRE_EDITOR_SIZE); break; case SAT_EDITOR : setSize(&attr->win_size,SAT_EDITOR_SIZE); break; @@ -2201,7 +2201,7 @@ case PHB_EDITOR: setSize(&attr->win_size,PHB_EDITOR_SIZE); break; case PIN_EDIT_RESET: setSize(&attr->win_size,PIN_EDIT_RESET_SIZE); break; case TIMEDATE_EDITOR_AREA: setSize(&attr->win_size,TIMEDATE_EDITOR_AREA_SIZE); break; -#endif +#endif default: break; } @@ -2210,7 +2210,7 @@ /******************************************************************************* $Function: AUI_edit_CalculateWindow - + $Description: Sets up window size $Returns: None. @@ -2225,12 +2225,12 @@ void AUI_edit_CalculateWindow(T_ED_ATTR* attr, int *zone_id_pointer ) { int zone_id = *zone_id_pointer; - + attr->win_size.px = 0; attr->win_size.py = 0; attr->win_size.sx = SCREEN_SIZE_X; attr->win_size.sy = SCREEN_SIZE_Y; - + if (zone_id == ZONE_BORDER_EDITOR) { //Leave border on left/right of screen. attr->win_size.px = 4; @@ -2248,7 +2248,7 @@ zone_id = ZONE_FULLSOFTKEYS; *zone_id_pointer = zone_id; } - + if (zone_id & ZONE_ICONS) attr->win_size.py = attr->win_size.py + Mmi_layout_IconHeight(); @@ -2257,7 +2257,7 @@ if (zone_id & ZONE_TITLE) attr->win_size.py = attr->win_size.py + Mmi_layout_TitleHeight(); - + if (zone_id & ZONE_CASE_ABC) attr->win_size.sy = attr->win_size.sy - Mmi_layout_line_height(); @@ -2268,54 +2268,54 @@ if ((zone_id & ZONE_FULLSCREEN) == ZONE_FULLSCREEN) return; - + /*Else window is not entire screen */ - + switch (zone_id & ZONE_FULL_HEIGHT) { - case ZONE_FULL_HEIGHT: + case ZONE_FULL_HEIGHT: break; case ZONE_TOPHALF_HEIGHT: - attr->win_size.sy = attr->win_size.sy/2; + attr->win_size.sy = attr->win_size.sy/2; break; - case ZONE_MIDDLE_HEIGHT: - attr->win_size.sy = attr->win_size.sy/2; - attr->win_size.py = attr->win_size.py+attr->win_size.sy/2; + case ZONE_MIDDLE_HEIGHT: + attr->win_size.sy = attr->win_size.sy/2; + attr->win_size.py = attr->win_size.py+attr->win_size.sy/2; break; - case ZONE_BOTTOMHALF_HEIGHT: - attr->win_size.sy = attr->win_size.sy/2; - attr->win_size.py = attr->win_size.py+attr->win_size.sy; + case ZONE_BOTTOMHALF_HEIGHT: + attr->win_size.sy = attr->win_size.sy/2; + attr->win_size.py = attr->win_size.py+attr->win_size.sy; break; - case ZONE_BOTTOMTWOLINES_HEIGHT: + case ZONE_BOTTOMTWOLINES_HEIGHT: attr->win_size.py = attr->win_size.py+attr->win_size.sy-Mmi_layout_line_height()*2; - attr->win_size.sy = Mmi_layout_line_height()*2; + attr->win_size.sy = Mmi_layout_line_height()*2; break; /* xreddymn OMAPS00075852 May-15-2006 * This display zone is located one line above the softkeys. */ - case ZONE_MIDDLETWOLINES_HEIGHT: + case ZONE_MIDDLETWOLINES_HEIGHT: attr->win_size.py = attr->win_size.py+attr->win_size.sy-Mmi_layout_line_height()*3; - attr->win_size.sy = Mmi_layout_line_height()*2; + attr->win_size.sy = Mmi_layout_line_height()*2; break; default: //No action break; } - + switch (zone_id & ZONE_FULL_WIDTH) { - case ZONE_FULL_WIDTH: + case ZONE_FULL_WIDTH: break; - case ZONE_LEFTHALF_WIDTH: - attr->win_size.sx = attr->win_size.sx/2; + case ZONE_LEFTHALF_WIDTH: + attr->win_size.sx = attr->win_size.sx/2; break; - case ZONE_MIDDLE_WIDTH : - attr->win_size.sx = attr->win_size.sx/2; - attr->win_size.px = attr->win_size.px+attr->win_size.sx/2; + case ZONE_MIDDLE_WIDTH : + attr->win_size.sx = attr->win_size.sx/2; + attr->win_size.px = attr->win_size.px+attr->win_size.sx/2; break; - case ZONE_RIGHTHALF_WIDTH: - attr->win_size.sx = attr->win_size.sx/2; - attr->win_size.px = attr->win_size.px+attr->win_size.sx; + case ZONE_RIGHTHALF_WIDTH: + attr->win_size.sx = attr->win_size.sx/2; + attr->win_size.px = attr->win_size.px+attr->win_size.sx; break; default: //No action @@ -2333,18 +2333,18 @@ $Returns: None. $Arguments: editor_data - The MMI editor data that is to be modified. - + *******************************************************************************/ void AUI_edit_SetDefault(T_AUI_EDITOR_DATA *editor_data) { /* Set everything to zero... */ /* SPR#1559 - Move CalculateWindow to below */ - + memset(editor_data, 0, sizeof(T_AUI_EDITOR_DATA)); /* Except these things... */ - + editor_data->editor_attr.colour = COLOUR_EDITOR; editor_data->editor_attr.font = EDITOR_FONT; editor_data->editor_attr.cursor = ED_CURSOR_BAR; @@ -2364,11 +2364,11 @@ //set the default value for display_type to SAT_ICON_NONE editor_data->editor_attr.TitleIcon.display_type = SAT_ICON_NONE; editor_data->editor_attr.TitleIcon.selfExplanatory = FALSE; -#endif +#endif /* SPR#1559 - SH - CalculateWindow moved here; pointer to zone_id used */ AUI_edit_CalculateWindow(&editor_data->editor_attr, &editor_data->zone_id); - + ATB_display_ClearFormat(&editor_data->editor_attr.startFormat); return; } @@ -2385,7 +2385,7 @@ $Arguments: editor_data - The MMI editor data that is to be modified. zone_id - Type of editor screen (see header file for ZONE_...) colour - Colour of the editor - + *******************************************************************************/ void AUI_edit_SetDisplay(T_AUI_EDITOR_DATA *editor_data, int zone_id, int colour, UBYTE font ) @@ -2395,7 +2395,7 @@ editor_data->zone_id = zone_id; editor_data->editor_attr.colour = colour; editor_data->editor_attr.font = font; - + return; } @@ -2419,7 +2419,7 @@ editor_data->destroyEditor = destroyEditor; editor_data->timeout = timeout; editor_data->Callback = Callback; - } + } return; } @@ -2435,7 +2435,7 @@ $Arguments: editor_data - The MMI editor data that is to be modified. mode - Editor mode (see header file for ED_MODE_...) cursor - Editor cursor (see header file for ED_CURSOR_...) - + *******************************************************************************/ void AUI_edit_SetMode(T_AUI_EDITOR_DATA *editor_data, USHORT mode, USHORT cursor ) @@ -2445,7 +2445,7 @@ editor_data->editor_attr.mode = mode; editor_data->editor_attr.cursor = cursor; } - + return; } @@ -2461,7 +2461,7 @@ dcs - Data coding scheme of text (see ATB_DCS_...) text - The text in the appropriate coding scheme size - Maximum size of the edit buffer in characters - + *******************************************************************************/ void AUI_edit_SetBuffer(T_AUI_EDITOR_DATA *editor_data, UBYTE dcs, UBYTE *text, USHORT size) @@ -2473,7 +2473,7 @@ editor_data->editor_attr.text.len = ATB_string_Length(&editor_data->editor_attr.text); editor_data->editor_attr.size = size; } - + return; } @@ -2489,7 +2489,7 @@ LeftSoftKey, RightSoftKey - Text IDs of the softkeys TitleId - Text ID for the title TextString - Text string for the title, used if TitleId is 0 - + *******************************************************************************/ void AUI_edit_SetTextStr(T_AUI_EDITOR_DATA *editor_data, USHORT LeftSoftKey, USHORT RightSoftKey, USHORT TitleId, UBYTE *TitleString) @@ -2502,7 +2502,7 @@ editor_data->TitleId = TitleId; editor_data->TitleString = TitleString; } - + return; } @@ -2520,7 +2520,7 @@ change_rsk_on_empty - TRUE if alternative right soft key is used for empty buffer AltRightSoftKey - Text ID of alternative right softkey - + *******************************************************************************/ void AUI_edit_SetAltTextStr(T_AUI_EDITOR_DATA *editor_data, UBYTE min_enter, USHORT AltLeftSoftKey, BOOL change_rsk_on_empty, USHORT AltRightSoftKey) @@ -2532,7 +2532,7 @@ editor_data->AltRightSoftKey = AltRightSoftKey; editor_data->change_rsk_on_empty = change_rsk_on_empty; } - + return; } @@ -2550,7 +2550,7 @@ before editing filler - If preformat is true, this character will be used to pad out the provided string - + *******************************************************************************/ void AUI_edit_SetFormatStr(T_AUI_EDITOR_DATA *editor_data, char *formatstr, BOOL preformat, char filler) @@ -2560,7 +2560,7 @@ // USHORT character; // RAVI TRACE_FUNCTION("AUI_edit_SetFormatStr()"); - + if (editor_data) { editor_data->editor_attr.FormatString = formatstr; @@ -2572,7 +2572,7 @@ textIndex = 0; /* SPR#1983 - SH - Ensure formatting doesn't write over null terminator */ - while (formatstr[formatIndex]!=0 && + while (formatstr[formatIndex]!=0 && !strchr("123456789*", formatstr[formatIndex]) && /* Exit at delimited field */ textIndex<(editor_data->editor_attr.size-1)) { @@ -2591,11 +2591,11 @@ { formatIndex++; textIndex++; - } + } } } } - + return; } @@ -2609,7 +2609,7 @@ $Arguments: editor_data - The MMI editor data that is to be modified. startFormat - Pointer to text formatting data structure - + *******************************************************************************/ void AUI_edit_SetFormatAttr(T_AUI_EDITOR_DATA *editor_data, UBYTE attr) @@ -2618,7 +2618,7 @@ { editor_data->editor_attr.startFormat.attr = attr; } - + return; } @@ -2665,8 +2665,8 @@ *******************************************************************************/ void AUI_Edit_Display_Only(T_MFW_HND win, int LSK, int RSK, char *string1, char *string2, int Title) -{ - +{ + T_MFW_WIN *win_data = ((T_MFW_HDR *)win)->data; T_AUI_EDITOR_INFO *data = (T_AUI_EDITOR_INFO *)win_data->user; @@ -2675,7 +2675,7 @@ int size = MAX_RO_EDITOR_LEN; AUI_edit_SetDefault(&display_editor_info); - + /* Include title for colour display */ #ifdef COLOURDISPLAY AUI_edit_SetDisplay(&display_editor_info, ZONE_FULL_SK_TITLE_SCROLL, COLOUR_EDITOR, EDITOR_FONT); @@ -2689,15 +2689,15 @@ /* SPR#2672 - SH - Allocate buffer dynamically */ data->displayBuffer = (char *)ALLOC_MEMORY(size); - + strcpy(data->displayBuffer, string1); - + if(string2 != NULL) { strcat(data->displayBuffer, "\n"); strcat(data->displayBuffer, string2); } - + if (data->displayBuffer[0]==(char)0x80) { AUI_edit_SetBuffer(&display_editor_info, ATB_DCS_UNICODE, (UBYTE *)&data->displayBuffer[2], size/2); @@ -2708,7 +2708,7 @@ } data->win = AUI_edit_Start(win,&display_editor_info); /* start the editor */ - + } /******************************************************************************* @@ -2719,11 +2719,11 @@ $Returns: None. - $Arguments: + $Arguments: *******************************************************************************/ static void AUI_Edit_Display_Only_CB(T_MFW_HND win, USHORT Identifier, SHORT reason) -{ +{ T_MFW_WIN * win_data = ((T_MFW_HDR *) win)->data; T_AUI_EDITOR_INFO * data = (T_AUI_EDITOR_INFO *)win_data->user; @@ -2740,7 +2740,7 @@ default: TRACE_EVENT("Err: Default"); break; - + } } @@ -2749,11 +2749,11 @@ $Function: AUI_Edit_Display_Only_Destroy $Description: Destroy the Read only information Editor - + $Returns: none $Arguments: own_window - current window handler - + *******************************************************************************/ static void AUI_Edit_Display_Only_Destroy(MfwHnd own_window) @@ -2774,7 +2774,7 @@ { /* * Delete WIN handler - */ + */ /* SPR#2672 - SH - Delete buffer */ @@ -2782,7 +2782,7 @@ { FREE_MEMORY((void *)data->displayBuffer, MAX_RO_EDITOR_LEN); } - + /* SPR#1428 - SH - New Editor changes */ #ifdef NEW_EDITOR AUI_edit_Destroy(data->win); @@ -2793,8 +2793,8 @@ win_delete (data->win); FREE_MEMORY ((void *)data, sizeof (T_AUI_EDITOR_INFO)); - - + + } else {