summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tty.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-10-27 15:58:42 +0000
committernicm <nicm@openbsd.org>2015-10-27 15:58:42 +0000
commitd89252e541ebb5e90a6b7e1089b8f396e19ca235 (patch)
tree6fd0ce863c715f2818c48c94c4f8de9afdb057e9 /usr.bin/tmux/tty.c
parentUse AF_UNIX instead of AF_LOCAL. (diff)
downloadwireguard-openbsd-d89252e541ebb5e90a6b7e1089b8f396e19ca235.tar.xz
wireguard-openbsd-d89252e541ebb5e90a6b7e1089b8f396e19ca235.zip
Move struct options into options.c.
Diffstat (limited to 'usr.bin/tmux/tty.c')
-rw-r--r--usr.bin/tmux/tty.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index 23d62789b74..acc33ea1adb 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.190 2015/10/23 16:30:15 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.191 2015/10/27 15:58:43 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -229,7 +229,7 @@ tty_start_tty(struct tty *tty)
tty_puts(tty, "\033[?1000l\033[?1002l\033[?1006l\033[?1005l");
if (tty_term_flag(tty->term, TTYC_XT)) {
- if (options_get_number(&global_options, "focus-events")) {
+ if (options_get_number(global_options, "focus-events")) {
tty->flags |= TTY_FOCUS;
tty_puts(tty, "\033[?1004h");
}
@@ -457,7 +457,7 @@ tty_set_italics(struct tty *tty)
const char *s;
if (tty_term_has(tty->term, TTYC_SITM)) {
- s = options_get_string(&global_options, "default-terminal");
+ s = options_get_string(global_options, "default-terminal");
if (strcmp(s, "screen") != 0 && strncmp(s, "screen-", 7) != 0) {
tty_putcode(tty, TTYC_SITM);
return;
@@ -1686,8 +1686,8 @@ tty_default_colours(struct grid_cell *gc, const struct window_pane *wp)
return;
pgc = &wp->colgc;
- agc = options_get_style(&wp->window->options, "window-active-style");
- wgc = options_get_style(&wp->window->options, "window-style");
+ agc = options_get_style(wp->window->options, "window-active-style");
+ wgc = options_get_style(wp->window->options, "window-style");
if (gc->fg == 8 && !(gc->flags & GRID_FLAG_FG256)) {
if (pgc->fg != 8 || (pgc->flags & GRID_FLAG_FG256)) {