0.3 release.

Make it possible to use the corefont font description too. It is not very
useful, but easy to implement.
2012-11-02 20:08:27 +01:00 · 2012-11-02 20:07:11 +01:00 · 2012-11-02 19:56:02 +01:00 · 2012-10-31 20:36:32 +01:00 · 2012-10-31 20:35:07 +01:00 · 2012-10-28 14:13:39 +01:00
12 changed files with 1893 additions and 756 deletions
--- a/.hgtags
+++ b/.hgtags
@ -0,0 +1,4 @@
+cbc18c988236c63a58ed24031805e8d36a3ad01a 0.1
+f245ac2efd8ac2f1ac6bffae876c2663e794f79d 0.1.1
+3c2f9f2ab5e433db1401047760ec31d66939b74b 0.2
+108926a0fe610b92c0296148721c3225932f39aa 0.2.1
--- a/8
+++ b/8
@ -0,0 +1,8 @@
+--
+Why does st not handle utmp entries?
+
+Use the excellent tool of utmp[0] for this task.
+
+[0] http://hg.suckless.org/utmp/
+--
+
--- a/17
+++ b/17
@ -0,0 +1,17 @@
+A STATEMENT ON LEGACY SUPPORT
+
+In the terminal world there is much cruft that comes from old and unsup‐
+ported terminals that inherit incompatible modes  and  escape  sequences
+which noone is able to know, except when he/she comes from that time and
+developed a graphical vt100 emulator at that time.
+
+One  goal  of  st is to only support what is really needed. When you en‐
+counter a sequence which you really need, implement it.  But  while  you
+are  at it,  do not add the other cruft you might encounter while sneek‐
+ing at other terminal emulators. History has bloated them and  there  is
+no real evidence that most of the sequences are used today.
+
+
+Christoph Lohmann <20h@r-36.net>
+2012-09-13T07:00:36.081271045+02:00
+
--- a/4
+++ b/4
@ -1,4 +1,6 @@
-Copyright (c) 2009, Aurélien APTEL <aurelien dot aptel at gmail dot com>
+Copyright (c) 2009-2012, Aurélien APTEL <aurelien dot aptel at gmail dot com>
+Copyright (c) 2012, Roberto E. Vargas Caballero <k0ga at shike2 dot com>
+Copyright (c) 2012, Christoph Lohmann <20h at r-36 dot net>
 Copyright (c) 2009, Anselm R Garbe <garbeam at gmail dot com>

 Redistribution and use in source and binary forms, with or without
--- a/2
+++ b/2
@ -48,6 +48,8 @@ install: all
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
 	@sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
+	@echo If things do not seem to work, be sure that there is no \
+		floating st terminfo in the .terminfo directory in your home dir.
 	@tic -s st.info

 uninstall:
--- a/9
+++ b/9
@ -21,7 +21,14 @@ necessary as root):

 Running st
 ----------
-See the man page for details.
+If you don't install st, define TNAME to "xterm" in config.h or make sure to at
+least compile st terminfo entry with the following command:
+
+    tic -s st.info
+
+It should print the path of the compiled terminfo entry. You can
+safely remove it if you don't plan to use st anymore.
+See the man page for additional details.

 Credits
 -------
--- a/34
+++ b/34
@ -1,15 +1,33 @@
 vt emulation
 ------------

-* screen erased with background color ## capname:bce
-* back tab                            ## capname:cbt ## seq:CSI Z
-* ...
+* implement BCE right
+* color definition in CSI
+	* implement CSI parsing
+* make the keypad keys really work
+	* kf0 .. kf44
+	* kend, kel, kent, kfnd, ked, kext
+	* kNXT, kPRV
+	* ka1, ka3, kb2
+* add arrow keys handling

 code & interface
 ----------------

-* clean selection code
-* use the real x11 clipboard
-* clean terminfo entry
-* utf8
-* ...
+* clean and complete terminfo entry
+* add fallback fonts for the restricted xft code
+
+bugs
+----
+
+* handle XOpenMI() errors
+* fix shift up/down (shift selection in emacs)
+* fix selection paste for xatom STRING
+* fix umlaut handling in settitle
+* fix rows and column definition in fixed geometry
+
+misc
+----
+
+    $ grep -nE 'XXX|TODO' st.c
+
--- a/config.def.h
+++ b/config.def.h
@ -1,12 +1,23 @@
-#define TAB 8
-#define TNAME "st-256color"
-#define FONT "-*-*-medium-r-*-*-*-120-75-75-*-60-*-*"
-#define BOLDFONT "-*-*-bold-r-*-*-*-120-75-75-*-60-*-*"
-#define BORDER 2
-#define SHELL "/bin/sh"
+/* See LICENSE file for copyright and license details. */

-/* Terminal colors */
+/* appearance */
+static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static unsigned int borderpx = 2;
+static char shell[] = "/bin/sh";
+
+/* double-click timeout (in milliseconds) between clicks for selection */
+static unsigned int doubleclicktimeout = 300;
+static unsigned int tripleclicktimeout = 600;
+
+/* TERM value */
+static char termname[] = "st-256color";
+
+static unsigned int tabspaces = 8;
+
+
+/* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
+	/* 8 normal colors */
 	"black",
 	"red3",
 	"green3",
@ -15,6 +26,8 @@ static const char *colorname[] = {
 	"magenta3",
 	"cyan3",
 	"gray90",
+
+	/* 8 bright colors */
 	"gray50",
 	"red",
 	"green",
@ -22,42 +35,63 @@ static const char *colorname[] = {
 	"#5c5cff",
 	"magenta",
 	"cyan",
-	"white"
-};
+	"white",

-/* Default colors (colorname index) */
-/* foreground, background, cursor */
-#define DefaultFG 7
-#define DefaultBG 0
-#define DefaultCS 1
-
-/* Special keys */
-static Key key[] = {
-	{ XK_BackSpace, "\177" },
-	{ XK_Insert,    "\033[2~" },
-	{ XK_Delete,    "\033[3~" },
-	{ XK_Home,      "\033[1~" },
-	{ XK_End,       "\033[4~" },
-	{ XK_Prior,     "\033[5~" },
-	{ XK_Next,      "\033[6~" },
-	{ XK_F1,        "\033OP"   },
-	{ XK_F2,        "\033OQ"   },
-	{ XK_F3,        "\033OR"   },
-	{ XK_F4,        "\033OS"   },
-	{ XK_F5,        "\033[15~" },
-	{ XK_F6,        "\033[17~" },
-	{ XK_F7,        "\033[18~" },
-	{ XK_F8,        "\033[19~" },
-	{ XK_F9,        "\033[20~" },
-	{ XK_F10,       "\033[21~" },
-	{ XK_F11,       "\033[23~" },
-	{ XK_F12,       "\033[24~" },
-};
-
-/* Line drawing characters (sometime specific to each font...) */
-static char gfx[] = {
-	['f'] = 'o',
-	['g'] = '+',
-	['i'] = '#',
 	[255] = 0,
+
+	/* more colors can be added after 255 to use with DefaultXX */
+	"#cccccc",
+	"#333333",
 };
+
+
+/*
+ * Default colors (colorname index)
+ * foreground, background, cursor, unfocused cursor
+ */
+static unsigned int defaultfg = 7;
+static unsigned int defaultbg = 0;
+static unsigned int defaultcs = 256;
+static unsigned int defaultucs = 257;
+
+/*
+ * Special keys (change & recompile st.info accordingly)
+ * Keep in mind that kpress() in st.c hardcodes some keys.
+ *
+ * Mask value:
+ * * Use XK_ANY_MOD to match the key no matter modifiers state
+ * * Use XK_NO_MOD to match the key alone (no modifiers)
+ */
+
+/* key, mask, output */
+static Key key[] = {
+	{ XK_BackSpace, XK_NO_MOD, "\177" },
+	{ XK_Insert,    XK_NO_MOD, "\033[2~" },
+	{ XK_Delete,    XK_NO_MOD, "\033[3~" },
+	{ XK_Home,      XK_NO_MOD, "\033[1~" },
+	{ XK_End,       XK_NO_MOD, "\033[4~" },
+	{ XK_Prior,     XK_NO_MOD, "\033[5~" },
+	{ XK_Next,      XK_NO_MOD, "\033[6~" },
+	{ XK_F1,        XK_NO_MOD, "\033OP"   },
+	{ XK_F2,        XK_NO_MOD, "\033OQ"   },
+	{ XK_F3,        XK_NO_MOD, "\033OR"   },
+	{ XK_F4,        XK_NO_MOD, "\033OS"   },
+	{ XK_F5,        XK_NO_MOD, "\033[15~" },
+	{ XK_F6,        XK_NO_MOD, "\033[17~" },
+	{ XK_F7,        XK_NO_MOD, "\033[18~" },
+	{ XK_F8,        XK_NO_MOD, "\033[19~" },
+	{ XK_F9,        XK_NO_MOD, "\033[20~" },
+	{ XK_F10,       XK_NO_MOD, "\033[21~" },
+	{ XK_F11,       XK_NO_MOD, "\033[23~" },
+	{ XK_F12,       XK_NO_MOD, "\033[24~" },
+};
+
+/* Internal shortcuts. */
+#define MODKEY Mod1Mask
+
+static Shortcut shortcuts[] = {
+	/* modifier		key		function	argument */
+	{ MODKEY|ShiftMask,	XK_Prior,	xzoom,		{.i = +1} },
+	{ MODKEY|ShiftMask,	XK_Next,	xzoom,		{.i = -1} },
+};
+
--- a/config.mk
+++ b/config.mk
@ -1,5 +1,5 @@
 # st version
-VERSION = 0.0
+VERSION = 0.3

 # Customize below to fit your system

@ -11,13 +11,13 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib

 # includes and libs
-INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil
+INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig

 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\"
-CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS += -s ${LIBS}
+CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS += -g ${LIBS}

 # compiler and linker
 CC ?= cc
--- a/st.1
+++ b/st.1
@ -1,32 +1,71 @@
-.TH ST 1 st-VERSION
+.TH ST 1 st\-VERSION
 .SH NAME
 st \- simple terminal
 .SH SYNOPSIS
 .B st
 .RB [ \-c
 .IR class ]
+.RB [ \-f
+.IR font ]
+.RB [ \-g
+.IR geometry ]
+.RB [ \-o
+.IR file ]
 .RB [ \-t 
 .IR title ]
+.RB [ \-w 
+.IR windowid ]
 .RB [ \-v ]
 .RB [ \-e
-.IR cmd ]
+.IR command ...]
 .SH DESCRIPTION
 .B st
 is a simple terminal emulator.
 .SH OPTIONS
 .TP
-.B \-t title
-Overrides the default title (st)
+.BI \-c " class"
+defines the window class (default $TERM).
 .TP
-.B \-c class
-Overrides the default class ($TERM)
+.BI \-f " font"
+defines the
+.I font
+to use when st is run.
+.TP
+.BI \-g " geometry"
+defines the X11 geometry string, which will fixate the height and width of st. 
+.TP
+.BI \-o " file"
+writes all the I/O to
+.I file.
+This feature is useful when recording st sessions. A value of "-" means
+standard output.
+.TP
+.BI \-t " title"
+defines the window title (default 'st').
+.TP
+.BI \-w " windowid"
+embeds st within the window identified by 
+.I windowid
 .TP
 .B \-v
-Prints version information to standard output, then exits.
+prints version information to stderr, then exits.
 .TP
-.B \-e cmd [arguments]
-Execute cmd instead of the shell. Type your command as you would on your
-shell. If this option is used, it
-.BI "must be the last"
-on the command-line. This is the same behaviour as xterm/rxvt.
+.BI \-e " program " [ " arguments " "... ]"
+st executes
+.I program
+instead of the shell.  If this is used it
+.B must be the last option
+on the command line, as in xterm / rxvt.
+.SH CUSTOMIZATION
+.B st
+can be customized by creating a custom config.h and (re)compiling the source
+code. This keeps it fast, secure and simple.
+.SH AUTHORS
+See the LICENSE file for the authors.
+.SH LICENSE
+See the LICENSE file for the terms of redistribution.
+.SH SEE ALSO
+.BR tabbed (1)
+.SH BUGS
+See the TODO file in the distribution.

--- a/st.c
+++ b/st.c
--- a/st.info
+++ b/st.info
@ -33,8 +33,12 @@ st| simpleterm,
 	ed=\E[J,
 	el=\E[K,
 	el1=\E[1K,
+	enacs=\E)0,
+	flash=\E[?5h\E[?5l,
+	fsl=^G,
 	home=\E[H,
 	hpa=\E[%i%p1%dG,
+	hs,
 	ht=^I,
 	hts=\EH,
 	ich=\E[%p1%d@,
@ -43,12 +47,17 @@ st| simpleterm,
 	ind=^J,
 	indn=\E[%p1%dS,
 	invis=\E[8m,
+	is2=\E[4l\E>,
 	it#8,
 	kbs=\177,
 	kcub1=\E[D,
 	kcud1=\E[B,
 	kcuf1=\E[C,
 	kcuu1=\E[A,
+	kLFT=\E[d,
+	kRIT=\E[c,
+	kind=\E[a,
+	kri=\E[b,
 	kdch1=\E[3~,
 	kich1=\E[2~,
 	kend=\E[4~,
@ -66,30 +75,44 @@ st| simpleterm,
 	kf9=\E[20~,
 	khome=\E[1~,
 	knp=\E[6~,
+	kmous=\E[M,
 	kpp=\E[5~,
 	lines#24,
 	mir,
 	msgr,
 	ncv#3,
-	op=\E[37;40m,
+	op=\E[39;49m,
 	pairs#64,
 	rc=\E8,
 	rev=\E[7m,
 	ri=\EM,
+	ritm=\E[23m,
 	rmacs=\E(B,
-	rmso=\E[m,
+	rmcup=\E[?1049l,
+#	rmkx=\E>,
+	rmso=\E[23m,
 	rmul=\E[m,
+	rs1=\Ec,
+	rs2=\E[4l\E>,
 	sc=\E7,
 	setab=\E[4%p1%dm,
 	setaf=\E[3%p1%dm,
+	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
 	sgr0=\E[0m,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+	sitm=\E[3m,
 	smacs=\E(0,
-	smso=\E[7m,
+	smcup=\E[?1049h,
+#	smkx=\E=,
+	smso=\E[3m,
 	smul=\E[4m,
-	tbc=\E[2g,
+	tbc=\E[3g,
+	tsl=\E]0;,
 	ul,
 	xenl,
+	vpa=\E[%i%p1%dd,
+

 st-256color| simpleterm with 256 colors,
 	use=st,