mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup internal filemanager layout variables.

Browse Source 
_free_space and _xterm_title never used.
_command_prompt, _keybar_visible, _menubar_visible, _message_visible used within layout_callback() only.

Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andreas Mohr 2016-01-01 16:05:14 +00:00 committed by Andrew Borodin
parent 686ce302bd
commit d72390a45d
1 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/filemanager/layout.c
View File

@ -147,13 +147,7 @@ static int old_output_lines;
/* Internal variables */ /* Internal variables */
static int equal_split; static int equal_split;
static int _menubar_visible;
static int _output_lines; static int _output_lines;
static gboolean _command_prompt;
static int _keybar_visible;
static int _message_visible;
static gboolean _xterm_title;
static int _free_space;
static int height; static int height;
@ -336,38 +330,42 @@ layout_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *
return MSG_HANDLED; return MSG_HANDLED;
case MSG_POST_KEY: case MSG_POST_KEY:
_menubar_visible = check_options[1].widget->state & C_BOOL;
_command_prompt = (check_options[2].widget->state & C_BOOL) != 0;
_keybar_visible = check_options[3].widget->state & C_BOOL;
_message_visible = check_options[4].widget->state & C_BOOL;
_xterm_title = (check_options[5].widget->state & C_BOOL) != 0;
_free_space = check_options[6].widget->state & C_BOOL;
if (mc_global.tty.console_flag != '\0')
{ {
int minimum; int _menubar_visible, _command_prompt, _keybar_visible, _message_visible;
if (_output_lines < 0) _menubar_visible = check_options[1].widget->state & C_BOOL;
_output_lines = 0; _command_prompt = check_options[2].widget->state & C_BOOL;
height = LINES - _keybar_visible - (_command_prompt ? 1 : 0) - _keybar_visible = check_options[3].widget->state & C_BOOL;
_menubar_visible - _output_lines - _message_visible; _message_visible = check_options[4].widget->state & C_BOOL;
minimum = MINHEIGHT * (1 + panels_layout.horizontal_split);
if (height < minimum) if (mc_global.tty.console_flag != '\0')
{ {
_output_lines -= minimum - height; int minimum;
height = minimum;
}
}
else
height = LINES - _keybar_visible - (_command_prompt ? 1 : 0) -
_menubar_visible - _output_lines - _message_visible;
if (old_output_lines != _output_lines) if (_output_lines < 0)
{ _output_lines = 0;
old_output_lines = _output_lines; height =
tty_setcolor (mc_global.tty.console_flag != '\0' ? COLOR_NORMAL : DISABLED_COLOR); LINES - _keybar_visible - _command_prompt - _menubar_visible - _output_lines -
widget_move (h, 9, 5 + 3 + output_lines_label_len); _message_visible;
tty_printf ("%02d", _output_lines); minimum = MINHEIGHT * (1 + panels_layout.horizontal_split);
if (height < minimum)
{
_output_lines -= minimum - height;
height = minimum;
}
}
else
height =
LINES - _keybar_visible - _command_prompt - _menubar_visible - _output_lines -
_message_visible;
if (old_output_lines != _output_lines)
{
old_output_lines = _output_lines;
tty_setcolor (mc_global.tty.console_flag != '\0' ? COLOR_NORMAL : DISABLED_COLOR);
widget_move (h, 9, 5 + 3 + output_lines_label_len);
tty_printf ("%02d", _output_lines);
}
} }
return MSG_HANDLED; return MSG_HANDLED;
@ -463,12 +461,6 @@ init_layout (void)
output_lines_label = _("Output lines:"); output_lines_label = _("Output lines:");
/* save old params */ /* save old params */
_menubar_visible = menubar_visible;
_command_prompt = command_prompt;
_keybar_visible = mc_global.keybar_visible;
_message_visible = mc_global.message_visible;
_xterm_title = xterm_title;
_free_space = free_space;
old_output_lines = -1; old_output_lines = -1;
_output_lines = output_lines; _output_lines = output_lines;