regular metric for InputMode

stepmania/Themes/default/metrics.ini

@@ -2169,7 +2169,7 @@ NextScreen=ScreenJukebox
 PrevScreen=@ScreenTitleBranch()
 StyleIcon=0
 TimerSeconds=0
-OptionMenuFlags=together
+InputMode=together
 ForceAllPlayers=1
 LineNames=1,2,3,4
 Line1=list,Styles
@@ -2458,6 +2458,7 @@ WarningCommand0=stoptweening;stopeffect;linear,0.2;zoomx,1
 
 [ScreenOptions]
 Fallback=ScreenWithMenuElements
+InputMode=individual
 NumRowsShown=10
 RowInitCommand=
 RowOnCommand=
@@ -3123,7 +3124,6 @@ IdleTimeoutSeconds=0
 [ScreenInputOptions]
 Fallback=ScreenOptionsServiceChild
 LineNames=1,2,3,4,5,6
-OptionMenuFlags=together
 Line1=conf,AutoMapOnJoyChange
 Line2=conf,OnlyDedicatedMenuButtons
 Line3=conf,AutoPlay
@@ -3134,7 +3134,6 @@ Line6=conf,MusicWheelSwitchSpeed
 [ScreenCoinOptions]
 Fallback=ScreenOptionsServiceChild
 LineNames=1,2,3,4,5
-OptionMenuFlags=together
 Line1=conf,CoinMode
 Line2=conf,SongsPerPlay
 Line3=conf,CoinsPerCredit
@@ -3144,7 +3143,6 @@ Line5=conf,EventMode
 [ScreenMachineOptions]
 Fallback=ScreenOptionsServiceChild
 LineNames=1,2,3,4,5,6,7,8,9,10,11
-OptionMenuFlags=together
 Line1=conf,MenuTimer
 Line2=conf,ScoringType
 Line3=conf,TimingWindowScale
@@ -3160,7 +3158,6 @@ Line11=conf,AllowW1
 [ScreenGraphicOptions]
 Fallback=ScreenOptionsServiceChild
 LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14
-OptionMenuFlags=together
 Line1=conf,Windowed
 Line2=conf,DisplayResolution
 Line3=conf,DisplayAspectRatio
@@ -3179,7 +3176,6 @@ Line14=conf,ShowBanners
 [ScreenGameplayOptions]
 Fallback=ScreenOptionsServiceChild
 LineNames=1,2,3,4,5,6
-OptionMenuFlags=together
 Line1=conf,SoloSingle
 Line2=conf,HiddenSongs
 Line3=conf,EasterEggs
@@ -3190,7 +3186,6 @@ Line6=conf,UseUnlockSystem
 [ScreenBackgroundOptions]
 Fallback=ScreenOptionsServiceChild
 LineNames=1,2,3,4,5,6
-OptionMenuFlags=together
 Line1=conf,RandomBackgroundMode
 Line2=conf,BGBrightness
 Line3=conf,ShowDanger
@@ -3201,7 +3196,6 @@ Line6=conf,NumBackgrounds
 [ScreenAppearanceOptions]
 Fallback=ScreenOptionsServiceChild
 LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13
-OptionMenuFlags=together
 Line1=conf,Language
 Line2=conf,Announcer
 Line3=conf,Theme
@@ -3219,7 +3213,6 @@ Line13=conf,ShowLyrics
 [ScreenOtherOptions]
 Fallback=ScreenOptionsServiceChild
 LineNames=1,2,3
-OptionMenuFlags=together
 Line1=conf,AutogenSteps
 Line2=conf,AutogenGroupCourses
 Line3=conf,FastLoad
@@ -3227,7 +3220,6 @@ Line3=conf,FastLoad
 [ScreenSoundOptions]
 Fallback=ScreenOptionsServiceChild
 LineNames=1,2,3
-OptionMenuFlags=together
 Line1=conf,SoundResampleQuality
 Line2=conf,AttractSoundFrequency
 Line3=conf,SoundVolume
@@ -3657,8 +3649,9 @@ TitleX=SCREEN_CENTER_X-180
 TitleOnCommand=zoom,0.5;horizalign,left;ShadowLength,0
 TitleGainFocusCommand=diffuseshift;EffectColor1,1.3,1.3,1.3,1;EffectColor2,0.3,0.3,0.3,1
 TitleLoseFocusCommand=stopeffect
-OptionMenuFlags=together;smnavigation
+OptionMenuFlags=smnavigation
 ForceAllPlayers=1
+InputMode=together
 
 [ScreenOptionsService]
 Class=ScreenOptionsMaster
@@ -3701,12 +3694,12 @@ Line15=gamecommand;screen,ScreenTestInput;name,Test Input
 
 [ScreenOptionsServiceChild]
 Fallback=ScreenOptionsMaster
+InputMode=together
 IconsOnCommand=x,-30
 TimerOnCommand=hidden,1
 StyleIcon=0
 TimerSeconds=0
 AllowOperatorMenuButton=0
-OptionMenuFlags=together
 ForceAllPlayers=1
 PrevScreen=ScreenOptionsService
 NextScreen=ScreenOptionsService
@@ -3774,7 +3767,6 @@ Fallback=ScreenOptionsServiceChild
 PrevScreen=@ScreenTitleBranch()
 NextScreen=@ScreenTitleBranch()
 LineNames=1
-OptionMenuFlags=together
 Line1=conf,Game
 
 [ScreenPlayerOptions]

stepmania/src/ScreenOptionsMaster.cpp

@@ -20,6 +20,7 @@
 #define OPTION_MENU_FLAGS			THEME->GetMetric (m_sName,"OptionMenuFlags")
 #define LINE(sLineName)				THEME->GetMetric (m_sName,ssprintf("Line%s",sLineName.c_str()))
 #define FORCE_ALL_PLAYERS			THEME->GetMetricB(m_sName,"ForceAllPlayers")
+#define INPUT_MODE				THEME->GetMetric (m_sName,"InputMode")
 
 
 REGISTER_SCREEN_CLASS( ScreenOptionsMaster );
@@ -34,7 +35,6 @@ void ScreenOptionsMaster::Init()
 
 	vector<CString> Flags;
 	split( OPTION_MENU_FLAGS, ";", Flags, true );
-	InputMode im = INPUTMODE_INDIVIDUAL;
 	
 	if( FORCE_ALL_PLAYERS )
 	{
@@ -48,9 +48,7 @@ void ScreenOptionsMaster::Init()
 		CString sFlag = Flags[i];
 		sFlag.MakeLower();
 
-		if( sFlag == "together" )
-			im = INPUTMODE_SHARE_CURSOR;
-		else if( sFlag == "smnavigation" )
+		if( sFlag == "smnavigation" )
 			SetNavigation( NAV_THREE_KEY_MENU );
 		else if( sFlag == "toggle" )
 			SetNavigation( PREFSMAN->m_bArcadeOptionsNavigation? NAV_TOGGLE_THREE_KEY:NAV_TOGGLE_FIVE_KEY );
@@ -58,7 +56,7 @@ void ScreenOptionsMaster::Init()
 			RageException::Throw( "Unknown flag \"%s\"", sFlag.c_str() );
 	}
 
-	SetInputMode( im );
+	SetInputMode( StringToInputMode(INPUT_MODE) );
 
 	// Call this after enabling players, if any.
 	ScreenOptions::Init();