From a987ae298200543d29bc6591a5fc0a18fe1e777f Mon Sep 17 00:00:00 2001
From: John Luke <jluke@mono-cvs.ximian.com>
Date: Thu, 29 Jan 2004 01:08:46 +0000
Subject: [PATCH] * sample/VteTest.cs: update * vte/Vte.metadata: remove
 incorrect rules * vte/vte-api.xml: regen

svn path=/trunk/gtk-sharp/; revision=22586
---
 ChangeLog         |  4 ++++
 sample/VteTest.cs | 34 ++++++++++++++++++++++++++++------
 vte/Vte.metadata  |  3 ---
 vte/vte-api.xml   | 12 ++++++------
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f97feea8..2e963ad6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* glade/XML.custom : some null checking for crash prevention.
 	[Fixes #47017]
 
+	* sample/VteTest.cs: update
+	* vte/Vte.metadata: remove incorrect rules
+	* vte/vte-api.xml: regen
+
 2004-01-28  Mike Kestner  <mkestner@ximian.com>
 
 	* gtk/gtk-api.xml : regen
diff --git a/sample/VteTest.cs b/sample/VteTest.cs
index 46ca64212..f594eb45d 100644
--- a/sample/VteTest.cs
+++ b/sample/VteTest.cs
@@ -24,11 +24,19 @@ class T
 		
 		ScrolledWindow sw = new ScrolledWindow ();
 		Terminal term = new Terminal ();
+		term.EncodingChanged += new EventHandler (OnEncodingChanged);
 		term.CursorBlinks = true;
 		term.MouseAutohide = true;
 		term.ScrollOnKeystroke = true;
-		//term.BackgroundTransparent = true;
+		term.DeleteBinding = TerminalEraseBinding.Auto;
 		term.Encoding = "UTF-8";
+		term.FontFromString = "Monospace";
+		term.Commit += new VteSharp.CommitHandler (OnCommit);
+		term.TextDeleted += new EventHandler (OnTextDeleted);
+
+		Gdk.Color white = new Gdk.Color ();
+		Gdk.Color.Parse ("white", ref white);
+		term.ColorBackground = white;
 		
 		Console.WriteLine (term.UsingXft);
 		Console.WriteLine (term.Encoding);
@@ -39,19 +47,33 @@ class T
 		string envv = "";
 		// FIXME: send the env vars to ForkCommand
 		Console.WriteLine (Environment.GetEnvironmentVariables ().Count);
+		Console.WriteLine (Environment.CurrentDirectory);
 		
-		int pid = term.ForkCommand ("/bin/bash", argv, envv, Environment.CurrentDirectory, false, true, true);
-		Console.WriteLine ("Child pid: " + pid);
+		//int pid = term.ForkCommand ("/bin/bash", argv, envv, Environment.CurrentDirectory, false, true, true);
+		//Console.WriteLine ("Child pid: " + pid);
 
-		//term.Feed ("ls");
-		//term.FeedChild ("ls");
-		
 		sw.AddWithViewport (term);
 
 		app.Contents = sw;
 		app.ShowAll ();
 		program.Run ();
 	}
+
+	private void OnCommit (object o, VteSharp.CommitArgs args)
+	{
+		Terminal term = (Terminal) o;
+		term.Feed (args.P0);
+	}
+
+	private void OnTextDeleted (object o, EventArgs args)
+	{
+		Console.WriteLine ("text deleted");
+	}
+	
+	private void OnEncodingChanged (object o, EventArgs args)
+	{
+		Console.WriteLine ("encoding changed");
+	}
 	
 	private void OnTextInserted (object o, EventArgs args)
 	{
diff --git a/vte/Vte.metadata b/vte/Vte.metadata
index c0a65485c..dcd9ceccc 100644
--- a/vte/Vte.metadata
+++ b/vte/Vte.metadata
@@ -2,9 +2,6 @@
   <attr path="/api/namespace/object[@cname='VteReaper']" name="parent">GObject</attr>
   <attr path="/api/namespace/object[@cname='VteTerminal']/method[@name='ForkCommand']/return-type" name="type">gint</attr>
   <attr path="//return-type[@type='GNone']" name="type">void</attr>
-  <attr path="/api/namespace/object[@cname='VteBg']/signal/parameters/parameter[@name='p0']" name="type">VteBg*</attr>
-  <attr path="/api/namespace/object[@cname='VteReaper']/signal/parameters/parameter[@name='p0']" name="type">VteReaper*</attr>
-  <attr path="/api/namespace/object[@cname='VteTerminal']/signal/parameters/parameter[@name='p0']" name="type">VteTerminal*</attr>
   <attr path="/api/namespace/object[@cname='VteTerminal']/method/parameters/parameter[@name='terminal,']" name="name">is_selected</attr>
   <attr path="/api/namespace/object[@cname='VteTerminal']/method/parameters/parameter[@name='is_selected']" name="type">gboolean</attr>
 </metadata>
diff --git a/vte/vte-api.xml b/vte/vte-api.xml
index e29933365..618ee1ba8 100644
--- a/vte/vte-api.xml
+++ b/vte/vte-api.xml
@@ -93,7 +93,7 @@
         <return-type type="void" />
         <parameters>
           <parameter name="inst" type="VteReaper*" />
-          <parameter name="p0" type="VteReaper*" />
+          <parameter name="p0" type="gint32" />
           <parameter name="p1" type="gint32" />
         </parameters>
       </signal>
@@ -149,7 +149,7 @@
         <return-type type="void" />
         <parameters>
           <parameter name="inst" type="VteTerminal*" />
-          <parameter name="p0" type="VteTerminal*" />
+          <parameter name="p0" type="gchar*" />
           <parameter name="p1" type="guint32" />
         </parameters>
       </signal>
@@ -163,7 +163,7 @@
         <return-type type="void" />
         <parameters>
           <parameter name="inst" type="VteTerminal*" />
-          <parameter name="p0" type="VteTerminal*" />
+          <parameter name="p0" type="guint32" />
           <parameter name="p1" type="guint32" />
         </parameters>
       </signal>
@@ -231,7 +231,7 @@
         <return-type type="void" />
         <parameters>
           <parameter name="inst" type="VteTerminal*" />
-          <parameter name="p0" type="VteTerminal*" />
+          <parameter name="p0" type="guint32" />
           <parameter name="p1" type="guint32" />
         </parameters>
       </signal>
@@ -239,7 +239,7 @@
         <return-type type="void" />
         <parameters>
           <parameter name="inst" type="VteTerminal*" />
-          <parameter name="p0" type="VteTerminal*" />
+          <parameter name="p0" type="guint32" />
           <parameter name="p1" type="guint32" />
         </parameters>
       </signal>
@@ -283,7 +283,7 @@
         <return-type type="void" />
         <parameters>
           <parameter name="inst" type="VteTerminal*" />
-          <parameter name="p0" type="VteTerminal*" />
+          <parameter name="p0" type="gint32" />
         </parameters>
       </signal>
       <method name="CopyClipboard" cname="vte_terminal_copy_clipboard">