---
trunk/cmd-choose-buffer.c | 47 +++++++++++++++++++++------------------------
1 file changed, 22 insertions(+), 25 deletions(-)
diff --git a/trunk/cmd-choose-buffer.c b/trunk/cmd-choose-buffer.c
index 3e803f8..f55e565 100644
--- a/trunk/cmd-choose-buffer.c
+++ b/trunk/cmd-choose-buffer.c
@@ -28,8 +28,8 @@
int cmd_choose_buffer_exec(struct cmd *, struct cmd_ctx *);
-void cmd_choose_buffer_callback(void *, int);
-void cmd_choose_buffer_free(void *);
+void cmd_choose_buffer_callback(struct window_choose_data *);
+void cmd_choose_buffer_free(struct window_choose_data *);
const struct cmd_entry cmd_choose_buffer_entry = {
"choose-buffer", NULL,
@@ -48,9 +48,7 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
struct window_choose_data *cdata;
struct winlink *wl;
struct paste_buffer *pb;
- struct format_tree *ft;
u_int idx;
- char *line;
const char *template;
if (ctx->curclient == NULL) {
@@ -72,37 +70,34 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_ctx
*ctx)
idx = 0;
while ((pb = paste_walk_stack(&global_buffers, &idx)) != NULL) {
- ft = format_create();
- format_add(ft, "line", "%u", idx - 1);
- format_paste_buffer(ft, pb);
+ cdata = window_choose_data_create(ctx);
+ if (args->argc != 0)
+ cdata->action = xstrdup(args->argv[0]);
+ else
+ cdata->action = xstrdup("paste-buffer -b '%%'");
- line = format_expand(ft, template);
- window_choose_add(wl->window->active, idx - 1, "%s", line);
+ cdata->idx = idx - 1;
+ cdata->client->references++;
- xfree(line);
- format_free(ft);
- }
+ cdata->ft_template = xstrdup(template);
+ format_add(cdata->ft, "line", "%u", idx - 1);
+ format_paste_buffer(cdata->ft, pb);
- cdata = xmalloc(sizeof *cdata);
- if (args->argc != 0)
- cdata->template = xstrdup(args->argv[0]);
- else
- cdata->template = xstrdup("paste-buffer -b '%%'");
- cdata->client = ctx->curclient;
- cdata->client->references++;
+ window_choose_add(wl->window->active, cdata);
+ }
window_choose_ready(wl->window->active,
- 0, cmd_choose_buffer_callback, cmd_choose_buffer_free, cdata);
+ 0, cmd_choose_buffer_callback, cmd_choose_buffer_free);
return (0);
}
void
-cmd_choose_buffer_callback(void *data, int idx)
+cmd_choose_buffer_callback(struct window_choose_data *cdata)
{
- struct window_choose_data *cdata = data;
+ u_int idx = cdata->idx;
- if (idx == -1)
+ if (cdata == NULL)
return;
if (cdata->client->flags & CLIENT_DEAD)
return;
@@ -112,12 +107,14 @@ cmd_choose_buffer_callback(void *data, int idx)
}
void
-cmd_choose_buffer_free(void *data)
+cmd_choose_buffer_free(struct window_choose_data *data)
{
struct window_choose_data *cdata = data;
cdata->client->references--;
- xfree(cdata->template);
+
+ xfree(cdata->ft_template);
+ xfree(cdata->action);
xfree(cdata->raw_format);
xfree(cdata);
}
--
1.7.10
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
