config.c (multitail-6.4.2.tgz) | : | config.c (multitail-6.5.0.tgz) | ||
---|---|---|---|---|
skipping to change at line 25 | skipping to change at line 25 | |||
#include "mt.h" | #include "mt.h" | |||
#include "mem.h" | #include "mem.h" | |||
#include "error.h" | #include "error.h" | |||
#include "utils.h" | #include "utils.h" | |||
#include "color.h" | #include "color.h" | |||
#include "term.h" | #include "term.h" | |||
#include "exec.h" | #include "exec.h" | |||
#include "globals.h" | #include "globals.h" | |||
#include "config.h" | #include "config.h" | |||
#include "xclip.h" | #include "clipboard.h" | |||
/* "local global" */ | /* "local global" */ | |||
int cur_colorscheme_nr = -1; | int cur_colorscheme_nr = -1; | |||
int cur_filterscheme_nr = -1; | int cur_filterscheme_nr = -1; | |||
int cur_editscheme_nr = -1; | int cur_editscheme_nr = -1; | |||
mybool_t config_yes_no(char *what) | mybool_t config_yes_no(char *what) | |||
{ | { | |||
if (what[0] == '1' || strcasecmp(what, "yes") == 0 || strcasecmp(what, "y ") == 0 || strcasecmp(what, "on") == 0) | if (what[0] == '1' || strcasecmp(what, "yes") == 0 || strcasecmp(what, "y ") == 0 || strcasecmp(what, "on") == 0) | |||
{ | { | |||
skipping to change at line 844 | skipping to change at line 844 | |||
void set_wordwrapmaxlength(int linenr, char *cmd, char *par) | void set_wordwrapmaxlength(int linenr, char *cmd, char *par) | |||
{ | { | |||
wordwrapmaxlength = get_value_arg("wordwrapmaxlength", par, VAL_POSITIVE) ; | wordwrapmaxlength = get_value_arg("wordwrapmaxlength", par, VAL_POSITIVE) ; | |||
} | } | |||
void set_xclip(int linenr, char *cmd, char *par) | void set_xclip(int linenr, char *cmd, char *par) | |||
{ | { | |||
if (file_exist(par) == -1) | if (file_exist(par) == -1) | |||
error_exit(TRUE, FALSE, "xclip binary '%s' does not exist"); | error_exit(TRUE, FALSE, "xclip binary '%s' does not exist"); | |||
xclip = strdup(par); | clipboard = strdup(par); | |||
} | ||||
void set_pbcopy(int linenr, char *cmd, char *par) | ||||
{ | ||||
if (file_exist(par) == -1) | ||||
error_exit(TRUE, FALSE, "pbcopy binary '%s' does not exist"); | ||||
clipboard = strdup(par); | ||||
} | } | |||
void set_map_delete_as_backspace(int linenr, char *cmd, char *par) | void set_map_delete_as_backspace(int linenr, char *cmd, char *par) | |||
{ | { | |||
map_delete_as_backspace = config_yes_no(par); | map_delete_as_backspace = config_yes_no(par); | |||
} | } | |||
void set_searchhistory_file(int linenr, char *cmd, char *par) | void set_searchhistory_file(int linenr, char *cmd, char *par) | |||
{ | { | |||
if (par[0] == 0x00) | if (par[0] == 0x00) | |||
skipping to change at line 1004 | skipping to change at line 1012 | |||
void set_resolv_ip_addresses(int linenr, char *cmd, char *par) | void set_resolv_ip_addresses(int linenr, char *cmd, char *par) | |||
{ | { | |||
resolv_ip_addresses = config_yes_no(par); | resolv_ip_addresses = config_yes_no(par); | |||
} | } | |||
void set_show_severity_facility(int linenr, char *cmd, char *par) | void set_show_severity_facility(int linenr, char *cmd, char *par) | |||
{ | { | |||
show_severity_facility = config_yes_no(par); | show_severity_facility = config_yes_no(par); | |||
} | } | |||
void set_scrollback_fullscreen_default(int linenr, char *cmd, char *par) | ||||
{ | ||||
scrollback_fullscreen_default = config_yes_no(par); | ||||
} | ||||
void set_scrollback_no_colors(int linenr, char *cmd, char *par) | void set_scrollback_no_colors(int linenr, char *cmd, char *par) | |||
{ | { | |||
scrollback_no_colors = config_yes_no(par); | scrollback_no_colors = config_yes_no(par); | |||
} | } | |||
void set_scrollback_search_new_window(int linenr, char *cmd, char *par) | void set_scrollback_search_new_window(int linenr, char *cmd, char *par) | |||
{ | { | |||
scrollback_search_new_window = config_yes_no(par); | scrollback_search_new_window = config_yes_no(par); | |||
} | } | |||
skipping to change at line 1095 | skipping to change at line 1108 | |||
{ "min_shrink", set_default_min_shrink }, | { "min_shrink", set_default_min_shrink }, | |||
{ "msgline_char", set_msgline_char }, | { "msgline_char", set_msgline_char }, | |||
{ "msgline_color", set_msgline_color }, | { "msgline_color", set_msgline_color }, | |||
{ "popup_refresh_interval", set_popup_refresh_interval }, | { "popup_refresh_interval", set_popup_refresh_interval }, | |||
{ "posix_tail", set_posix_tail }, | { "posix_tail", set_posix_tail }, | |||
{ "replace_by_markerline", set_replace_by_markerline }, | { "replace_by_markerline", set_replace_by_markerline }, | |||
{ "resolv_ip_addresses", set_resolv_ip_addresses }, | { "resolv_ip_addresses", set_resolv_ip_addresses }, | |||
{ "reuse_searchstring", set_reuse_searchstring }, | { "reuse_searchstring", set_reuse_searchstring }, | |||
{ "rule", add_filterscheme_rule }, | { "rule", add_filterscheme_rule }, | |||
{ "scheme", scheme }, | { "scheme", scheme }, | |||
{ "scrollback_fullscreen_default", set_scrollback_fullscreen_default }, | ||||
{ "scrollback_no_colors", set_scrollback_no_colors }, | { "scrollback_no_colors", set_scrollback_no_colors }, | |||
{ "scrollback_search_new_window", set_scrollback_search_new_window }, | { "scrollback_search_new_window", set_scrollback_search_new_window }, | |||
{ "scrollback_show_winnrs", set_scrollback_show_winnrs }, | { "scrollback_show_winnrs", set_scrollback_show_winnrs }, | |||
{ "searches_case_insensitive", set_searches_case_insensitive }, | { "searches_case_insensitive", set_searches_case_insensitive }, | |||
{ "searchhistory_file", set_searchhistory_file }, | { "searchhistory_file", set_searchhistory_file }, | |||
{ "searchhistory_size", set_searchhistory_size }, | { "searchhistory_size", set_searchhistory_size }, | |||
{ "shell", set_shell }, | { "shell", set_shell }, | |||
{ "show_severity_facility", set_show_severity_facility }, | { "show_severity_facility", set_show_severity_facility }, | |||
{ "show_subwindow_id", set_show_subwindow_id }, | { "show_subwindow_id", set_show_subwindow_id }, | |||
{ "splitline", set_splitline }, | { "splitline", set_splitline }, | |||
skipping to change at line 1122 | skipping to change at line 1136 | |||
{ "tab_stop", set_tab_stop }, | { "tab_stop", set_tab_stop }, | |||
{ "tail", set_tail }, | { "tail", set_tail }, | |||
{ "titlebar", set_titlebar }, | { "titlebar", set_titlebar }, | |||
{ "ts_format", set_ts_format }, | { "ts_format", set_ts_format }, | |||
{ "umask", set_umask }, | { "umask", set_umask }, | |||
{ "useeditscheme", use_editscheme }, | { "useeditscheme", use_editscheme }, | |||
{ "usefilterscheme", use_filterscheme }, | { "usefilterscheme", use_filterscheme }, | |||
{ "warn_closed", set_warn_closed }, | { "warn_closed", set_warn_closed }, | |||
{ "window_number", set_window_number }, | { "window_number", set_window_number }, | |||
{ "wordwrapmaxlength", set_wordwrapmaxlength }, | { "wordwrapmaxlength", set_wordwrapmaxlength }, | |||
{ "xclip", set_xclip } | { "xclip", set_xclip }, | |||
#ifdef __APPLE__ | ||||
{ "pbcopy", set_pbcopy }, | ||||
#endif | ||||
}; | }; | |||
int find_config_entry_in_dispatch_table(char *cmd_name) | int find_config_entry_in_dispatch_table(char *cmd_name) | |||
{ | { | |||
int left = 0; | int left = 0; | |||
int right = (sizeof(cf_entries) / sizeof(config_file_keyword)) - 1; | int right = (sizeof(cf_entries) / sizeof(config_file_keyword)) - 1; | |||
while(left <= right) | while(left <= right) | |||
{ | { | |||
int mid = (left + right) / 2; | int mid = (left + right) / 2; | |||
End of changes. 5 change blocks. | ||||
3 lines changed or deleted | 20 lines changed or added |