Update of /cvsroot/easycalc/easycalc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23832 Modified Files: calc.c calc.h calc.rcp.in graph.rcp.in grcalc.c grsetup.c memo.c solver.c varmgr.c Log Message: Support Handera also for calc-small. Updated CREDITS. Index: calc.rcp.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/calc.rcp.in,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** calc.rcp.in 2 Aug 2006 16:35:18 -0000 1.102 --- calc.rcp.in 6 Aug 2006 01:09:15 -0000 1.103 *************** *** 12,15 **** --- 12,21 ---- #include "lang.h" + //Handera support + #ifdef HANDERA_SDK + HEX "sKst" ID 1000 + 0x00 0x00 0x00 0x00 + #endif + VERSION "1.24-cvs" APPLICATION ID 1 "OpCl" Index: calc.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/calc.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** calc.c 2 Aug 2006 17:34:44 -0000 1.28 --- calc.c 6 Aug 2006 01:09:15 -0000 1.29 *************** *** 33,36 **** --- 33,39 ---- #include <SonyCLIE.h> #endif + #ifdef HANDERA_SDK + #include "Vga.h" + #endif #include "clie.h" *************** *** 68,71 **** --- 71,75 ---- Boolean palmOS35=false; + Boolean handera=false; Boolean colorDisplay=false; Boolean grayDisplay=false; *************** *** 215,218 **** --- 219,228 ---- palmOS35 = calc_rom_greater(3,5); + /* Are we on a Handera ? */ + #ifdef HANDERA_SDK + if (FtrGet(TRGSysFtrID, TRGVgaFtrNum, &version) == errNone) + handera = true; + #endif + gHrMode = hrNone; FtrGet(sysFtrCreator, sysFtrNumWinVersion, &version); Index: varmgr.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/varmgr.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** varmgr.c 2 Aug 2006 17:43:55 -0000 1.19 --- varmgr.c 6 Aug 2006 01:09:15 -0000 1.20 *************** *** 38,46 **** #include "main.h" ! #ifdef SUPPORT_DIA ! #include "DIA.h" ! #ifdef SUPPORT_DIA_HANDERA #include "Vga.h" #endif #endif --- 38,46 ---- #include "main.h" ! #ifdef HANDERA_SDK #include "Vga.h" #endif + #ifdef SUPPORT_DIA + #include "DIA.h" #endif *************** *** 658,663 **** * depending on the existing function */ frm = FrmInitForm(varEditForm); ! #ifdef SUPPORT_DIA_HANDERA ! if (GetDIAHardware() == DIA_HARDWARE_HANDERA) VgaFormModify(frm, vgaFormModify160To240); #endif --- 658,663 ---- * depending on the existing function */ frm = FrmInitForm(varEditForm); ! #ifdef HANDERA_SDK ! if (handera) VgaFormModify(frm, vgaFormModify160To240); #endif *************** *** 694,699 **** frm = FrmInitForm(dinputForm); ! #ifdef SUPPORT_DIA_HANDERA ! if (GetDIAHardware() == DIA_HARDWARE_HANDERA) VgaFormModify(frm, vgaFormModify160To240); #endif --- 694,699 ---- frm = FrmInitForm(dinputForm); ! #ifdef HANDERA_SDK ! if (handera) VgaFormModify(frm, vgaFormModify160To240); #endif *************** *** 769,774 **** frm = FrmInitForm(dinputForm); ! #ifdef SUPPORT_DIA_HANDERA ! if (GetDIAHardware() == DIA_HARDWARE_HANDERA) VgaFormModify(frm, vgaFormModify160To240); #endif --- 769,774 ---- frm = FrmInitForm(dinputForm); ! #ifdef HANDERA_SDK ! if (handera) VgaFormModify(frm, vgaFormModify160To240); #endif *************** *** 838,843 **** frm = FrmInitForm(dinputForm); ! #ifdef SUPPORT_DIA_HANDERA ! if (GetDIAHardware() == DIA_HARDWARE_HANDERA) VgaFormModify(frm, vgaFormModify160To240); #endif --- 838,843 ---- frm = FrmInitForm(dinputForm); ! #ifdef HANDERA_SDK ! if (handera) VgaFormModify(frm, vgaFormModify160To240); #endif Index: memo.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/memo.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** memo.c 2 Aug 2006 17:43:55 -0000 1.14 --- memo.c 6 Aug 2006 01:09:15 -0000 1.15 *************** *** 38,46 **** #include "solver.h" ! #ifdef SUPPORT_DIA ! #include "DIA.h" ! #ifdef SUPPORT_DIA_HANDERA #include "Vga.h" #endif #endif --- 38,46 ---- #include "solver.h" ! #ifdef HANDERA_SDK #include "Vga.h" #endif + #ifdef SUPPORT_DIA + #include "DIA.h" #endif *************** *** 226,231 **** frm = FrmInitForm(memoExportQuestionForm); ! #ifdef SUPPORT_DIA_HANDERA ! if (GetDIAHardware() == DIA_HARDWARE_HANDERA) VgaFormModify(frm, vgaFormModify160To240); #endif --- 226,231 ---- frm = FrmInitForm(memoExportQuestionForm); ! #ifdef HANDERA_SDK ! if (handera) VgaFormModify(frm, vgaFormModify160To240); #endif Index: solver.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/solver.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** solver.c 2 Aug 2006 17:43:55 -0000 1.11 --- solver.c 6 Aug 2006 01:09:15 -0000 1.12 *************** *** 41,49 **** #include "prefs.h" ! #ifdef SUPPORT_DIA ! #include "DIA.h" ! #ifdef SUPPORT_DIA_HANDERA #include "Vga.h" #endif #endif --- 41,49 ---- #include "prefs.h" ! #ifdef HANDERA_SDK #include "Vga.h" #endif + #ifdef SUPPORT_DIA + #include "DIA.h" #endif *************** *** 680,685 **** frm = FrmInitForm(slvTitleForm); ! #ifdef SUPPORT_DIA_HANDERA ! if (GetDIAHardware() == DIA_HARDWARE_HANDERA) VgaFormModify(frm, vgaFormModify160To240); #endif --- 680,685 ---- frm = FrmInitForm(slvTitleForm); ! #ifdef HANDERA_SDK ! if (handera) VgaFormModify(frm, vgaFormModify160To240); #endif *************** *** 967,972 **** frm = FrmInitForm(slvOptionsForm); ! #ifdef SUPPORT_DIA_HANDERA ! if (GetDIAHardware() == DIA_HARDWARE_HANDERA) VgaFormModify(frm, vgaFormModify160To240); #endif --- 967,972 ---- frm = FrmInitForm(slvOptionsForm); ! #ifdef HANDERA_SDK ! if (handera) VgaFormModify(frm, vgaFormModify160To240); #endif *************** *** 1098,1103 **** frm = FrmInitForm(slvNoteForm); ! #ifdef SUPPORT_DIA_HANDERA ! if (GetDIAHardware() == DIA_HARDWARE_HANDERA) VgaFormModify(frm, vgaFormModify160To240); #endif --- 1098,1103 ---- frm = FrmInitForm(slvNoteForm); ! #ifdef HANDERA_SDK ! if (handera) VgaFormModify(frm, vgaFormModify160To240); #endif Index: grsetup.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/grsetup.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** grsetup.c 2 Aug 2006 18:02:09 -0000 1.20 --- grsetup.c 6 Aug 2006 01:09:15 -0000 1.21 *************** *** 315,332 **** UInt16 rows; FormPtr frm = FrmGetActiveForm(); - #ifdef SUPPORT_DIA Int16 height; ! height = HanderaCoord(FntLineHeight()); ! #endif table = GetObjectPtr(grSetupTable); rows = TblGetNumberOfRows(table); for (i=0;i<rows;i++) { ! #ifdef SUPPORT_DIA ! if (GetDIAHardware() == DIA_HARDWARE_HANDERA) { ! TblSetRowHeight(table,i,height); ! } ! #endif TblSetItemStyle(table,i,0,customTableItem); TblSetItemStyle(table,i,1,customTableItem); --- 315,328 ---- UInt16 rows; FormPtr frm = FrmGetActiveForm(); Int16 height; ! height = FntLineHeight(); ! if (handera) ! height = height * 3 / 2; table = GetObjectPtr(grSetupTable); rows = TblGetNumberOfRows(table); for (i=0;i<rows;i++) { ! TblSetRowHeight(table,i,height); TblSetItemStyle(table,i,0,customTableItem); TblSetItemStyle(table,i,1,customTableItem); *************** *** 341,345 **** /* because others do not have scrolling table */ if (graphPrefs.functype != graph_param) ! firstVisible = 0; /* Setup the up/down pointers & grType buttons*/ --- 337,341 ---- /* because others do not have scrolling table */ if (graphPrefs.functype != graph_param) ! firstVisible = 0; /* Setup the up/down pointers & grType buttons*/ Index: grcalc.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/grcalc.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** grcalc.c 2 Aug 2006 17:51:41 -0000 1.16 --- grcalc.c 6 Aug 2006 01:09:15 -0000 1.17 *************** *** 39,48 **** #include "stack.h" ! #ifdef SUPPORT_DIA ! #include "DIA.h" ! #ifdef SUPPORT_DIA_HANDERA #include "Vga.h" #endif - #endif static enum { --- 39,45 ---- #include "stack.h" ! #ifdef HANDERA_SDK #include "Vga.h" #endif static enum { *************** *** 106,111 **** frm = FrmInitForm(frmGrcSel); ! #ifdef SUPPORT_DIA_HANDERA ! if (GetDIAHardware() == DIA_HARDWARE_HANDERA) VgaFormModify(frm, vgaFormModify160To240); #endif --- 103,108 ---- frm = FrmInitForm(frmGrcSel); ! #ifdef HANDERA_SDK ! if (handera) VgaFormModify(frm, vgaFormModify160To240); #endif Index: calc.h =================================================================== RCS file: /cvsroot/easycalc/easycalc/calc.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** calc.h 2 Aug 2006 17:34:44 -0000 1.7 --- calc.h 6 Aug 2006 01:09:15 -0000 1.8 *************** *** 36,39 **** --- 36,40 ---- extern Boolean palmOS35; + extern Boolean handera; extern Boolean colorDisplay; extern Boolean grayDisplay; Index: graph.rcp.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/graph.rcp.in,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** graph.rcp.in 4 Aug 2006 15:23:00 -0000 1.28 --- graph.rcp.in 6 Aug 2006 01:09:15 -0000 1.29 *************** *** 9,16 **** HEX "wTap" ID 1000 0x00 0x00 0x00 0x01 - - //Handera support - HEX "sKst" ID 1000 - 0x00 0x00 0x00 0x00 #endif --- 9,12 ---- |