X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fconsole.cpp;h=82b08e3c2ab5468ca1919e0a094dd0a99af7a9e7;hb=6882578a4675ab8b8609d0b0421918dc664a2c18;hp=60154723b7ede94b3f21e9fc332bae5d081ff9fb;hpb=04fe1ceba51db67b2b1743e383f146ea8d31a07e;p=xonotic%2Fnetradiant.git

diff --git a/radiant/console.cpp b/radiant/console.cpp
index 60154723..82b08e3c 100644
--- a/radiant/console.cpp
+++ b/radiant/console.cpp
@@ -22,8 +22,8 @@
 #include "console.h"
 
 #include <time.h>
-#include <gtk/gtk.h>
 #include <uilib/uilib.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/accelerator.h"
 #include "gtkutil/messagebox.h"
@@ -67,7 +67,7 @@ void Sys_LogFile( bool enable ){
 								 << "This is NetRadiant '" RADIANT_VERSION "' compiled " __DATE__ "\n" RADIANT_ABOUTMSG "\n";
 		}
 		else{
-			ui::root.alert( "Failed to create log file, check write permissions in Radiant directory.\n",
+			ui::alert( ui::root, "Failed to create log file, check write permissions in Radiant directory.\n",
 							"Console logging", ui::alert_type::OK, ui::alert_icon::Error );
 		}
 	}
@@ -81,42 +81,41 @@ void Sys_LogFile( bool enable ){
 	}
 }
 
-ui::Widget g_console;
+ui::TextView g_console{ui::null};
 
 void console_clear(){
-	GtkTextBuffer* buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW( g_console ) );
-	gtk_text_buffer_set_text( buffer, "", -1 );
+	g_console.text("");
 }
 
-void console_populate_popup( GtkTextView* textview, ui::Menu menu, gpointer user_data ){
+void console_populate_popup( ui::TextView textview, ui::Menu menu, gpointer user_data ){
 	menu_separator( menu );
 
 	ui::Widget item(ui::MenuItem( "Clear" ));
-	g_signal_connect( G_OBJECT( item ), "activate", G_CALLBACK( console_clear ), 0 );
-	gtk_widget_show( item );
-	container_add_widget( GTK_CONTAINER( menu ), item );
+	item.connect( "activate", G_CALLBACK( console_clear ), 0 );
+	item.show();
+	menu.add(item);
 }
 
 gboolean destroy_set_null( ui::Window widget, ui::Widget* p ){
-	*p = ui::Widget();
+	*p = ui::Widget{ui::null};
 	return FALSE;
 }
 
 WidgetFocusPrinter g_consoleWidgetFocusPrinter( "console" );
 
 ui::Widget Console_constructWindow( ui::Window toplevel ){
-	ui::Widget scr = ui::ScrolledWindow();
-	gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scr ), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
+	auto scr = ui::ScrolledWindow(ui::New);
+	scr.overflow(ui::Policy::AUTOMATIC, ui::Policy::AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN );
-	gtk_widget_show( scr );
+	scr.show();
 
 	{
-		ui::Widget text = ui::TextView();
-		gtk_widget_set_size_request( text, 0, -1 ); // allow shrinking
-		gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( text ), GTK_WRAP_WORD );
-		gtk_text_view_set_editable( GTK_TEXT_VIEW( text ), FALSE );
-		gtk_container_add( GTK_CONTAINER( scr ), text );
-		gtk_widget_show( text );
+		auto text = ui::TextView(ui::New);
+		text.dimensions(0, -1); // allow shrinking
+		gtk_text_view_set_wrap_mode( text, GTK_WRAP_WORD );
+		gtk_text_view_set_editable( text, FALSE );
+		scr.add(text);
+		text.show();
 		g_console = text;
 
 		//globalExtendedASCIICharacterSet().print();
@@ -125,8 +124,8 @@ ui::Widget Console_constructWindow( ui::Window toplevel ){
 
 		//g_consoleWidgetFocusPrinter.connect(g_console);
 
-		g_signal_connect( G_OBJECT( g_console ), "populate-popup", G_CALLBACK( console_populate_popup ), 0 );
-		g_signal_connect( G_OBJECT( g_console ), "destroy", G_CALLBACK( destroy_set_null ), &g_console );
+		g_console.connect( "populate-popup", G_CALLBACK( console_populate_popup ), 0 );
+		g_console.connect( "destroy", G_CALLBACK( destroy_set_null ), &g_console );
 	}
 
 	gtk_container_set_focus_chain( GTK_CONTAINER( scr ), NULL );
@@ -143,7 +142,7 @@ public:
 GtkTextBufferOutputStream( GtkTextBuffer* textBuffer, GtkTextIter* iter, GtkTextTag* tag ) : textBuffer( textBuffer ), iter( iter ), tag( tag ){
 }
 std::size_t write( const char* buffer, std::size_t length ){
-	gtk_text_buffer_insert_with_tags( textBuffer, iter, buffer, gint( length ), tag, 0 );
+	gtk_text_buffer_insert_with_tags( textBuffer, iter, buffer, gint( length ), tag, NULL );
 	return length;
 }
 };
@@ -163,20 +162,20 @@ std::size_t Sys_Print( int level, const char* buf, std::size_t length ){
 	}
 
 	if ( level != SYS_NOCON ) {
-		if ( g_console != 0 ) {
-			GtkTextBuffer* buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW( g_console ) );
+		if ( g_console ) {
+			auto buffer = gtk_text_view_get_buffer( g_console );
 
 			GtkTextIter iter;
 			gtk_text_buffer_get_end_iter( buffer, &iter );
 
-			static GtkTextMark* end = gtk_text_buffer_create_mark( buffer, "end", &iter, FALSE );
+			static auto end = gtk_text_buffer_create_mark( buffer, "end", &iter, FALSE );
 
 			const GdkColor yellow = { 0, 0xb0ff, 0xb0ff, 0x0000 };
 			const GdkColor red = { 0, 0xffff, 0x0000, 0x0000 };
 
-			static GtkTextTag* error_tag = gtk_text_buffer_create_tag( buffer, "red_foreground", "foreground-gdk", &red, 0 );
-			static GtkTextTag* warning_tag = gtk_text_buffer_create_tag( buffer, "yellow_foreground", "foreground-gdk", &yellow, 0 );
-			static GtkTextTag* standard_tag = gtk_text_buffer_create_tag( buffer, "black_foreground", 0 );
+			static auto error_tag = gtk_text_buffer_create_tag( buffer, "red_foreground", "foreground-gdk", &red, NULL );
+			static auto warning_tag = gtk_text_buffer_create_tag( buffer, "yellow_foreground", "foreground-gdk", &yellow, NULL );
+			static auto standard_tag = gtk_text_buffer_create_tag( buffer, "black_foreground", NULL );
 			GtkTextTag* tag;
 			switch ( level )
 			{
@@ -208,7 +207,7 @@ std::size_t Sys_Print( int level, const char* buf, std::size_t length ){
 
 			// update console widget immediatly if we're doing something time-consuming
 			if ( contains_newline ) {
-				gtk_text_view_scroll_mark_onscreen( GTK_TEXT_VIEW( g_console ), end );
+				gtk_text_view_scroll_mark_onscreen( g_console, end );
 
 				if ( !ScreenUpdates_Enabled() && gtk_widget_get_realized( g_console ) ) {
 					ScreenUpdates_process();