Rename the global options variables to be shorter and to make session options

clear. No functional change, getting this out of the way to make later options
changes easier.
This commit is contained in:
Nicholas Marriott
2009-07-08 18:01:31 +00:00
parent 1825609d8d
commit 86504af149
10 changed files with 77 additions and 81 deletions

View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.153 2009-07-01 23:06:32 nicm Exp $ */
/* $OpenBSD: server.c,v 1.6 2009/07/07 19:49:19 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -378,8 +378,8 @@ server_main(int srv_fd)
unlink(socket_path);
xfree(socket_path);
options_free(&global_options);
options_free(&global_window_options);
options_free(&global_s_options);
options_free(&global_w_options);
if (server_password != NULL)
xfree(server_password);
@ -578,10 +578,8 @@ server_redraw_locked(struct client *c)
yy = c->tty.sy - 1;
if (xx == 0 || yy == 0)
return;
colour = options_get_number(
&global_window_options, "clock-mode-colour");
style = options_get_number(
&global_window_options, "clock-mode-style");
colour = options_get_number(&global_w_options, "clock-mode-colour");
style = options_get_number(&global_w_options, "clock-mode-style");
screen_init(&screen, xx, yy, 0);
@ -1067,7 +1065,7 @@ server_second_timers(void)
time_t t;
t = time(NULL);
xtimeout = options_get_number(&global_options, "lock-after-time");
xtimeout = options_get_number(&global_s_options, "lock-after-time");
if (xtimeout > 0 && t > server_activity + xtimeout)
server_lock();