x11/st-sdk: new port
This commit is contained in:
c0dev0id
61
x11/st-sdk/Makefile
Normal file
61
x11/st-sdk/Makefile
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
COMMENT= simple X terminal (personalized)
|
||||||
|
|
||||||
|
V= 0.9.2
|
||||||
|
DISTNAME= st-${V}
|
||||||
|
PKGNAME= st-sdk-${V}
|
||||||
|
REVISION= 38
|
||||||
|
|
||||||
|
DIST_SUBDIR= st
|
||||||
|
SUPDISTFILES.p= scrollback/st-scrollback-0.9.2.diff \
|
||||||
|
scrollback/st-scrollback-reflow-0.9.2.diff \
|
||||||
|
charoffsets/st-charoffsets-20220311-0.8.5.diff \
|
||||||
|
glyph_wide_support/st-glyph-wide-support-20230701-5770f2f.diff
|
||||||
|
# sync/st-appsync-20200618-b27a383.diff \
|
||||||
|
# disable_bold_italic_fonts/st-disable-bold-italic-fonts-0.8.2.diff
|
||||||
|
# glyph_wide_support/st-glyph-wide-support-boxdraw-20220411-ef05519.diff
|
||||||
|
# boxdraw/st-boxdraw_v2-0.8.5.diff
|
||||||
|
|
||||||
|
CATEGORIES= x11
|
||||||
|
|
||||||
|
HOMEPAGE= https://st.suckless.org/
|
||||||
|
|
||||||
|
MAINTAINER= Stefan Hagen <sh+ports@codevoid.de>
|
||||||
|
|
||||||
|
# MIT/X Consortium License
|
||||||
|
PERMIT_PACKAGE= Yes
|
||||||
|
|
||||||
|
# uses pledge()
|
||||||
|
WANTLIB= X11 Xft c fontconfig freetype m util harfbuzz
|
||||||
|
|
||||||
|
SITES= https://dl.suckless.org/st/
|
||||||
|
SITES.p= https://st.suckless.org/patches/
|
||||||
|
|
||||||
|
LIB_DEPENDS = devel/harfbuzz,-main
|
||||||
|
|
||||||
|
MAKE_ENV= LDFLAGS="${LDFLAGS}" \
|
||||||
|
X11INC=${X11BASE}/include \
|
||||||
|
X11LIB=${X11BASE}/lib
|
||||||
|
|
||||||
|
NO_TEST= Yes
|
||||||
|
|
||||||
|
PATCHFILES.p= ${SUPDISTFILES.p}
|
||||||
|
PATCH_DIST_STRIP= -p1
|
||||||
|
|
||||||
|
post-extract:
|
||||||
|
cp ${FILESDIR}/config.h ${WRKSRC}/config.h
|
||||||
|
|
||||||
|
# needs fixing for scrollback + boxdraw
|
||||||
|
# https://st.suckless.org/patches/ligatures/
|
||||||
|
# post-patch:
|
||||||
|
# cd ${WRKSRC} && patch < ${FILESDIR}/ligatures.diff
|
||||||
|
|
||||||
|
post-patch:
|
||||||
|
cd ${WRKSRC} && patch -p0 < ${FILESDIR}/pixel-geom.diff
|
||||||
|
|
||||||
|
do-install:
|
||||||
|
${INSTALL_PROGRAM} ${WRKBUILD}/st ${PREFIX}/bin/
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/st.1 ${PREFIX}/man/man1/
|
||||||
|
sed -i s/VERSION/${V}/g ${PREFIX}/man/man1/st.1
|
||||||
|
tic -s -x -o ${PREFIX}/share/terminfo ${WRKSRC}/st.info
|
||||||
|
|
||||||
|
.include <bsd.port.mk>
|
||||||
10
x11/st-sdk/distinfo
Normal file
10
x11/st-sdk/distinfo
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
SHA256 (st/charoffsets/st-charoffsets-20220311-0.8.5.diff) = 5UV0fcvZkRMMuGkyohGcg5a1f0l1OPiD4bTFQvyL1OM=
|
||||||
|
SHA256 (st/glyph_wide_support/st-glyph-wide-support-20230701-5770f2f.diff) = YMd8dEvk0R/DzziCb0U3S6wKWUIS+9xua7ABgFTCqZ4=
|
||||||
|
SHA256 (st/scrollback/st-scrollback-0.9.2.diff) = jbY7+D3wbLoSzbAuV4y0mvx4nHJrTIX2bpWzclYrrHo=
|
||||||
|
SHA256 (st/scrollback/st-scrollback-reflow-0.9.2.diff) = AFFF65c+aKmBb7ZZIi2O+pEjgoCE95p30XRqV5ms3yc=
|
||||||
|
SHA256 (st/st-0.9.2.tar.gz) = ayFdT0crIdYjLzDyIRF6d34kvP7miVXd77dCZGf5SUs=
|
||||||
|
SIZE (st/charoffsets/st-charoffsets-20220311-0.8.5.diff) = 1244
|
||||||
|
SIZE (st/glyph_wide_support/st-glyph-wide-support-20230701-5770f2f.diff) = 7400
|
||||||
|
SIZE (st/scrollback/st-scrollback-0.9.2.diff) = 8955
|
||||||
|
SIZE (st/scrollback/st-scrollback-reflow-0.9.2.diff) = 43790
|
||||||
|
SIZE (st/st-0.9.2.tar.gz) = 48381
|
||||||
512
x11/st-sdk/files/config.h
Normal file
512
x11/st-sdk/files/config.h
Normal file
@@ -0,0 +1,512 @@
|
|||||||
|
/* See LICENSE file for copyright and license details. */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* appearance
|
||||||
|
*
|
||||||
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||||
|
*/
|
||||||
|
static char *font = "Terminus:pixelsize=18";
|
||||||
|
|
||||||
|
/* disable bold, italic and roman fonts globally */
|
||||||
|
int disablebold = 1;
|
||||||
|
int disableitalic = 0;
|
||||||
|
int disableroman = 0;
|
||||||
|
|
||||||
|
static int borderpx = 6;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* What program is execed by st depends of these precedence rules:
|
||||||
|
* 1: program passed with -e
|
||||||
|
* 2: scroll and/or utmp
|
||||||
|
* 3: SHELL environment variable
|
||||||
|
* 4: value of shell in /etc/passwd
|
||||||
|
* 5: value of shell in config.h
|
||||||
|
*/
|
||||||
|
static char *shell = "/bin/ksh";
|
||||||
|
char *utmp = NULL;
|
||||||
|
|
||||||
|
/* scroll program: to enable use a string like "scroll" */
|
||||||
|
char *scroll = NULL;
|
||||||
|
|
||||||
|
char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
|
||||||
|
|
||||||
|
/* identification sequence returned in DA and DECID */
|
||||||
|
char *vtiden = "\033[?6c";
|
||||||
|
|
||||||
|
/* Kerning / character bounding-box multipliers */
|
||||||
|
static float cwscale = 1.0;
|
||||||
|
static float chscale = 1.0;
|
||||||
|
|
||||||
|
/* Character rendering offsets in pixels */
|
||||||
|
static short cxoffset = 0;
|
||||||
|
static short cyoffset = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* word delimiter string
|
||||||
|
*
|
||||||
|
* More advanced example: L" `'\"()[]{}"
|
||||||
|
*/
|
||||||
|
wchar_t *worddelimiters = L" `'\"›|()[]{}·»«›‹‘’;│\t";
|
||||||
|
|
||||||
|
/* selection timeouts (in milliseconds) */
|
||||||
|
static unsigned int doubleclicktimeout = 300;
|
||||||
|
static unsigned int tripleclicktimeout = 600;
|
||||||
|
|
||||||
|
/* alt screens */
|
||||||
|
int allowaltscreen = 1;
|
||||||
|
|
||||||
|
/* allow certain non-interactive (insecure) window operations such as:
|
||||||
|
setting the clipboard text */
|
||||||
|
int allowwindowops = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* draw latency range in ms - from new content/keypress/etc until drawing.
|
||||||
|
* within this range, st draws when content stops arriving (idle). mostly it's
|
||||||
|
* near minlatency, but it waits longer for slow updates to avoid partial draw.
|
||||||
|
* low minlatency will tear/flicker more, as it can "detect" idle too early.
|
||||||
|
*/
|
||||||
|
static double minlatency = 8;
|
||||||
|
static double maxlatency = 33;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Synchronized-Update timeout in ms
|
||||||
|
* https://gitlab.com/gnachman/iterm2/-/wikis/synchronized-updates-spec
|
||||||
|
*/
|
||||||
|
static uint su_timeout = 200;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* blinking timeout (set to 0 to disable blinking) for the terminal blinking
|
||||||
|
* attribute.
|
||||||
|
*/
|
||||||
|
static unsigned int blinktimeout = 800;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* thickness of underline and bar cursors
|
||||||
|
*/
|
||||||
|
static unsigned int cursorthickness = 2;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 1: render most of the lines/blocks characters without using the font for
|
||||||
|
* perfect alignment between cells (U2500 - U259F except dashes/diagonals).
|
||||||
|
* Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
|
||||||
|
* 0: disable (render all U25XX glyphs normally from the font).
|
||||||
|
*/
|
||||||
|
const int boxdraw = 1;
|
||||||
|
const int boxdraw_bold = 1;
|
||||||
|
|
||||||
|
/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */
|
||||||
|
const int boxdraw_braille = 1;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
||||||
|
* it
|
||||||
|
*/
|
||||||
|
static int bellvolume = 0;
|
||||||
|
|
||||||
|
/* default TERM value */
|
||||||
|
char *termname = "xterm-256color";
|
||||||
|
|
||||||
|
/*
|
||||||
|
* spaces per tab
|
||||||
|
*
|
||||||
|
* When you are changing this value, don't forget to adapt the »it« value in
|
||||||
|
* the st.info and appropriately install the st.info in the environment where
|
||||||
|
* you use this st version.
|
||||||
|
*
|
||||||
|
* it#$tabspaces,
|
||||||
|
*
|
||||||
|
* Secondly make sure your kernel is not expanding tabs. When running `stty
|
||||||
|
* -a` »tab0« should appear. You can tell the terminal to not expand tabs by
|
||||||
|
* running following command:
|
||||||
|
*
|
||||||
|
* stty tabs
|
||||||
|
*/
|
||||||
|
unsigned int tabspaces = 8;
|
||||||
|
|
||||||
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
|
static const char *colorname[] = {
|
||||||
|
/* 8 normal colors */
|
||||||
|
"black",
|
||||||
|
"red3",
|
||||||
|
"green3",
|
||||||
|
"yellow3",
|
||||||
|
"#005fff",
|
||||||
|
"magenta3",
|
||||||
|
"cyan3",
|
||||||
|
"gray90",
|
||||||
|
|
||||||
|
/* 8 bright colors */
|
||||||
|
"gray50",
|
||||||
|
"red",
|
||||||
|
"green",
|
||||||
|
"yellow",
|
||||||
|
"#5c5cff",
|
||||||
|
"magenta",
|
||||||
|
"cyan",
|
||||||
|
"white",
|
||||||
|
|
||||||
|
[255] = 0,
|
||||||
|
|
||||||
|
/* more colors can be added after 255 to use with DefaultXX */
|
||||||
|
"#FF8700",
|
||||||
|
"#555555",
|
||||||
|
"#080808",
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default colors (colorname index)
|
||||||
|
* foreground, background, cursor, reverse cursor
|
||||||
|
*/
|
||||||
|
unsigned int defaultfg = 15;
|
||||||
|
unsigned int defaultbg = 258;
|
||||||
|
unsigned int defaultcs = 256;
|
||||||
|
static unsigned int defaultrcs = 257;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default shape of cursor
|
||||||
|
* 2: Block ("█")
|
||||||
|
* 4: Underline ("_")
|
||||||
|
* 6: Bar ("|")
|
||||||
|
* 7: Snowman ("☃")
|
||||||
|
*/
|
||||||
|
static unsigned int cursorshape = 2;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default columns and rows numbers
|
||||||
|
*/
|
||||||
|
|
||||||
|
static unsigned int cols = 80;
|
||||||
|
static unsigned int rows = 24;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default width and height (including borders!)
|
||||||
|
*/
|
||||||
|
|
||||||
|
static unsigned int width = 564;
|
||||||
|
static unsigned int height = 364;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default colour and shape of the mouse cursor
|
||||||
|
*/
|
||||||
|
static unsigned int mouseshape = XC_xterm;
|
||||||
|
static unsigned int mousefg = 7;
|
||||||
|
static unsigned int mousebg = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Color used to display font attributes when fontconfig selected a font which
|
||||||
|
* doesn't match the ones requested.
|
||||||
|
*/
|
||||||
|
static unsigned int defaultattr = 11;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
|
||||||
|
* Note that if you want to use ShiftMask with selmasks, set this to an other
|
||||||
|
* modifier, set to 0 to not use it.
|
||||||
|
*/
|
||||||
|
static uint forcemousemod = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Internal mouse shortcuts.
|
||||||
|
* Beware that overloading Button1 will disable the selection.
|
||||||
|
*/
|
||||||
|
static MouseShortcut mshortcuts[] = {
|
||||||
|
/* mask button function argument release */
|
||||||
|
{ XK_NO_MOD, Button2, selpaste, {.i = 0}, 1 },
|
||||||
|
/* { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
|
||||||
|
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
|
||||||
|
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
|
||||||
|
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, */
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Internal keyboard shortcuts. */
|
||||||
|
#define MODKEY Mod1Mask
|
||||||
|
#define TERMMOD (ControlMask|ShiftMask)
|
||||||
|
|
||||||
|
static Shortcut shortcuts[] = {
|
||||||
|
/* mask keysym function argument */
|
||||||
|
{ XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} },
|
||||||
|
{ ControlMask, XK_Print, toggleprinter, {.i = 0} },
|
||||||
|
{ ShiftMask, XK_Print, printscreen, {.i = 0} },
|
||||||
|
{ XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
|
||||||
|
{ ControlMask, XK_plus, zoom, {.f = +1} },
|
||||||
|
{ ControlMask, XK_minus, zoom, {.f = -1} },
|
||||||
|
{ TERMMOD, XK_Home, zoomreset, {.f = 0} },
|
||||||
|
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
|
||||||
|
{ TERMMOD, XK_V, clippaste, {.i = 0} },
|
||||||
|
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||||
|
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||||
|
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
{ ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
|
||||||
|
{ ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Special keys (change & recompile st.info accordingly)
|
||||||
|
*
|
||||||
|
* 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)
|
||||||
|
* appkey value:
|
||||||
|
* * 0: no value
|
||||||
|
* * > 0: keypad application mode enabled
|
||||||
|
* * = 2: term.numlock = 1
|
||||||
|
* * < 0: keypad application mode disabled
|
||||||
|
* appcursor value:
|
||||||
|
* * 0: no value
|
||||||
|
* * > 0: cursor application mode enabled
|
||||||
|
* * < 0: cursor application mode disabled
|
||||||
|
*
|
||||||
|
* Be careful with the order of the definitions because st searches in
|
||||||
|
* this table sequentially, so any XK_ANY_MOD must be in the last
|
||||||
|
* position for a key.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
|
||||||
|
* to be mapped below, add them to this array.
|
||||||
|
*/
|
||||||
|
static KeySym mappedkeys[] = { -1 };
|
||||||
|
|
||||||
|
/*
|
||||||
|
* State bits to ignore when matching key or button events. By default,
|
||||||
|
* numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
|
||||||
|
*/
|
||||||
|
static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This is the huge key array which defines all compatibility to the Linux
|
||||||
|
* world. Please decide about changes wisely.
|
||||||
|
*/
|
||||||
|
static Key key[] = {
|
||||||
|
/* keysym mask string appkey appcursor */
|
||||||
|
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1},
|
||||||
|
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
|
||||||
|
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
||||||
|
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
||||||
|
{ XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0},
|
||||||
|
{ XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
||||||
|
{ XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
||||||
|
{ XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0},
|
||||||
|
{ XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
||||||
|
{ XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
||||||
|
{ XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0},
|
||||||
|
{ XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
||||||
|
{ XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
||||||
|
{ XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0},
|
||||||
|
{ XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
||||||
|
{ XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
||||||
|
{ XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
||||||
|
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
||||||
|
{ XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0},
|
||||||
|
{ XK_KP_End, ControlMask, "\033[J", -1, 0},
|
||||||
|
{ XK_KP_End, ControlMask, "\033[1;5F", +1, 0},
|
||||||
|
{ XK_KP_End, ShiftMask, "\033[K", -1, 0},
|
||||||
|
{ XK_KP_End, ShiftMask, "\033[1;2F", +1, 0},
|
||||||
|
{ XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
||||||
|
{ XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
|
||||||
|
{ XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
||||||
|
{ XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||||
|
{ XK_KP_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||||
|
{ XK_KP_Insert, ControlMask, "\033[L", -1, 0},
|
||||||
|
{ XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
|
||||||
|
{ XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
||||||
|
{ XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
||||||
|
{ XK_KP_Delete, ControlMask, "\033[M", -1, 0},
|
||||||
|
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||||
|
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||||
|
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
||||||
|
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
||||||
|
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
||||||
|
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
|
||||||
|
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
|
||||||
|
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0},
|
||||||
|
{ XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0},
|
||||||
|
{ XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0},
|
||||||
|
{ XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0},
|
||||||
|
{ XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0},
|
||||||
|
{ XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0},
|
||||||
|
{ XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0},
|
||||||
|
{ XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0},
|
||||||
|
{ XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0},
|
||||||
|
{ XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0},
|
||||||
|
{ XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0},
|
||||||
|
{ XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0},
|
||||||
|
{ XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0},
|
||||||
|
{ XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0},
|
||||||
|
{ XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0},
|
||||||
|
{ XK_Up, ShiftMask, "\033[1;2A", 0, 0},
|
||||||
|
{ XK_Up, Mod1Mask, "\033[1;3A", 0, 0},
|
||||||
|
{ XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0},
|
||||||
|
{ XK_Up, ControlMask, "\033[1;5A", 0, 0},
|
||||||
|
{ XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0},
|
||||||
|
{ XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0},
|
||||||
|
{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0},
|
||||||
|
{ XK_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
||||||
|
{ XK_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
||||||
|
{ XK_Down, ShiftMask, "\033[1;2B", 0, 0},
|
||||||
|
{ XK_Down, Mod1Mask, "\033[1;3B", 0, 0},
|
||||||
|
{ XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0},
|
||||||
|
{ XK_Down, ControlMask, "\033[1;5B", 0, 0},
|
||||||
|
{ XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0},
|
||||||
|
{ XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0},
|
||||||
|
{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0},
|
||||||
|
{ XK_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
||||||
|
{ XK_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
||||||
|
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0},
|
||||||
|
{ XK_Left, Mod1Mask, "\033[1;3D", 0, 0},
|
||||||
|
{ XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0},
|
||||||
|
{ XK_Left, ControlMask, "\033[1;5D", 0, 0},
|
||||||
|
{ XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0},
|
||||||
|
{ XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0},
|
||||||
|
{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0},
|
||||||
|
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
||||||
|
{ XK_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
||||||
|
{ XK_Right, ShiftMask, "\033[1;2C", 0, 0},
|
||||||
|
{ XK_Right, Mod1Mask, "\033[1;3C", 0, 0},
|
||||||
|
{ XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0},
|
||||||
|
{ XK_Right, ControlMask, "\033[1;5C", 0, 0},
|
||||||
|
{ XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0},
|
||||||
|
{ XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0},
|
||||||
|
{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0},
|
||||||
|
{ XK_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
||||||
|
{ XK_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
||||||
|
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
|
||||||
|
{ XK_Return, Mod1Mask, "\033\r", 0, 0},
|
||||||
|
{ XK_Return, ShiftMask, "\033[13;2u", 0, 0},
|
||||||
|
{ XK_Return, XK_ANY_MOD, "\r", 0, 0},
|
||||||
|
{ XK_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||||
|
{ XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||||
|
{ XK_Insert, ControlMask, "\033[L", -1, 0},
|
||||||
|
{ XK_Insert, ControlMask, "\033[2;5~", +1, 0},
|
||||||
|
{ XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
||||||
|
{ XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
||||||
|
{ XK_Delete, ControlMask, "\033[M", -1, 0},
|
||||||
|
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||||
|
{ XK_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||||
|
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
||||||
|
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
||||||
|
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
||||||
|
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
|
||||||
|
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
|
||||||
|
{ XK_Home, ShiftMask, "\033[2J", 0, -1},
|
||||||
|
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1},
|
||||||
|
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
||||||
|
{ XK_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
||||||
|
{ XK_End, ControlMask, "\033[J", -1, 0},
|
||||||
|
{ XK_End, ControlMask, "\033[1;5F", +1, 0},
|
||||||
|
{ XK_End, ShiftMask, "\033[K", -1, 0},
|
||||||
|
{ XK_End, ShiftMask, "\033[1;2F", +1, 0},
|
||||||
|
{ XK_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
||||||
|
{ XK_Prior, ControlMask, "\033[5;5~", 0, 0},
|
||||||
|
{ XK_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
||||||
|
{ XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
||||||
|
{ XK_Next, ControlMask, "\033[6;5~", 0, 0},
|
||||||
|
{ XK_Next, ShiftMask, "\033[6;2~", 0, 0},
|
||||||
|
{ XK_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
||||||
|
{ XK_F1, XK_NO_MOD, "\033OP" , 0, 0},
|
||||||
|
{ XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0},
|
||||||
|
{ XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0},
|
||||||
|
{ XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0},
|
||||||
|
{ XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0},
|
||||||
|
{ XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0},
|
||||||
|
{ XK_F2, XK_NO_MOD, "\033OQ" , 0, 0},
|
||||||
|
{ XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0},
|
||||||
|
{ XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0},
|
||||||
|
{ XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0},
|
||||||
|
{ XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0},
|
||||||
|
{ XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0},
|
||||||
|
{ XK_F3, XK_NO_MOD, "\033OR" , 0, 0},
|
||||||
|
{ XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0},
|
||||||
|
{ XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0},
|
||||||
|
{ XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0},
|
||||||
|
{ XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0},
|
||||||
|
{ XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0},
|
||||||
|
{ XK_F4, XK_NO_MOD, "\033OS" , 0, 0},
|
||||||
|
{ XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0},
|
||||||
|
{ XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0},
|
||||||
|
{ XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0},
|
||||||
|
{ XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0},
|
||||||
|
{ XK_F5, XK_NO_MOD, "\033[15~", 0, 0},
|
||||||
|
{ XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0},
|
||||||
|
{ XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0},
|
||||||
|
{ XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0},
|
||||||
|
{ XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0},
|
||||||
|
{ XK_F6, XK_NO_MOD, "\033[17~", 0, 0},
|
||||||
|
{ XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0},
|
||||||
|
{ XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0},
|
||||||
|
{ XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0},
|
||||||
|
{ XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0},
|
||||||
|
{ XK_F7, XK_NO_MOD, "\033[18~", 0, 0},
|
||||||
|
{ XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0},
|
||||||
|
{ XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0},
|
||||||
|
{ XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0},
|
||||||
|
{ XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0},
|
||||||
|
{ XK_F8, XK_NO_MOD, "\033[19~", 0, 0},
|
||||||
|
{ XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0},
|
||||||
|
{ XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0},
|
||||||
|
{ XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0},
|
||||||
|
{ XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0},
|
||||||
|
{ XK_F9, XK_NO_MOD, "\033[20~", 0, 0},
|
||||||
|
{ XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0},
|
||||||
|
{ XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0},
|
||||||
|
{ XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0},
|
||||||
|
{ XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0},
|
||||||
|
{ XK_F10, XK_NO_MOD, "\033[21~", 0, 0},
|
||||||
|
{ XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0},
|
||||||
|
{ XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0},
|
||||||
|
{ XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0},
|
||||||
|
{ XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0},
|
||||||
|
{ XK_F11, XK_NO_MOD, "\033[23~", 0, 0},
|
||||||
|
{ XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0},
|
||||||
|
{ XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0},
|
||||||
|
{ XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0},
|
||||||
|
{ XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0},
|
||||||
|
{ XK_F12, XK_NO_MOD, "\033[24~", 0, 0},
|
||||||
|
{ XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0},
|
||||||
|
{ XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0},
|
||||||
|
{ XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0},
|
||||||
|
{ XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0},
|
||||||
|
{ XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0},
|
||||||
|
{ XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0},
|
||||||
|
{ XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0},
|
||||||
|
{ XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0},
|
||||||
|
{ XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0},
|
||||||
|
{ XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0},
|
||||||
|
{ XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0},
|
||||||
|
{ XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0},
|
||||||
|
{ XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0},
|
||||||
|
{ XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0},
|
||||||
|
{ XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0},
|
||||||
|
{ XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0},
|
||||||
|
{ XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0},
|
||||||
|
{ XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0},
|
||||||
|
{ XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0},
|
||||||
|
{ XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0},
|
||||||
|
{ XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0},
|
||||||
|
{ XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0},
|
||||||
|
{ XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0},
|
||||||
|
{ XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0},
|
||||||
|
{ XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0},
|
||||||
|
{ XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0},
|
||||||
|
{ XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0},
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Selection types' masks.
|
||||||
|
* Use the same masks as usual.
|
||||||
|
* Button1Mask is always unset, to make masks match between ButtonPress.
|
||||||
|
* ButtonRelease and MotionNotify.
|
||||||
|
* If no match is found, regular selection is used.
|
||||||
|
*/
|
||||||
|
static uint selmasks[] = {
|
||||||
|
[SEL_RECTANGULAR] = Mod1Mask,
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Printable characters in ASCII, used to estimate the advance width
|
||||||
|
* of single wide characters.
|
||||||
|
*/
|
||||||
|
static char ascii_printable[] =
|
||||||
|
" !\"#$%&'()*+,-./0123456789:;<=>?"
|
||||||
|
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
|
||||||
|
"`abcdefghijklmnopqrstuvwxyz{|}~";
|
||||||
303
x11/st-sdk/files/ligatures.diff
Normal file
303
x11/st-sdk/files/ligatures.diff
Normal file
@@ -0,0 +1,303 @@
|
|||||||
|
--- Makefile.orig Tue Feb 13 20:36:32 2024
|
||||||
|
+++ Makefile Tue Feb 13 20:37:04 2024
|
||||||
|
@@ -4,7 +4,7 @@
|
||||||
|
|
||||||
|
include config.mk
|
||||||
|
|
||||||
|
-SRC = st.c x.c boxdraw.c
|
||||||
|
+SRC = st.c x.c boxdraw.c hb.c
|
||||||
|
OBJ = $(SRC:.c=.o)
|
||||||
|
|
||||||
|
all: options st
|
||||||
|
@@ -22,7 +22,8 @@
|
||||||
|
$(CC) $(STCFLAGS) -c $<
|
||||||
|
|
||||||
|
st.o: config.h st.h win.h
|
||||||
|
-x.o: arg.h config.h st.h win.h
|
||||||
|
+x.o: arg.h config.h st.h win.h hb.h
|
||||||
|
+hb.o: st.h
|
||||||
|
boxdraw.o: config.h st.h boxdraw_data.h
|
||||||
|
|
||||||
|
$(OBJ): config.h config.mk
|
||||||
|
--- config.mk.orig Tue Feb 13 20:36:32 2024
|
||||||
|
+++ config.mk Tue Feb 13 20:38:06 2024
|
||||||
|
@@ -15,10 +15,12 @@
|
||||||
|
# includes and libs
|
||||||
|
INCS = -I$(X11INC) \
|
||||||
|
`$(PKG_CONFIG) --cflags fontconfig` \
|
||||||
|
- `$(PKG_CONFIG) --cflags freetype2`
|
||||||
|
+ `$(PKG_CONFIG) --cflags freetype2` \
|
||||||
|
+ `$(PKG_CONFIG) --cflags harfbuzz`
|
||||||
|
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
|
||||||
|
`$(PKG_CONFIG) --libs fontconfig` \
|
||||||
|
- `$(PKG_CONFIG) --libs freetype2`
|
||||||
|
+ `$(PKG_CONFIG) --libs freetype2` \
|
||||||
|
+ `$(PKG_CONFIG) --libs harfbuzz`
|
||||||
|
|
||||||
|
# flags
|
||||||
|
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
|
||||||
|
@@ -29,7 +31,8 @@
|
||||||
|
CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
|
||||||
|
LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
|
||||||
|
`$(PKG_CONFIG) --libs fontconfig` \
|
||||||
|
- `$(PKG_CONFIG) --libs freetype2`
|
||||||
|
+ `$(PKG_CONFIG) --libs freetype2` \
|
||||||
|
+ `$(PKG_CONFIG) --libs harfbuzz`
|
||||||
|
MANPREFIX = ${PREFIX}/man
|
||||||
|
|
||||||
|
# compiler and linker
|
||||||
|
--- hb.c.orig Tue Feb 13 20:37:04 2024
|
||||||
|
+++ hb.c Tue Feb 13 20:37:04 2024
|
||||||
|
@@ -0,0 +1,140 @@
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+#include <stdio.h>
|
||||||
|
+#include <math.h>
|
||||||
|
+#include <X11/Xft/Xft.h>
|
||||||
|
+#include <hb.h>
|
||||||
|
+#include <hb-ft.h>
|
||||||
|
+
|
||||||
|
+#include "st.h"
|
||||||
|
+
|
||||||
|
+void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
|
||||||
|
+hb_font_t *hbfindfont(XftFont *match);
|
||||||
|
+
|
||||||
|
+typedef struct {
|
||||||
|
+ XftFont *match;
|
||||||
|
+ hb_font_t *font;
|
||||||
|
+} HbFontMatch;
|
||||||
|
+
|
||||||
|
+static int hbfontslen = 0;
|
||||||
|
+static HbFontMatch *hbfontcache = NULL;
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+hbunloadfonts()
|
||||||
|
+{
|
||||||
|
+ for (int i = 0; i < hbfontslen; i++) {
|
||||||
|
+ hb_font_destroy(hbfontcache[i].font);
|
||||||
|
+ XftUnlockFace(hbfontcache[i].match);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (hbfontcache != NULL) {
|
||||||
|
+ free(hbfontcache);
|
||||||
|
+ hbfontcache = NULL;
|
||||||
|
+ }
|
||||||
|
+ hbfontslen = 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+hb_font_t *
|
||||||
|
+hbfindfont(XftFont *match)
|
||||||
|
+{
|
||||||
|
+ for (int i = 0; i < hbfontslen; i++) {
|
||||||
|
+ if (hbfontcache[i].match == match)
|
||||||
|
+ return hbfontcache[i].font;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* Font not found in cache, caching it now. */
|
||||||
|
+ hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 1));
|
||||||
|
+ FT_Face face = XftLockFace(match);
|
||||||
|
+ hb_font_t *font = hb_ft_font_create(face, NULL);
|
||||||
|
+ if (font == NULL)
|
||||||
|
+ die("Failed to load Harfbuzz font.");
|
||||||
|
+
|
||||||
|
+ hbfontcache[hbfontslen].match = match;
|
||||||
|
+ hbfontcache[hbfontslen].font = font;
|
||||||
|
+ hbfontslen += 1;
|
||||||
|
+
|
||||||
|
+ return font;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
|
||||||
|
+{
|
||||||
|
+ int start = 0, length = 1, gstart = 0;
|
||||||
|
+ hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
|
||||||
|
+
|
||||||
|
+ for (int idx = 1, specidx = 1; idx < len; idx++) {
|
||||||
|
+ if (glyphs[idx].mode & ATTR_WDUMMY) {
|
||||||
|
+ length += 1;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
|
||||||
|
+ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
|
||||||
|
+
|
||||||
|
+ /* Reset the sequence. */
|
||||||
|
+ length = 1;
|
||||||
|
+ start = specidx;
|
||||||
|
+ gstart = idx;
|
||||||
|
+ } else {
|
||||||
|
+ length += 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ specidx++;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* EOL. */
|
||||||
|
+ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
|
||||||
|
+
|
||||||
|
+ /* Apply the transformation to glyph specs. */
|
||||||
|
+ for (int i = 0, specidx = 0; i < len; i++) {
|
||||||
|
+ if (glyphs[i].mode & ATTR_WDUMMY)
|
||||||
|
+ continue;
|
||||||
|
+ if (glyphs[i].mode & ATTR_BOXDRAW) {
|
||||||
|
+ specidx++;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (codepoints[i] != specs[specidx].glyph)
|
||||||
|
+ ((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
|
||||||
|
+
|
||||||
|
+ specs[specidx++].glyph = codepoints[i];
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ free(codepoints);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
|
||||||
|
+{
|
||||||
|
+ hb_font_t *font = hbfindfont(xfont);
|
||||||
|
+ if (font == NULL)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ Rune rune;
|
||||||
|
+ ushort mode = USHRT_MAX;
|
||||||
|
+ hb_buffer_t *buffer = hb_buffer_create();
|
||||||
|
+ hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
|
||||||
|
+
|
||||||
|
+ /* Fill buffer with codepoints. */
|
||||||
|
+ for (int i = start; i < (start+length); i++) {
|
||||||
|
+ rune = string[i].u;
|
||||||
|
+ mode = string[i].mode;
|
||||||
|
+ if (mode & ATTR_WDUMMY)
|
||||||
|
+ rune = 0x0020;
|
||||||
|
+ hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* Shape the segment. */
|
||||||
|
+ hb_shape(font, buffer, NULL, 0);
|
||||||
|
+
|
||||||
|
+ /* Get new glyph info. */
|
||||||
|
+ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
|
||||||
|
+
|
||||||
|
+ /* Write new codepoints. */
|
||||||
|
+ for (int i = 0; i < length; i++) {
|
||||||
|
+ hb_codepoint_t gid = info[i].codepoint;
|
||||||
|
+ codepoints[start+i] = gid;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* Cleanup. */
|
||||||
|
+ hb_buffer_destroy(buffer);
|
||||||
|
+}
|
||||||
|
--- hb.h.orig Tue Feb 13 20:37:04 2024
|
||||||
|
+++ hb.h Tue Feb 13 20:37:04 2024
|
||||||
|
@@ -0,0 +1,7 @@
|
||||||
|
+#include <X11/Xft/Xft.h>
|
||||||
|
+#include <hb.h>
|
||||||
|
+#include <hb-ft.h>
|
||||||
|
+
|
||||||
|
+void hbunloadfonts();
|
||||||
|
+void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
|
||||||
|
+
|
||||||
|
--- st.c.orig Tue Feb 13 20:36:32 2024
|
||||||
|
+++ st.c Tue Feb 13 20:38:55 2024
|
||||||
|
@@ -2758,7 +2758,8 @@
|
||||||
|
drawregion(0, 0, term.col, term.row);
|
||||||
|
if (term.scr == 0)
|
||||||
|
xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
||||||
|
- term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||||
|
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx],
|
||||||
|
+ term.line[term.ocy], term.col);
|
||||||
|
term.ocx = cx;
|
||||||
|
term.ocy = term.c.y;
|
||||||
|
xfinishdraw();
|
||||||
|
--- st.h.orig Tue Feb 13 20:36:32 2024
|
||||||
|
+++ st.h Tue Feb 13 20:37:04 2024
|
||||||
|
@@ -11,7 +11,8 @@
|
||||||
|
#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
|
||||||
|
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
|
||||||
|
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
|
||||||
|
-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
|
||||||
|
+#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
|
||||||
|
+ (a).fg != (b).fg || \
|
||||||
|
(a).bg != (b).bg)
|
||||||
|
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \
|
||||||
|
(t1.tv_nsec-t2.tv_nsec)/1E6)
|
||||||
|
@@ -34,6 +35,7 @@
|
||||||
|
ATTR_WIDE = 1 << 9,
|
||||||
|
ATTR_WDUMMY = 1 << 10,
|
||||||
|
ATTR_BOXDRAW = 1 << 11,
|
||||||
|
+ ATTR_LIGA = 1 << 12,
|
||||||
|
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
||||||
|
};
|
||||||
|
|
||||||
|
--- win.h.orig Tue Oct 4 19:41:26 2022
|
||||||
|
+++ win.h Tue Feb 13 20:37:04 2024
|
||||||
|
@@ -25,7 +25,7 @@
|
||||||
|
|
||||||
|
void xbell(void);
|
||||||
|
void xclipcopy(void);
|
||||||
|
-void xdrawcursor(int, int, Glyph, int, int, Glyph);
|
||||||
|
+void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
|
||||||
|
void xdrawline(Line, int, int, int);
|
||||||
|
void xfinishdraw(void);
|
||||||
|
void xloadcols(void);
|
||||||
|
--- x.c.orig Tue Feb 13 20:36:32 2024
|
||||||
|
+++ x.c Tue Feb 13 20:37:04 2024
|
||||||
|
@@ -19,6 +19,7 @@
|
||||||
|
#include "arg.h"
|
||||||
|
#include "st.h"
|
||||||
|
#include "win.h"
|
||||||
|
+#include "hb.h"
|
||||||
|
|
||||||
|
/* types used in config.h */
|
||||||
|
typedef struct {
|
||||||
|
@@ -1079,6 +1080,9 @@
|
||||||
|
void
|
||||||
|
xunloadfonts(void)
|
||||||
|
{
|
||||||
|
+ /* Clear Harfbuzz font cache. */
|
||||||
|
+ hbunloadfonts();
|
||||||
|
+
|
||||||
|
/* Free the loaded fonts in the font cache. */
|
||||||
|
while (frclen > 0)
|
||||||
|
XftFontClose(xw.dpy, frc[--frclen].font);
|
||||||
|
@@ -1288,7 +1292,7 @@
|
||||||
|
mode = glyphs[i].mode;
|
||||||
|
|
||||||
|
/* Skip dummy wide-character spacing. */
|
||||||
|
- if (mode == ATTR_WDUMMY)
|
||||||
|
+ if (mode & ATTR_WDUMMY)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* Determine font for glyph if different from previous glyph. */
|
||||||
|
@@ -1400,6 +1404,9 @@
|
||||||
|
numspecs++;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* Harfbuzz transformation for ligatures. */
|
||||||
|
+ hbtransform(specs, glyphs, len, x, y);
|
||||||
|
+
|
||||||
|
return numspecs;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1547,14 +1554,17 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||||
|
+xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
|
||||||
|
{
|
||||||
|
Color drawcol;
|
||||||
|
|
||||||
|
/* remove the old cursor */
|
||||||
|
if (selected(ox, oy))
|
||||||
|
og.mode ^= ATTR_REVERSE;
|
||||||
|
- xdrawglyph(og, ox, oy);
|
||||||
|
+
|
||||||
|
+ /* Redraw the line where cursor was previously.
|
||||||
|
+ * It will restore the ligatures broken by the cursor. */
|
||||||
|
+ xdrawline(line, 0, oy, len);
|
||||||
|
|
||||||
|
if (IS_SET(MODE_HIDE))
|
||||||
|
return;
|
||||||
69
x11/st-sdk/files/pixel-geom.diff
Normal file
69
x11/st-sdk/files/pixel-geom.diff
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
--- x.c.orig Fri Mar 13 08:07:14 2026
|
||||||
|
+++ x.c Fri Mar 13 08:10:58 2026
|
||||||
|
@@ -251,6 +251,7 @@
|
||||||
|
static char *opt_line = NULL;
|
||||||
|
static char *opt_name = NULL;
|
||||||
|
static char *opt_title = NULL;
|
||||||
|
+static int opt_pixelgeom = 0;
|
||||||
|
|
||||||
|
static uint buttons; /* bit field of pressed buttons */
|
||||||
|
|
||||||
|
@@ -1147,6 +1148,15 @@
|
||||||
|
usedfont = (opt_font == NULL)? font : opt_font;
|
||||||
|
xloadfonts(usedfont, 0);
|
||||||
|
|
||||||
|
+ /* -p: convert stashed pixel dimensions to cols/rows */
|
||||||
|
+ if (opt_pixelgeom && win.w > 0 && win.h > 0) {
|
||||||
|
+ cols = MAX(1, (win.w - 2 * borderpx) / win.cw);
|
||||||
|
+ rows = MAX(1, (win.h - 2 * borderpx) / win.ch);
|
||||||
|
+ tresize(cols, rows);
|
||||||
|
+ win.w = 2 * borderpx + cols * win.cw;
|
||||||
|
+ win.h = 2 * borderpx + rows * win.ch;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* colors */
|
||||||
|
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
||||||
|
xloadcols();
|
||||||
|
@@ -2026,11 +2036,11 @@
|
||||||
|
void
|
||||||
|
usage(void)
|
||||||
|
{
|
||||||
|
- die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
|
||||||
|
+ die("usage: %s [-aipv] [-c class] [-f font] [-g geometry]"
|
||||||
|
" [-n name] [-o file]\n"
|
||||||
|
" [-T title] [-t title] [-w windowid]"
|
||||||
|
" [[-e] command [args ...]]\n"
|
||||||
|
- " %s [-aiv] [-c class] [-f font] [-g geometry]"
|
||||||
|
+ " %s [-aipv] [-c class] [-f font] [-g geometry]"
|
||||||
|
" [-n name] [-o file]\n"
|
||||||
|
" [-T title] [-t title] [-w windowid] -l line"
|
||||||
|
" [stty_args ...]\n", argv0, argv0);
|
||||||
|
@@ -2061,6 +2071,9 @@
|
||||||
|
xw.gm = XParseGeometry(EARGF(usage()),
|
||||||
|
&xw.l, &xw.t, &cols, &rows);
|
||||||
|
break;
|
||||||
|
+ case 'p':
|
||||||
|
+ opt_pixelgeom = 1;
|
||||||
|
+ break;
|
||||||
|
case 'i':
|
||||||
|
xw.isfixed = 1;
|
||||||
|
break;
|
||||||
|
@@ -2096,6 +2109,18 @@
|
||||||
|
|
||||||
|
setlocale(LC_CTYPE, "");
|
||||||
|
XSetLocaleModifiers("");
|
||||||
|
+ if (opt_pixelgeom && cols > 0 && rows > 0) {
|
||||||
|
+ /*
|
||||||
|
+ * -p: cols/rows from -g are pixel dimensions.
|
||||||
|
+ * Stash them in win.w/win.h; use default 80x24
|
||||||
|
+ * for the initial tnew() allocation. xinit() will
|
||||||
|
+ * compute the real cols/rows after font loading.
|
||||||
|
+ */
|
||||||
|
+ win.w = cols;
|
||||||
|
+ win.h = rows;
|
||||||
|
+ cols = 80;
|
||||||
|
+ rows = 24;
|
||||||
|
+ }
|
||||||
|
cols = MAX(cols, 1);
|
||||||
|
rows = MAX(rows, 1);
|
||||||
|
tnew(cols, rows);
|
||||||
20
x11/st-sdk/patches/patch-config_def_h
Normal file
20
x11/st-sdk/patches/patch-config_def_h
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
Index: config.def.h
|
||||||
|
--- config.def.h.orig
|
||||||
|
+++ config.def.h
|
||||||
|
@@ -106,7 +106,7 @@ static const char *colorname[] = {
|
||||||
|
"blue2",
|
||||||
|
"magenta3",
|
||||||
|
"cyan3",
|
||||||
|
- "gray90",
|
||||||
|
+ "gray",
|
||||||
|
|
||||||
|
/* 8 bright colors */
|
||||||
|
"gray50",
|
||||||
|
@@ -341,6 +341,7 @@ static Key key[] = {
|
||||||
|
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
|
||||||
|
{ XK_Return, Mod1Mask, "\033\r", 0, 0},
|
||||||
|
{ XK_Return, XK_ANY_MOD, "\r", 0, 0},
|
||||||
|
+ { XK_Return, ShiftMask, "\033[13;2u", 0, 0, 0},
|
||||||
|
{ XK_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||||
|
{ XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||||
|
{ XK_Insert, ControlMask, "\033[L", -1, 0},
|
||||||
36
x11/st-sdk/patches/patch-config_mk
Normal file
36
x11/st-sdk/patches/patch-config_mk
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
Index: config.mk
|
||||||
|
--- config.mk.orig
|
||||||
|
+++ config.mk
|
||||||
|
@@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
|
||||||
|
# includes and libs
|
||||||
|
INCS = -I$(X11INC) \
|
||||||
|
`$(PKG_CONFIG) --cflags fontconfig` \
|
||||||
|
- `$(PKG_CONFIG) --cflags freetype2`
|
||||||
|
+ `$(PKG_CONFIG) --cflags freetype2` \
|
||||||
|
+ `$(PKG_CONFIG) --libs harfbuzz`
|
||||||
|
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
||||||
|
`$(PKG_CONFIG) --libs fontconfig` \
|
||||||
|
- `$(PKG_CONFIG) --libs freetype2`
|
||||||
|
+ `$(PKG_CONFIG) --libs freetype2` \
|
||||||
|
+ `$(PKG_CONFIG) --libs harfbuzz`
|
||||||
|
|
||||||
|
# flags
|
||||||
|
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
|
||||||
|
@@ -26,11 +28,12 @@ STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
|
||||||
|
STLDFLAGS = $(LIBS) $(LDFLAGS)
|
||||||
|
|
||||||
|
# OpenBSD:
|
||||||
|
-#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
|
||||||
|
-#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
|
||||||
|
-# `$(PKG_CONFIG) --libs fontconfig` \
|
||||||
|
-# `$(PKG_CONFIG) --libs freetype2`
|
||||||
|
-#MANPREFIX = ${PREFIX}/man
|
||||||
|
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
|
||||||
|
+LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
|
||||||
|
+ `$(PKG_CONFIG) --libs fontconfig` \
|
||||||
|
+ `$(PKG_CONFIG) --libs freetype2` \
|
||||||
|
+ `$(PKG_CONFIG) --libs harfbuzz`
|
||||||
|
+MANPREFIX = ${PREFIX}/man
|
||||||
|
|
||||||
|
# compiler and linker
|
||||||
|
# CC = c99
|
||||||
34
x11/st-sdk/patches/patch-st_c
Normal file
34
x11/st-sdk/patches/patch-st_c
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
Index: st.c
|
||||||
|
--- st.c.orig
|
||||||
|
+++ st.c
|
||||||
|
@@ -35,6 +35,7 @@
|
||||||
|
#define ESC_ARG_SIZ 16
|
||||||
|
#define STR_BUF_SIZ ESC_BUF_SIZ
|
||||||
|
#define STR_ARG_SIZ ESC_ARG_SIZ
|
||||||
|
+#define STR_BUF_MAX (256*1024)
|
||||||
|
#define HISTSIZE 2000
|
||||||
|
#define RESIZEBUFFER 1000
|
||||||
|
|
||||||
|
@@ -2025,7 +2026,8 @@ csihandle(void)
|
||||||
|
case 6: /* Report Cursor Position (CPR) "<row>;<column>R" */
|
||||||
|
n = snprintf(buf, sizeof(buf), "\033[%i;%iR",
|
||||||
|
term.c.y+1, term.c.x+1);
|
||||||
|
- ttywrite(buf, n, 0);
|
||||||
|
+ if (n > 0)
|
||||||
|
+ ttywrite(buf, n, 0);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
goto unknown;
|
||||||
|
@@ -2645,8 +2647,11 @@ tputc(Rune u)
|
||||||
|
* term.esc = 0;
|
||||||
|
* strhandle();
|
||||||
|
*/
|
||||||
|
- if (strescseq.siz > (SIZE_MAX - UTF_SIZ) / 2)
|
||||||
|
+ if (strescseq.siz > (SIZE_MAX - UTF_SIZ) / 2 ||
|
||||||
|
+ strescseq.siz >= STR_BUF_MAX) {
|
||||||
|
+ strreset();
|
||||||
|
return;
|
||||||
|
+ }
|
||||||
|
strescseq.siz *= 2;
|
||||||
|
strescseq.buf = xrealloc(strescseq.buf, strescseq.siz);
|
||||||
|
}
|
||||||
5
x11/st-sdk/pkg/DESCR
Normal file
5
x11/st-sdk/pkg/DESCR
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
st is a simple virtual terminal emulator for X which sucks less.
|
||||||
|
|
||||||
|
Flavour:
|
||||||
|
scrollback - allows scrolling through terminal output with
|
||||||
|
shift+pgup/pgdn
|
||||||
12
x11/st-sdk/pkg/PLIST
Normal file
12
x11/st-sdk/pkg/PLIST
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
@conflict st-*
|
||||||
|
@bin bin/st
|
||||||
|
@man man/man1/st.1
|
||||||
|
share/terminfo/
|
||||||
|
share/terminfo/s/
|
||||||
|
share/terminfo/s/st
|
||||||
|
share/terminfo/s/st-256color
|
||||||
|
share/terminfo/s/st-bs
|
||||||
|
share/terminfo/s/st-bs-256color
|
||||||
|
share/terminfo/s/st-meta
|
||||||
|
share/terminfo/s/st-meta-256color
|
||||||
|
share/terminfo/s/st-mono
|
||||||
Reference in New Issue
Block a user