Register VteTerminalEraseBinding with GObject as an enum. Update. Ignore

* src/vte.c: Register VteTerminalEraseBinding with GObject as an enum.
* python/vte.defs: Update.
* python/vte.overrides: Ignore vte_terminal_get_text_range().

5 files changed, 118 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 0f1ed5ee..183983d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2002-08-30 nalin
+	* src/vte.c: Register VteTerminalEraseBinding with GObject as an
+	enumerated type.
+	* python/vte.defs: Update.
+	* python/vte.overrides: Ignore vte_terminal_get_text_range().
+
+2002-08-30 nalin
 	* src/vte.c: Restore the focus-in/focus-out handlers -- the defaults
 	don't quite DTRT for us because they miss our im_context (#72946).  When
 	setting the cursor location for the input method, make the Y coordinate
diff --git a/python/vte.defs b/python/vte.defs
index e721646f..8de49f40 100644
--- a/python/vte.defs
+++ b/python/vte.defs
@@ -13,6 +13,7 @@
 (define-enum TerminalEraseBinding
   (in-module "Vte")
   (c-name "VteTerminalEraseBinding")
+  (gtype-id "VTE_TYPE_TERMINAL_ERASE_BINDING")
   (values
     '("auto" "VTE_ERASE_AUTO")
     '("ascii-backspace" "VTE_ERASE_ASCII_BACKSPACE")
@@ -29,10 +30,15 @@
   (return-type "GtkType")
 )
 
+(define-function vte_terminal_erase_binding_get_type
+  (c-name "vte_terminal_erase_binding_get_type")
+  (return-type "GtkType")
+)
+
 (define-function vte_terminal_new
   (c-name "vte_terminal_new")
-  (is-constructor-of VteTerminal)
-  (return-type "VteTerminal*")
+  (is-constructor-of "VteTerminal")
+  (return-type "GtkWidget*")
 )
 
 (define-method fork_command
@@ -52,7 +58,7 @@
   (return-type "none")
   (parameters
     '("const-char*" "data")
-    '("size_t" "length")
+    '("glong" "length")
   )
 )
 
@@ -62,7 +68,7 @@
   (return-type "none")
   (parameters
     '("const-char*" "data")
-    '("size_t" "length")
+    '("glong" "length")
   )
 )
 
@@ -78,6 +84,18 @@
   (return-type "none")
 )
 
+(define-method copy_primary
+  (of-object "VteTerminal")
+  (c-name "vte_terminal_copy_primary")
+  (return-type "none")
+)
+
+(define-method paste_primary
+  (of-object "VteTerminal")
+  (c-name "vte_terminal_paste_primary")
+  (return-type "none")
+)
+
 (define-method set_size
   (of-object "VteTerminal")
   (c-name "vte_terminal_set_size")
@@ -97,6 +115,27 @@
   )
 )
 
+(define-method get_audible_bell
+  (of-object "VteTerminal")
+  (c-name "vte_terminal_get_audible_bell")
+  (return-type "gboolean")
+)
+
+(define-method set_visible_bell
+  (of-object "VteTerminal")
+  (c-name "vte_terminal_set_visible_bell")
+  (return-type "none")
+  (parameters
+    '("gboolean" "is_visible")
+  )
+)
+
+(define-method get_visible_bell
+  (of-object "VteTerminal")
+  (c-name "vte_terminal_get_visible_bell")
+  (return-type "gboolean")
+)
+
 (define-method set_scroll_on_output
   (of-object "VteTerminal")
   (c-name "vte_terminal_set_scroll_on_output")
@@ -150,7 +189,7 @@
     '("const-GdkColor*" "foreground")
     '("const-GdkColor*" "background")
     '("const-GdkColor*" "palette")
-    '("size_t" "palette_size")
+    '("glong" "palette_size")
   )
 )
 
@@ -328,6 +367,18 @@
   )
 )
 
+(define-method get_text_range
+  (of-object "VteTerminal")
+  (c-name "vte_terminal_get_text_range")
+  (return-type "char*")
+  (parameters
+    '("glong" "start_row")
+    '("glong" "start_col")
+    '("glong" "end_row")
+    '("glong" "end_col")
+  )
+)
+
 (define-method get_cursor_position
   (of-object "VteTerminal")
   (c-name "vte_terminal_get_cursor_position")
@@ -394,4 +445,20 @@
   (return-type "const-char*")
 )
 
+(define-method get_status_line
+  (of-object "VteTerminal")
+  (c-name "vte_terminal_get_status_line")
+  (return-type "const-char*")
+)
+
+(define-method get_padding
+  (of-object "VteTerminal")
+  (c-name "vte_terminal_get_padding")
+  (return-type "none")
+  (parameters
+    '("int*" "xpad")
+    '("int*" "ypad")
+  )
+)
+
 
diff --git a/python/vte.override b/python/vte.override
index e0be7931..76d3169a 100644
--- a/python/vte.override
+++ b/python/vte.override
@@ -11,6 +11,7 @@ import gtk.MenuShell as PyGtkMenuShell_Type
 import gtk.Widget as PyGtkWidget_Type
 %%
 ignore vte_terminal_get_text
+ignore vte_terminal_get_text_range
 %%
 override vte_terminal_fork_command kwargs
 static PyObject *
diff --git a/src/vte.c b/src/vte.c
index 7205dce6..8e326372 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -5361,7 +5361,7 @@ vte_terminal_set_colors(VteTerminal *terminal,
 			const GdkColor *foreground,
 			const GdkColor *background,
 			const GdkColor *palette,
-			gssize palette_size)
+			glong palette_size)
 {
 	int i;
 	GdkColor color;
@@ -6311,7 +6311,7 @@ vte_terminal_io_read(GIOChannel *channel,
 
 /* Render some UTF-8 text. */
 void
-vte_terminal_feed(VteTerminal *terminal, const char *data, gssize length)
+vte_terminal_feed(VteTerminal *terminal, const char *data, glong length)
 {
 	char *buf;
 	gboolean empty;
@@ -6465,7 +6465,7 @@ vte_terminal_send(VteTerminal *terminal, const char *encoding,
 
 /* Send a chunk of UTF-8 text to the child. */
 void
-vte_terminal_feed_child(VteTerminal *terminal, const char *text, gssize length)
+vte_terminal_feed_child(VteTerminal *terminal, const char *text, glong length)
 {
 	g_return_if_fail(VTE_IS_TERMINAL(terminal));
 	if (length == ((gssize)-1)) {
@@ -6782,6 +6782,11 @@ vte_terminal_key_press(GtkWidget *widget, GdkEventKey *event)
 	if (!steal) {
 		if (gtk_im_context_filter_keypress(terminal->pvt->im_context,
 						   event)) {
+#ifdef VTE_DEBUG
+			if (vte_debug_on(VTE_DEBUG_EVENTS)) {
+				fprintf(stderr, "Keypress taken by IM.\n");
+			}
+#endif
 			return TRUE;
 		}
 	}
@@ -12389,6 +12394,27 @@ vte_terminal_class_init(VteTerminalClass *klass, gconstpointer data)
 }
 
 GtkType
+vte_terminal_erase_binding_get_type(void)
+{
+	static GtkType terminal_erase_binding_type = 0;
+	static GEnumValue values[] = {
+		{VTE_ERASE_AUTO, "VTE_ERASE_AUTO", "auto"},
+		{VTE_ERASE_ASCII_BACKSPACE, "VTE_ERASE_ASCII_BACKSPACE",
+		 "ascii-backspace"},
+		{VTE_ERASE_ASCII_DELETE, "VTE_ERASE_ASCII_DELETE",
+		 "ascii-delete"},
+		{VTE_ERASE_DELETE_SEQUENCE, "VTE_ERASE_DELETE_SEQUENCE",
+		 "delete-sequence"},
+	};
+	if (terminal_erase_binding_type == 0) {
+		terminal_erase_binding_type =
+			g_enum_register_static("VteTerminalEraseBinding",
+					       values);
+	}
+	return terminal_erase_binding_type;
+}
+
+GtkType
 vte_terminal_get_type(void)
 {
 	static GtkType terminal_type = 0;
diff --git a/src/vte.h b/src/vte.h
index 4ef0e667..f1511a5d 100644
--- a/src/vte.h
+++ b/src/vte.h
@@ -105,6 +105,7 @@ struct vte_char_attributes {
 
 /* The widget's type. */
 GtkType vte_terminal_get_type(void);
+GtkType vte_terminal_erase_binding_get_type(void);
 
 #define VTE_TYPE_TERMINAL		(vte_terminal_get_type())
 #define VTE_TERMINAL(obj)		(GTK_CHECK_CAST((obj),\
@@ -119,6 +120,10 @@ GtkType vte_terminal_get_type(void);
 							     VTE_TYPE_TERMINAL)
 #define VTE_TERMINAL_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_TERMINAL, VteTerminalClass))
 
+#define VTE_TYPE_TERMINAL_ERASE_BINDING	(vte_terminal_erase_binding_get_type())
+#define VTE_IS_TERMINAL_ERASE_BINDING(obj)	GTK_CHECK_TYPE((obj),\
+						VTE_TYPE_TERMINAL_ERASE_BINDING)
+
 /* You can get by with just these two functions. */
 GtkWidget *vte_terminal_new(void);
 pid_t vte_terminal_fork_command(VteTerminal *terminal,
@@ -126,9 +131,9 @@ pid_t vte_terminal_fork_command(VteTerminal *terminal,
 
 /* Send data to the terminal to display, or to the terminal's forked command
  * to handle in some way.  If it's 'cat', they should be the same. */
-void vte_terminal_feed(VteTerminal *terminal, const char *data, gssize length);
+void vte_terminal_feed(VteTerminal *terminal, const char *data, glong length);
 void vte_terminal_feed_child(VteTerminal *terminal,
-			     const char *data, gssize length);
+			     const char *data, glong length);
 
 /* Copy currently-selected text to the clipboard, or from the clipboard to
  * the terminal. */
@@ -153,14 +158,14 @@ void vte_terminal_set_scroll_on_keystroke(VteTerminal *terminal,
 void vte_terminal_set_color_bold(VteTerminal *terminal,
 				 const GdkColor *bold);
 void vte_terminal_set_color_foreground(VteTerminal *terminal,
-				       const GdkColor *fore);
+				       const GdkColor *foreground);
 void vte_terminal_set_color_background(VteTerminal *terminal,
-				       const GdkColor *back);
+				       const GdkColor *background);
 void vte_terminal_set_colors(VteTerminal *terminal,
 			     const GdkColor *foreground,
 			     const GdkColor *background,
 			     const GdkColor *palette,
-			     gssize palette_size);
+			     glong palette_size);
 void vte_terminal_set_default_colors(VteTerminal *terminal);
 
 /* Background effects. */