mirror of
https://github.com/tmux/tmux.git
synced 2025-09-04 15:26:58 +00:00
Sync OpenBSD patchset 580:
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
/* $Id: cmd-show-window-options.c,v 1.14 2009-11-14 17:56:39 tcunha Exp $ */
|
||||
/* $Id: cmd-show-window-options.c,v 1.15 2009-12-04 22:11:23 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -24,7 +24,7 @@
|
||||
#include "tmux.h"
|
||||
|
||||
/*
|
||||
* Show window options.
|
||||
* Show window options. This is an alias for show-options -w.
|
||||
*/
|
||||
|
||||
int cmd_show_window_options_exec(struct cmd *, struct cmd_ctx *);
|
||||
@ -44,26 +44,7 @@ int
|
||||
cmd_show_window_options_exec(struct cmd *self, struct cmd_ctx *ctx)
|
||||
{
|
||||
struct cmd_target_data *data = self->data;
|
||||
struct winlink *wl;
|
||||
struct options *oo;
|
||||
struct options_entry *o;
|
||||
const struct set_option_entry *entry;
|
||||
const char *optval;
|
||||
|
||||
if (cmd_check_flag(data->chflags, 'g'))
|
||||
oo = &global_w_options;
|
||||
else {
|
||||
if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
|
||||
return (-1);
|
||||
oo = &wl->window->options;
|
||||
}
|
||||
|
||||
for (entry = set_window_option_table; entry->name != NULL; entry++) {
|
||||
if ((o = options_find1(oo, entry->name)) == NULL)
|
||||
continue;
|
||||
optval = set_option_print(entry, o);
|
||||
ctx->print(ctx, "%s %s", entry->name, optval);
|
||||
}
|
||||
|
||||
return (0);
|
||||
cmd_set_flag(&data->chflags, 'w');
|
||||
return (cmd_show_options_entry.exec(self, ctx));
|
||||
}
|
||||
|
Reference in New Issue
Block a user