Merge pull request #527 from OoliteProject/new-event-guiSelectedRow

phkb · web-flow · commit 83bc90149839 · 2025-09-02T07:38:41.000+10:00
Adding new world event guiSelectedRowChanged
diff --git a/src/Core/Entities/PlayerEntity.m b/src/Core/Entities/PlayerEntity.m
@@ -8876,7 +8876,9 @@ - (void) setGuiToGameOptionsScreen
 
 	[[UNIVERSE gameView] clearMouse];
 	[[UNIVERSE gameController] setMouseInteractionModeForUIWithMouseInteraction:YES];
-	
+
+	gui_screen = GUI_SCREEN_GAMEOPTIONS;
+
 	// GUI stuff
 	{
 		#define OO_SETACCESSCONDITIONFORROW(condition, row)				\
@@ -9138,9 +9140,6 @@ - (void) setGuiToGameOptionsScreen
 	}
 	/* ends */
 
-	[self setShowDemoShips:NO];
-	gui_screen = GUI_SCREEN_GAMEOPTIONS;
-
 	[self setShowDemoShips:NO];
 	[UNIVERSE enterGUIViewModeWithMouseInteraction:YES];
 }
@@ -9155,6 +9154,8 @@ - (void) setGuiToLoadSaveScreen
 	
 	[[UNIVERSE gameController] setMouseInteractionModeForUIWithMouseInteraction:YES];
 
+	gui_screen = GUI_SCREEN_OPTIONS;
+
 	if ([self status] == STATUS_DOCKED)
 	{
 		if ([self dockedStation] == nil)  [self setDockedAtMainStation];
@@ -9232,7 +9233,6 @@ - (void) setGuiToLoadSaveScreen
 	[[UNIVERSE gameView] clearMouse];
 	
 	[self setShowDemoShips:NO];
-	gui_screen = GUI_SCREEN_OPTIONS;
 	
 	[UNIVERSE enterGUIViewModeWithMouseInteraction:YES];
 	
@@ -9439,6 +9439,8 @@ - (void) setGuiToEquipShipScreen:(int)skipParam selectingFacingFor:(NSString *)e
 		BOOL			weaponMounted = NO;
 		BOOL			guiChanged = (gui_screen != GUI_SCREEN_EQUIP_SHIP);
 
+		gui_screen = GUI_SCREEN_EQUIP_SHIP;
+
 		[gui clearAndKeepBackground:!guiChanged];
 		[gui setTitle:DESC(@"equip-title")];
 		
@@ -9684,8 +9686,6 @@ - (void) setGuiToEquipShipScreen:(int)skipParam selectingFacingFor:(NSString *)e
 	/* ends */
 
 	chosen_weapon_facing = WEAPON_FACING_NONE;
-	[self setShowDemoShips:NO];
-	gui_screen = GUI_SCREEN_EQUIP_SHIP;
 
 	[self setShowDemoShips:NO];
 	[UNIVERSE enterGUIViewModeWithMouseInteraction:YES];
@@ -9752,7 +9752,9 @@ - (void) setGuiToInterfacesScreen:(int)skip
 	NSDictionary *interfaces = [[self dockedStation] localInterfaces];
 	NSArray		*interfaceKeys = [interfaces keysSortedByValueUsingSelector:@selector(interfaceCompare:)]; // sorts by category, then title
 	int i;
-	
+
+	OOGUIScreenID	oldScreen = gui_screen;
+
 	// GUI stuff
 	{
 		GuiDisplayGen	*gui = [UNIVERSE gui];
@@ -9763,6 +9765,7 @@ - (void) setGuiToInterfacesScreen:(int)skip
 		[gui clearAndKeepBackground:!guiChanged];
 		[gui setTitle:DESC(@"interfaces-title")];
 		
+		gui_screen = GUI_SCREEN_INTERFACES;
 		
 		OOGUITabSettings tab_stops;
 		tab_stops[0] = 0;
@@ -9853,11 +9856,8 @@ - (void) setGuiToInterfacesScreen:(int)skip
 	}
 	/* ends */
 
-
 	[self setShowDemoShips:NO];
 	
-	OOGUIScreenID	oldScreen = gui_screen;
-	gui_screen = GUI_SCREEN_INTERFACES;
 	[self noteGUIDidChangeFrom:oldScreen to:gui_screen];
 	
 	[self setShowDemoShips:NO];
diff --git a/src/Core/Entities/PlayerEntityControls.m b/src/Core/Entities/PlayerEntityControls.m
@@ -136,6 +136,7 @@
 static BOOL				switching_status_screens;
 //static BOOL				switching_market_screens;
 static BOOL				switching_equipship_screens;
+static BOOL				switching_interface_screens;
 static BOOL				zoom_pressed;
 static BOOL				customView_pressed;
 static BOOL				weaponsOnlineToggle_pressed;
@@ -754,7 +755,7 @@ - (BOOL) handleGUIUpDownArrowKeys
 			{
 				if ([gui setLastSelectableRow])  result = YES;
 			}
-			
+
 			if (result && [gui selectableRange].length > 1)  [self playMenuNavigationUp];
 			else  [self playMenuNavigationNot];
 
@@ -4673,12 +4674,14 @@ - (void) pollGuiScreenControlsWithFKeyAlias:(BOOL)fKeyAlias
 		if (gui_screen != GUI_SCREEN_MARKET)
 		{
 			[gameView clearKeys];
+			[gui setNoSelectedRow];
 			[self noteGUIWillChangeTo:GUI_SCREEN_MARKET];
 			[self setGuiToMarketScreen];
 		}
 		else
 		{
 			[gameView clearKeys];
+			[gui setNoSelectedRow];
 			[self noteGUIWillChangeTo:GUI_SCREEN_MARKETINFO];
 			[self setGuiToMarketInfoScreen];
 		}
@@ -4704,6 +4707,7 @@ - (void) pollGuiScreenControlsWithFKeyAlias:(BOOL)fKeyAlias
 				{
 					[gameView clearKeys];
 					[self noteGUIWillChangeTo:GUI_SCREEN_SHIPYARD];
+					[gui setNoSelectedRow];
 					[self setGuiToShipyardScreen:0];
 					[gui setSelectedRow:GUI_ROW_SHIPYARD_START];
 					[self showShipyardInfoForSelection];
@@ -4712,6 +4716,7 @@ - (void) pollGuiScreenControlsWithFKeyAlias:(BOOL)fKeyAlias
 				{
 					[gameView clearKeys];
 					[self noteGUIWillChangeTo:GUI_SCREEN_EQUIP_SHIP];
+					[gui setNoSelectedRow];
 					[self setGuiToEquipShipScreen:0];
 					[gui setSelectedRow:GUI_ROW_EQUIPMENT_START];
 				}
@@ -4727,8 +4732,16 @@ - (void) pollGuiScreenControlsWithFKeyAlias:(BOOL)fKeyAlias
 		
 		if ([self checkKeyPress:n_key_gui_screen_interfaces fKey_only:!fKeyAlias])
 		{
-			[self setGuiToInterfacesScreen:0];
-			[gui setSelectedRow:GUI_ROW_INTERFACES_START];
+			if (!switching_interface_screens) {
+				[gui setNoSelectedRow];
+				[self setGuiToInterfacesScreen:0];
+				[gui setSelectedRow:GUI_ROW_INTERFACES_START];
+			}
+			switching_interface_screens = YES;
+		}
+		else 
+		{
+			switching_interface_screens = NO;
 		}
 
 	}
diff --git a/src/Core/Entities/PlayerEntityLoadSave.m b/src/Core/Entities/PlayerEntityLoadSave.m
@@ -259,11 +259,11 @@ - (void) setGuiToScenarioScreen:(int)page
 			++row;
 		}
 		
+		gui_screen = GUI_SCREEN_NEWGAME;
+
 		[gui setSelectableRange:NSMakeRange(start_row - 2,3 + row - start_row)];
 		[gui setSelectedRow:start_row];
 		[self showScenarioDetails];
-
-		gui_screen = GUI_SCREEN_NEWGAME;
 	
 		if (guiChanged)
 		{
diff --git a/src/Core/GuiDisplayGen.h b/src/Core/GuiDisplayGen.h
@@ -286,6 +286,7 @@ typedef OOGUITabStop OOGUITabSettings[GUI_MAX_COLUMNS];
 - (void) setNoSelectedRow;
 - (NSString *) selectedRowText;
 - (NSString *) selectedRowKey;
+- (void) reportSelectedRow:(int) row;
 
 - (void) setShowTextCursor:(BOOL) yesno;
 - (void) setCurrentRow:(OOGUIRow) value;
diff --git a/src/Core/GuiDisplayGen.m b/src/Core/GuiDisplayGen.m
@@ -497,13 +497,16 @@ - (OOGUIRow) selectedRow
 
 - (BOOL) setSelectedRow:(OOGUIRow)row
 {
-	if ((row == selectedRow)&&RowInRange(row, selectableRange))
+	if ((row == selectedRow) && RowInRange(row, selectableRange))
+	{
 		return YES;
+	}
 	if (RowInRange(row, selectableRange))
 	{
 		if (![[rowKey objectAtIndex:row] isEqual:GUI_KEY_SKIP])
 		{
 			selectedRow = row;
+			[self reportSelectedRow:row];
 			return YES;
 		}
 	}
@@ -519,6 +522,7 @@ - (BOOL) setNextRow:(int) direction
 		if (![[rowKey objectAtIndex:row] isEqual:GUI_KEY_SKIP])
 		{
 			selectedRow = row;
+			[self reportSelectedRow:row];
 			return YES;
 		}
 		row += direction;
@@ -535,6 +539,7 @@ - (BOOL) setFirstSelectableRow
 		if (![[rowKey objectAtIndex:row] isEqual:GUI_KEY_SKIP])
 		{
 			selectedRow = row;
+			[self reportSelectedRow:row];
 			return YES;
 		}
 		row++;
@@ -552,6 +557,7 @@ - (BOOL) setLastSelectableRow
 		if (![[rowKey objectAtIndex:row] isEqual:GUI_KEY_SKIP])
 		{
 			selectedRow = row;
+			[self reportSelectedRow:row];
 			return YES;
 		}
 		row--;
@@ -561,6 +567,12 @@ - (BOOL) setLastSelectableRow
 }
 
 
+- (void) reportSelectedRow:(int) row
+{
+	[PLAYER doScriptEvent:OOJSID("guiSelectedRowChanged") withArguments:[NSArray arrayWithObjects:[self keyForRow:row], [NSNumber numberWithInt:row], [self selectedRowText], nil]];
+}
+
+
 - (void) setNoSelectedRow
 {
 	selectedRow = -1;

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@`
`136`	`136`	`static BOOL switching_status_screens;`
`137`	`137`	`//static BOOL switching_market_screens;`
`138`	`138`	`static BOOL switching_equipship_screens;`
	`139`	`+static BOOL switching_interface_screens;`
`139`	`140`	`static BOOL zoom_pressed;`
`140`	`141`	`static BOOL customView_pressed;`
`141`	`142`	`static BOOL weaponsOnlineToggle_pressed;`
`@@ -754,7 +755,7 @@ - (BOOL) handleGUIUpDownArrowKeys`
`754`	`755`	`{`
`755`	`756`	`if ([gui setLastSelectableRow]) result = YES;`
`756`	`757`	`}`
`757`		`-`
	`758`	`+`
`758`	`759`	`if (result && [gui selectableRange].length > 1) [self playMenuNavigationUp];`
`759`	`760`	`else [self playMenuNavigationNot];`
`760`	`761`
`@@ -4673,12 +4674,14 @@ - (void) pollGuiScreenControlsWithFKeyAlias:(BOOL)fKeyAlias`
`4673`	`4674`	`if (gui_screen != GUI_SCREEN_MARKET)`
`4674`	`4675`	`{`
`4675`	`4676`	`[gameView clearKeys];`
	`4677`	`+ [gui setNoSelectedRow];`
`4676`	`4678`	`[self noteGUIWillChangeTo:GUI_SCREEN_MARKET];`
`4677`	`4679`	`[self setGuiToMarketScreen];`
`4678`	`4680`	`}`
`4679`	`4681`	`else`
`4680`	`4682`	`{`
`4681`	`4683`	`[gameView clearKeys];`
	`4684`	`+ [gui setNoSelectedRow];`
`4682`	`4685`	`[self noteGUIWillChangeTo:GUI_SCREEN_MARKETINFO];`
`4683`	`4686`	`[self setGuiToMarketInfoScreen];`
`4684`	`4687`	`}`
`@@ -4704,6 +4707,7 @@ - (void) pollGuiScreenControlsWithFKeyAlias:(BOOL)fKeyAlias`
`4704`	`4707`	`{`
`4705`	`4708`	`[gameView clearKeys];`
`4706`	`4709`	`[self noteGUIWillChangeTo:GUI_SCREEN_SHIPYARD];`
	`4710`	`+ [gui setNoSelectedRow];`
`4707`	`4711`	`[self setGuiToShipyardScreen:0];`
`4708`	`4712`	`[gui setSelectedRow:GUI_ROW_SHIPYARD_START];`
`4709`	`4713`	`[self showShipyardInfoForSelection];`
`@@ -4712,6 +4716,7 @@ - (void) pollGuiScreenControlsWithFKeyAlias:(BOOL)fKeyAlias`
`4712`	`4716`	`{`
`4713`	`4717`	`[gameView clearKeys];`
`4714`	`4718`	`[self noteGUIWillChangeTo:GUI_SCREEN_EQUIP_SHIP];`
	`4719`	`+ [gui setNoSelectedRow];`
`4715`	`4720`	`[self setGuiToEquipShipScreen:0];`
`4716`	`4721`	`[gui setSelectedRow:GUI_ROW_EQUIPMENT_START];`
`4717`	`4722`	`}`
`@@ -4727,8 +4732,16 @@ - (void) pollGuiScreenControlsWithFKeyAlias:(BOOL)fKeyAlias`
`4727`	`4732`
`4728`	`4733`	`if ([self checkKeyPress:n_key_gui_screen_interfaces fKey_only:!fKeyAlias])`
`4729`	`4734`	`{`
`4730`		`- [self setGuiToInterfacesScreen:0];`
`4731`		`- [gui setSelectedRow:GUI_ROW_INTERFACES_START];`
	`4735`	`+ if (!switching_interface_screens) {`
	`4736`	`+ [gui setNoSelectedRow];`
	`4737`	`+ [self setGuiToInterfacesScreen:0];`
	`4738`	`+ [gui setSelectedRow:GUI_ROW_INTERFACES_START];`
	`4739`	`+ }`
	`4740`	`+ switching_interface_screens = YES;`
	`4741`	`+ }`
	`4742`	`+ else`
	`4743`	`+ {`
	`4744`	`+ switching_interface_screens = NO;`
`4732`	`4745`	`}`
`4733`	`4746`
`4734`	`4747`	`}`
Original file line number	Diff line number	Diff line change
`@@ -259,11 +259,11 @@ - (void) setGuiToScenarioScreen:(int)page`
`259`	`259`	`++row;`
`260`	`260`	`}`
`261`	`261`
	`262`	`+ gui_screen = GUI_SCREEN_NEWGAME;`
	`263`	`+`
`262`	`264`	`[gui setSelectableRange:NSMakeRange(start_row - 2,3 + row - start_row)];`
`263`	`265`	`[gui setSelectedRow:start_row];`
`264`	`266`	`[self showScenarioDetails];`
`265`		`-`
`266`		`- gui_screen = GUI_SCREEN_NEWGAME;`
`267`	`267`
`268`	`268`	`if (guiChanged)`
`269`	`269`	`{`
Original file line number	Diff line number	Diff line change
`@@ -497,13 +497,16 @@ - (OOGUIRow) selectedRow`
`497`	`497`
`498`	`498`	`- (BOOL) setSelectedRow:(OOGUIRow)row`
`499`	`499`	`{`
`500`		`- if ((row == selectedRow)&&RowInRange(row, selectableRange))`
	`500`	`+ if ((row == selectedRow) && RowInRange(row, selectableRange))`
	`501`	`+ {`
`501`	`502`	`return YES;`
	`503`	`+ }`
`502`	`504`	`if (RowInRange(row, selectableRange))`
`503`	`505`	`{`
`504`	`506`	`if (![[rowKey objectAtIndex:row] isEqual:GUI_KEY_SKIP])`
`505`	`507`	`{`
`506`	`508`	`selectedRow = row;`
	`509`	`+ [self reportSelectedRow:row];`
`507`	`510`	`return YES;`
`508`	`511`	`}`
`509`	`512`	`}`
`@@ -519,6 +522,7 @@ - (BOOL) setNextRow:(int) direction`
`519`	`522`	`if (![[rowKey objectAtIndex:row] isEqual:GUI_KEY_SKIP])`
`520`	`523`	`{`
`521`	`524`	`selectedRow = row;`
	`525`	`+ [self reportSelectedRow:row];`
`522`	`526`	`return YES;`
`523`	`527`	`}`
`524`	`528`	`row += direction;`
`@@ -535,6 +539,7 @@ - (BOOL) setFirstSelectableRow`
`535`	`539`	`if (![[rowKey objectAtIndex:row] isEqual:GUI_KEY_SKIP])`
`536`	`540`	`{`
`537`	`541`	`selectedRow = row;`
	`542`	`+ [self reportSelectedRow:row];`
`538`	`543`	`return YES;`
`539`	`544`	`}`
`540`	`545`	`row++;`
`@@ -552,6 +557,7 @@ - (BOOL) setLastSelectableRow`
`552`	`557`	`if (![[rowKey objectAtIndex:row] isEqual:GUI_KEY_SKIP])`
`553`	`558`	`{`
`554`	`559`	`selectedRow = row;`
	`560`	`+ [self reportSelectedRow:row];`
`555`	`561`	`return YES;`
`556`	`562`	`}`
`557`	`563`	`row--;`
`@@ -561,6 +567,12 @@ - (BOOL) setLastSelectableRow`
`561`	`567`	`}`
`562`	`568`
`563`	`569`
	`570`	`+- (void) reportSelectedRow:(int) row`
	`571`	`+{`
	`572`	`+ [PLAYER doScriptEvent:OOJSID("guiSelectedRowChanged") withArguments:[NSArray arrayWithObjects:[self keyForRow:row], [NSNumber numberWithInt:row], [self selectedRowText], nil]];`
	`573`	`+}`
	`574`	`+`
	`575`	`+`
`564`	`576`	`- (void) setNoSelectedRow`
`565`	`577`	`{`
`566`	`578`	`selectedRow = -1;`