0.3 release.

Make it possible to use the corefont font description too. It is not very
useful, but easy to implement.
2025-08-03 13:42:28 -07:00 · 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
11 changed files with 1503 additions and 721 deletions
--- a/.hgtags
+++ b/.hgtags
@@ -1,3 +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/2
+++ b/2
@@ -1,4 +1,6 @@
 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/19
+++ b/19
@@ -1,23 +1,30 @@
 vt emulation
 ------------
-* screen erased with background color ## capname:bce
+* implement BCE right
-* back tab                            ## capname:cbt ## seq:CSI Z
+* 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
 * clean and complete terminfo entry
-* fast drawing
+* 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
 ----
--- a/config.def.h
+++ b/config.def.h
@@ -1,12 +1,19 @@
 /* See LICENSE file for copyright and license details. */
-#define FONT "-*-*-medium-r-*-*-*-120-75-75-*-60-*-*"
+/* appearance */
-#define BOLDFONT "-*-*-bold-r-*-*-*-120-75-75-*-60-*-*"
+static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
 static unsigned int borderpx = 2;
 static char shell[] = "/bin/sh";
-/* Space in pixels around the terminal buffer */
+/* double-click timeout (in milliseconds) between clicks for selection */
-#define BORDER 2
+static unsigned int doubleclicktimeout = 300;
 static unsigned int tripleclicktimeout = 600;
 /* TERM value */
 static char termname[] = "st-256color";
 static unsigned int tabspaces = 8;
 /* Default shell to use if SHELL is not set in the env */
 #define SHELL "/bin/sh"
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
@@ -29,32 +36,37 @@ static const char *colorname[] = {
 	"magenta",
 	"cyan",
 	"white",
-	
+
 	[255] = 0,
-	
+
 	/* more colors can be added after 255 to use with DefaultXX */
 	"#cccccc",
 	"#333333",
 };
 /* Default colors (colorname index)
   foreground, background, cursor, unfocused cursor */
 #define DefaultFG  7
 #define DefaultBG  0
 #define DefaultCS  256
 #define DefaultUCS 257
-/* Special keys (change & recompile st.info accordingly)
+/*
-   Keep in mind that kpress() in st.c hardcodes some keys.
+ * 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;
-   Mask value:
+/*
-   * Use XK_ANY_MOD to match the key no matter modifiers state
+ * Special keys (change & recompile st.info accordingly)
-   * Use XK_NO_MOD to match the key alone (no modifiers)
+ * Keep in mind that kpress() in st.c hardcodes some keys.
-   
+ *
-      key,        mask,  output */
+ * 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_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~" },
@@ -74,19 +86,12 @@ static Key key[] = {
 	{ XK_F12,       XK_NO_MOD, "\033[24~" },
 };
-/* Set TERM to this */
+/* Internal shortcuts. */
-#define TNAME "st-256color"
+#define MODKEY Mod1Mask
-/* Line drawing characters (sometime specific to each font...) */
+static Shortcut shortcuts[] = {
-static char gfx[] = {
+	/* modifier		key		function	argument */
-	['f'] = 'o',
+	{ MODKEY|ShiftMask,	XK_Prior,	xzoom,		{.i = +1} },
-	['g'] = '+',
+	{ MODKEY|ShiftMask,	XK_Next,	xzoom,		{.i = -1} },
 	['i'] = '#',
 	[255] = 0,
 };
 /* double-click timeout (in milliseconds) between clicks for selection */
 #define DOUBLECLICK_TIMEOUT 300
 #define TRIPLECLICK_TIMEOUT (2*DOUBLECLICK_TIMEOUT)
 #define TAB 8
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # st version
-VERSION = 0.2.1
+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}
+INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\"
-CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS += -s ${LIBS}
+LDFLAGS += -g ${LIBS}
 # compiler and linker
 CC ?= cc
--- a/st.1
+++ b/st.1
@@ -5,6 +5,12 @@ st \- simple terminal
 .B st
 .RB [ \-c
 .IR class ]
 .RB [ \-f
 .IR font ]
 .RB [ \-g
 .IR geometry ]
 .RB [ \-o
 .IR file ]
 .RB [ \-t 
 .IR title ]
 .RB [ \-w 
@@ -17,12 +23,26 @@ st \- simple terminal
 is a simple terminal emulator.
 .SH OPTIONS
 .TP
 .BI \-t " title"
 defines the window title (default 'st').
 .TP
 .BI \-c " class"
 defines the window class (default $TERM).
 .TP
 .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
@@ -36,3 +56,16 @@ st executes
 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,6 +33,7 @@ st| simpleterm,
 	ed=\E[J,
 	el=\E[K,
 	el1=\E[1K,
 	enacs=\E)0,
 	flash=\E[?5h\E[?5l,
 	fsl=^G,
 	home=\E[H,
@@ -46,6 +47,7 @@ st| simpleterm,
 	ind=^J,
 	indn=\E[%p1%dS,
 	invis=\E[8m,
 	is2=\E[4l\E>,
 	it#8,
 	kbs=\177,
 	kcub1=\E[D,
@@ -84,23 +86,33 @@ st| simpleterm,
 	rc=\E8,
 	rev=\E[7m,
 	ri=\EM,
 	ritm=\E[23m,
 	rmacs=\E(B,
 	rmcup=\E[?1049l,
-	rmso=\E[m,
+#	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,
 	smcup=\E[?1049h,
-	smso=\E[7m,
+#	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,