diff options
Diffstat (limited to 'format.c')
| -rw-r--r-- | format.c | 36 |
1 files changed, 7 insertions, 29 deletions
@@ -43,28 +43,6 @@ typedef void (*format_cb)(struct format_tree *, struct format_entry *); static char *format_job_get(struct format_tree *, const char *); static void format_job_timer(int, short, void *); -static void format_cb_host(struct format_tree *, struct format_entry *); -static void format_cb_host_short(struct format_tree *, - struct format_entry *); -static void format_cb_pid(struct format_tree *, struct format_entry *); -static void format_cb_session_alerts(struct format_tree *, - struct format_entry *); -static void format_cb_window_layout(struct format_tree *, - struct format_entry *); -static void format_cb_window_visible_layout(struct format_tree *, - struct format_entry *); -static void format_cb_start_command(struct format_tree *, - struct format_entry *); -static void format_cb_current_command(struct format_tree *, - struct format_entry *); -static void format_cb_history_bytes(struct format_tree *, - struct format_entry *); -static void format_cb_pane_tabs(struct format_tree *, - struct format_entry *); - -static void format_cb_current_path(struct format_tree *, - struct format_entry *); - static char *format_find(struct format_tree *, const char *, int); static void format_add_cb(struct format_tree *, const char *, format_cb); static void format_add_tv(struct format_tree *, const char *, @@ -217,7 +195,6 @@ format_job_update(struct job *job) struct format_job *fj = job->data; char *line; time_t t; - struct client *c; if ((line = evbuffer_readline(job->event->input)) == NULL) return; @@ -226,12 +203,12 @@ format_job_update(struct job *job) free(fj->out); fj->out = line; - log_debug("%s: %s: %s", __func__, fj->cmd, fj->out); + log_debug("%s: %p %s: %s", __func__, fj, fj->cmd, fj->out); t = time (NULL); if (fj->status && fj->last != t) { - TAILQ_FOREACH(c, &clients, entry) - server_status_client(c); + if (fj->client != NULL) + server_status_client(fj->client); fj->last = t; } } @@ -256,10 +233,11 @@ format_job_complete(struct job *job) } else buf = line; + log_debug("%s: %p %s: %s", __func__, fj, fj->cmd, buf); + if (*buf != '\0' || !fj->updated) { free(fj->out); fj->out = buf; - log_debug("%s: %s: %s", __func__, fj->cmd, fj->out); } else free(buf); @@ -1416,8 +1394,8 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp) format_add(ft, "pane_synchronized", "%d", !!options_get_number(wp->window->options, "synchronize-panes")); - format_add(ft, "pane_search_string", "%s", - window_copy_search_string(wp)); + if (wp->searchstr != NULL) + format_add(ft, "pane_search_string", "%s", wp->searchstr); format_add(ft, "pane_tty", "%s", wp->tty); format_add(ft, "pane_pid", "%ld", (long) wp->pid); |