aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd-new-session.c20
-rw-r--r--format.c12
-rw-r--r--grid.c14
-rw-r--r--screen-write.c4
-rw-r--r--tmux.110
-rw-r--r--tmux.h1
-rw-r--r--utf8.c37
7 files changed, 81 insertions, 17 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c
index b4bb37d5..291107bc 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -68,13 +68,13 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
struct client *c = cmdq->client;
- struct session *s, *attach_sess;
+ struct session *s, *as;
struct session *groupwith = cmdq->state.tflag.s;
struct window *w;
struct environ *env;
struct termios tio, *tiop;
const char *newname, *target, *update, *errstr, *template;
- const char *path, *cwd, *to_free;
+ const char *path, *cwd, *to_free = NULL;
char **argv, *cmd, *cause, *cp;
int detached, already_attached, idx, argc;
u_int sx, sy;
@@ -100,7 +100,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
cmdq_error(cmdq, "bad session name: %s", newname);
return (CMD_RETURN_ERROR);
}
- if ((attach_sess = session_find(newname)) != NULL) {
+ if ((as = session_find(newname)) != NULL) {
if (args_has(args, 'A')) {
/*
* This cmdq is now destined for
@@ -108,7 +108,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
* will have already been prepared, copy this
* session into its tflag so it can be used.
*/
- cmdq->state.tflag.s = attach_sess;
+ cmd_find_from_session(&cmdq->state.tflag, as);
return (cmd_attach_session(cmdq,
args_has(args, 'D'), 0, NULL,
args_has(args, 'E')));
@@ -118,7 +118,12 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
}
}
- if ((target = args_get(args, 't')) == NULL)
+ if ((target = args_get(args, 't')) != NULL) {
+ if (groupwith == NULL) {
+ cmdq_error(cmdq, "no such session: %s", target);
+ goto error;
+ }
+ } else
groupwith = NULL;
/* Set -d if no client. */
@@ -132,7 +137,6 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
already_attached = 1;
/* Get the new session working directory. */
- to_free = NULL;
if (args_has(args, 'c')) {
ft = format_create(cmdq, 0);
format_defaults(ft, c, NULL, NULL, NULL);
@@ -208,7 +212,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
if (!args_has(args, 't') && args->argc != 0) {
argc = args->argc;
argv = args->argv;
- } else if (target == NULL) {
+ } else if (groupwith == NULL) {
cmd = options_get_string(global_s_options, "default-command");
if (cmd != NULL && *cmd != '\0') {
argc = 1;
@@ -257,7 +261,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
* If a target session is given, this is to be part of a session group,
* so add it to the group and synchronize.
*/
- if (args_has(args, 't')) {
+ if (groupwith != NULL) {
session_group_add(groupwith, s);
session_group_synchronize_to(s);
session_select(s, RB_MIN(winlinks, &s->windows)->idx);
diff --git a/format.c b/format.c
index f7282a61..d263cb0c 100644
--- a/format.c
+++ b/format.c
@@ -701,7 +701,7 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
char *copy, *copy0, *endptr, *ptr, *found, *new, *value;
char *from = NULL, *to = NULL;
size_t valuelen, newlen, fromlen, tolen, used;
- u_long limit = 0;
+ long limit = 0;
int modifiers = 0, brackets;
/* Make a copy of the key. */
@@ -713,8 +713,8 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
switch (copy[0]) {
case '=':
errno = 0;
- limit = strtoul(copy + 1, &endptr, 10);
- if (errno == ERANGE && limit == ULONG_MAX)
+ limit = strtol(copy + 1, &endptr, 10);
+ if (errno == ERANGE && (limit == LONG_MIN || limit == LONG_MAX))
break;
if (*endptr != ':')
break;
@@ -830,10 +830,14 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
}
/* Truncate the value if needed. */
- if (limit != 0) {
+ if (limit > 0) {
new = utf8_trimcstr(value, limit);
free(value);
value = new;
+ } else if (limit < 0) {
+ new = utf8_rtrimcstr(value, -limit);
+ free(value);
+ value = new;
}
/* Expand the buffer and copy in the value. */
diff --git a/grid.c b/grid.c
index 782032f4..0be0254f 100644
--- a/grid.c
+++ b/grid.c
@@ -452,6 +452,12 @@ grid_string_cells_fg(const struct grid_cell *gc, int *values)
values[n++] = 38;
values[n++] = 5;
values[n++] = gc->fg;
+ } else if (gc->flags & GRID_FLAG_FGRGB) {
+ values[n++] = 38;
+ values[n++] = 2;
+ values[n++] = gc->fg_rgb.r;
+ values[n++] = gc->fg_rgb.g;
+ values[n++] = gc->fg_rgb.b;
} else {
switch (gc->fg) {
case 0:
@@ -493,6 +499,12 @@ grid_string_cells_bg(const struct grid_cell *gc, int *values)
values[n++] = 48;
values[n++] = 5;
values[n++] = gc->bg;
+ } else if (gc->flags & GRID_FLAG_BGRGB) {
+ values[n++] = 48;
+ values[n++] = 2;
+ values[n++] = gc->bg_rgb.r;
+ values[n++] = gc->bg_rgb.g;
+ values[n++] = gc->bg_rgb.b;
} else {
switch (gc->bg) {
case 0:
@@ -532,7 +544,7 @@ void
grid_string_cells_code(const struct grid_cell *lastgc,
const struct grid_cell *gc, char *buf, size_t len, int escape_c0)
{
- int oldc[16], newc[16], s[32];
+ int oldc[64], newc[64], s[128];
size_t noldc, nnewc, n, i;
u_int attr = gc->attr;
u_int lastattr = lastgc->attr;
diff --git a/screen-write.c b/screen-write.c
index 05315b3f..e58d744c 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -994,7 +994,9 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
utf8_copy(&tmp_gc.data, &gc->data);
tmp_gc.attr = tmp_gc.attr & ~GRID_ATTR_CHARSET;
tmp_gc.attr |= gc->attr & GRID_ATTR_CHARSET;
- tmp_gc.flags = gc->flags & ~(GRID_FLAG_FG256|GRID_FLAG_BG256);
+ tmp_gc.flags = gc->flags;
+ tmp_gc.flags &= ~(GRID_FLAG_FGRGB|GRID_FLAG_BGRGB);
+ tmp_gc.flags &= ~(GRID_FLAG_FG256|GRID_FLAG_BG256);
tmp_gc.flags |= s->sel.cell.flags &
(GRID_FLAG_FG256|GRID_FLAG_BG256);
ttyctx.cell = &tmp_gc;
diff --git a/tmux.1 b/tmux.1
index fcf388af..ceb351ee 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3381,9 +3381,13 @@ if not.
A limit may be placed on the length of the resultant string by prefixing it
by an
.Ql = ,
-a number and a colon, so
-.Ql #{=10:pane_title}
-will include at most the first 10 characters of the pane title.
+a number and a colon.
+Positive numbers count from the start of the string and negative from the end,
+so
+.Ql #{=5:pane_title}
+will include at most the first 5 characters of the pane title, or
+.Ql #{=-5:pane_title}
+the last 5 characters.
Prefixing a time variable with
.Ql t:
will convert it to a string, so if
diff --git a/tmux.h b/tmux.h
index 4bdc8afc..be00098d 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2326,6 +2326,7 @@ char *utf8_sanitize(const char *);
struct utf8_data *utf8_fromcstr(const char *);
char *utf8_tocstr(struct utf8_data *);
u_int utf8_cstrwidth(const char *);
+char *utf8_rtrimcstr(const char *, u_int);
char *utf8_trimcstr(const char *, u_int);
char *utf8_padcstr(const char *, u_int);
diff --git a/utf8.c b/utf8.c
index 5e32de2d..524ba872 100644
--- a/utf8.c
+++ b/utf8.c
@@ -723,6 +723,43 @@ utf8_trimcstr(const char *s, u_int width)
return (out);
}
+/* Trim UTF-8 string to width. Caller frees. */
+char *
+utf8_rtrimcstr(const char *s, u_int width)
+{
+ struct utf8_data *tmp, *next, *end;
+ char *out;
+ u_int at;
+
+ tmp = utf8_fromcstr(s);
+
+ for (end = tmp; end->size != 0; end++)
+ /* nothing */;
+ if (end == tmp) {
+ free(tmp);
+ return (xstrdup(""));
+ }
+ next = end - 1;
+
+ at = 0;
+ for (;;)
+ {
+ if (at + next->width > width) {
+ next++;
+ break;
+ }
+ at += next->width;
+
+ if (next == tmp)
+ break;
+ next--;
+ }
+
+ out = utf8_tocstr(next);
+ free(tmp);
+ return (out);
+}
+
/* Pad UTF-8 string to width. Caller frees. */
char *
utf8_padcstr(const char *s, u_int width)
generated by cgit (git 2.34.1) at 2025-05-01 16:08:38 +0000