[Xfce4-commits] r30208 - in terminal/trunk: . terminal

[Nick Schermer]

Author: nick
Date: 2009-07-06 18:49:43 +0000 (Mon, 06 Jul 2009)
New Revision: 30208

Modified:
   terminal/trunk/Terminal.glade
   terminal/trunk/terminal/terminal-preferences.h
   terminal/trunk/terminal/terminal-screen.c
Log:
Add the erase TTY binding (since VTE 0.20.4) (bug #2925).

On older versions of vte we will fallback to the
ASCII_BACKSPACE binding, like VTE does internally.


Modified: terminal/trunk/Terminal.glade
===================================================================
--- terminal/trunk/Terminal.glade	2009-07-06 18:32:36 UTC (rev 30207)
+++ terminal/trunk/Terminal.glade	2009-07-06 18:49:43 UTC (rev 30208)
@@ -75,6 +75,9 @@
       <row>
         <col id="0" translatable="yes">Control-H</col>
       </row>
+      <row>
+        <col id="0" translatable="yes">Erase TTY</col>
+      </row>
     </data>
   </object>
   <object class="GtkListStore" id="liststore5">
@@ -95,6 +98,9 @@
       <row>
         <col id="0" translatable="yes">Control-H</col>
       </row>
+      <row>
+        <col id="0" translatable="yes">Erase TTY</col>
+      </row>
     </data>
   </object>
   <object class="XfceTitledDialog" id="dialog">

Modified: terminal/trunk/terminal/terminal-preferences.h
===================================================================
--- terminal/trunk/terminal/terminal-preferences.h	2009-07-06 18:32:36 UTC (rev 30207)
+++ terminal/trunk/terminal/terminal-preferences.h	2009-07-06 18:49:43 UTC (rev 30208)
@@ -71,7 +71,8 @@
   TERMINAL_ERASE_BINDING_AUTO,
   TERMINAL_ERASE_BINDING_ASCII_DELETE,
   TERMINAL_ERASE_BINDING_DELETE_SEQUENCE,
-  TERMINAL_ERASE_BINDING_ASCII_BACKSPACE
+  TERMINAL_ERASE_BINDING_ASCII_BACKSPACE,
+  TERMINAL_ERASE_BINDING_ERASE_TTY
 } TerminalEraseBinding;
 
 typedef enum /*< enum,prefix=TERMINAL_CURSOR_SHAPE >*/

Modified: terminal/trunk/terminal/terminal-screen.c
===================================================================
--- terminal/trunk/terminal/terminal-screen.c	2009-07-06 18:32:36 UTC (rev 30207)
+++ terminal/trunk/terminal/terminal-screen.c	2009-07-06 18:49:43 UTC (rev 30208)
@@ -577,6 +577,13 @@
     case TERMINAL_ERASE_BINDING_DELETE_SEQUENCE:
       return VTE_ERASE_DELETE_SEQUENCE;
 
+    case TERMINAL_ERASE_BINDING_ERASE_TTY:
+#if VTE_CHECK_VERSION (0, 20, 4)
+      return VTE_ERASE_TTY;
+#else
+      return VTE_ERASE_ASCII_BACKSPACE;
+#endif
+
     default:
       terminal_assert_not_reached ();
     }