aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arguments.c14
-rw-r--r--cmd-find-window.c4
-rw-r--r--cmd-list-keys.c5
-rw-r--r--format.c7
-rw-r--r--input-keys.c2
-rw-r--r--mode-tree.c2
-rw-r--r--names.c2
-rw-r--r--screen.c2
-rw-r--r--server-client.c2
-rw-r--r--status.c4
-rw-r--r--tmux.h1
-rw-r--r--window-copy.c6
-rw-r--r--window.c2
13 files changed, 32 insertions, 21 deletions
diff --git a/arguments.c b/arguments.c
index 3ce0e680..f6f6ecaf 100644
--- a/arguments.c
+++ b/arguments.c
@@ -63,6 +63,17 @@ args_find(struct args *args, u_char flag)
return (RB_FIND(args_tree, &args->tree, &entry));
}
+/* Create an empty arguments set. */
+struct args *
+args_create(void)
+{
+ struct args *args;
+
+ args = xcalloc(1, sizeof *args);
+ RB_INIT(&args->tree);
+ return (args);
+}
+
/* Parse an argv and argc into a new argument set. */
struct args *
args_parse(const char *template, int argc, char **argv)
@@ -70,12 +81,11 @@ args_parse(const char *template, int argc, char **argv)
struct args *args;
int opt;
- args = xcalloc(1, sizeof *args);
-
optreset = 1;
optind = 1;
optarg = NULL;
+ args = args_create();
while ((opt = getopt(argc, argv, template)) != -1) {
if (opt < 0)
continue;
diff --git a/cmd-find-window.c b/cmd-find-window.c
index 4cd155e4..43f5f9be 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -48,7 +48,7 @@ cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
struct cmd_find_state *target = cmdq_get_target(item);
struct window_pane *wp = target->wp;
const char *s = args->argv[0], *suffix = "";
- char *filter, *argv = { NULL };
+ char *filter;
int C, N, T;
C = args_has(args, 'C');
@@ -91,7 +91,7 @@ cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
else
xasprintf(&filter, "#{m%s:*%s*,#{pane_title}}", suffix, s);
- new_args = args_parse("", 1, &argv);
+ new_args = args_create();
if (args_has(args, 'Z'))
args_set(new_args, 'Z', NULL);
args_set(new_args, 'f', filter);
diff --git a/cmd-list-keys.c b/cmd-list-keys.c
index 91715f93..dbb510fb 100644
--- a/cmd-list-keys.c
+++ b/cmd-list-keys.c
@@ -211,7 +211,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
repeat = 0;
tablewidth = keywidth = 0;
- table = key_bindings_first_table ();
+ table = key_bindings_first_table();
while (table != NULL) {
if (tablename != NULL && strcmp(table->name, tablename) != 0) {
table = key_bindings_next_table(table);
@@ -243,8 +243,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
tmpsize = 256;
tmp = xmalloc(tmpsize);
-
- table = key_bindings_first_table ();
+ table = key_bindings_first_table();
while (table != NULL) {
if (tablename != NULL && strcmp(table->name, tablename) != 0) {
table = key_bindings_next_table(table);
diff --git a/format.c b/format.c
index 1f18828a..fee406f8 100644
--- a/format.c
+++ b/format.c
@@ -4078,8 +4078,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
case 's':
if (fm->argc < 2)
break;
- sub = xreallocarray (sub, nsub + 1,
- sizeof *sub);
+ sub = xreallocarray(sub, nsub + 1, sizeof *sub);
sub[nsub++] = fm;
break;
case '=':
@@ -4188,7 +4187,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
value = xstrdup("");
else
xasprintf(&value, "%c", c);
- free (new);
+ free(new);
goto done;
}
@@ -4752,7 +4751,7 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s,
if (wp != NULL)
format_defaults_pane(ft, wp);
- pb = paste_get_top (NULL);
+ pb = paste_get_top(NULL);
if (pb != NULL)
format_defaults_paste_buffer(ft, pb);
}
diff --git a/input-keys.c b/input-keys.c
index be83600e..b4770808 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -333,7 +333,7 @@ input_key_cmp(struct input_key_entry *ike1, struct input_key_entry *ike2)
/* Look for key in tree. */
static struct input_key_entry *
-input_key_get (key_code key)
+input_key_get(key_code key)
{
struct input_key_entry entry = { .key = key };
diff --git a/mode-tree.c b/mode-tree.c
index 807c1dcb..c92f7cff 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -922,7 +922,7 @@ mode_tree_menu_callback(__unused struct menu *menu, __unused u_int idx,
if (mti->itemdata != mtm->itemdata)
goto out;
mtd->current = mtm->line;
- mtd->menucb (mtd->modedata, mtm->c, key);
+ mtd->menucb(mtd->modedata, mtm->c, key);
out:
mode_tree_remove_ref(mtd);
diff --git a/names.c b/names.c
index 09b33082..aeb67338 100644
--- a/names.c
+++ b/names.c
@@ -146,7 +146,7 @@ parse_window_name(const char *in)
name = copy = xstrdup(in);
if (*name == '"')
name++;
- name[strcspn (name, "\"")] = '\0';
+ name[strcspn(name, "\"")] = '\0';
if (strncmp(name, "exec ", (sizeof "exec ") - 1) == 0)
name = name + (sizeof "exec ") - 1;
diff --git a/screen.c b/screen.c
index 30b448e8..4b5b1c60 100644
--- a/screen.c
+++ b/screen.c
@@ -697,6 +697,6 @@ screen_mode_to_string(int mode)
strlcat(tmp, "CRLF,", sizeof tmp);
if (mode & MODE_KEXTENDED)
strlcat(tmp, "KEXTENDED,", sizeof tmp);
- tmp[strlen (tmp) - 1] = '\0';
+ tmp[strlen(tmp) - 1] = '\0';
return (tmp);
}
diff --git a/server-client.c b/server-client.c
index e96f4f60..8fde3ade 100644
--- a/server-client.c
+++ b/server-client.c
@@ -2379,7 +2379,7 @@ server_client_set_flags(struct client *c, const char *flags)
uint64_t flag;
int not;
- s = copy = xstrdup (flags);
+ s = copy = xstrdup(flags);
while ((next = strsep(&s, ",")) != NULL) {
not = (*next == '!');
if (not)
diff --git a/status.c b/status.c
index 853f46d3..b442e85d 100644
--- a/status.c
+++ b/status.c
@@ -1413,7 +1413,7 @@ process_key:
break;
if (c->prompt_buffer[0].size == 0) {
prefix = '=';
- free (c->prompt_buffer);
+ free(c->prompt_buffer);
c->prompt_buffer = utf8_fromcstr(c->prompt_last);
c->prompt_index = utf8_strlen(c->prompt_buffer);
} else
@@ -1424,7 +1424,7 @@ process_key:
break;
if (c->prompt_buffer[0].size == 0) {
prefix = '=';
- free (c->prompt_buffer);
+ free(c->prompt_buffer);
c->prompt_buffer = utf8_fromcstr(c->prompt_last);
c->prompt_index = utf8_strlen(c->prompt_buffer);
} else
diff --git a/tmux.h b/tmux.h
index 9c8a584c..9c734ae5 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2183,6 +2183,7 @@ int tty_keys_next(struct tty *);
/* arguments.c */
void args_set(struct args *, u_char, const char *);
+struct args *args_create(void);
struct args *args_parse(const char *, int, char **);
void args_free(struct args *);
char *args_print(struct args *);
diff --git a/window-copy.c b/window-copy.c
index 951d7581..c3b1a66b 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -2226,7 +2226,7 @@ window_copy_cmd_search_backward_incremental(struct window_copy_cmd_state *cs)
data->timeout = 0;
- log_debug ("%s: %s", __func__, argument);
+ log_debug("%s: %s", __func__, argument);
prefix = *argument++;
if (data->searchx == -1 || data->searchy == -1) {
@@ -2281,7 +2281,7 @@ window_copy_cmd_search_forward_incremental(struct window_copy_cmd_state *cs)
data->timeout = 0;
- log_debug ("%s: %s", __func__, argument);
+ log_debug("%s: %s", __func__, argument);
prefix = *argument++;
if (data->searchx == -1 || data->searchy == -1) {
@@ -2859,7 +2859,7 @@ window_copy_command(struct window_mode_entry *wme, struct client *c,
args->argc - 1 > window_copy_cmd_table[i].maxargs)
break;
clear = window_copy_cmd_table[i].clear;
- action = window_copy_cmd_table[i].f (&cs);
+ action = window_copy_cmd_table[i].f(&cs);
break;
}
}
diff --git a/window.c b/window.c
index 5fcb547d..5e256874 100644
--- a/window.c
+++ b/window.c
@@ -931,6 +931,8 @@ window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit)
wp->pipe_fd = -1;
colour_palette_init(&wp->palette);
+ colour_palette_from_option(&wp->palette, wp->options);
+
screen_init(&wp->base, sx, sy, hlimit);
wp->screen = &wp->base;
generated by cgit (git 2.34.1) at 2025-04-28 18:43:24 +0000