FreeCalypso > hg > fc-tourmaline
diff src/ui/bmi/mmiDialogs.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 | 67bfe9f274f6 |
| children | 303704cf0701 |
line wrap: on
line diff
--- a/src/ui/bmi/mmiDialogs.c Sun Nov 08 05:12:05 2020 +0000 +++ b/src/ui/bmi/mmiDialogs.c Sun Nov 08 06:39:16 2020 +0000 @@ -3,70 +3,70 @@ CONDAT (UK) -******************************************************************************** +******************************************************************************** This software product is the property of Condat (UK) Ltd and may not be - disclosed to any third party without the express permission of the owner. - + disclosed to any third party without the express permission of the owner. + ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) + $Project name: Basic MMI + $Project code: BMI (6349) $Module: MmiDialogs $File: MmiDialogs.c - $Revision: 1.0 - - $Author: Condat(UK) - $Date: 25/10/00 - + $Revision: 1.0 + + $Author: Condat(UK) + $Date: 25/10/00 + ******************************************************************************** - + Description:MMI Information dialogue handling. - - - + + + ******************************************************************************** $History: MmiDialogs.c May 23, 2007 DR: OMAPS00127483 x0pleela Description: Phonelock - Unable to unlock the phone during incoming call with ringer... - Solution: Made changes in the function dialog_info_win_resize_cb() to restart the ringer set for + Solution: Made changes in the function dialog_info_win_resize_cb() to restart the ringer set for incoming call or alarm after thr phone is unlocked. - + Apr 03, 2007 ER: OMAPS00122561 x0pleela Description: [ACI] Phone lock feature has to be supported by ACI - Solution: Phone Lock ER implementation - + Solution: Phone Lock ER implementation + x0066814 06 Dec 2006, OMAPS00106825 - The window height calculation related to wrapping should be skipped when no + The window height calculation related to wrapping should be skipped when no string wrapping is done Mar 11, 2006 REF:DR:OMAPS00061467 x0035544 Description: 27.22.4.13.3 SET UP CALL (display of icons) fails. - Solution: Assigned the default values for icon data for the structure display_info in the function - dlg_zeroDisplayData(). copied icon data in to the structure data->IconData and provided functionality + Solution: Assigned the default values for icon data for the structure display_info in the function + dlg_zeroDisplayData(). copied icon data in to the structure data->IconData and provided functionality in the function dialog_info_win_resize_cb() to display icon data appropriately on the dialog screen for SAT call setup. - + Sep 06 2005 REF: MMI-SPR-33548 x0012849 Jagan Description : A dialog with long message is not displayed properly. Solution : The no of lines in a dialog is increased from 4 to 15. - + Feb 24, 2005 REF: CRR MMI-SPR-29102 xnkulkar - Description: The phone resets when user presses the ''End All' key while the SMSs are being deleted. - Solution: As the user has already confirmed that all SMS messages are to be deleted, ''End All' key + Description: The phone resets when user presses the ''End All' key while the SMSs are being deleted. + Solution: As the user has already confirmed that all SMS messages are to be deleted, ''End All' key press is ignored till the delete operation is over. xrashmic 08 Feb, 2005 MMI-SPR-27853 - Moved the T_dialog_info structure from MmiDialogs.c to MmiDialogs.h + Moved the T_dialog_info structure from MmiDialogs.c to MmiDialogs.h xrashmic 08 Feb, 2005 MMI-SPR-27853 - Moved the T_dialog_info structure from MmiDialogs.c to MmiDialogs.h + Moved the T_dialog_info structure from MmiDialogs.c to MmiDialogs.h Aug 25, 2004 REF: CRR 24904 Deepa M.D Bug:cleanup compile switches used for Go-lite - Fix:COLOURDISPLAY compiler switch has been added to the functions which are + Fix:COLOURDISPLAY compiler switch has been added to the functions which are used only for the normal color build. Aug 16, 2004 REF: CRR 24323 Deepa M.D @@ -74,7 +74,7 @@ Fix:Replace the char buf[]; sprintf (buf, "...", ...); TRACE_EVENT (buf); statements by TRACE_EVENT_PX - Sep 01, 2004 REF: CRR 21380 Deepa M.D + Sep 01, 2004 REF: CRR 21380 Deepa M.D Bug:Not getting proper display, When Messages Memory is Full. Fix:Assigning TextId and TextString will not display both the messages. Hence we need to use TextId and TextString2 or TextId2 and TextString @@ -83,17 +83,17 @@ Description: CFO interrogation display : Timer to long Fix: Timer is enabled for the information dialog. It times out after 5 seconds from the last key press. - 25/10/00 Original Condat(UK) BMI version. - + 25/10/00 Original Condat(UK) BMI version. + $End *******************************************************************************/ /******************************************************************************* - + Include Files - + *******************************************************************************/ #define ENTITY_MFW @@ -139,9 +139,9 @@ //x0pleela 15 May, 2007 DR: OMAPS00127483 #ifdef FF_PHONE_LOCK -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER #include "mfw_midi.h" -#endif //FF_MIDI_RINGER +#endif //FF_MIDI_RINGER #endif /* FF_PHONE_LOCK */ #include "dspl.h" @@ -177,17 +177,17 @@ #include "MmiPins.h" //x0pleela 15 May, 2007 DR: OMAPS00127483 #include "MmiSounds.h" -EXTERN T_call call_data; +EXTERN T_call call_data; extern T_MFW_HND phlock_win_handle; /* to hold the win handle of phone unlock editor window */ extern T_MFW_HND phlock_kbd_handle; /* to hold the kbd handle of phone unlock editor window */ extern T_MFW_HND phlock_alarm_win_handle; /* to hold the win handle of alarm window */ extern T_MFW_HND phlock_dialog_mtc_win_handle;/* to hold the win handle of MT call dialog window */ -extern int phlock_alarm; /* flag to check whether alarm event has occured or not */ +extern int phlock_alarm; /* flag to check whether alarm event has occured or not */ int phlock_mtc_anim_time; /* to hold the display info for MTC while in locked state */ //x0pleela 15 May, 2007 DR: OMAPS00127483 #ifdef FF_MMI_AUDIO_PROFILE -extern UBYTE mfwAudPlay;//flag for audio +extern UBYTE mfwAudPlay;//flag for audio #endif static T_MFW_HND phlock_dialog_info_create (T_MFW_HND parent_win); @@ -210,7 +210,7 @@ static void dialog_info (T_MFW_HND win, USHORT event, SHORT value, void * parameter); -/* x0039928 - Lint warning fix +/* x0039928 - Lint warning fix static int dialog_info_win_cb (T_MFW_EVENT event, T_MFW_WIN * win); */ static int dialog_info_win_resize_cb (T_MFW_EVENT event, T_MFW_WIN * win); @@ -265,10 +265,10 @@ case DLG_INFO_LAYOUT_LEFT: //display all info at the top of the bitmap sx = dataSx; break; - default: //display info over entire area + default: //display info over entire area break; } - + switch (dlgType & (DLG_INFO_LAYOUT_BOTTOM | DLG_INFO_LAYOUT_TOP)) { case DLG_INFO_LAYOUT_CENTRE: //display info in centre of display @@ -282,7 +282,7 @@ case DLG_INFO_LAYOUT_TOP: //display all info at the top of the bitmap sy = dataSy; break; - default: //display info over entire area + default: //display info over entire area break; } area.px = px; area.py = py; @@ -296,20 +296,20 @@ $Function: info_dialog $Description: Common information dialog - + $Returns: Dialogue info win $Arguments: parent win, display info - + *******************************************************************************/ T_MFW_HND info_dialog (T_MFW_HND parent_win, T_DISPLAY_DATA * display_info) { - T_MFW_HND win; + T_MFW_HND win; TRACE_FUNCTION("info_dialog()"); display_info->SoftKeyStrings = FALSE; - - win = dialog_info_create (parent_win); + + win = dialog_info_create (parent_win); if (win NEQ NULL) { @@ -324,11 +324,11 @@ $Function: info_dialog_softkeystrings $Description: Common information dialog, sets "softkeystrings" to TRUE - + $Returns: Dialogue info win $Arguments: parent win, display info, leftsoftkey, rightsoftkey - + *******************************************************************************/ T_MFW_HND info_dialog_softkeystrings (T_MFW_HND parent_win, T_DISPLAY_DATA * display_info) { @@ -350,11 +350,11 @@ $Function: dialog_info_create $Description: Creation of an information dialog - + $Returns: Dialogue info win $Arguments: parent win - + *******************************************************************************/ static T_MFW_HND dialog_info_create (T_MFW_HND parent_win) { @@ -366,7 +366,7 @@ //x0pleela 06 Apr, 2007 ER: OMAPS00122561 #ifdef FF_PHONE_LOCK |E_WIN_RESUME - #endif //FF_PHONE_LOCK + #endif //FF_PHONE_LOCK , (T_MFW_CB)dialog_info_win_resize_cb); if (data->info_win EQ 0) @@ -393,11 +393,11 @@ $Function: dialog_info_destroy $Description: Destruction of an information dialog - + $Returns: void $Arguments: win - + *******************************************************************************/ void dialog_info_destroy (T_MFW_HND own_window) { @@ -459,21 +459,21 @@ if (displayInfo == NULL) return; memset (displayInfo, 0x00, sizeof(T_DISPLAY_DATA)); - + displayInfo->LeftSoftKey = 0; displayInfo->RightSoftKey = 0; displayInfo->LSKString = NULL; displayInfo->RSKString = NULL; displayInfo->TextString = NULL; displayInfo->TextString2 = NULL; - + displayInfo->WrapStrings = 0; - + displayInfo->TextId = 0; displayInfo->TextId2 = 0; - + displayInfo->SoftKeyStrings = FALSE; - + displayInfo->Identifier = 0; displayInfo->anim_time = 0; displayInfo->number_of_frames = 0; @@ -484,15 +484,15 @@ displayInfo->IconData.height = 0; displayInfo->IconData.dst = NULL; displayInfo->IconData.selfExplanatory = FALSE; -#endif +#endif dlg_initDisplayData_events( displayInfo, NULL, 0, 0); - + /* GW#2294 COLOUR_STATUS has been used for all popups - change this to default instead of COLOUR_POPUP .*/ dlg_initDisplayData_type( displayInfo, COLOUR_STATUS, 0, NULL, 0 ); /* GW #2294 02/07/03 - The default bitmap is set-up here to allow us to disable it for some dialogs (if required) */ displayInfo->bgdBitmap = icon_getBgdBitmap(BGD_CLOUD); - + } void dlg_initDisplayData_TextId( T_DISPLAY_DATA *displayInfo, int lsk, int rsk, int str1, int str2, int colId) @@ -505,7 +505,7 @@ displayInfo->TextId = str1; displayInfo->TextId2 = str2; displayInfo->displayCol = colId ; - + } void dlg_initDisplayData_TextStr( T_DISPLAY_DATA *displayInfo, int lsk, int rsk,char *str1, char *str2, int colId) @@ -539,7 +539,7 @@ $Function: dialog_info $Description: Dialog function for information dialog - + $Returns: void $Arguments: win, window handle event, value, parameter @@ -549,7 +549,7 @@ { T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; T_dialog_info * data = (T_dialog_info *)win_data->user; - T_DISPLAY_DATA * display_info = (T_DISPLAY_DATA *)parameter; + T_DISPLAY_DATA * display_info = (T_DISPLAY_DATA *)parameter; TRACE_FUNCTION ("dialog_info()"); switch (event) @@ -561,7 +561,7 @@ #if defined (WIN32) { /***************************Go-lite Optimization changes Start***********************/ - + //Aug 16, 2004 REF: CRR 24323 Deepa M.D TRACE_EVENT_P1( "Identifier %d", display_info->Identifier); /***************************Go-lite Optimization changes end***********************/ @@ -571,13 +571,13 @@ /* * Create timer and keyboard handler */ - data->info_tim = tim_create (win, display_info->Time, (T_MFW_CB)dialog_info_tim_cb); + data->info_tim = tim_create (win, display_info->Time, (T_MFW_CB)dialog_info_tim_cb); data->info_kbd = kbd_create (win, KEY_ALL, (T_MFW_CB)dialog_info_kbd_cb); data->info_kbd_long = kbd_create(win,KEY_ALL|KEY_LONG,(MfwCb)dialog_info_kbd_long_cb); //x0pleela 05 Apr, 2007 ER: OMAPS00122561 #ifdef FF_PHONE_LOCK - if( phlock_win_handle && + if( phlock_win_handle && ( ( phlock_alarm) || ( call_data.call_direction == MFW_CM_MTC ) ) ) { TRACE_EVENT("dialog_info: Bef deleting kbd_delete(data->info_kbd);"); @@ -586,7 +586,7 @@ if( call_data.call_direction == MFW_CM_MTC ) phlock_dialog_mtc_win_handle = win; - + kbd_delete(data->info_kbd); data->info_kbd = phlock_kbd_handle; //set the kbd handle of unlock screen } @@ -623,24 +623,24 @@ { data->IconData.width = display_info->IconData.width; data->IconData.height = display_info->IconData.height; - data->IconData.dst = display_info->IconData.dst; + data->IconData.dst = display_info->IconData.dst; data->IconData.selfExplanatory = display_info->IconData.selfExplanatory; } else - { + { data->IconData.dst = NULL; data->IconData.selfExplanatory = FALSE; data->IconData.width =0; data->IconData.height =0; - } -#endif + } +#endif TRACE_EVENT_P1("anim_time = %d", display_info->anim_time); TRACE_EVENT_P1("data->anim_time = %d", data->anim_time); //x0pleela 27 Mar, 2007 ER: OMAPS00122561 -#ifdef FF_PHONE_LOCK +#ifdef FF_PHONE_LOCK phlock_mtc_anim_time = display_info->anim_time; -if( ( !phlock_win_handle) || (mmiPinsEmergencyCall()) +if( ( !phlock_win_handle) || (mmiPinsEmergencyCall()) || call_data.emergencyCall ) { #endif //FF_PHONE_LOCK @@ -654,7 +654,7 @@ tim_start (data->info_tim); win_show (win); -#ifdef FF_PHONE_LOCK +#ifdef FF_PHONE_LOCK } else { @@ -680,12 +680,12 @@ $Function: dialog_info_win_cb $Description: Callback function for information dialog - + $Returns: void $Arguments: window handle event, win *******************************************************************************/ -//GW-SPR#762-Added code to wraps txtString2 if there is room on the display to allow +//GW-SPR#762-Added code to wraps txtString2 if there is room on the display to allow //very long numbers to be displayed. #define MAX_LINE_CHAR MAX_LINE static int dialog_info_win_cb (T_MFW_EVENT event, T_MFW_WIN * win) @@ -722,7 +722,7 @@ displayCustSoftKeys(data->LSKString, data->RSKString); // SH - display text softkeys else displaySoftKeys(data->LeftSoftKey, data->RightSoftKey); // display ID softkeys - + /* * Print information */ @@ -734,7 +734,7 @@ } else if (data->TextString NEQ NULL) { -#ifdef EASY_TEXT_ENABLED +#ifdef EASY_TEXT_ENABLED if (data->TextString[0] == (char)0x80) //MC if this is a unicode string /* x0039928 -lint warning removal */ displayAlignedText(LEFT, 0, DSPL_TXTATTR_UNICODE, &data->TextString[2]); else @@ -747,8 +747,8 @@ ALIGNED_PROMPT(LEFT,Mmi_layout_first_line()/*MC*/,DSPL_TXTATTR_CURRENT_MODE, data->TextId2); } else if (data->TextString2 NEQ NULL) - { -#ifdef EASY_TEXT_ENABLED + { +#ifdef EASY_TEXT_ENABLED if (data->TextString2[0] == (char)0x80 ) //MC if this is a unicode string /* x0039928 -Lint warning removal */ displayAlignedText(LEFT, Mmi_layout_first_line()/*MC*/, DSPL_TXTATTR_UNICODE, &data->TextString2[2]); else @@ -762,7 +762,7 @@ len = strlen(data->TextString2); while ((bufPos < len) && (nLines >=0)) { - memcpy(buffer,&data->TextString2[bufPos],MAX_LINE_CHAR); + memcpy(buffer,&data->TextString2[bufPos],MAX_LINE_CHAR); bufPos = bufPos + MAX_LINE_CHAR; buffer[MAX_LINE_CHAR] = 0x00; displayAlignedText(LEFT, yPos, 0, buffer); @@ -791,34 +791,34 @@ $Function: dialog_info_win_cb $Description: Callback function for information dialog - + $Returns: void $Arguments: window handle event, win -GW SPR#2294 02/07/03 - Removed Unicode specific code as the 'display' routines called to calculate - the string length and output the text should correctly handle the 0x80 unicode tag +GW SPR#2294 02/07/03 - Removed Unicode specific code as the 'display' routines called to calculate + the string length and output the text should correctly handle the 0x80 unicode tag at the start. Modified the display code to wrap the text in the second text string. Modified the window drawing code so that if the text will not fit in the dialog box - with the background bitmap, a pop-up 'box' will be drawn instead. If this will still + with the background bitmap, a pop-up 'box' will be drawn instead. If this will still not be large enough, the entire screen is used. For the C-sample, there is no bitmap. Modified the code to use an array of values to position the text output. GW SPR#2294 08/07/03 - Added code to expand the dialog box to include the animation (if any). - + *******************************************************************************/ // Allow 4 lines of text (0..3) for dialogs // Sep 06 2005 REF: MMI-SPR-33548 x0012849 // To display a dialog properly when it contain lengthy message - No of lines increased. -#define MAX_DLG_LINES (15) +#define MAX_DLG_LINES (15) //Allow up to 40 chars of text on a dialog line #define MAX_WRAP_CHAR (42) //Allow us to wrap text from line 2 to lines 2,3 and 4 lines #define MAX_WRAP_LINES (MAX_DLG_LINES-1) #define DLG_USE_BITMAP 0x0001 //use bitmap if present -#define DLG_USE_RECTANGLE 0x0002 //use a rectangle +#define DLG_USE_RECTANGLE 0x0002 //use a rectangle #define DLG_USE_FULL_SCREEN 0x0004 //use full-screen #define DLG_LINE1 0 @@ -831,10 +831,10 @@ int xPos[MAX_DLG_LINES]; int yPos[MAX_DLG_LINES]; // Sep 06 2005 REF: MMI-SPR-33548 x0012849 - //The size of array str and strlen are increased by 1, so that the last elements holds data + //The size of array str and strlen are increased by 1, so that the last elements holds data // which is used while wrapping the text. - char* str[MAX_DLG_LINES+1]; - int strLen[MAX_DLG_LINES+1]; + char* str[MAX_DLG_LINES+1]; + int strLen[MAX_DLG_LINES+1]; int i; char* lskStr,*rskStr; int wx = 0; //,wy,sx=0,sy=0; // RAVI @@ -847,19 +847,19 @@ MfwRect skArea; //x0035544 Feb 15, 2006. DR:OMAPS00061467 #ifdef FF_MMI_SAT_ICON - USHORT titleIconWidth = 0; + USHORT titleIconWidth = 0; #endif MfwRect area; int scrWidth = 0; //available width for the display // RAVI - Assignment to 0. // Sep 06 2005 REF: MMI-SPR-33548 x0012849 // temp_ptr is used while wrapping the text. // Now str2[][] is not required. - char *temp_ptr; + char *temp_ptr; int nChar; /* t_font_bitmap bmp; */ /* Warning Removal - x0020906 - 24-08-2006 */ // t_font_bitmap* bmpPtr = &bmp; // RAVI - Not Referenced. - + int drawWinType; int nLines; @@ -868,7 +868,7 @@ int wrapLine = 0; /*GW #2294*/ // x0066814 06 Dec 2006, OMAPS00106825 const int charWidth = dspl_GetTextExtent("0",1); - TRACE_FUNCTION ("dialog_info_win_resize_cb()"); + TRACE_FUNCTION ("dialog_info_win_resize_cb()"); memset(str,'\0',sizeof(str)); /* x0039928 - Lint warning fix */ @@ -877,7 +877,7 @@ #ifdef FF_MMI_SAT_ICON if (data->IconData.dst != NULL) { - if (data->IconData.width > TITLE_ICON_WIDTH) + if (data->IconData.width > TITLE_ICON_WIDTH) { titleIconWidth = TITLE_ICON_WIDTH; } @@ -885,13 +885,13 @@ { titleIconWidth = data->IconData.width ; } - } + } else { titleIconWidth = 0; } - -#endif + +#endif if (data EQ 0) return 1; @@ -902,38 +902,38 @@ //the ringer for incoming call or alarm is restarted here after unlocking the phone. case E_WIN_RESUME: -#ifdef FF_PHONE_LOCK - +#ifdef FF_PHONE_LOCK + if( ( ( ( call_data.call_direction == MFW_CM_MTC ) && ( phlock_dialog_mtc_win_handle ) ) || ( phlock_alarm ) ) - #ifdef FF_MMI_AUDIO_PROFILE + #ifdef FF_MMI_AUDIO_PROFILE && ( !mfwAudPlay) - #endif + #endif ) { - if( call_data.call_direction == MFW_CM_MTC ) + if( call_data.call_direction == MFW_CM_MTC ) { - #ifdef FF_MIDI_RINGER + #ifdef FF_MIDI_RINGER mfw_ringer_start(AS_RINGER_MODE_IC, TRUE, sounds_midi_ringer_start_cb); #endif } else if ( phlock_alarm ) { - #ifdef FF_MIDI_RINGER + #ifdef FF_MIDI_RINGER mfw_ringer_start(AS_RINGER_MODE_ALARM, TRUE, sounds_midi_ringer_start_cb); #endif } } - + #endif // FF_PHONE_LOCK break; - + case E_WIN_VISIBLE: if (win->flags & E_WIN_VISIBLE) { TRACE_EVENT("dialog_info_win_resize_cb: E_WIN_VISIBLE"); - -#ifdef FF_PHONE_LOCK + +#ifdef FF_PHONE_LOCK if( phlock_alarm && phlock_alarm_win_handle ) { TRACE_EVENT("dialog_info_win_resize_cb: creating alarm kbd handler"); @@ -950,7 +950,7 @@ timStart(data->animation_timer); } } -#endif //FF_PHONE_LOCK +#endif //FF_PHONE_LOCK /* * Print the information dialog @@ -964,18 +964,18 @@ } // Sep 06 2005 REF: MMI-SPR-33548 x0012849 // Assign the values to last elments of the array str and strLen - str[MAX_DLG_LINES] = NULL; + str[MAX_DLG_LINES] = NULL; strLen[MAX_DLG_LINES] = 0; yOfs = Mmi_layout_line_height()/4; if (data->TextId != 0) str[DLG_LINE1] = MmiRsrcGetText( data->TextId); - else + else str[DLG_LINE1] = data->TextString; - + if (data->TextId2 != 0) str[DLG_LINE2] = MmiRsrcGetText( data->TextId2); else - str[DLG_LINE2] = data->TextString2; + str[DLG_LINE2] = data->TextString2; if (data->SoftKeyStrings!=0) { @@ -987,12 +987,12 @@ if (data->LeftSoftKey != TxtNull) lskStr = MmiRsrcGetText(data->LeftSoftKey); else - lskStr = NULL; - + lskStr = NULL; + if (data->RightSoftKey != TxtNull) rskStr = MmiRsrcGetText(data->RightSoftKey); else - rskStr = NULL; + rskStr = NULL; } if ((str[DLG_LINE1]!= NULL) || (str[DLG_LINE2]!=NULL)) @@ -1000,39 +1000,39 @@ if (str[DLG_LINE2] == NULL) { sy = Mmi_layout_line_height()+yOfs*2; // 18 or 12 - + } else { sy = Mmi_layout_line_height()*2+yOfs*3; // 33 or 22 } - - //MC, if (Mmi_getCurrentLanguage() != CHINESE_LANGUAGE) + + //MC, if (Mmi_getCurrentLanguage() != CHINESE_LANGUAGE) { //calculate longest string - use this to calc width of window sx = 0; if ((lskStr!=NULL) || (rskStr!=NULL)) { - sy = sy+Mmi_layout_softkeyHeight()+yOfs*2; + sy = sy+Mmi_layout_softkeyHeight()+yOfs*2; sx = sx + 10; - if (lskStr != NULL) + if (lskStr != NULL) { sx = sx + dspl_GetTextExtent(lskStr, 0); } - if (rskStr != NULL) + if (rskStr != NULL) { sx = sx + dspl_GetTextExtent(rskStr,0); } - + } for (i=DLG_LINE1;i<=DLG_LINE2;i++) - { + { strLen[i] = dspl_GetTextExtent(str[i],0); } - + /* Work out the desired width of the dialog. If we can wrap line 2 and it is long, wrap it */ if (data->WrapStrings & WRAP_STRING_2) nLines = MAX_WRAP_LINES; - else + else nLines = 1; #ifdef COLOURDISPLAY if (data->dlgBgdBitmap!=NULL) @@ -1041,15 +1041,15 @@ //NB this should be calculated depending on the height of the popup bitmap. const int max_lines_dlg_popup=2; if (nLines>max_lines_dlg_popup) - nLines = max_lines_dlg_popup; + nLines = max_lines_dlg_popup; scrWidth = (data->dlgBgdBitmap->area.sx * 3)/4; //the max width is about 3/4 of the pop-up - if ( (strLen[DLG_LINE2] > (scrWidth-charWidth)*nLines) || + if ( (strLen[DLG_LINE2] > (scrWidth-charWidth)*nLines) || (strLen[DLG_LINE1] > scrWidth)) { //recalculate width below. if (data->WrapStrings & WRAP_STRING_2) nLines = MAX_WRAP_LINES; - fullScreen = DLG_USE_RECTANGLE; + fullScreen = DLG_USE_RECTANGLE; } else { @@ -1062,17 +1062,17 @@ { const int max_lines_dlg_popup=2; if (nLines>max_lines_dlg_popup) - nLines = max_lines_dlg_popup; + nLines = max_lines_dlg_popup; } #endif - if (fullScreen == DLG_USE_RECTANGLE) - { + if (fullScreen == DLG_USE_RECTANGLE) + { //see if we can display as a pop-up if (SCREEN_SIZE_X < 128) scrWidth = SCREEN_SIZE_X-6; else - scrWidth = (SCREEN_SIZE_X*7)/8; + scrWidth = (SCREEN_SIZE_X*7)/8; if ( strLen[DLG_LINE2] > (scrWidth-charWidth)*nLines) { //Cannot fit in as a pop-up - use full screen @@ -1084,7 +1084,7 @@ //We can fit it in - but we may want to reduce the width for a nicer look. } } - + /* * Wrap second text line (e.g. for long phone numbers.) */ @@ -1103,49 +1103,49 @@ str[MAX_DLG_LINES] = str[DLG_LINE2]; // Now move the second line of text to the last element of the arrya strLen[MAX_DLG_LINES] = strLen[DLG_LINE2];// put the right value for the length of the string str[DLG_LINE2] = NULL ; // Assign NULL to the second element of the array. - while ((wrapLine < MAX_WRAP_LINES) && (linePos<lineLen)) + while ((wrapLine < MAX_WRAP_LINES) && (linePos<lineLen)) { // Sep 06 2005 REF: MMI-SPR-33548 x0012849 - // Instead of DLG_LINE2 use MAX_DLG_LINES - nChar = dspl_GetNcharToFit (&str[MAX_DLG_LINES][linePos], (USHORT)scrWidth); + // Instead of DLG_LINE2 use MAX_DLG_LINES + nChar = dspl_GetNcharToFit (&str[MAX_DLG_LINES][linePos], (USHORT)scrWidth); if (nChar > MAX_WRAP_CHAR) nChar = MAX_WRAP_CHAR; // Sep 06 2005 REF: MMI-SPR-33548 x0012849 - // Allocate MAX_WRAP_CHAR no of bytes - temp_ptr = (char*)mfwAlloc(MAX_WRAP_CHAR); + // Allocate MAX_WRAP_CHAR no of bytes + temp_ptr = (char*)mfwAlloc(MAX_WRAP_CHAR); if(NULL == temp_ptr) - return 0; + return 0; // Sep 06 2005 REF: MMI-SPR-33548 x0012849 // Now the destination of memcpy is temp_ptr instead of str2[wrapLine] and the source is str[MAX_DLG_LINES] instead of str[DLG_LINE2] memcpy(temp_ptr,&str[MAX_DLG_LINES][linePos],nChar); // Now the source data is from the last element of the array. linePos = linePos+nChar; - ////GW - even if we cannot display the entire string - it is better than what we would have otherwise + ////GW - even if we cannot display the entire string - it is better than what we would have otherwise // Sep 06 2005 REF: MMI-SPR-33548 x0012849 // Assign the value of pointer temp_ptr to str[] str[DLG_LINE2+wrapLine] = temp_ptr; - temp_ptr = NULL; + temp_ptr = NULL; strLen[DLG_LINE2 + wrapLine] = dspl_GetTextExtent(str[DLG_LINE2+wrapLine],0); wrapLine++; } - + } else { //Unicode is more problematic - we need the 0x80 at the front of the string - //for the call to 'dspl_GetNcharToFit'. This will involve copying the entire remainder + //for the call to 'dspl_GetNcharToFit'. This will involve copying the entire remainder //of 'str2' into a temporary buffer. At the moment, we only wrap numbers so this //code will wait until it is required. // str[3] = "Code not written!!"; //issue warning // strLen[3] = dspl_GetTextExtent(str[3],0); - fullScreen = DLG_USE_FULL_SCREEN; //error - use full screen + fullScreen = DLG_USE_FULL_SCREEN; //error - use full screen } } } - + //Calculate longest line of text (including softkeys - sx already set to the softkey width) for (i=0;i< MAX_DLG_LINES;i++) { - if (strLen[i]>sx) + if (strLen[i]>sx) sx = strLen[i]; } if (sx > SCREEN_SIZE_X-charWidth) @@ -1157,7 +1157,7 @@ else sx = sx + charWidth*2; } - if (sy> sx) + if (sy> sx) sx = sy; wx = (SCREEN_SIZE_X-sx)/2; if (wx<0) @@ -1166,13 +1166,13 @@ if (sy > SCREEN_SIZE_Y) wy = 0; - else if (SCREEN_SIZE_Y > 2*sy) + else if (SCREEN_SIZE_Y > 2*sy) wy = (SCREEN_SIZE_Y*2/3-sy)/2; //display in middle of top 2/3 of screen - else + else wy = (SCREEN_SIZE_Y-sy)/2; //display in middle of screen if (wy < 10) wy = wy/2; - + if ((wx == 0) || (wy==0)) { //not enough room to display as a window - use whole screen fullScreen = DLG_USE_FULL_SCREEN; @@ -1180,7 +1180,7 @@ #ifdef COLOURDISPLAY if ((data->icon_array != NULL) && (fullScreen != DLG_USE_BITMAP)) - { //The dialog has an animation - we must make the pop-up large enough to support this + { //The dialog has an animation - we must make the pop-up large enough to support this if (sx < data->icon_array[0].area.sx) sx = data->icon_array[0].area.sx; yBmpOfs = data->icon_array[0].area.py + data->icon_array[0].area.sy; @@ -1190,7 +1190,7 @@ #endif } else - { + { //We have no strings to display - clear entire screen fullScreen = DLG_USE_FULL_SCREEN; } @@ -1207,7 +1207,7 @@ area.sy = sy; resources_setColour(data->dlgCol); drawWinType = DSPL_WIN_CENTRE; - + if (fullScreen!=DLG_USE_FULL_SCREEN) { t_font_bitmap bmp; @@ -1219,7 +1219,7 @@ xPos[i] = wx+(sx-strLen[i])/2; yPos[i] = wy+yOfs+yBmpOfs+Mmi_layout_line_height()*i; } - + #ifdef COLOURDISPLAY if ((data->dlgBgdBitmap != NULL) && (fullScreen==DLG_USE_BITMAP)) { @@ -1245,16 +1245,16 @@ yPos[i] = yPos[i] + area.py; } - TRACE_EVENT_P3("wy = %d, yOfs = %d, area.py = %d",wy,yOfs,area.py); - if( data->dlgBgdBitmap->icnType != ICON_TYPE_1BIT_UNPACKED ) + TRACE_EVENT_P3("wy = %d, yOfs = %d, area.py = %d",wy,yOfs,area.py); + if( data->dlgBgdBitmap->icnType != ICON_TYPE_1BIT_UNPACKED ) dspl_SetBgdColour( COL_TRANSPARENT ); - - + + } else { // x0066814 06 Dec 2006, OMAPS00106825 - //The window height calculation related to wrapping should be skipped when no + //The window height calculation related to wrapping should be skipped when no //string wrapping is done if(wrapLine>0) { @@ -1267,24 +1267,24 @@ { sy = sy + (wrapLine-1)*Mmi_layout_line_height(); area.sy = sy; - } + } #endif // Sep 06 2005 REF: MMI-SPR-33548 x0012849 //If length of the dialog is bigger than screen then start the dialog from the top corner. if(sy+wy >= SCREEN_SIZE_Y && sy < SCREEN_SIZE_Y) if(wy>0 && wy < sy) - { + { wy = (SCREEN_SIZE_Y - sy ) /2 ;// centre the dialog if(wy < 0) - wy=0; - for (i=0;i<MAX_DLG_LINES;i++) + wy=0; + for (i=0;i<MAX_DLG_LINES;i++) yPos[i] = wy+yOfs+yBmpOfs+Mmi_layout_line_height()*i; - } + } dspl_DrawWin( wx,wy,sx,sy, drawWinType , bmpPtr); } else { - dspl_ClearAll(); + dspl_ClearAll(); sx = 84; for (i=0;i<MAX_DLG_LINES;i++) { @@ -1305,82 +1305,82 @@ skArea.px = area.px+wx; skArea.sx = area.sx; skArea.py = area.py+wy+area.sy-Mmi_layout_softkeyHeight()-1; - skArea.sy = Mmi_layout_softkeyHeight(); + skArea.sy = Mmi_layout_softkeyHeight(); } - softKeys_displayStrXY(lskStr, rskStr, data->dlgSkFormat, data->dlgCol, &skArea); + softKeys_displayStrXY(lskStr, rskStr, data->dlgSkFormat, data->dlgCol, &skArea); } /****************************** * Print dialog text *****************************/ for (i=0;i<MAX_DLG_LINES;i++) - { /* GW#2294 No need to draw zero length strings .*/ + { /* GW#2294 No need to draw zero length strings .*/ if ((str[i] != NULL) && (strLen[i] > 0)) - { - //x0035544 Feb 15, 2006. DR:OMAPS00061467 - #ifdef FF_MMI_SAT_ICON - if(data->IconData.selfExplanatory == FALSE) + { + //x0035544 Feb 15, 2006. DR:OMAPS00061467 + #ifdef FF_MMI_SAT_ICON + if(data->IconData.selfExplanatory == FALSE) dspl_TextOut(xPos[i] + titleIconWidth, yPos[i], DSPL_TXTATTR_NORMAL, str[i] ); #else dspl_TextOut(xPos[i] , yPos[i], DSPL_TXTATTR_NORMAL, str[i] ); - #endif + #endif } } - //x0035544 Feb 15, 2006. DR:OMAPS00061467 + //x0035544 Feb 15, 2006. DR:OMAPS00061467 #ifdef FF_MMI_SAT_ICON if(data->IconData.dst != NULL) - { + { if(str[DLG_LINE2] == NULL) { - if ((data->IconData.width > TITLE_ICON_WIDTH) || + if ((data->IconData.width > TITLE_ICON_WIDTH) || (data->IconData.height > TITLE_ICON_HEIGHT)) { - dspl_BitBlt2(xPos[0], yPos[0], 8, + dspl_BitBlt2(xPos[0], yPos[0], 8, 10, (void*)SATIconQuestionMark, 0, BMP_FORMAT_256_COLOUR); - } - - else - dspl_BitBlt2(xPos[0], yPos[0], data->IconData.width, + } + + else + dspl_BitBlt2(xPos[0], yPos[0], data->IconData.width, data->IconData.height, (void*)data->IconData.dst, 0, BMP_FORMAT_256_COLOUR); } else { - if ((data->IconData.width > TITLE_ICON_WIDTH) || + if ((data->IconData.width > TITLE_ICON_WIDTH) || (data->IconData.height > TITLE_ICON_HEIGHT)) { - dspl_BitBlt2(xPos[DLG_LINE2], yPos[DLG_LINE2], 8, + dspl_BitBlt2(xPos[DLG_LINE2], yPos[DLG_LINE2], 8, 10, (void*)SATIconQuestionMark, 0, BMP_FORMAT_256_COLOUR); } else - dspl_BitBlt2(xPos[DLG_LINE2], yPos[DLG_LINE2],data->IconData.width, + dspl_BitBlt2(xPos[DLG_LINE2], yPos[DLG_LINE2],data->IconData.width, data->IconData.height, (void*)data->IconData.dst, 0, BMP_FORMAT_256_COLOUR); } - - } + + } #endif - - resources_restoreColour(); + + resources_restoreColour(); } // Sep 06 2005 REF: MMI-SPR-33548 x0012849 - // Now free the allocated memory + // Now free the allocated memory /* x0039928 - Lint warning removal */ - if (strLen[MAX_DLG_LINES] > scrWidth-charWidth) - if (data->WrapStrings & WRAP_STRING_2) + if (strLen[MAX_DLG_LINES] > scrWidth-charWidth) + if (data->WrapStrings & WRAP_STRING_2) if (str[MAX_DLG_LINES][0] != (char)0x80) /* x0039928 - lint warning removal */ { for(i=DLG_LINE2;i<MAX_DLG_LINES;i++) { - if(NULL != str[i] && strLen[i] > 0) + if(NULL != str[i] && strLen[i] > 0) mfwFree((U8*)str[i],MAX_WRAP_CHAR); } - str[MAX_DLG_LINES]=NULL; + str[MAX_DLG_LINES]=NULL; } - + break; default: return 0; - } + } return 1; } @@ -1391,7 +1391,7 @@ $Description: Callback function for the dialog info timer. - + $Returns: MFW event handler $Arguments: window handle event, timer control block @@ -1422,7 +1422,7 @@ /* ** SPR#1744 NDH ** Move the dialog destory in front of the Callback to make the processing consistent - ** with the Right Keypress and Hangup Processing. Also to ensure that the dialog is + ** with the Right Keypress and Hangup Processing. Also to ensure that the dialog is ** removed when the screen is redrawn. */ dialog_info_destroy (win); @@ -1461,7 +1461,7 @@ switch (keyboard->code) { case KCD_LEFT: - if (data->KeyEvents & KEY_LEFT ) + if (data->KeyEvents & KEY_LEFT ) { TRACE_EVENT("dialog_info_kbd_cb: KEY_LEFT"); @@ -1472,7 +1472,7 @@ break; case KCD_RIGHT: - if (data->KeyEvents & KEY_RIGHT) + if (data->KeyEvents & KEY_RIGHT) { dialog_info_destroy (win); if (Callback) @@ -1489,26 +1489,26 @@ } break; case KCD_MNUUP: - + if (data->KeyEvents & KEY_MNUUP) { if (Callback) (Callback) (parent_win, Identifier, INFO_KCD_UP); } - + break; case KCD_MNUDOWN: - + if (data->KeyEvents & KEY_MNUDOWN) { if (Callback) (Callback) (parent_win, Identifier, INFO_KCD_DOWN); } - + break; //MZ 7/3/01 used to start a call. case KCD_CALL: - if (data->KeyEvents & KEY_CALL ) + if (data->KeyEvents & KEY_CALL ) { dialog_info_destroy (win); if (Callback) @@ -1532,7 +1532,7 @@ } break; - } + } return MFW_EVENT_CONSUMED; } @@ -1546,11 +1546,11 @@ $Function: mmi_dialog_information_screen - $Description: - - $Returns: - - $Arguments: + $Description: + + $Returns: + + $Arguments: *******************************************************************************/ @@ -1559,13 +1559,13 @@ T_DISPLAY_DATA display_info; dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtId, TxtNull, COLOUR_STATUS); dlg_initDisplayData_events( &display_info, call_back, THREE_SECS, KEY_ALL ); - //Sep 01, 2004 REF: CRR 21380 Deepa M.D + //Sep 01, 2004 REF: CRR 21380 Deepa M.D //Assigning TextId and TextString will not display both the messages. //Hence we need to use TextId and TextString2 or TextId2 and TextString - display_info.TextString2 = text; + display_info.TextString2 = text; display_info.Identifier = identifier; return info_dialog(parent_win,&display_info); //information screen - + } T_MFW_HND mmi_dialog_information_screen_forever(MfwHnd win,int TextId, char* TextStr, int colour) @@ -1581,7 +1581,7 @@ $Function: mmi_dialogs_insert_icon - $Description: Displays one icon in a dialog + $Description: Displays one icon in a dialog $Returns: none @@ -1594,10 +1594,10 @@ T_dialog_info * data = (T_dialog_info *)win_data->user; - data->icon = icnCreate(win_dialog,icon,E_ICN_VISIBLE,NULL); + data->icon = icnCreate(win_dialog,icon,E_ICN_VISIBLE,NULL); icnUnhide(data->icon); winShow(win_dialog); - + } /******************************************************************************* @@ -1619,15 +1619,15 @@ data->number_of_frames = number_of_frames; data->current_frame = 0; - data->icon_array = icon; + data->icon_array = icon; data->current_icon = data->icon_array; - data->icon = icnCreate(win_dialog,data->current_icon,E_ICN_VISIBLE,NULL); + data->icon = icnCreate(win_dialog,data->current_icon,E_ICN_VISIBLE,NULL); icnUnhide(data->icon); data->animation_timer = timCreate(win_dialog,anim_time,(MfwCb)mmi_dialogs_insert_animation_CB); timStart(data->animation_timer); winShow(win_dialog); - + } /******************************************************************************* @@ -1647,30 +1647,30 @@ T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; T_dialog_info * data = (T_dialog_info *)win_data->user; - + icnDelete(data->icon); if (data->current_frame < (data->number_of_frames-1)) { data->current_frame++; - data->current_icon++; + data->current_icon++; } - else + else { data->current_frame = 0; data->current_icon = data->icon_array; } - data->icon = icnCreate(win,data->current_icon,E_ICN_VISIBLE,NULL); + data->icon = icnCreate(win,data->current_icon,E_ICN_VISIBLE,NULL); icnUnhide(data->icon); timStart(data->animation_timer); winShow(win); - + } /***************************Go-lite Optimization changes Start***********************/ //Aug 25, 2004 REF: CRR 24904 Deepa M.D -//This function is used only for the Color build.Hence it is put under the +//This function is used only for the Color build.Hence it is put under the //COLOURDISPLAY compiler switch -#ifdef COLOURDISPLAY +#ifdef COLOURDISPLAY void mmi_dialogs_insert_animation_new (T_DISPLAY_DATA *animateInfo , S32 anim_time ,MfwIcnAttr* icon ,UBYTE number_of_frames) { TRACE_EVENT("mmi_dialogs_insert_animation_new()"); @@ -1679,7 +1679,7 @@ animateInfo->current_frame = 0; animateInfo->icon_array = icon; animateInfo->anim_time = anim_time; - + } #endif /***************************Go-lite Optimization changes end***********************/ @@ -1696,26 +1696,26 @@ TRACE_EVENT("mmi_dialogs_insert_animation_new_CB()"); - - - data->current_frame = (data->current_frame +1) % data->number_of_frames; - TRACE_EVENT_P1("data->current_frame = %d", data->current_frame); + + + data->current_frame = (data->current_frame +1) % data->number_of_frames; + TRACE_EVENT_P1("data->current_frame = %d", data->current_frame); TRACE_EVENT_P1("number_of_frames = %d", data->number_of_frames); - + icn_array = (MfwIcnAttr*)data->icon_array; TRACE_EVENT_P1("data->icon_array = %x", (int)data->icon_array); - + icn = &icn_array[data->current_frame]; - + px = icn->area.px; py = icn->area.py; sx = icn->area.sx; sy = icn->area.sy; - + TRACE_EVENT_P4("px = %d, py = %d, sx = %d, sy = %d", icn->area.px,icn->area.py,icn->area.sx,icn->area.sy); - + idData = icn->icons; - + dspl_BitBlt2(px,py,sx,sy,(void*)idData,0,0x02); timStart(data->animation_timer); @@ -1737,7 +1737,7 @@ { T_MFW_WIN * win_data; T_dialog_info * data; - + win_data = ((T_MFW_HDR *)win)->data; data = (T_dialog_info *)win_data->user; @@ -1762,11 +1762,11 @@ T_MFW_HND mmi_dialog_information_screen_delete_all(MfwHnd win,int TextId, char* TextStr, int colour) { T_DISPLAY_DATA DisplayInfo; - + dlg_initDisplayData_TextId( &DisplayInfo, TxtNull, TxtNull, TextId, TxtNull, colour); - dlg_initDisplayData_events( &DisplayInfo, NULL, FOREVER, NULL ); + dlg_initDisplayData_events( &DisplayInfo, NULL, FOREVER, NULL ); DisplayInfo.TextString = TextStr; - + return info_dialog(win, &DisplayInfo); } @@ -1777,20 +1777,20 @@ $Function: phlock_info_dialog $Description: Common information dialog - + $Returns: Dialogue info win $Arguments: parent win, display info - + *******************************************************************************/ T_MFW_HND phlock_info_dialog (T_MFW_HND parent_win, T_DISPLAY_DATA * display_info) { - T_MFW_HND win; + T_MFW_HND win; TRACE_FUNCTION("phlock_info_dialog()"); display_info->SoftKeyStrings = FALSE; - - win = phlock_dialog_info_create (parent_win); + + win = phlock_dialog_info_create (parent_win); if (win NEQ NULL) { @@ -1804,11 +1804,11 @@ $Function: phlock_dialog_info_create $Description: Creation of an information dialog - + $Returns: Dialogue info win $Arguments: parent win - + *******************************************************************************/ static T_MFW_HND phlock_dialog_info_create (T_MFW_HND parent_win) { @@ -1841,11 +1841,11 @@ $Function: phlock_dialog_info_win_resize_cb $Description: Creation of an information dialog - + $Returns: Dialogue info win $Arguments: parent win - + *******************************************************************************/ static int phlock_dialog_info_win_resize_cb (T_MFW_EVENT event, T_MFW_WIN * win) { @@ -1854,10 +1854,10 @@ int xPos[MAX_DLG_LINES]; int yPos[MAX_DLG_LINES]; // Sep 06 2005 REF: MMI-SPR-33548 x0012849 - //The size of array str and strlen are increased by 1, so that the last elements holds data + //The size of array str and strlen are increased by 1, so that the last elements holds data // which is used while wrapping the text. - char* str[MAX_DLG_LINES+1]; - int strLen[MAX_DLG_LINES+1]; + char* str[MAX_DLG_LINES+1]; + int strLen[MAX_DLG_LINES+1]; int i; char* lskStr,*rskStr; int wx = 0; //,wy,sx=0,sy=0; // RAVI @@ -1870,19 +1870,19 @@ MfwRect skArea; //x0035544 Feb 15, 2006. DR:OMAPS00061467 #ifdef FF_MMI_SAT_ICON - USHORT titleIconWidth = 0; + USHORT titleIconWidth = 0; #endif MfwRect area; int scrWidth = 0; //available width for the display // RAVI - Assignment to 0. // Sep 06 2005 REF: MMI-SPR-33548 x0012849 // temp_ptr is used while wrapping the text. // Now str2[][] is not required. - char *temp_ptr; + char *temp_ptr; int nChar; /* t_font_bitmap bmp; */ /* Warning Removal - x0020906 - 24-08-2006 */ // t_font_bitmap* bmpPtr = &bmp; // RAVI - Not Referenced. - + int drawWinType; int nLines; @@ -1891,7 +1891,7 @@ int wrapLine = 0; /*GW #2294*/ // x0066814 06 Dec 2006, OMAPS00106825 const int charWidth = dspl_GetTextExtent("0",1); - TRACE_FUNCTION ("phlock_dialog_info_win_resize_cb()"); + TRACE_FUNCTION ("phlock_dialog_info_win_resize_cb()"); memset(str,'\0',sizeof(str)); /* x0039928 - Lint warning fix */ memset(strLen,0,sizeof(strLen)); @@ -1899,7 +1899,7 @@ #ifdef FF_MMI_SAT_ICON if (data->IconData.dst != NULL) { - if (data->IconData.width > TITLE_ICON_WIDTH) + if (data->IconData.width > TITLE_ICON_WIDTH) { titleIconWidth = TITLE_ICON_WIDTH; } @@ -1907,13 +1907,13 @@ { titleIconWidth = data->IconData.width ; } - } + } else { titleIconWidth = 0; } - -#endif + +#endif if (data EQ 0) return 1; @@ -1934,18 +1934,18 @@ } // Sep 06 2005 REF: MMI-SPR-33548 x0012849 // Assign the values to last elments of the array str and strLen - str[MAX_DLG_LINES] = NULL; + str[MAX_DLG_LINES] = NULL; strLen[MAX_DLG_LINES] = 0; yOfs = Mmi_layout_line_height()/4; if (data->TextId != 0) str[DLG_LINE1] = MmiRsrcGetText( data->TextId); - else + else str[DLG_LINE1] = data->TextString; - + if (data->TextId2 != 0) str[DLG_LINE2] = MmiRsrcGetText( data->TextId2); else - str[DLG_LINE2] = data->TextString2; + str[DLG_LINE2] = data->TextString2; if (data->SoftKeyStrings!=0) { @@ -1957,12 +1957,12 @@ if (data->LeftSoftKey != TxtNull) lskStr = MmiRsrcGetText(data->LeftSoftKey); else - lskStr = NULL; - + lskStr = NULL; + if (data->RightSoftKey != TxtNull) rskStr = MmiRsrcGetText(data->RightSoftKey); else - rskStr = NULL; + rskStr = NULL; } if ((str[DLG_LINE1]!= NULL) || (str[DLG_LINE2]!=NULL)) @@ -1970,39 +1970,39 @@ if (str[DLG_LINE2] == NULL) { sy = Mmi_layout_line_height()+yOfs*2; // 18 or 12 - + } else { sy = Mmi_layout_line_height()*2+yOfs*3; // 33 or 22 } - - //MC, if (Mmi_getCurrentLanguage() != CHINESE_LANGUAGE) + + //MC, if (Mmi_getCurrentLanguage() != CHINESE_LANGUAGE) { //calculate longest string - use this to calc width of window sx = 0; if ((lskStr!=NULL) || (rskStr!=NULL)) { - sy = sy+Mmi_layout_softkeyHeight()+yOfs*2; + sy = sy+Mmi_layout_softkeyHeight()+yOfs*2; sx = sx + 10; - if (lskStr != NULL) + if (lskStr != NULL) { sx = sx + dspl_GetTextExtent(lskStr, 0); } - if (rskStr != NULL) + if (rskStr != NULL) { sx = sx + dspl_GetTextExtent(rskStr,0); } - + } for (i=DLG_LINE1;i<=DLG_LINE2;i++) - { + { strLen[i] = dspl_GetTextExtent(str[i],0); } - + /* Work out the desired width of the dialog. If we can wrap line 2 and it is long, wrap it */ if (data->WrapStrings & WRAP_STRING_2) nLines = MAX_WRAP_LINES; - else + else nLines = 1; #ifdef COLOURDISPLAY if (data->dlgBgdBitmap!=NULL) @@ -2011,15 +2011,15 @@ //NB this should be calculated depending on the height of the popup bitmap. const int max_lines_dlg_popup=2; if (nLines>max_lines_dlg_popup) - nLines = max_lines_dlg_popup; + nLines = max_lines_dlg_popup; scrWidth = (data->dlgBgdBitmap->area.sx * 3)/4; //the max width is about 3/4 of the pop-up - if ( (strLen[DLG_LINE2] > (scrWidth-charWidth)*nLines) || + if ( (strLen[DLG_LINE2] > (scrWidth-charWidth)*nLines) || (strLen[DLG_LINE1] > scrWidth)) { //recalculate width below. if (data->WrapStrings & WRAP_STRING_2) nLines = MAX_WRAP_LINES; - fullScreen = DLG_USE_RECTANGLE; + fullScreen = DLG_USE_RECTANGLE; } else { @@ -2032,17 +2032,17 @@ { const int max_lines_dlg_popup=2; if (nLines>max_lines_dlg_popup) - nLines = max_lines_dlg_popup; + nLines = max_lines_dlg_popup; } #endif - if (fullScreen == DLG_USE_RECTANGLE) - { + if (fullScreen == DLG_USE_RECTANGLE) + { //see if we can display as a pop-up if (SCREEN_SIZE_X < 128) scrWidth = SCREEN_SIZE_X-6; else - scrWidth = (SCREEN_SIZE_X*7)/8; + scrWidth = (SCREEN_SIZE_X*7)/8; if ( strLen[DLG_LINE2] > (scrWidth-charWidth)*nLines) { //Cannot fit in as a pop-up - use full screen @@ -2054,7 +2054,7 @@ //We can fit it in - but we may want to reduce the width for a nicer look. } } - + /* * Wrap second text line (e.g. for long phone numbers.) */ @@ -2073,49 +2073,49 @@ str[MAX_DLG_LINES] = str[DLG_LINE2]; // Now move the second line of text to the last element of the arrya strLen[MAX_DLG_LINES] = strLen[DLG_LINE2];// put the right value for the length of the string str[DLG_LINE2] = NULL ; // Assign NULL to the second element of the array. - while ((wrapLine < MAX_WRAP_LINES) && (linePos<lineLen)) + while ((wrapLine < MAX_WRAP_LINES) && (linePos<lineLen)) { // Sep 06 2005 REF: MMI-SPR-33548 x0012849 - // Instead of DLG_LINE2 use MAX_DLG_LINES - nChar = dspl_GetNcharToFit (&str[MAX_DLG_LINES][linePos], (USHORT)scrWidth); + // Instead of DLG_LINE2 use MAX_DLG_LINES + nChar = dspl_GetNcharToFit (&str[MAX_DLG_LINES][linePos], (USHORT)scrWidth); if (nChar > MAX_WRAP_CHAR) nChar = MAX_WRAP_CHAR; // Sep 06 2005 REF: MMI-SPR-33548 x0012849 - // Allocate MAX_WRAP_CHAR no of bytes - temp_ptr = (char*)mfwAlloc(MAX_WRAP_CHAR); + // Allocate MAX_WRAP_CHAR no of bytes + temp_ptr = (char*)mfwAlloc(MAX_WRAP_CHAR); if(NULL == temp_ptr) - return 0; + return 0; // Sep 06 2005 REF: MMI-SPR-33548 x0012849 // Now the destination of memcpy is temp_ptr instead of str2[wrapLine] and the source is str[MAX_DLG_LINES] instead of str[DLG_LINE2] memcpy(temp_ptr,&str[MAX_DLG_LINES][linePos],nChar); // Now the source data is from the last element of the array. linePos = linePos+nChar; - ////GW - even if we cannot display the entire string - it is better than what we would have otherwise + ////GW - even if we cannot display the entire string - it is better than what we would have otherwise // Sep 06 2005 REF: MMI-SPR-33548 x0012849 // Assign the value of pointer temp_ptr to str[] str[DLG_LINE2+wrapLine] = temp_ptr; - temp_ptr = NULL; + temp_ptr = NULL; strLen[DLG_LINE2 + wrapLine] = dspl_GetTextExtent(str[DLG_LINE2+wrapLine],0); wrapLine++; } - + } else { //Unicode is more problematic - we need the 0x80 at the front of the string - //for the call to 'dspl_GetNcharToFit'. This will involve copying the entire remainder + //for the call to 'dspl_GetNcharToFit'. This will involve copying the entire remainder //of 'str2' into a temporary buffer. At the moment, we only wrap numbers so this //code will wait until it is required. // str[3] = "Code not written!!"; //issue warning // strLen[3] = dspl_GetTextExtent(str[3],0); - fullScreen = DLG_USE_FULL_SCREEN; //error - use full screen + fullScreen = DLG_USE_FULL_SCREEN; //error - use full screen } } } - + //Calculate longest line of text (including softkeys - sx already set to the softkey width) for (i=0;i< MAX_DLG_LINES;i++) { - if (strLen[i]>sx) + if (strLen[i]>sx) sx = strLen[i]; } if (sx > SCREEN_SIZE_X-charWidth) @@ -2127,7 +2127,7 @@ else sx = sx + charWidth*2; } - if (sy> sx) + if (sy> sx) sx = sy; wx = (SCREEN_SIZE_X-sx)/2; if (wx<0) @@ -2136,13 +2136,13 @@ if (sy > SCREEN_SIZE_Y) wy = 0; - else if (SCREEN_SIZE_Y > 2*sy) + else if (SCREEN_SIZE_Y > 2*sy) wy = (SCREEN_SIZE_Y*2/3-sy)/2; //display in middle of top 2/3 of screen - else + else wy = (SCREEN_SIZE_Y-sy)/2; //display in middle of screen if (wy < 10) wy = wy/2; - + if ((wx == 0) || (wy==0)) { //not enough room to display as a window - use whole screen fullScreen = DLG_USE_FULL_SCREEN; @@ -2150,7 +2150,7 @@ #ifdef COLOURDISPLAY if ((data->icon_array != NULL) && (fullScreen != DLG_USE_BITMAP)) - { //The dialog has an animation - we must make the pop-up large enough to support this + { //The dialog has an animation - we must make the pop-up large enough to support this if (sx < data->icon_array[0].area.sx) sx = data->icon_array[0].area.sx; yBmpOfs = data->icon_array[0].area.py + data->icon_array[0].area.sy; @@ -2160,7 +2160,7 @@ #endif } else - { + { //We have no strings to display - clear entire screen fullScreen = DLG_USE_FULL_SCREEN; } @@ -2177,7 +2177,7 @@ area.sy = sy; resources_setColour(data->dlgCol); drawWinType = DSPL_WIN_CENTRE; - + if (fullScreen!=DLG_USE_FULL_SCREEN) { t_font_bitmap bmp; @@ -2189,7 +2189,7 @@ xPos[i] = wx+(sx-strLen[i])/2; yPos[i] = wy+yOfs+yBmpOfs+Mmi_layout_line_height()*i; } - + #ifdef COLOURDISPLAY if ((data->dlgBgdBitmap != NULL) && (fullScreen==DLG_USE_BITMAP)) { @@ -2215,16 +2215,16 @@ yPos[i] = yPos[i] + area.py; } - TRACE_EVENT_P3("wy = %d, yOfs = %d, area.py = %d",wy,yOfs,area.py); - if( data->dlgBgdBitmap->icnType != ICON_TYPE_1BIT_UNPACKED ) + TRACE_EVENT_P3("wy = %d, yOfs = %d, area.py = %d",wy,yOfs,area.py); + if( data->dlgBgdBitmap->icnType != ICON_TYPE_1BIT_UNPACKED ) dspl_SetBgdColour( COL_TRANSPARENT ); - - + + } else { // x0066814 06 Dec 2006, OMAPS00106825 - //The window height calculation related to wrapping should be skipped when no + //The window height calculation related to wrapping should be skipped when no //string wrapping is done if(wrapLine>0) { @@ -2237,24 +2237,24 @@ { sy = sy + (wrapLine-1)*Mmi_layout_line_height(); area.sy = sy; - } + } #endif // Sep 06 2005 REF: MMI-SPR-33548 x0012849 //If length of the dialog is bigger than screen then start the dialog from the top corner. if(sy+wy >= SCREEN_SIZE_Y && sy < SCREEN_SIZE_Y) if(wy>0 && wy < sy) - { + { wy = (SCREEN_SIZE_Y - sy ) /2 ;// centre the dialog if(wy < 0) - wy=0; - for (i=0;i<MAX_DLG_LINES;i++) + wy=0; + for (i=0;i<MAX_DLG_LINES;i++) yPos[i] = wy+yOfs+yBmpOfs+Mmi_layout_line_height()*i; - } + } dspl_DrawWin( wx,wy,sx,sy, drawWinType , bmpPtr); } else { - dspl_ClearAll(); + dspl_ClearAll(); sx = 84; for (i=0;i<MAX_DLG_LINES;i++) { @@ -2275,84 +2275,84 @@ skArea.px = area.px+wx; skArea.sx = area.sx; skArea.py = area.py+wy+area.sy-Mmi_layout_softkeyHeight()-1; - skArea.sy = Mmi_layout_softkeyHeight(); + skArea.sy = Mmi_layout_softkeyHeight(); } - softKeys_displayStrXY(lskStr, rskStr, data->dlgSkFormat, data->dlgCol, &skArea); + softKeys_displayStrXY(lskStr, rskStr, data->dlgSkFormat, data->dlgCol, &skArea); } /****************************** * Print dialog text *****************************/ for (i=0;i<MAX_DLG_LINES;i++) - { /* GW#2294 No need to draw zero length strings .*/ + { /* GW#2294 No need to draw zero length strings .*/ if ((str[i] != NULL) && (strLen[i] > 0)) - { - //x0035544 Feb 15, 2006. DR:OMAPS00061467 - #ifdef FF_MMI_SAT_ICON - if(data->IconData.selfExplanatory == FALSE) + { + //x0035544 Feb 15, 2006. DR:OMAPS00061467 + #ifdef FF_MMI_SAT_ICON + if(data->IconData.selfExplanatory == FALSE) dspl_TextOut(xPos[i] + titleIconWidth, yPos[i], DSPL_TXTATTR_NORMAL, str[i] ); #else dspl_TextOut(xPos[i] , yPos[i], DSPL_TXTATTR_NORMAL, str[i] ); - #endif + #endif } } - //x0035544 Feb 15, 2006. DR:OMAPS00061467 + //x0035544 Feb 15, 2006. DR:OMAPS00061467 #ifdef FF_MMI_SAT_ICON if(data->IconData.dst != NULL) - { + { if(str[DLG_LINE2] == NULL) { - if ((data->IconData.width > TITLE_ICON_WIDTH) || + if ((data->IconData.width > TITLE_ICON_WIDTH) || (data->IconData.height > TITLE_ICON_HEIGHT)) { - dspl_BitBlt2(xPos[0], yPos[0], 8, + dspl_BitBlt2(xPos[0], yPos[0], 8, 10, (void*)SATIconQuestionMark, 0, BMP_FORMAT_256_COLOUR); - } - - else - dspl_BitBlt2(xPos[0], yPos[0], data->IconData.width, + } + + else + dspl_BitBlt2(xPos[0], yPos[0], data->IconData.width, data->IconData.height, (void*)data->IconData.dst, 0, BMP_FORMAT_256_COLOUR); } else { - if ((data->IconData.width > TITLE_ICON_WIDTH) || + if ((data->IconData.width > TITLE_ICON_WIDTH) || (data->IconData.height > TITLE_ICON_HEIGHT)) { - dspl_BitBlt2(xPos[DLG_LINE2], yPos[DLG_LINE2], 8, + dspl_BitBlt2(xPos[DLG_LINE2], yPos[DLG_LINE2], 8, 10, (void*)SATIconQuestionMark, 0, BMP_FORMAT_256_COLOUR); } else - dspl_BitBlt2(xPos[DLG_LINE2], yPos[DLG_LINE2],data->IconData.width, + dspl_BitBlt2(xPos[DLG_LINE2], yPos[DLG_LINE2],data->IconData.width, data->IconData.height, (void*)data->IconData.dst, 0, BMP_FORMAT_256_COLOUR); } - - } + + } #endif - - resources_restoreColour(); + + resources_restoreColour(); } // Sep 06 2005 REF: MMI-SPR-33548 x0012849 - // Now free the allocated memory + // Now free the allocated memory /* x0039928 - Lint warning removal */ - if (strLen[MAX_DLG_LINES] > scrWidth-charWidth) - if (data->WrapStrings & WRAP_STRING_2) + if (strLen[MAX_DLG_LINES] > scrWidth-charWidth) + if (data->WrapStrings & WRAP_STRING_2) if (str[MAX_DLG_LINES][0] != (char)0x80) /* x0039928 - lint warning removal */ { for(i=DLG_LINE2;i<MAX_DLG_LINES;i++) { - if(NULL != str[i] && strLen[i] > 0) + if(NULL != str[i] && strLen[i] > 0) mfwFree((U8*)str[i],MAX_WRAP_CHAR); } - str[MAX_DLG_LINES]=NULL; + str[MAX_DLG_LINES]=NULL; } - + break; default: return 0; - } + } return 1; } @@ -2362,7 +2362,7 @@ $Function: phlock_dialog_info $Description: Dialog function for information dialog - + $Returns: void $Arguments: win, window handle event, value, parameter @@ -2372,7 +2372,7 @@ { T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; T_dialog_info * data = (T_dialog_info *)win_data->user; - T_DISPLAY_DATA * display_info = (T_DISPLAY_DATA *)parameter; + T_DISPLAY_DATA * display_info = (T_DISPLAY_DATA *)parameter; TRACE_FUNCTION ("phlock_dialog_info()"); switch (event) @@ -2384,7 +2384,7 @@ #if defined (WIN32) { /***************************Go-lite Optimization changes Start***********************/ - + //Aug 16, 2004 REF: CRR 24323 Deepa M.D TRACE_EVENT_P1( "Identifier %d", display_info->Identifier); /***************************Go-lite Optimization changes end***********************/ @@ -2429,17 +2429,17 @@ { data->IconData.width = display_info->IconData.width; data->IconData.height = display_info->IconData.height; - data->IconData.dst = display_info->IconData.dst; + data->IconData.dst = display_info->IconData.dst; data->IconData.selfExplanatory = display_info->IconData.selfExplanatory; } else - { + { data->IconData.dst = NULL; data->IconData.selfExplanatory = FALSE; data->IconData.width =0; data->IconData.height =0; - } -#endif + } +#endif TRACE_EVENT_P1("anim_time = %d", display_info->anim_time); TRACE_EVENT_P1("data->anim_time = %d", data->anim_time); @@ -2467,7 +2467,7 @@ $Description: Callback function for the dialog info timer. - + $Returns: MFW event handler $Arguments: window handle event, timer control block @@ -2503,10 +2503,10 @@ /* ** SPR#1744 NDH ** Move the dialog destory in front of the Callback to make the processing consistent - ** with the Right Keypress and Hangup Processing. Also to ensure that the dialog is + ** with the Right Keypress and Hangup Processing. Also to ensure that the dialog is ** removed when the screen is redrawn. */ - + TRACE_EVENT("phlock_dialog_info_tim_cb: Bef dialog_info_destrroy"); phlock_dialog_info_destroy (win); @@ -2514,7 +2514,7 @@ TRACE_EVENT("Aft. destroy"); TRACE_EVENT_P1("phlock_dialog_info_tim_cb: win: %02x", win); #endif //FF_PHONE_LOCK - + if (Callback) (Callback) (parent_win, Identifier, INFO_TIMEOUT); @@ -2547,7 +2547,7 @@ switch (keyboard->code) { case KCD_LEFT: - if (data->KeyEvents & KEY_LEFT ) + if (data->KeyEvents & KEY_LEFT ) { phlock_dialog_info_destroy (win); if (Callback) @@ -2556,7 +2556,7 @@ break; case KCD_RIGHT: - if (data->KeyEvents & KEY_RIGHT) + if (data->KeyEvents & KEY_RIGHT) { phlock_dialog_info_destroy (win); if (Callback) @@ -2573,26 +2573,26 @@ } break; case KCD_MNUUP: - + if (data->KeyEvents & KEY_MNUUP) { if (Callback) (Callback) (parent_win, Identifier, INFO_KCD_UP); } - + break; case KCD_MNUDOWN: - + if (data->KeyEvents & KEY_MNUDOWN) { if (Callback) (Callback) (parent_win, Identifier, INFO_KCD_DOWN); } - + break; //MZ 7/3/01 used to start a call. case KCD_CALL: - if (data->KeyEvents & KEY_CALL ) + if (data->KeyEvents & KEY_CALL ) { phlock_dialog_info_destroy (win); if (Callback) @@ -2640,11 +2640,11 @@ $Function: phlock_dialog_info_destroy $Description: Destruction of an information dialog - + $Returns: void $Arguments: win - + *******************************************************************************/ void phlock_dialog_info_destroy (T_MFW_HND own_window) { @@ -2658,7 +2658,7 @@ TRACE_EVENT ("Error :- Called with NULL Pointer"); return; } - + if (data) { /*