st: dropped
This commit is contained in:
parent
9c253bc90b
commit
c67e9ffd6c
GPG Key ID:
42F8B4E30B673606
@ -1,7 +0,0 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/st
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/man/
|
||||
drwxr-xr-x root/root usr/share/man/man1/
|
||||
-rw-r--r-- root/root usr/share/man/man1/st.1.gz
|
||||
@ -1,6 +0,0 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF3xhL0rItNIc4F5INNpwIIpq8l3Kq+RhjHotNzCbXHjKJzcAVWAll5p9/bvMuEowg/kbX5JLAh3mr6tVR+nYsewo=
|
||||
SHA256 (Pkgfile) = 5e2674e6d8a22f90dbe5a112e8977eb577e3154aaebc24982b46dc41d4bbe9c4
|
||||
SHA256 (.footprint) = 691a6289f6a50fbf5ac809a9575739a0cf939045f0b1b24f28847765a13a620b
|
||||
SHA256 (st-0.9.tar.gz) = f36359799734eae785becb374063f0be833cf22f88b4f169cd251b99324e08e7
|
||||
SHA256 (xrdb-plus.patch) = a42b7172431660b3a5ea152019e1893e2453fb0b32a17d0abc7f4470bb53b008
|
||||
28
st/Pkgfile
28
st/Pkgfile
@ -1,28 +0,0 @@
|
||||
# Description: Simple terminal emulator for X, with X resource support (patch)
|
||||
# URL: https://st.suckless.org
|
||||
# Maintainer: Steffen Nurpmeso, steffen at sdaoden dot eu
|
||||
# Depends on: fontconfig freetype xorg-libx11 xorg-libxext xorg-libxft
|
||||
|
||||
name=st
|
||||
version=0.9
|
||||
release=1
|
||||
realn=st
|
||||
source=(
|
||||
https://dl.suckless.org/${realn}/${realn}-${version}.tar.gz
|
||||
xrdb-plus.patch
|
||||
)
|
||||
|
||||
build() {
|
||||
cd ${realn}-${version}
|
||||
|
||||
patch -p1 -i "${SRC}"/xrdb-plus.patch
|
||||
|
||||
sed -i '/tic/d' Makefile
|
||||
|
||||
make CC="${CC:-cc}" PREFIX=/usr \
|
||||
X11INC=/usr/include/X11 X11LIB=/usr/lib \
|
||||
DESTDIR="${PKG}" \
|
||||
all install
|
||||
}
|
||||
|
||||
# s-sh-mode
|
||||
@ -1,184 +0,0 @@
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 91ab8cab2c..d3f9f00cbc 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -170,6 +170,42 @@ static unsigned int defaultattr = 11;
|
||||
*/
|
||||
static uint forcemousemod = ShiftMask;
|
||||
|
||||
+/*
|
||||
+ * Xresources preferences to load at startup
|
||||
+ */
|
||||
+ResourcePref resources[] = {
|
||||
+ { "font", STRING, &font },
|
||||
+ { "color0", STRING, &colorname[0] },
|
||||
+ { "color1", STRING, &colorname[1] },
|
||||
+ { "color2", STRING, &colorname[2] },
|
||||
+ { "color3", STRING, &colorname[3] },
|
||||
+ { "color4", STRING, &colorname[4] },
|
||||
+ { "color5", STRING, &colorname[5] },
|
||||
+ { "color6", STRING, &colorname[6] },
|
||||
+ { "color7", STRING, &colorname[7] },
|
||||
+ { "color8", STRING, &colorname[8] },
|
||||
+ { "color9", STRING, &colorname[9] },
|
||||
+ { "color10", STRING, &colorname[10] },
|
||||
+ { "color11", STRING, &colorname[11] },
|
||||
+ { "color12", STRING, &colorname[12] },
|
||||
+ { "color13", STRING, &colorname[13] },
|
||||
+ { "color14", STRING, &colorname[14] },
|
||||
+ { "color15", STRING, &colorname[15] },
|
||||
+ { "background", STRING, &colorname[259] },
|
||||
+ { "foreground", STRING, &colorname[258] },
|
||||
+ { "cursorColor", STRING, &colorname[256] },
|
||||
+ { "termname", STRING, &termname },
|
||||
+ { "shell", STRING, &shell },
|
||||
+ { "minlatency", INTEGER, &minlatency },
|
||||
+ { "maxlatency", INTEGER, &maxlatency },
|
||||
+ { "blinktimeout", INTEGER, &blinktimeout },
|
||||
+ { "bellvolume", INTEGER, &bellvolume },
|
||||
+ { "tabspaces", INTEGER, &tabspaces },
|
||||
+ { "borderpx", INTEGER, &borderpx },
|
||||
+ { "cwscale", FLOAT, &cwscale },
|
||||
+ { "chscale", FLOAT, &chscale },
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* Internal mouse shortcuts.
|
||||
* Beware that overloading Button1 will disable the selection.
|
||||
@@ -177,10 +213,12 @@ static uint forcemousemod = ShiftMask;
|
||||
static MouseShortcut mshortcuts[] = {
|
||||
/* mask button function argument release */
|
||||
{ XK_ANY_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. */
|
||||
diff --git a/x.c b/x.c
|
||||
index 8a16faaad0..2cce27d1c9 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <X11/keysym.h>
|
||||
#include <X11/Xft/Xft.h>
|
||||
#include <X11/XKBlib.h>
|
||||
+#include <X11/Xresource.h>
|
||||
|
||||
char *argv0;
|
||||
#include "arg.h"
|
||||
@@ -45,6 +46,19 @@ typedef struct {
|
||||
signed char appcursor; /* application cursor */
|
||||
} Key;
|
||||
|
||||
+/* Xresources preferences */
|
||||
+enum resource_type {
|
||||
+ STRING = 0,
|
||||
+ INTEGER = 1,
|
||||
+ FLOAT = 2
|
||||
+};
|
||||
+
|
||||
+typedef struct {
|
||||
+ char *name;
|
||||
+ enum resource_type type;
|
||||
+ void *dst;
|
||||
+} ResourcePref;
|
||||
+
|
||||
/* X modifiers */
|
||||
#define XK_ANY_MOD UINT_MAX
|
||||
#define XK_NO_MOD 0
|
||||
@@ -843,8 +857,8 @@ xclear(int x1, int y1, int x2, int y2)
|
||||
void
|
||||
xhints(void)
|
||||
{
|
||||
- XClassHint class = {opt_name ? opt_name : termname,
|
||||
- opt_class ? opt_class : termname};
|
||||
+ XClassHint class = {opt_name ? opt_name : "st",
|
||||
+ opt_class ? opt_class : "St"};
|
||||
XWMHints wm = {.flags = InputHint, .input = 1};
|
||||
XSizeHints *sizeh;
|
||||
|
||||
@@ -1119,8 +1133,6 @@ xinit(int cols, int rows)
|
||||
pid_t thispid = getpid();
|
||||
XColor xmousefg, xmousebg;
|
||||
|
||||
- if (!(xw.dpy = XOpenDisplay(NULL)))
|
||||
- die("can't open display\n");
|
||||
xw.scr = XDefaultScreen(xw.dpy);
|
||||
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
|
||||
|
||||
@@ -1995,6 +2007,59 @@ run(void)
|
||||
}
|
||||
}
|
||||
|
||||
+int
|
||||
+resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
|
||||
+{
|
||||
+ char **sdst = dst;
|
||||
+ int *idst = dst;
|
||||
+ float *fdst = dst;
|
||||
+
|
||||
+ char fullname[256];
|
||||
+ char fullclass[256];
|
||||
+ char *type;
|
||||
+ XrmValue ret;
|
||||
+
|
||||
+ snprintf(fullname, sizeof(fullname), "%s.%s",
|
||||
+ opt_name ? opt_name : "st", name);
|
||||
+ snprintf(fullclass, sizeof(fullclass), "%s.%s",
|
||||
+ opt_class ? opt_class : "St", name);
|
||||
+ fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0';
|
||||
+
|
||||
+ XrmGetResource(db, fullname, fullclass, &type, &ret);
|
||||
+ if (ret.addr == NULL || strncmp("String", type, 64))
|
||||
+ return 1;
|
||||
+
|
||||
+ switch (rtype) {
|
||||
+ case STRING:
|
||||
+ *sdst = ret.addr;
|
||||
+ break;
|
||||
+ case INTEGER:
|
||||
+ *idst = strtoul(ret.addr, NULL, 10);
|
||||
+ break;
|
||||
+ case FLOAT:
|
||||
+ *fdst = strtof(ret.addr, NULL);
|
||||
+ break;
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+config_init(void)
|
||||
+{
|
||||
+ char *resm;
|
||||
+ XrmDatabase db;
|
||||
+ ResourcePref *p;
|
||||
+
|
||||
+ XrmInitialize();
|
||||
+ resm = XResourceManagerString(xw.dpy);
|
||||
+ if (!resm)
|
||||
+ return;
|
||||
+
|
||||
+ db = XrmGetStringDatabase(resm);
|
||||
+ for (p = resources; p < resources + LEN(resources); p++)
|
||||
+ resource_load(db, p->name, p->type, p->dst);
|
||||
+}
|
||||
+
|
||||
void
|
||||
usage(void)
|
||||
{
|
||||
@@ -2068,6 +2133,11 @@ run:
|
||||
|
||||
setlocale(LC_CTYPE, "");
|
||||
XSetLocaleModifiers("");
|
||||
+
|
||||
+ if(!(xw.dpy = XOpenDisplay(NULL)))
|
||||
+ die("Can't open display\n");
|
||||
+
|
||||
+ config_init();
|
||||
cols = MAX(cols, 1);
|
||||
rows = MAX(rows, 1);
|
||||
tnew(cols, rows);
|
||||
Loading…
Reference in New Issue
Block a user