[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src start.cpp,1.4,1.5

Chris Apers chrilith at users.sourceforge.net
Tue Jan 20 06:25:02 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1:/tmp/cvs-serv9828

Modified Files:
	start.cpp 
Log Message:
Moved MainForm stuffs to its own file

Index: start.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/start.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- start.cpp	6 Jan 2004 12:45:25 -0000	1.4
+++ start.cpp	20 Jan 2004 14:24:30 -0000	1.5
@@ -23,22 +23,13 @@
 #include <PalmOS.h>
 #include <SonyClie.h>
 
-#include "StarterRsc.h"
-#include "skin.h"
-#include "globals.h"
-#include "scumm_globals.h"
-#include "engine.h"
 #include "vibrate.h"
 #include "start.h"
 #include "games.h"
+#include "globals.h"
 
-#include "formUtil.h"
 #include "forms.h"
 
-#ifndef DISABLE_TAPWAVE
-//#include "tapwave.h"
-#endif
-
 /***********************************************************************
  *
  *	Internal Structures
@@ -54,8 +45,7 @@
 GlobalsPreferencePtr gPrefs;
 GlobalsDataPtr gVars;
 
-static UInt16 sknLastOn = skinButtonNone;
-static Boolean bStartScumm = false;
+Boolean bStartScumm = false;
 
 /***********************************************************************
  *
@@ -102,19 +92,6 @@
 	return err;
 }
 
-static Err BeamMe() {
-	UInt16 cardNo;
-	LocalID dbID;
-	Err err;
-
-	err = SysCurAppDatabase(&cardNo, &dbID);
-	if (dbID)
-		err = SendDatabase(0, dbID, "ScummVM.prc", "\nPlay your favorite LucasArts games");
-	else
-		err = DmGetLastErr();
-	
-	return err;
-}
 
 /***********************************************************************
  *
@@ -172,110 +149,6 @@
 	}
 }
 
-
-/***********************************************************************
- *
- * FUNCTION:    MainFormInit
- *
- * DESCRIPTION: This routine initializes the MainForm form.
- *
- * PARAMETERS:  frm - pointer to the MainForm form.
- *
- * RETURNED:    nothing
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-static void MainFormInit()
-{
-	SknApplySkin();
-}
-
-/***********************************************************************
- *
- * FUNCTION:    MainFormDoCommand
- *
- * DESCRIPTION: This routine performs the menu command specified.
- *
- * PARAMETERS:  command  - menu item id
- *
- * RETURNED:    nothing
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-
-static void MainFormAbout() {
-	FormPtr frmP;
-	FormLabelType *versionP;
-
-	frmP = FrmInitForm(AboutForm);
-	versionP = FrmNewLabel(&frmP, 1120, gScummVMVersion, 4, 126, stdFont);
-	versionP = FrmNewLabel(&frmP, 1121, gScummVMBuildDate, 4, 136, stdFont);
-	FrmDoDialog (frmP);					// Display the About Box.
-	FrmDeleteForm (frmP);
-}
-
-static Boolean MainFormDoCommand(UInt16 command)
-{
-	Boolean handled = false;
-
-	switch (command) {
-		case MainGamesMemoryCards:
-			FrmPopupForm(CardSlotForm);
-			handled = true;
-			break;
-
-		case MainGamesViewMemory:
-			FrmPopupForm(SystemInfoForm);
-			handled = true;
-			break;
-
-		case MainGamesNewEdit:
-			gFormEditMode = edtModeParams;
-			FrmPopupForm(EditGameForm);
-			handled = true;
-			break;
-
-		case MainGamesBeam:
-			BeamMe();
-			//if (BeamMe())
-				//FrmCustomAlert(FrmErrorAlert,"Unable to beam ScummVM for PalmOS.",0,0);
-			handled = true;
-			break;
-
-		case MainOptionsAbout:
- 			MainFormAbout();
- 			handled = true;
-			break;
-		
-		case MainOptionsVolumeControl:
-			FrmPopupForm(VolumeForm);
-			handled = true;
-			break;
-
-		case MainOptionsMusic:
-			FrmPopupForm(SoundForm);
-			handled = true;
-			break;
-		
-		case MainOptionsSkins:
-			FrmPopupForm(SkinsForm);
-			handled = true;
-			break;
-
-		case MainOptionsMisc:
-			FrmPopupForm(MiscOptionsForm);
-			handled = true;
-			break;
-		}
-
-	MenuEraseStatus(0);
-	return handled;
-}
-
 Boolean CheckVibratorExists() {
 	UInt32 romVersion;
 	Err err;
@@ -293,203 +166,6 @@
 	return exists;
 }
 
-
-
-/***********************************************************************
- *
- * FUNCTION:    MainFormHandleEvent
- *
- * DESCRIPTION: This routine is the event handler for the 
- *              "MainForm" of this application.
- *
- * PARAMETERS:  eventP  - a pointer to an EventType structure
- *
- * RETURNED:    true if the event has handle and should not be passed
- *              to a higher level handler.
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-
-static Boolean PenDownRepeat() {
-	Coord x,y;
-	Boolean penDown, handled = false;
-	EvtGetPen(&x, &y, &penDown);
-
-	if (penDown && sknLastOn) {
-		RectangleType r;
-		DmOpenRef skinDBP;
-	
-		skinDBP = SknOpenSkin();
-		SknGetObjectBounds(skinDBP, sknLastOn, &r);
-
-		if (RctPtInRectangle(x*2, y*2, &r)) {
-			if (SknGetState(skinDBP, sknLastOn) != sknStateSelected) {
-				SknSetState(skinDBP, sknLastOn, sknStateSelected);
-				SknShowObject(skinDBP, sknLastOn);
-			}
-			
-			switch (sknLastOn) {
-				case skinSliderUpArrow:
-				case skinSliderDownArrow:
-					handled = SknProcessArrowAction(sknLastOn);
-					break;
-			}
-			
-		} else {
-			if (SknGetState(skinDBP, sknLastOn) != sknStateNormal) {
-				SknSetState(skinDBP, sknLastOn, sknStateNormal);
-				SknShowObject(skinDBP, sknLastOn);
-			}
-		}
-
-		SknCloseSkin(skinDBP);
-	}
-	
-	return handled;
-}
-
-
-static Boolean MainFormHandleEvent(EventPtr eventP)
-{
-	Boolean handled = false;
-	FormPtr frmP;
-	Coord x,y;
-	DmOpenRef skinDBP;
-	
-	switch (eventP->eType) {
-		case frmUpdateEvent:
-		frmP = FrmGetFormPtr(MainForm);
-			if (gPrefs->card.volRefNum != sysInvalidRefNum)
-				FrmShowObject(frmP, FrmGetObjectIndex (frmP, MainMSBitMap));
-			else
-				FrmShowObject(frmP, FrmGetObjectIndex (frmP, MainMSNoneBitMap));
-			if (eventP->data.frmUpdate.updateCode == frmRedrawUpdateMSImport) {
-				GamImportDatabase();
-				SknUpdateList();
-			}
-			handled = true;
-			break;
-
-		case winDisplayChangedEvent:
-			if (gVars) {
-				if (gVars->skinSet)
-					SknApplySkin();
-			}
-			break;
-
-		case menuEvent:
-			handled = MainFormDoCommand(eventP->data.menu.itemID);
-			break;
-
-		case frmOpenEvent:
-			MainFormInit();
-			handled = true;
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case MainCardsButton:
-					//gPrefs->card.volRefNum = parseCards(true);
-					FrmPopupForm(CardSlotForm);
-					break;
-			
-				case MainAboutButton:
-					MainFormAbout();
-					break;
-				
-//				case MainListTypeSelTrigger:
-//					FrmList(eventP, MainListTypeList);
-//					break;
-			}
-			handled = true;
-			break;
-
-		case penUpEvent:
-			x = eventP->screenX;
-			y = eventP->screenY;
-			lastIndex = dmMaxRecordIndex;	// enable select/unselect list item
-			
-			if (sknLastOn != skinButtonNone) {
-				RectangleType r;
-				skinDBP = SknOpenSkin();
-				SknGetObjectBounds(skinDBP, sknLastOn, &r);
-				SknSetState(skinDBP, sknLastOn, sknStateNormal);
-				SknShowObject(skinDBP, sknLastOn);
-				SknCloseSkin(skinDBP);
-				
-				if (RctPtInRectangle(x*2, y*2, &r)) {
-					switch (sknLastOn) {
-						case skinButtonGameAdd:
-							gFormEditMode = edtModeAdd;
-							FrmPopupForm(EditGameForm);
-							handled = true;
-							break;
-
-						case skinButtonGameEdit:
-						case skinButtonGameParams:
-							gFormEditMode = edtModeParams;
-							FrmPopupForm(EditGameForm);
-							handled = true;
-							break;
-
-						case skinButtonGameStart:
-							if (gPrefs->card.volRefNum == sysInvalidRefNum)
-								FrmCustomAlert(FrmWarnAlert,"Please select/insert a memory card.", 0, 0);
-							else
-								bStartScumm = true;
-							handled = true;
-							break;
-
-						case skinButtonGameDelete:
-							EditGameFormDelete(true);
-							break;
-					}
-				}
-				sknLastOn = skinButtonNone;
-			}
-			break;
-
-		case penDownEvent:
-		case penMoveEvent:
-			if (sknLastOn == skinButtonNone) {
-				x = eventP->screenX;
-				y = eventP->screenY;
-				skinDBP = SknOpenSkin();
-
-				switch (sknLastOn = SknCheckClick(skinDBP, x,y)) {
-					case skinButtonNone:
-						break;
-					case skinSliderUpArrow:
-					case skinSliderDownArrow:
-					case skinButtonGameAdd:
-					case skinButtonGameEdit:
-					case skinButtonGameParams:
-					case skinButtonGameStart:
-					case skinButtonGameDelete:
-						SknSetState(skinDBP, sknLastOn, sknStateSelected);
-						SknShowObject(skinDBP, sknLastOn);				
-						if (gPrefs->soundClick)
-							SndPlaySystemSound(sndClick);
-						handled = true;
-						break;
-					default:
-						FrmCustomAlert(FrmWarnAlert,"Unknown button !",0,0);
-				}
-				SknCloseSkin(skinDBP);
-				SknSelect(x, y);
-			}
-			break;
-		
-		default:
-			handled = PenDownRepeat();
-	}
-
-	return handled;
-}
-
 /***********************************************************************
  *
  * FUNCTION:    AppHandleEvent
@@ -688,7 +364,7 @@
 			error = AppStart();
 			if (error) 
 				goto end;
-				
+
 			FrmGotoForm(MainForm);
 			AppEventLoop();
 end:





More information about the Scummvm-git-logs mailing list