X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fbuild.cpp;h=4e5ca1863a75fa86136835ac37b444be2c26b941;hp=a1eab6c36a392a395b814816bc45c7eaa002c087;hb=a333eaee1c5b8b20ec59411f4878f8fc5bdfa584;hpb=18d60f90d7603cb420150739251cf98519c57406

diff --git a/radiant/build.cpp b/radiant/build.cpp
index a1eab6c3..4e5ca186 100644
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -41,12 +41,12 @@ void build_set_variable( const char* name, const char* value ){
 	g_build_variables[name] = value;
 }
 
-const char* build_get_variable( const char* name ){
-	Variables::iterator i = g_build_variables.find( name );
+const char* build_get_variable( const std::string& name ){
+	Variables::iterator i = g_build_variables.find( name.c_str() );
 	if ( i != g_build_variables.end() ) {
 		return ( *i ).second.c_str();
 	}
-	globalErrorStream() << "undefined build variable: " << makeQuoted( name ) << "\n";
+	globalErrorStream() << "undefined build variable: " << makeQuoted( name.c_str() ) << "\n";
 	return "";
 }
 
@@ -57,55 +57,80 @@ class Evaluatable
 {
 public:
 virtual ~Evaluatable() = default;
-virtual void evaluate( StringBuffer& output ) = 0;
+virtual std::string evaluate() = 0;
 virtual void exportXML( XMLImporter& importer ) = 0;
 };
 
 class VariableString : public Evaluatable
 {
-CopiedString m_string;
+std::string m_string;
 public:
 VariableString() : m_string(){
 }
-VariableString( const char* string ) : m_string( string ){
+VariableString( std::string string ) : m_string( std::move(string) ){
 }
 const char* c_str() const {
 	return m_string.c_str();
 }
-void setString( const char* string ){
+void setString( const std::string& string ){
 	m_string = string;
 }
-void evaluate( StringBuffer& output ){
-	StringBuffer variable;
+std::string evaluate(){
+	// replace ".[ExecutableType]" with "[ExecutableExt]"
+	{
+		size_t pos;
+		const std::string pattern = ".[ExecutableType]";
+		while ( ( pos = m_string.find(pattern) ) != std::string::npos ) {
+			m_string.replace(pos, pattern.length(), "[ExecutableExt]");
+		}
+	}
+
+	// add missing [ExtraQ3map2Args] if "[RadiantPath]q3map2[ExecutableExt]"
+	{
+		size_t pos;
+		const std::string pattern = "\"[RadiantPath]q3map2[ExecutableExt]\"";
+		const std::string extra = "[ExtraQ3map2Args]";
+		if ( ( pos = m_string.find(pattern) ) != std::string::npos
+				&& m_string.find(extra) == std::string::npos )
+		{
+			m_string.insert(pos + pattern.size(), " ");
+			m_string.insert(pos + pattern.size() + 1, extra);
+		}
+	}
+
+	std::string output;
+	std::string variable_name;
 	bool in_variable = false;
-	for ( const char* i = m_string.c_str(); *i != '\0'; ++i )
+	for ( const char c : m_string )
 	{
 		if ( !in_variable ) {
-			switch ( *i )
+			switch ( c )
 			{
 			case '[':
 				in_variable = true;
 				break;
 			default:
-				output.push_back( *i );
+				output += c;
 				break;
 			}
 		}
 		else
 		{
-			switch ( *i )
+			switch ( c )
 			{
 			case ']':
 				in_variable = false;
-				output.push_string( build_get_variable( variable.c_str() ) );
-				variable.clear();
+				output += build_get_variable( variable_name );
+				variable_name.clear();
 				break;
 			default:
-				variable.push_back( *i );
+				variable_name += c;
 				break;
 			}
 		}
 	}
+
+	return output;
 }
 void exportXML( XMLImporter& importer ){
 	importer << c_str();
@@ -123,12 +148,12 @@ Conditional( VariableString* test ) : m_test( test ){
 	delete m_test;
 	delete m_result;
 }
-void evaluate( StringBuffer& output ){
-	StringBuffer buffer;
-	m_test->evaluate( buffer );
-	if ( !string_empty( buffer.c_str() ) ) {
-		m_result->evaluate( output );
+std::string evaluate(){
+	std::string result = m_test->evaluate();
+	if ( result.empty() ) {
+		return result;
 	}
+	return m_result->evaluate();
 }
 void exportXML( XMLImporter& importer ){
 	StaticElement conditionElement( "cond" );
@@ -154,11 +179,13 @@ public:
 void push_back( Evaluatable* evaluatable ){
 	m_evaluatables.push_back( evaluatable );
 }
-void evaluate( StringBuffer& output ){
+std::string evaluate(){
+	std::string result;
 	for ( Evaluatables::iterator i = m_evaluatables.begin(); i != m_evaluatables.end(); ++i )
 	{
-		( *i )->evaluate( output );
+		result += ( *i )->evaluate();
 	}
+	return result;
 }
 void exportXML( XMLImporter& importer ){
 	for ( Evaluatables::iterator i = m_evaluatables.begin(); i != m_evaluatables.end(); ++i )
@@ -180,16 +207,16 @@ virtual void popElement( const char* name ) = 0;
 
 class VariableStringXMLConstructor : public XMLElementParser
 {
-StringBuffer m_buffer;
+std::string m_buffer;
 VariableString& m_variableString;
 public:
 VariableStringXMLConstructor( VariableString& variableString ) : m_variableString( variableString ){
 }
 ~VariableStringXMLConstructor(){
-	m_variableString.setString( m_buffer.c_str() );
+	m_variableString.setString( std::move(m_buffer) );
 }
 std::size_t write( const char* buffer, std::size_t length ){
-	m_buffer.push_range( buffer, buffer + length );
+	m_buffer.append( buffer, length );
 	return length;
 }
 XMLElementParser& pushElement( const XMLElement& element ){
@@ -202,16 +229,16 @@ void popElement( const char* name ){
 
 class ConditionalXMLConstructor : public XMLElementParser
 {
-StringBuffer m_buffer;
+std::string m_buffer;
 Conditional& m_conditional;
 public:
 ConditionalXMLConstructor( Conditional& conditional ) : m_conditional( conditional ){
 }
 ~ConditionalXMLConstructor(){
-	m_conditional.m_result = new VariableString( m_buffer.c_str() );
+	m_conditional.m_result = new VariableString( std::move( m_buffer ) );
 }
 std::size_t write( const char* buffer, std::size_t length ){
-	m_buffer.push_range( buffer, buffer + length );
+	m_buffer.append( buffer, length );
 	return length;
 }
 XMLElementParser& pushElement( const XMLElement& element ){
@@ -224,7 +251,7 @@ void popElement( const char* name ){
 
 class ToolXMLConstructor : public XMLElementParser
 {
-StringBuffer m_buffer;
+std::string m_buffer;
 Tool& m_tool;
 ConditionalXMLConstructor* m_conditional;
 public:
@@ -234,7 +261,7 @@ ToolXMLConstructor( Tool& tool ) : m_tool( tool ){
 	flush();
 }
 std::size_t write( const char* buffer, std::size_t length ){
-	m_buffer.push_range( buffer, buffer + length );
+	m_buffer.append( buffer, length );
 	return length;
 }
 XMLElementParser& pushElement( const XMLElement& element ){
@@ -259,7 +286,7 @@ void popElement( const char* name ){
 
 void flush(){
 	if ( !m_buffer.empty() ) {
-		m_tool.push_back( new VariableString( m_buffer.c_str() ) );
+		m_tool.push_back( new VariableString( std::move( m_buffer ) ) );
 		m_buffer.clear();
 	}
 }
@@ -474,8 +501,7 @@ void project_verify( Project& project, Tools& tools ){
 void build_run( const char* name, CommandListener& listener ){
 	for ( Tools::iterator i = g_build_tools.begin(); i != g_build_tools.end(); ++i )
 	{
-		StringBuffer output;
-		( *i ).second.evaluate( output );
+		std::string output = ( *i ).second.evaluate();
 		build_set_variable( ( *i ).first.c_str(), output.c_str() );
 	}
 
@@ -485,8 +511,7 @@ void build_run( const char* name, CommandListener& listener ){
 			Build& build = ( *i ).second;
 			for ( Build::iterator j = build.begin(); j != build.end(); ++j )
 			{
-				StringBuffer output;
-				( *j ).evaluate( output );
+				std::string output = ( *j ).evaluate();
 				listener.execute( output.c_str() );
 			}
 		}
@@ -657,7 +682,7 @@ ProjectList( Project& project ) : m_project( project ), m_changed( false ){
 }
 };
 
-gboolean project_cell_edited( GtkCellRendererText* cell, gchar* path_string, gchar* new_text, ProjectList* projectList ){
+gboolean project_cell_edited(ui::CellRendererText cell, gchar* path_string, gchar* new_text, ProjectList* projectList ){
 	Project& project = projectList->m_project;
 
 	auto path = ui::TreePath( path_string );
@@ -699,7 +724,7 @@ gboolean project_key_press( ui::TreeView widget, GdkEventKey* event, ProjectList
 	Project& project = projectList->m_project;
 
 	if ( event->keyval == GDK_KEY_Delete ) {
-		auto selection = ui::TreeSelection(gtk_tree_view_get_selection(widget));
+		auto selection = ui::TreeSelection::from(gtk_tree_view_get_selection(widget));
 		GtkTreeIter iter;
 		GtkTreeModel* model;
 		if ( gtk_tree_selection_get_selected( selection, &model, &iter ) ) {
@@ -757,7 +782,7 @@ gboolean project_selection_changed( ui::TreeSelection selection, ui::ListStore s
 	return FALSE;
 }
 
-gboolean commands_cell_edited( GtkCellRendererText* cell, gchar* path_string, gchar* new_text, ui::ListStore store ){
+gboolean commands_cell_edited(ui::CellRendererText cell, const gchar* path_string, const gchar* new_text, ui::ListStore store ){
 	if ( g_current_build == 0 ) {
 		return FALSE;
 	}
@@ -823,6 +848,12 @@ gboolean commands_key_press( ui::TreeView widget, GdkEventKey* event, ui::ListSt
 ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectList ){
 	ui::Window window = MainFrame_getWindow().create_dialog_window("Build Menu", G_CALLBACK(dialog_delete_callback ), &modal, -1, 400 );
 
+	// FIXME: GTK_WIN_POS_CENTER_ON_PARENT must be used instead but does not work
+	// for unknown reason.
+	// It's possible MaingFrame_getWindow() does not return the main window.
+	// It's known the preferences window has same issue when using MaingFrame_getWindow().
+	gtk_window_set_position( window, GTK_WIN_POS_CENTER_ALWAYS );
+
 	{
 		auto table1 = create_dialog_table( 2, 2, 4, 4, 4 );
 		window.add(table1);
@@ -838,8 +869,8 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
 				vbox.pack_start( button, FALSE, FALSE, 0 );
 			}
 		}
-		auto buildViewStore = ui::ListStore(gtk_list_store_new( 1, G_TYPE_STRING ));
-		auto buildView = ui::TreeView( ui::TreeModel( buildViewStore ));
+		auto buildViewStore = ui::ListStore::from(gtk_list_store_new( 1, G_TYPE_STRING ));
+		auto buildView = ui::TreeView( ui::TreeModel::from( buildViewStore._handle ));
 		{
 			auto frame = create_dialog_frame( "Build menu" );
             table1.attach(frame, {0, 1, 0, 1});
@@ -874,16 +905,16 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
 			}
 		}
 		{
-			auto frame = create_dialog_frame( "Commandline" );
+			auto frame = create_dialog_frame( "Command line" );
             table1.attach(frame, {0, 1, 1, 2});
 			{
 				auto scr = create_scrolled_window( ui::Policy::NEVER, ui::Policy::AUTOMATIC, 4 );
 				frame.add(scr);
 
 				{
-					auto store = ui::ListStore(gtk_list_store_new( 1, G_TYPE_STRING ));
+					auto store = ui::ListStore::from(gtk_list_store_new( 1, G_TYPE_STRING ));
 
-					auto view = ui::TreeView(ui::TreeModel( store ));
+					auto view = ui::TreeView(ui::TreeModel::from( store._handle ));
 					gtk_tree_view_set_headers_visible(view, FALSE );
 
 					auto renderer = ui::CellRendererText(ui::New);
@@ -904,7 +935,7 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
 
 					view.connect( "key_press_event", G_CALLBACK( commands_key_press ), store );
 
-					auto sel = ui::TreeSelection(gtk_tree_view_get_selection(buildView ));
+					auto sel = ui::TreeSelection::from(gtk_tree_view_get_selection(buildView ));
 					sel.connect( "changed", G_CALLBACK( project_selection_changed ), store );
 				}
 			}
@@ -1026,7 +1057,7 @@ void SaveBuildMenu(){
 #include "stringio.h"
 
 void BuildMenu_Construct(){
-	GlobalPreferenceSystem().registerPreference( "BuildMenu", CopiedStringImportStringCaller( g_buildMenu ), CopiedStringExportStringCaller( g_buildMenu ) );
+	GlobalPreferenceSystem().registerPreference( "BuildMenu", make_property_string( g_buildMenu ) );
 	LoadBuildMenu();
 }
 void BuildMenu_Destroy(){