fixed backspace problem, updated terminfo entry and moved TNAME in config.h.

diff --git a/Makefile b/Makefile
index 14da7a5..9ec8d21 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,6 @@ install: all
        @cp -f st ${DESTDIR}${PREFIX}/bin
        @chmod 755 ${DESTDIR}${PREFIX}/bin/st
        @tic st.info
        @cp -f st ${DESTDIR}${PREFIX}/bin
        @chmod 755 ${DESTDIR}${PREFIX}/bin/st
        @tic st.info

-       @tic st-256color.info

 
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin
 
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin

diff --git a/config.h b/config.h
index aee8057..c3c4e41 100644 (file)
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
 #define TAB    8
 #define TAB    8

-
+#define TNAME "st-256color"

 #define FONT "6x13"
 #define BOLDFONT FONT"bold"
 #define BORDER 2
 #define FONT "6x13"
 #define BOLDFONT FONT"bold"
 #define BORDER 2


@@ -33,6 +33,7 @@ static const char *colorname[] = {
 
 /* special keys */
 static Key key[] = {
 
 /* special keys */
 static Key key[] = {

+       { XK_BackSpace, "\177" },

        { XK_Delete, "\033[3~" },
        { XK_Home,   "\033[1~" },
        { XK_End,    "\033[4~" },
        { XK_Delete, "\033[3~" },
        { XK_Home,   "\033[1~" },
        { XK_End,    "\033[4~" },

diff --git a/st.c b/st.c
index deddb0d..f8d2257 100644 (file)
--- a/st.c
+++ b/st.c
@@ -20,8 +20,6 @@
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 

-#define TNAME "st-256color"
-

 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
 #define ESC_BUF_SIZ   256
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
 #define ESC_BUF_SIZ   256


@@ -107,8 +105,6 @@ typedef struct {
        char s[ESC_BUF_SIZ];
 } Key;
 
        char s[ESC_BUF_SIZ];
 } Key;
 

-#include "config.h"
-

 /* Drawing Context */
 typedef struct {
        unsigned long col[256];
 /* Drawing Context */
 typedef struct {
        unsigned long col[256];


@@ -117,6 +113,8 @@ typedef struct {
        GC gc;
 } DC;
 
        GC gc;
 } DC;
 

+#include "config.h"
+

 static void die(const char *errstr, ...);
 static void draw(int);
 static void execsh(void);
 static void die(const char *errstr, ...);
 static void draw(int);
 static void execsh(void);

diff --git a/st.info b/st.info
index 1cf6344..b2669dd 100644 (file)
--- a/st.info
+++ b/st.info
@@ -30,7 +30,7 @@ st| simpleterm,
        il1=\E[L,
        ind=^J,
        invis=\E[8m,
        il1=\E[L,
        ind=^J,
        invis=\E[8m,

-       kbs=^H,
+       kbs=\177,

        kcub1=\E[D,
        kcud1=\E[B,
        kcuf1=\E[C,
        kcub1=\E[D,
        kcud1=\E[B,
        kcuf1=\E[C,


@@ -52,3 +52,10 @@ st| simpleterm,
        smso=\E[7m,
        smul=\E[4m,
        tbc=\E[2g,
        smso=\E[7m,
        smul=\E[4m,
        tbc=\E[2g,

+
+st-256color| simpleterm with 256 colors,
+       colors#256,
+#      Nicked from xterm-256color
+       setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
+       setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
+       use=st,