[arch-commits] Commit in st/trunk (PKGBUILD config.h)
Sergej Pupykin
spupykin at archlinux.org
Mon Aug 15 11:30:02 UTC 2016
Date: Monday, August 15, 2016 @ 11:30:01
Author: spupykin
Revision: 186790
upgpkg: st 0.7-1
upd
Modified:
st/trunk/PKGBUILD
st/trunk/config.h
----------+
PKGBUILD | 8 +++---
config.h | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 74 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-15 11:29:58 UTC (rev 186789)
+++ PKGBUILD 2016-08-15 11:30:01 UTC (rev 186790)
@@ -2,8 +2,8 @@
# Maintainer: Christoph Vigano <mail at cvigano.de>
pkgname=st
-pkgver=0.6
-pkgrel=3
+pkgver=0.7
+pkgrel=1
pkgdesc='A simple virtual terminal emulator for X.'
arch=('i686' 'x86_64')
license=('MIT')
@@ -12,8 +12,8 @@
url="http://st.suckless.org"
source=(http://dl.suckless.org/st/$pkgname-$pkgver.tar.gz
config.h)
-md5sums=('1a926f450b4eacb7e2f5ac5b8ffea7c8'
- '06f5d56f754a918916d6c92df75e6d11')
+md5sums=('29b2a599cf1511c8062ed8f025c84c63'
+ '9cb789e3912df36f296a219e1b9da850')
prepare() {
cd $srcdir/$pkgname-$pkgver
Modified: config.h
===================================================================
--- config.h 2016-08-15 11:29:58 UTC (rev 186789)
+++ config.h 2016-08-15 11:30:01 UTC (rev 186790)
@@ -7,9 +7,18 @@
*/
static char font[] = "Fixed:pixelsize=18:antialias=false:autohint=false";
static int borderpx = 2;
+
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: utmp option
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
static char shell[] = "/bin/sh";
static char *utmp = NULL;
-static char stty_args[] = "stty raw -echo -iexten echonl";
+static char stty_args[] = "stty raw pass8 nl -echo -iexten -cstopb 38400";
/* identification sequence returned in DA and DECID */
static char vtiden[] = "\033[?6c";
@@ -30,7 +39,7 @@
static unsigned int tripleclicktimeout = 600;
/* alt screens */
-static bool allowaltscreen = true;
+static int allowaltscreen = 1;
/* frames per second st should at maximum draw to the screen */
static unsigned int xfps = 120;
@@ -53,12 +62,26 @@
*/
static int bellvolume = 0;
-/* TERM value */
+/* default TERM value */
static char termname[] = "st-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
+ */
static unsigned int tabspaces = 8;
-
/* Terminal colors (16 first used in escape sequence) */
static const char *colorname[] = {
/* 8 normal colors */
@@ -85,18 +108,36 @@
/* more colors can be added after 255 to use with DefaultXX */
"#cccccc",
+ "#555555",
};
/*
* Default colors (colorname index)
- * foreground, background, cursor
+ * foreground, background, cursor, reverse cursor
*/
static unsigned int defaultfg = 7;
static unsigned int defaultbg = 0;
static 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 colour and shape of the mouse cursor
+ */
+static unsigned int mouseshape = XC_xterm;
+static unsigned int mousefg = 7;
+static unsigned int mousebg = 0;
+
+/*
* Colors used, when the specific fg == defaultfg. So in reverse mode this
* will reverse too. Another logic would only make the simple feature too
* complex.
@@ -104,9 +145,11 @@
static unsigned int defaultitalic = 11;
static unsigned int defaultunderline = 7;
-/* Internal mouse shortcuts. */
-/* Beware that overloading Button1 will disable the selection. */
-static Mousekey mshortcuts[] = {
+/*
+ * Internal mouse shortcuts.
+ * Beware that overloading Button1 will disable the selection.
+ */
+static MouseShortcut mshortcuts[] = {
/* button mask string */
{ Button4, XK_ANY_MOD, "\031" },
{ Button5, XK_ANY_MOD, "\005" },
@@ -117,6 +160,7 @@
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} },
@@ -167,11 +211,17 @@
*/
static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
-/* Override mouse-select while mask is active (when MODE_MOUSE is set).
+/*
+ * Override mouse-select 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. */
+ * modifier, set to 0 to not use it.
+ */
static uint forceselmod = ShiftMask;
+/*
+ * 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 crlf */
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1, 0},
@@ -268,6 +318,7 @@
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
+ { XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0},
{ XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
@@ -382,3 +433,12 @@
[SEL_RECTANGULAR] = Mod1Mask,
};
+/*
+ * Printable characters in ASCII, used to estimate the advance width
+ * of single wide characters.
+ */
+static char ascii_printable[] =
+ " !\"#$%&'()*+,-./0123456789:;<=>?"
+ "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+ "`abcdefghijklmnopqrstuvwxyz{|}~";
+
More information about the arch-commits
mailing list