p
/
xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 10 Wiki Activity

degesch: refactor handle_command_buffer() a bit

This commit is contained in:
Přemysl Eric Janouch 2015-04-25 02:41:52 +02:00
parent 0141bef3cd
commit a75fc35295
1 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
degesch.c
View File

@ -2642,20 +2642,9 @@ server_command_check (struct app_context *ctx, const char *action)
return false; return false;
} }
static bool static void
handle_command_buffer (struct app_context *ctx, char *arguments) show_buffers_list (struct app_context *ctx)
{ {
char *action = cut_word (&arguments);
if (try_handle_buffer_goto (ctx, action))
return true;
struct buffer *buffer = NULL;
// XXX: also build a prefix map?
// It looks like we'll want to split this into functions anyway.
// TODO: some subcommand to print N last lines from the buffer
if (!strcasecmp_ascii (action, "list"))
{
buffer_send_status (ctx, ctx->global_buffer, "%s", ""); buffer_send_status (ctx, ctx->global_buffer, "%s", "");
buffer_send_status (ctx, ctx->global_buffer, "Buffers list:"); buffer_send_status (ctx, ctx->global_buffer, "Buffers list:");
@ -2663,7 +2652,46 @@ handle_command_buffer (struct app_context *ctx, char *arguments)
LIST_FOR_EACH (struct buffer, iter, ctx->buffers) LIST_FOR_EACH (struct buffer, iter, ctx->buffers)
buffer_send_status (ctx, ctx->global_buffer, buffer_send_status (ctx, ctx->global_buffer,
" [%d] %s", i++, iter->name); " [%d] %s", i++, iter->name);
}
static void
handle_buffer_close (struct app_context *ctx, char *arguments)
{
struct buffer *buffer = NULL;
const char *which = NULL;
if (!*arguments)
buffer = ctx->current_buffer;
else
buffer = try_decode_buffer (ctx, (which = cut_word (&arguments)));
if (!buffer)
buffer_send_error (ctx, ctx->global_buffer,
"%s: %s", "No such buffer", which);
else if (buffer == ctx->global_buffer)
buffer_send_error (ctx, ctx->global_buffer,
"Can't close the global buffer");
else if (buffer == ctx->server_buffer)
buffer_send_error (ctx, ctx->global_buffer,
"Can't close the server buffer");
else
{
if (buffer == ctx->current_buffer)
buffer_activate (ctx, buffer_next (ctx, 1));
buffer_remove (ctx, buffer);
} }
}
static bool
handle_command_buffer (struct app_context *ctx, char *arguments)
{
char *action = cut_word (&arguments);
if (try_handle_buffer_goto (ctx, action))
return true;
// XXX: also build a prefix map?
// TODO: some subcommand to print N last lines from the buffer
if (!strcasecmp_ascii (action, "list"))
show_buffers_list (ctx);
else if (!strcasecmp_ascii (action, "clear")) else if (!strcasecmp_ascii (action, "clear"))
{ {
// TODO // TODO
@ -2674,36 +2702,7 @@ handle_command_buffer (struct app_context *ctx, char *arguments)
// we will probably need to extend liberty for this // we will probably need to extend liberty for this
} }
else if (!strcasecmp_ascii (action, "close")) else if (!strcasecmp_ascii (action, "close"))
{ handle_buffer_close (ctx, arguments);
const char *which = NULL;
if (!*arguments)
buffer = ctx->current_buffer;
else
buffer = try_decode_buffer (ctx, (which = cut_word (&arguments)));
if (!buffer)
{
buffer_send_error (ctx, ctx->global_buffer,
"%s: %s", "No such buffer", which);
return true;
}
if (buffer == ctx->global_buffer)
{
buffer_send_error (ctx, ctx->global_buffer,
"Can't close the global buffer");
return true;
}
if (buffer == ctx->server_buffer)
{
buffer_send_error (ctx, ctx->global_buffer,
"Can't close the server buffer");
return true;
}
if (buffer == ctx->current_buffer)
buffer_activate (ctx, buffer_next (ctx, 1));
buffer_remove (ctx, buffer);
}
else else
return false; return false;