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

master
Aurélien Aptel 2010-08-19 12:46:54 +02:00
parent d2f157c741
commit ce3f4fc647
4 changed files with 12 additions and 7 deletions

View File

@ -42,7 +42,6 @@ install: all
@cp -f st ${DESTDIR}${PREFIX}/bin @cp -f st ${DESTDIR}${PREFIX}/bin
@chmod 755 ${DESTDIR}${PREFIX}/bin/st @chmod 755 ${DESTDIR}${PREFIX}/bin/st
@tic st.info @tic st.info
@tic st-256color.info
uninstall: uninstall:
@echo removing executable file from ${DESTDIR}${PREFIX}/bin @echo removing executable file from ${DESTDIR}${PREFIX}/bin

View File

@ -1,5 +1,5 @@
#define TAB 8 #define TAB 8
#define TNAME "st-256color"
#define FONT "6x13" #define FONT "6x13"
#define BOLDFONT FONT"bold" #define BOLDFONT FONT"bold"
#define BORDER 2 #define BORDER 2
@ -33,6 +33,7 @@ static const char *colorname[] = {
/* special keys */ /* special keys */
static Key key[] = { static Key key[] = {
{ XK_BackSpace, "\177" },
{ XK_Delete, "\033[3~" }, { XK_Delete, "\033[3~" },
{ XK_Home, "\033[1~" }, { XK_Home, "\033[1~" },
{ XK_End, "\033[4~" }, { XK_End, "\033[4~" },

6
st.c
View File

@ -20,8 +20,6 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#define TNAME "st-256color"
/* Arbitrary sizes */ /* Arbitrary sizes */
#define ESC_TITLE_SIZ 256 #define ESC_TITLE_SIZ 256
#define ESC_BUF_SIZ 256 #define ESC_BUF_SIZ 256
@ -107,8 +105,6 @@ typedef struct {
char s[ESC_BUF_SIZ]; char s[ESC_BUF_SIZ];
} Key; } Key;
#include "config.h"
/* Drawing Context */ /* Drawing Context */
typedef struct { typedef struct {
unsigned long col[256]; unsigned long col[256];
@ -117,6 +113,8 @@ typedef struct {
GC gc; GC gc;
} DC; } DC;
#include "config.h"
static void die(const char *errstr, ...); static void die(const char *errstr, ...);
static void draw(int); static void draw(int);
static void execsh(void); static void execsh(void);

View File

@ -30,7 +30,7 @@ st| simpleterm,
il1=\E[L, il1=\E[L,
ind=^J, ind=^J,
invis=\E[8m, invis=\E[8m,
kbs=^H, kbs=\177,
kcub1=\E[D, kcub1=\E[D,
kcud1=\E[B, kcud1=\E[B,
kcuf1=\E[C, kcuf1=\E[C,
@ -52,3 +52,10 @@ st| simpleterm,
smso=\E[7m, smso=\E[7m,
smul=\E[4m, smul=\E[4m,
tbc=\E[2g, 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,