iAdd -n option for setting WM_CLASS instance name - st - Simple Terminal Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/st//log.gph gopher.r-36.net 70 1Files /scm/st//files.gph gopher.r-36.net 70 1Refs /scm/st//refs.gph gopher.r-36.net 70 1README /scm/st//file/README.gph gopher.r-36.net 70 1LICENSE /scm/st//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit 0cd5117a2cfc4134712de748ec416be0655838b2 /scm/st//commit/0cd5117a2cfc4134712de748ec416be0655838b2.gph gopher.r-36.net 70 1parent bd5fdbe64c8abfb624ad59939ed9b221c8b04eef /scm/st//commit/bd5fdbe64c8abfb624ad59939ed9b221c8b04eef.gph gopher.r-36.net 70 hAuthor: Quentin Rameau URL:mailto:quinq@fifth.space gopher.r-36.net 70 iDate: Fri, 29 Jan 2016 22:03:01 +0100 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iAdd -n option for setting WM_CLASS instance name Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iSigned-off-by: Christoph Lohmann <20h@r-36.net> Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i st.1 | 7 +++++++ Err gopher.r-36.net 70 i st.c | 34 +++++++++++++++++-------------- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i2 files changed, 26 insertions(+), 15 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/st.1 b/st.1 /scm/st//file/st.1.gph gopher.r-36.net 70 i@@ -10,6 +10,8 @@ st \- simple terminal Err gopher.r-36.net 70 i .IR font ] Err gopher.r-36.net 70 i .RB [ \-g Err gopher.r-36.net 70 i .IR geometry ] Err gopher.r-36.net 70 i+.RB [ \-n Err gopher.r-36.net 70 i+.IR name ] Err gopher.r-36.net 70 i .RB [ \-o Err gopher.r-36.net 70 i .IR iofile ] Err gopher.r-36.net 70 i .RB [ \-T Err gopher.r-36.net 70 i@@ -32,6 +34,8 @@ st \- simple terminal Err gopher.r-36.net 70 i .IR font ] Err gopher.r-36.net 70 i .RB [ \-g Err gopher.r-36.net 70 i .IR geometry ] Err gopher.r-36.net 70 i+.RB [ \-n Err gopher.r-36.net 70 i+.IR name ] Err gopher.r-36.net 70 i .RB [ \-o Err gopher.r-36.net 70 i .IR iofile ] Err gopher.r-36.net 70 i .RB [ \-T Err gopher.r-36.net 70 i@@ -68,6 +72,9 @@ for further details. Err gopher.r-36.net 70 i .B \-i Err gopher.r-36.net 70 i will fixate the position given with the -g option. Err gopher.r-36.net 70 i .TP Err gopher.r-36.net 70 i+.BI \-n " name" Err gopher.r-36.net 70 i+defines the window instance name (default $TERM). Err gopher.r-36.net 70 i+.TP Err gopher.r-36.net 70 i .BI \-o " iofile" Err gopher.r-36.net 70 i writes all the I/O to Err gopher.r-36.net 70 i .I iofile. Err gopher.r-36.net 70 1diff --git a/st.c b/st.c /scm/st//file/st.c.gph gopher.r-36.net 70 i@@ -524,14 +524,15 @@ static int cmdfd; Err gopher.r-36.net 70 i static pid_t pid; Err gopher.r-36.net 70 i static Selection sel; Err gopher.r-36.net 70 i static int iofd = 1; Err gopher.r-36.net 70 i-static char **opt_cmd = NULL; Err gopher.r-36.net 70 i-static char *opt_io = NULL; Err gopher.r-36.net 70 i-static char *opt_title = NULL; Err gopher.r-36.net 70 i-static char *opt_embed = NULL; Err gopher.r-36.net 70 i+static char **opt_cmd = NULL; Err gopher.r-36.net 70 i static char *opt_class = NULL; Err gopher.r-36.net 70 i-static char *opt_font = NULL; Err gopher.r-36.net 70 i-static char *opt_line = NULL; Err gopher.r-36.net 70 i-static int oldbutton = 3; /* button event on startup: 3 = release */ Err gopher.r-36.net 70 i+static char *opt_embed = NULL; Err gopher.r-36.net 70 i+static char *opt_font = NULL; Err gopher.r-36.net 70 i+static char *opt_io = NULL; Err gopher.r-36.net 70 i+static char *opt_line = NULL; Err gopher.r-36.net 70 i+static char *opt_name = NULL; Err gopher.r-36.net 70 i+static char *opt_title = NULL; Err gopher.r-36.net 70 i+static int oldbutton = 3; /* button event on startup: 3 = release */ Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static char *usedfont = NULL; Err gopher.r-36.net 70 i static double usedfontsize = 0; Err gopher.r-36.net 70 i@@ -3240,7 +3241,8 @@ xclear(int x1, int y1, int x2, int y2) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i xhints(void) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- XClassHint class = {termname, opt_class ? opt_class : termname}; Err gopher.r-36.net 70 i+ XClassHint class = {opt_name ? opt_name : termname, Err gopher.r-36.net 70 i+ opt_class ? opt_class : termname}; Err gopher.r-36.net 70 i XWMHints wm = {.flags = InputHint, .input = 1}; Err gopher.r-36.net 70 i XSizeHints *sizeh = NULL; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -4332,13 +4334,12 @@ run(void) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i usage(void) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]" Err gopher.r-36.net 70 i- " [-o file] [-T title]\n" Err gopher.r-36.net 70 i- " [-t title] [-w windowid] [[-e] command [args ...]]\n" Err gopher.r-36.net 70 i- " %s [-aiv] [-c class] [-f font] [-g geometry]" Err gopher.r-36.net 70 i- " [-o file] [-T title]\n" Err gopher.r-36.net 70 i- " [-t title] [-w windowid] -l line [stty_args ...]\n", Err gopher.r-36.net 70 i- argv0, argv0); Err gopher.r-36.net 70 i+ die("usage: %s " Err gopher.r-36.net 70 i+ "[-aiv] [-c class] [-f font] [-g geometry] [-n name] [-o file]\n " Err gopher.r-36.net 70 i+ " [-T title] [-t title] [-w windowid] [[-e] command [args ...]\n " Err gopher.r-36.net 70 i+ " %s [-aiv] [-c class] [-f font] [-g geometry] [-n name] [-o file]\n " Err gopher.r-36.net 70 i+ " [-o file] [-T title] [-t title] [-w windowid] -l line" Err gopher.r-36.net 70 i+ " [stty_args ...]\n", argv0, argv0); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i@@ -4383,6 +4384,9 @@ main(int argc, char *argv[]) Err gopher.r-36.net 70 i case 'l': Err gopher.r-36.net 70 i opt_line = EARGF(usage()); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i+ case 'n': Err gopher.r-36.net 70 i+ opt_name = EARGF(usage()); Err gopher.r-36.net 70 i+ break; Err gopher.r-36.net 70 i case 't': Err gopher.r-36.net 70 i case 'T': Err gopher.r-36.net 70 i opt_title = EARGF(usage()); Err gopher.r-36.net 70 .