[libvtemm] Changes due to vte 0.20.5.



commit 5af0c9db3142d7de23511f76339622adf54ab5ee
Author: Krzesimir Nowak <krnowak svn gnome org>
Date:   Mon Jun 15 22:18:30 2009 +0200

    Changes due to vte 0.20.5.
    
    * configure.ac: Bumped vte dependency from 0.20.0 to 0.20.5.
    * src/libvtemm/g/libvte_enums.defs:
    * src/libvtemm/g/libvte_methods.defs:
    * src/libvtemm/g/libvte_signals.defs: Regenerated. vte 0.20.5
    fixes some defs issues.
    * src/libvtemm/g/terminal.hg: Minor changes in commit signal.

 configure.ac                       |    2 +-
 src/libvtemm/g/libvte_enums.defs   |   13 ++-----------
 src/libvtemm/g/libvte_methods.defs |   16 +++++++---------
 src/libvtemm/g/libvte_signals.defs |   16 ++++++++--------
 src/libvtemm/g/terminal.hg         |   10 +++++-----
 5 files changed, 23 insertions(+), 34 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0bd7443..ff28e4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,7 @@ AC_CHECK_PROGS(PERL, perl5 perl)
 #########################################################################
 #  Dependency checks
 #########################################################################
-PKG_CHECK_MODULES(LIBVTEMM, glibmm-2.4 >= 2.18.0 gtkmm-2.4 >= 2.14.0 vte >= 0.20.0)
+PKG_CHECK_MODULES(LIBVTEMM, glibmm-2.4 >= 2.18.0 gtkmm-2.4 >= 2.14.0 vte >= 0.20.5)
 AC_SUBST([LIBVTEMM_CFLAGS])
 AC_SUBST([LIBVTEMM_LIBS])
 
diff --git a/src/libvtemm/g/libvte_enums.defs b/src/libvtemm/g/libvte_enums.defs
index e1f9c5a..68c0a9d 100644
--- a/src/libvtemm/g/libvte_enums.defs
+++ b/src/libvtemm/g/libvte_enums.defs
@@ -1,4 +1,4 @@
-;; From vte-0.19.4/src/vte.h
+;; From /home/kudi/testenvironment/usr/include/vte/vte.h
 
 (define-enum-extended TerminalEraseBinding
   (in-module "Vte")
@@ -8,16 +8,7 @@
     '("ascii-backspace" "VTE_ERASE_ASCII_BACKSPACE" "1")
     '("ascii-delete" "VTE_ERASE_ASCII_DELETE" "2")
     '("delete-sequence" "VTE_ERASE_DELETE_SEQUENCE" "3")
-  )
-)
-
-(define-enum-extended TerminalAntiAlias
-  (in-module "Vte")
-  (c-name "VteTerminalAntiAlias")
-  (values
-    '("use-default" "VTE_ANTI_ALIAS_USE_DEFAULT" "0")
-    '("force-enable" "VTE_ANTI_ALIAS_FORCE_ENABLE" "1")
-    '("force-disable" "VTE_ANTI_ALIAS_FORCE_DISABLE" "2")
+    '("tty" "VTE_ERASE_TTY" "4")
   )
 )
 
diff --git a/src/libvtemm/g/libvte_methods.defs b/src/libvtemm/g/libvte_methods.defs
index 7d8ddd2..bfa5e99 100644
--- a/src/libvtemm/g/libvte_methods.defs
+++ b/src/libvtemm/g/libvte_methods.defs
@@ -39,6 +39,7 @@
     '("ascii-backspace" "VTE_ERASE_ASCII_BACKSPACE")
     '("ascii-delete" "VTE_ERASE_ASCII_DELETE")
     '("delete-sequence" "VTE_ERASE_DELETE_SEQUENCE")
+    '("tty" "VTE_ERASE_TTY")
   )
 )
 
@@ -587,31 +588,28 @@
   )
 )
 
-; h2def chokes on pointers to functions - corrected manually.
 (define-method get_text
   (of-object "VteTerminal")
   (c-name "vte_terminal_get_text")
   (return-type "char*")
   (parameters
-;    '("gboolean(*)(VteTerminal*, glong, glong, gpointer)" "is_selected")
-    '("gpointer*" "data")
+    '("VteSelectionFunc" "is_selected")
+    '("gpointer" "data")
     '("GArray*" "attributes")
   )
 )
 
-; h2def chokes on pointers to functions - corrected manually.
 (define-method get_text_include_trailing_spaces
   (of-object "VteTerminal")
   (c-name "vte_terminal_get_text_include_trailing_spaces")
   (return-type "char*")
   (parameters
-;    '("gboolean(*)(VteTerminal*, glong, glong, gpointer)" "is_selected")
-    '("gpointer*" "data")
+    '("VteSelectionFunc" "is_selected")
+    '("gpointer" "data")
     '("GArray*" "attributes")
   )
 )
 
-; h2def chokes on pointers to functions - corrected manually.
 (define-method get_text_range
   (of-object "VteTerminal")
   (c-name "vte_terminal_get_text_range")
@@ -621,8 +619,8 @@
     '("glong" "start_col")
     '("glong" "end_row")
     '("glong" "end_col")
-;    '("gboolean(*)(VteTerminal*, glong, glong, gpointer)" "is_selected")
-    '("gpointer*" "data")
+    '("VteSelectionFunc" "is_selected")
+    '("gpointer" "data")
     '("GArray*" "attributes")
   )
 )
diff --git a/src/libvtemm/g/libvte_signals.defs b/src/libvtemm/g/libvte_signals.defs
index a9651a2..6dfed49 100644
--- a/src/libvtemm/g/libvte_signals.defs
+++ b/src/libvtemm/g/libvte_signals.defs
@@ -1,25 +1,25 @@
 ;; From VteTerminal
 
-(define-signal selection-changed
+(define-signal set-scroll-adjustments
   (of-object "VteTerminal")
   (return-type "void")
   (when "last")
+  (parameters
+    '("GtkAdjustment*" "p0")
+    '("GtkAdjustment*" "p1")
+  )
 )
 
-(define-signal child-exited
+(define-signal selection-changed
   (of-object "VteTerminal")
   (return-type "void")
   (when "last")
 )
 
-(define-signal set-scroll-adjustments
+(define-signal child-exited
   (of-object "VteTerminal")
   (return-type "void")
   (when "last")
-  (parameters
-    '("GtkAdjustment*" "p0")
-    '("GtkAdjustment*" "p1")
-  )
 )
 
 (define-signal eof
@@ -51,7 +51,7 @@
   (return-type "void")
   (when "last")
   (parameters
-    '("gchar*" "p0")
+    '("const-gchar*" "p0")
     '("guint" "p1")
   )
 )
diff --git a/src/libvtemm/g/terminal.hg b/src/libvtemm/g/terminal.hg
index 2c948c7..2efd384 100644
--- a/src/libvtemm/g/terminal.hg
+++ b/src/libvtemm/g/terminal.hg
@@ -261,10 +261,10 @@ public:
 #m4begin
 dnl // WRAP_SIGNAL "commit"
 dnl // C++ prototype: void commit(const Glib::ustring& text)
-dnl // C prototype: void commit(gchar* text, guint size)
+dnl // C prototype: void commit(const gchar* text, guint size)
 
   _SIGNAL_PROXY(
-      commit, void, `gchar* text, guint size',
+      commit, void, `const gchar* text, guint size',
       commit, void, `const Glib::ustring&',dnl // C++ prototype
       `Glib::ustring(text, text + size)',`dnl // C -> C++ conversion
       /**
@@ -273,16 +273,16 @@ dnl // C prototype: void commit(gchar* text, guint size)
        */')
 
   _SIGNAL_H(commit, void, `const Glib::ustring& text')
-  _SIGNAL_PH(commit, void, `VteTerminal* self, gchar* text, guint size')
+  _SIGNAL_PH(commit, void, `VteTerminal* self, const gchar* text, guint size')
 
   _SIGNAL_CC(
       commit, commit, void, void,
       `const Glib::ustring& text',dnl // C++ arguments
-      `const_cast<gchar*>(text.data()), text.bytes()')dnl // C++ -> C conversion
+      `text.data(), text.bytes()')dnl // C++ -> C conversion
 
   _SIGNAL_PCC(
       commit, commit, void, void,
-      `VteTerminal* self, gchar* text, guint size',dnl // C arguments
+      `VteTerminal* self, const gchar* text, guint size',dnl // C arguments
       `self, text, size',dnl // C argument names
       `Glib::ustring(text, text + size)',dnl // C -> C++ conversion
       self)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]