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

better eterm patch



This stops Eterm from randomly assigning keybindings for status.
It also uses ^? instead of ^H for backspace.

Index: patches/patch-src_command.c
===================================================================
RCS file: /cvs/ports/x11/eterm/patches/patch-src_command.c,v
retrieving revision 1.4
diff -u -r1.4 patch-src_command.c
--- patches/patch-src_command.c	7 Mar 2002 20:00:19 -0000	1.4
+++ patches/patch-src_command.c	25 Apr 2004 01:15:15 -0000
@@ -1,6 +1,28 @@
---- src/command.c.orig	Tue Nov  2 17:34:35 1999
-+++ src/command.c	Thu Mar  7 20:46:30 2002
-@@ -676,6 +676,8 @@ privileges(int mode)
+--- src/command.c.orig	1999-11-02 08:34:13.000000000 -0800
++++ src/command.c	2004-04-23 18:40:51.000000000 -0700
+@@ -248,11 +248,7 @@ ioctl (fd, TIOCLSET, &(tt->local));\
+ # define CQUIT		'\034'	/* ^\ */
+ #endif
+ #ifndef CERASE
+-# ifdef linux
+ #  define CERASE	'\177'	/* ^? */
+-# else
+-#  define CERASE	'\010'	/* ^H */
+-# endif
+ #endif
+ #ifndef CKILL
+ # define CKILL		'\025'	/* ^U */
+@@ -284,6 +280,9 @@ ioctl (fd, TIOCLSET, &(tt->local));\
+ #ifndef CLNEXT
+ # define CLNEXT		'\026'	/* ^V */
+ #endif
++#ifndef STATUS
++# define STATUS		'\024'	/* ^T */
++#endif
+ 
+ #ifndef VDISCRD
+ # ifdef VDISCARD
+@@ -676,6 +675,8 @@ privileges(int mode)
  
  #ifdef HAVE_SETRESGID
        setresgid(my_rgid, my_rgid, my_egid);
@@ -9,7 +31,7 @@
  #elif defined(HAVE_SAVED_UIDS)
        setregid(my_rgid, my_rgid);
  #else
-@@ -685,6 +687,8 @@ privileges(int mode)
+@@ -685,6 +686,8 @@ privileges(int mode)
  
  #ifdef HAVE_SETRESUID
        setresuid(my_ruid, my_ruid, my_euid);
@@ -18,7 +40,7 @@
  #elif defined(HAVE_SAVED_UIDS)
        setreuid(my_ruid, my_ruid);
  #else
-@@ -705,6 +709,8 @@ privileges(int mode)
+@@ -705,6 +708,8 @@ privileges(int mode)
  
  #ifdef HAVE_SETRESUID
        setresuid(my_ruid, my_euid, my_euid);
@@ -27,7 +49,7 @@
  #elif defined(HAVE_SAVED_UIDS)
        setreuid(my_ruid, my_euid);
  #else
-@@ -714,6 +720,8 @@ privileges(int mode)
+@@ -714,6 +719,8 @@ privileges(int mode)
  
  #ifdef HAVE_SETRESGID
        setresgid(my_rgid, my_egid, my_egid);
@@ -36,7 +58,17 @@
  #elif defined(HAVE_SAVED_UIDS)
        setregid(my_rgid, my_egid);
  #else
-@@ -2298,8 +2306,16 @@ run_command(char *argv[])
+@@ -2057,6 +2064,9 @@ get_ttymode(ttymode_t * tio)
+ # ifdef VLNEXT
+     tio->c_cc[VLNEXT] = CLNEXT;
+ # endif
++# ifdef VSTATUS
++    tio->c_cc[VSTATUS] = STATUS;
++# endif
+   }
+   tio->c_cc[VEOF] = CEOF;
+   tio->c_cc[VEOL] = VDISABLE;
+@@ -2298,8 +2308,16 @@ run_command(char *argv[])
         because the exec*() calls reset the saved uid/gid to the
         effective uid/gid                               -- mej */
  # ifndef __CYGWIN32__
Index: patches/patch-src_feature.h.in
===================================================================
RCS file: /cvs/ports/x11/eterm/patches/patch-src_feature.h.in,v
retrieving revision 1.2
diff -u -r1.2 patch-src_feature.h.in
--- patches/patch-src_feature.h.in	12 Aug 2000 08:31:48 -0000	1.2
+++ patches/patch-src_feature.h.in	25 Apr 2004 01:15:15 -0000
@@ -1,5 +1,14 @@
---- src/feature.h.in.orig	Wed Aug 18 16:54:24 1999
-+++ src/feature.h.in		Thu Aug 10 20:56:03 2000
+--- src/feature.h.in.orig	1999-08-18 16:54:02.000000000 -0700
++++ src/feature.h.in	2004-04-23 19:02:54.000000000 -0700
+@@ -219,7 +219,7 @@
+ #endif
+ 
+ /* Force the Backspace key to send ^H instead of checking the stty setting */
+-#define FORCE_BACKSPACE
++/* #define FORCE_BACKSPACE */
+ /* Force Backspace to send ^? */
+ /* #define FORCE_DELETE */
+ 
 @@ -380,7 +380,7 @@
   * may seem to be owned by root.  But if you define this and don't have them,
   * the utmp and tty stuff could break.  Do some testing.  DO NOT get this one



Visit your host, monkey.org