diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/irc/irc-config.c | 342 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.h | 42 | ||||
| -rw-r--r-- | src/plugins/logger/logger-config.c | 72 | ||||
| -rw-r--r-- | src/plugins/logger/logger-config.h | 11 | ||||
| -rw-r--r-- | src/plugins/relay/relay-config.c | 54 | ||||
| -rw-r--r-- | src/plugins/relay/relay-config.h | 5 | ||||
| -rw-r--r-- | src/plugins/script/script-config.c | 158 | ||||
| -rw-r--r-- | src/plugins/script/script-config.h | 24 | ||||
| -rw-r--r-- | src/plugins/xfer/xfer-config.c | 144 | ||||
| -rw-r--r-- | src/plugins/xfer/xfer-config.h | 18 |
10 files changed, 436 insertions, 434 deletions
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index e0bf8d6e9..584e8027e 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -55,16 +55,6 @@ struct t_config_option *irc_config_look_color_nicks_in_nicklist; struct t_config_option *irc_config_look_color_nicks_in_server_messages; struct t_config_option *irc_config_look_color_pv_nick_like_channel; struct t_config_option *irc_config_look_ctcp_time_format; -struct t_config_option *irc_config_look_server_buffer; -struct t_config_option *irc_config_look_pv_buffer; -struct t_config_option *irc_config_look_new_channel_position; -struct t_config_option *irc_config_look_new_pv_position; -struct t_config_option *irc_config_look_nick_mode; -struct t_config_option *irc_config_look_nick_mode_empty; -struct t_config_option *irc_config_look_nick_color_force; -struct t_config_option *irc_config_look_nick_color_hash; -struct t_config_option *irc_config_look_nick_color_stop_chars; -struct t_config_option *irc_config_look_nick_completion_smart; struct t_config_option *irc_config_look_display_away; struct t_config_option *irc_config_look_display_ctcp_blocked; struct t_config_option *irc_config_look_display_ctcp_reply; @@ -76,45 +66,55 @@ struct t_config_option *irc_config_look_display_join_message; struct t_config_option *irc_config_look_display_old_topic; struct t_config_option *irc_config_look_display_pv_away_once; struct t_config_option *irc_config_look_display_pv_back; -struct t_config_option *irc_config_look_item_away_message; -struct t_config_option *irc_config_look_item_channel_modes_hide_key; -struct t_config_option *irc_config_look_item_nick_modes; -struct t_config_option *irc_config_look_item_nick_prefix; struct t_config_option *irc_config_look_highlight_server; struct t_config_option *irc_config_look_highlight_channel; struct t_config_option *irc_config_look_highlight_pv; struct t_config_option *irc_config_look_highlight_tags; +struct t_config_option *irc_config_look_item_away_message; +struct t_config_option *irc_config_look_item_channel_modes_hide_key; struct t_config_option *irc_config_look_item_display_server; +struct t_config_option *irc_config_look_item_nick_modes; +struct t_config_option *irc_config_look_item_nick_prefix; struct t_config_option *irc_config_look_msgbuffer_fallback; +struct t_config_option *irc_config_look_new_channel_position; +struct t_config_option *irc_config_look_new_pv_position; struct t_config_option *irc_config_look_nicks_hide_password; +struct t_config_option *irc_config_look_nick_color_force; +struct t_config_option *irc_config_look_nick_color_hash; +struct t_config_option *irc_config_look_nick_color_stop_chars; +struct t_config_option *irc_config_look_nick_completion_smart; +struct t_config_option *irc_config_look_nick_mode; +struct t_config_option *irc_config_look_nick_mode_empty; struct t_config_option *irc_config_look_notice_as_pv; struct t_config_option *irc_config_look_notify_tags_ison; struct t_config_option *irc_config_look_notify_tags_whois; struct t_config_option *irc_config_look_part_closes_buffer; +struct t_config_option *irc_config_look_pv_buffer; struct t_config_option *irc_config_look_raw_messages; +struct t_config_option *irc_config_look_server_buffer; struct t_config_option *irc_config_look_smart_filter; struct t_config_option *irc_config_look_smart_filter_delay; struct t_config_option *irc_config_look_smart_filter_join; struct t_config_option *irc_config_look_smart_filter_join_unmask; -struct t_config_option *irc_config_look_smart_filter_quit; struct t_config_option *irc_config_look_smart_filter_nick; +struct t_config_option *irc_config_look_smart_filter_quit; struct t_config_option *irc_config_look_topic_strip_colors; /* IRC config, color section */ -struct t_config_option *irc_config_color_message_join; -struct t_config_option *irc_config_color_message_quit; -struct t_config_option *irc_config_color_mirc_remap; -struct t_config_option *irc_config_color_nick_prefixes; -struct t_config_option *irc_config_color_notice; struct t_config_option *irc_config_color_input_nick; struct t_config_option *irc_config_color_item_away; struct t_config_option *irc_config_color_item_channel_modes; struct t_config_option *irc_config_color_item_lag_counting; struct t_config_option *irc_config_color_item_lag_finished; +struct t_config_option *irc_config_color_message_join; +struct t_config_option *irc_config_color_message_quit; +struct t_config_option *irc_config_color_mirc_remap; +struct t_config_option *irc_config_color_nick_prefixes; +struct t_config_option *irc_config_color_notice; struct t_config_option *irc_config_color_reason_quit; -struct t_config_option *irc_config_color_topic_old; struct t_config_option *irc_config_color_topic_new; +struct t_config_option *irc_config_color_topic_old; /* IRC config, network section */ @@ -2206,88 +2206,6 @@ irc_config_init () N_("time format used in answer to message CTCP TIME (see man strftime " "for date/time specifiers)"), NULL, 0, 0, "%a, %d %b %Y %T %z", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - irc_config_look_server_buffer = weechat_config_new_option ( - irc_config_file, ptr_section, - "server_buffer", "integer", - N_("merge server buffers"), - "merge_with_core|merge_without_core|independent", 0, 0, "merge_with_core", - NULL, 0, NULL, NULL, - &irc_config_change_look_server_buffer, NULL, NULL, NULL); - irc_config_look_pv_buffer = weechat_config_new_option ( - irc_config_file, ptr_section, - "pv_buffer", "integer", - N_("merge private buffers"), - "independent|merge_by_server|merge_all", 0, 0, "independent", - NULL, 0, NULL, NULL, - &irc_config_change_look_pv_buffer, NULL, NULL, NULL); - irc_config_look_new_channel_position = weechat_config_new_option ( - irc_config_file, ptr_section, - "new_channel_position", "integer", - N_("force position of new channel in list of buffers " - "(none = default position (should be last buffer), " - "next = current buffer + 1, near_server = after last channel/pv " - "of server)"), - "none|next|near_server", 0, 0, "none", - NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - irc_config_look_new_pv_position = weechat_config_new_option ( - irc_config_file, ptr_section, - "new_pv_position", "integer", - N_("force position of new private in list of buffers " - "(none = default position (should be last buffer), " - "next = current buffer + 1, near_server = after last channel/pv " - "of server)"), - "none|next|near_server", 0, 0, "none", - NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - irc_config_look_nick_mode = weechat_config_new_option ( - irc_config_file, ptr_section, - "nick_mode", "integer", - N_("display nick mode (op, voice, ...) before nick (none = never, " - "prefix = in prefix only (default), action = in action messages " - "only, both = prefix + action messages)"), - "none|prefix|action|both", 0, 0, "prefix", - NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - irc_config_look_nick_mode_empty = weechat_config_new_option ( - irc_config_file, ptr_section, - "nick_mode_empty", "boolean", - N_("display a space if nick mode is enabled but nick has no mode (not " - "op, voice, ...)"), - NULL, 0, 0, "off", NULL, 0, NULL, NULL, - NULL, NULL, NULL, NULL); - irc_config_look_nick_color_force = weechat_config_new_option ( - irc_config_file, ptr_section, - "nick_color_force", "string", - N_("force color for some nicks: hash computed with nickname " - "to find color will not be used for these nicks (format is: " - "\"nick1:color1;nick2:color2\"); look up for nicks is with " - "exact case then lower case, so it's possible to use only lower " - "case for nicks in this option"), - NULL, 0, 0, "", NULL, 0, NULL, NULL, - &irc_config_change_look_nick_color_force, NULL, NULL, NULL); - irc_config_look_nick_color_hash = weechat_config_new_option ( - irc_config_file, ptr_section, - "nick_color_hash", "integer", - N_("hash algorithm used to find the color for a nick: djb2 = variant of " - "djb2 (position of letters matters: anagrams of a nick have different " - "color), sum = sum of letters"), - "djb2|sum", 0, 0, "sum", NULL, 0, NULL, NULL, - &irc_config_change_look_nick_colors, NULL, NULL, NULL); - irc_config_look_nick_color_stop_chars = weechat_config_new_option ( - irc_config_file, ptr_section, - "nick_color_stop_chars", "string", - N_("chars used to stop in nick when computing color with letters of " - "nick (at least one char outside this list must be in string before " - "stopping) (example: nick \"|nick|away\" with \"|\" in chars will " - "return color of nick \"|nick\")"), - NULL, 0, 0, "_|[", NULL, 0, NULL, NULL, - &irc_config_change_look_nick_colors, NULL, NULL, NULL); - irc_config_look_nick_completion_smart = weechat_config_new_option ( - irc_config_file, ptr_section, - "nick_completion_smart", "integer", - N_("smart completion for nicks (completes first with last speakers): " - "speakers = all speakers (including highlights), " - "speakers_highlights = only speakers with highlight"), - "off|speakers|speakers_highlights", 0, 0, "speakers", NULL, 0, NULL, NULL, - NULL, NULL, NULL, NULL); irc_config_look_display_away = weechat_config_new_option ( irc_config_file, ptr_section, "display_away", "integer", @@ -2356,31 +2274,6 @@ irc_config_init () N_("display a message in private when user is back (after quit on " "server)"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - irc_config_look_item_away_message = weechat_config_new_option ( - irc_config_file, ptr_section, - "item_away_message", "boolean", - N_("display server away message in away bar item"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, - &irc_config_change_look_item_away_message, NULL, NULL, NULL); - irc_config_look_item_channel_modes_hide_key = weechat_config_new_option ( - irc_config_file, ptr_section, - "item_channel_modes_hide_key", "boolean", - N_("hide channel key in channel modes (this will hide all channel modes " - "arguments if mode +k is set on channel)"), - NULL, 0, 0, "off", NULL, 0, NULL, NULL, - &irc_config_change_look_item_channel_modes_hide_key, NULL, NULL, NULL); - irc_config_look_item_nick_modes = weechat_config_new_option ( - irc_config_file, ptr_section, - "item_nick_modes", "boolean", - N_("display nick modes in \"input_prompt\" bar item"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, - &irc_config_change_look_item_nick_modes, NULL, NULL, NULL); - irc_config_look_item_nick_prefix = weechat_config_new_option ( - irc_config_file, ptr_section, - "item_nick_prefix", "boolean", - N_("display nick prefix in \"input_prompt\" bar item"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, - &irc_config_change_look_item_nick_prefix, NULL, NULL, NULL); irc_config_look_highlight_server = weechat_config_new_option ( irc_config_file, ptr_section, "highlight_server", "string", @@ -2425,12 +2318,37 @@ irc_config_init () "messages,..)"), NULL, 0, 0, "irc_privmsg,irc_notice", NULL, 0, NULL, NULL, &irc_config_change_look_highlight_tags, NULL, NULL, NULL); + irc_config_look_item_away_message = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_away_message", "boolean", + N_("display server away message in away bar item"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + &irc_config_change_look_item_away_message, NULL, NULL, NULL); + irc_config_look_item_channel_modes_hide_key = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_channel_modes_hide_key", "boolean", + N_("hide channel key in channel modes (this will hide all channel modes " + "arguments if mode +k is set on channel)"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, + &irc_config_change_look_item_channel_modes_hide_key, NULL, NULL, NULL); irc_config_look_item_display_server = weechat_config_new_option ( irc_config_file, ptr_section, "item_display_server", "integer", N_("name of bar item where IRC server is displayed (for status bar)"), "buffer_plugin|buffer_name", 0, 0, "buffer_plugin", NULL, 0, NULL, NULL, &irc_config_change_look_item_display_server, NULL, NULL, NULL); + irc_config_look_item_nick_modes = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_nick_modes", "boolean", + N_("display nick modes in \"input_prompt\" bar item"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + &irc_config_change_look_item_nick_modes, NULL, NULL, NULL); + irc_config_look_item_nick_prefix = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_nick_prefix", "boolean", + N_("display nick prefix in \"input_prompt\" bar item"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + &irc_config_change_look_item_nick_prefix, NULL, NULL, NULL); irc_config_look_msgbuffer_fallback = weechat_config_new_option ( irc_config_file, ptr_section, "msgbuffer_fallback", "integer", @@ -2438,6 +2356,24 @@ irc_config_init () "private and that private buffer is not found"), "current|server", 0, 0, "current", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_new_channel_position = weechat_config_new_option ( + irc_config_file, ptr_section, + "new_channel_position", "integer", + N_("force position of new channel in list of buffers " + "(none = default position (should be last buffer), " + "next = current buffer + 1, near_server = after last channel/pv " + "of server)"), + "none|next|near_server", 0, 0, "none", + NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_new_pv_position = weechat_config_new_option ( + irc_config_file, ptr_section, + "new_pv_position", "integer", + N_("force position of new private in list of buffers " + "(none = default position (should be last buffer), " + "next = current buffer + 1, near_server = after last channel/pv " + "of server)"), + "none|next|near_server", 0, 0, "none", + NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_look_nicks_hide_password = weechat_config_new_option ( irc_config_file, ptr_section, "nicks_hide_password", "string", @@ -2447,6 +2383,56 @@ irc_config_init () "\"nickserv,nickbot\""), NULL, 0, 0, "nickserv", NULL, 0, NULL, NULL, &irc_config_change_look_nicks_hide_password, NULL, NULL, NULL); + irc_config_look_nick_color_force = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_color_force", "string", + N_("force color for some nicks: hash computed with nickname " + "to find color will not be used for these nicks (format is: " + "\"nick1:color1;nick2:color2\"); look up for nicks is with " + "exact case then lower case, so it's possible to use only lower " + "case for nicks in this option"), + NULL, 0, 0, "", NULL, 0, NULL, NULL, + &irc_config_change_look_nick_color_force, NULL, NULL, NULL); + irc_config_look_nick_color_hash = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_color_hash", "integer", + N_("hash algorithm used to find the color for a nick: djb2 = variant of " + "djb2 (position of letters matters: anagrams of a nick have different " + "color), sum = sum of letters"), + "djb2|sum", 0, 0, "sum", NULL, 0, NULL, NULL, + &irc_config_change_look_nick_colors, NULL, NULL, NULL); + irc_config_look_nick_color_stop_chars = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_color_stop_chars", "string", + N_("chars used to stop in nick when computing color with letters of " + "nick (at least one char outside this list must be in string before " + "stopping) (example: nick \"|nick|away\" with \"|\" in chars will " + "return color of nick \"|nick\")"), + NULL, 0, 0, "_|[", NULL, 0, NULL, NULL, + &irc_config_change_look_nick_colors, NULL, NULL, NULL); + irc_config_look_nick_completion_smart = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_completion_smart", "integer", + N_("smart completion for nicks (completes first with last speakers): " + "speakers = all speakers (including highlights), " + "speakers_highlights = only speakers with highlight"), + "off|speakers|speakers_highlights", 0, 0, "speakers", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); + irc_config_look_nick_mode = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_mode", "integer", + N_("display nick mode (op, voice, ...) before nick (none = never, " + "prefix = in prefix only (default), action = in action messages " + "only, both = prefix + action messages)"), + "none|prefix|action|both", 0, 0, "prefix", + NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_nick_mode_empty = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_mode_empty", "boolean", + N_("display a space if nick mode is enabled but nick has no mode (not " + "op, voice, ...)"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); irc_config_look_notice_as_pv = weechat_config_new_option ( irc_config_file, ptr_section, "notice_as_pv", "integer", @@ -2476,12 +2462,26 @@ irc_config_init () "part_closes_buffer", "boolean", N_("close buffer when /part is issued on a channel"), NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_pv_buffer = weechat_config_new_option ( + irc_config_file, ptr_section, + "pv_buffer", "integer", + N_("merge private buffers"), + "independent|merge_by_server|merge_all", 0, 0, "independent", + NULL, 0, NULL, NULL, + &irc_config_change_look_pv_buffer, NULL, NULL, NULL); irc_config_look_raw_messages = weechat_config_new_option ( irc_config_file, ptr_section, "raw_messages", "integer", N_("number of raw messages to save in memory when raw data buffer is " "closed (messages will be displayed when opening raw data buffer)"), NULL, 0, 65535, "256", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_server_buffer = weechat_config_new_option ( + irc_config_file, ptr_section, + "server_buffer", "integer", + N_("merge server buffers"), + "merge_with_core|merge_without_core|independent", 0, 0, "merge_with_core", + NULL, 0, NULL, NULL, + &irc_config_change_look_server_buffer, NULL, NULL, NULL); irc_config_look_smart_filter = weechat_config_new_option ( irc_config_file, ptr_section, "smart_filter", "boolean", @@ -2509,18 +2509,18 @@ irc_config_init () "update on topic), the join is unmasked, as well as nick changes " "after this join (0 = disable: never unmask a join)"), NULL, 0, 60*24*7, "30", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - irc_config_look_smart_filter_quit = weechat_config_new_option ( - irc_config_file, ptr_section, - "smart_filter_quit", "boolean", - /* TRANSLATORS: please do not translate "part" and "quit" */ - N_("enable smart filter for \"part\" and \"quit\" messages"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_look_smart_filter_nick = weechat_config_new_option ( irc_config_file, ptr_section, "smart_filter_nick", "boolean", /* TRANSLATORS: please do not translate "nick" */ N_("enable smart filter for \"nick\" messages (nick changes)"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_smart_filter_quit = weechat_config_new_option ( + irc_config_file, ptr_section, + "smart_filter_quit", "boolean", + /* TRANSLATORS: please do not translate "part" and "quit" */ + N_("enable smart filter for \"part\" and \"quit\" messages"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_look_topic_strip_colors = weechat_config_new_option ( irc_config_file, ptr_section, "topic_strip_colors", "boolean", @@ -2540,6 +2540,37 @@ irc_config_init () return 0; } + irc_config_color_input_nick = weechat_config_new_option ( + irc_config_file, ptr_section, + "input_nick", "color", + N_("color for nick in input bar"), + NULL, -1, 0, "lightcyan", NULL, 0, NULL, NULL, + &irc_config_change_color_input_nick, NULL, NULL, NULL); + irc_config_color_item_away = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_away", "color", + N_("color for away item"), + NULL, -1, 0, "yellow", NULL, 0, NULL, NULL, + &irc_config_change_color_item_away, NULL, NULL, NULL); + irc_config_color_item_channel_modes = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_channel_modes", "color", + N_("color for channel modes, near channel name"), + NULL, -1, 0, "default", NULL, 0, NULL, NULL, + &irc_config_change_color_item_channel_modes, NULL, NULL, NULL); + irc_config_color_item_lag_counting = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_lag_counting", "color", + N_("color for lag indicator, when counting (pong not received from " + "server, lag is increasing)"), + NULL, -1, 0, "default", NULL, 0, NULL, NULL, + &irc_config_change_color_item_lag, NULL, NULL, NULL); + irc_config_color_item_lag_finished = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_lag_finished", "color", + N_("color for lag indicator, when pong has been received from server"), + NULL, -1, 0, "yellow", NULL, 0, NULL, NULL, + &irc_config_change_color_item_lag, NULL, NULL, NULL); irc_config_color_message_join = weechat_config_new_option ( irc_config_file, ptr_section, "message_join", "color", @@ -2584,55 +2615,24 @@ irc_config_init () N_("color for text \"Notice\" in notices"), NULL, -1, 0, "green", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - irc_config_color_input_nick = weechat_config_new_option ( - irc_config_file, ptr_section, - "input_nick", "color", - N_("color for nick in input bar"), - NULL, -1, 0, "lightcyan", NULL, 0, NULL, NULL, - &irc_config_change_color_input_nick, NULL, NULL, NULL); - irc_config_color_item_away = weechat_config_new_option ( - irc_config_file, ptr_section, - "item_away", "color", - N_("color for away item"), - NULL, -1, 0, "yellow", NULL, 0, NULL, NULL, - &irc_config_change_color_item_away, NULL, NULL, NULL); - irc_config_color_item_channel_modes = weechat_config_new_option ( - irc_config_file, ptr_section, - "item_channel_modes", "color", - N_("color for channel modes, near channel name"), - NULL, -1, 0, "default", NULL, 0, NULL, NULL, - &irc_config_change_color_item_channel_modes, NULL, NULL, NULL); - irc_config_color_item_lag_counting = weechat_config_new_option ( - irc_config_file, ptr_section, - "item_lag_counting", "color", - N_("color for lag indicator, when counting (pong not received from " - "server, lag is increasing)"), - NULL, -1, 0, "default", NULL, 0, NULL, NULL, - &irc_config_change_color_item_lag, NULL, NULL, NULL); - irc_config_color_item_lag_finished = weechat_config_new_option ( - irc_config_file, ptr_section, - "item_lag_finished", "color", - N_("color for lag indicator, when pong has been received from server"), - NULL, -1, 0, "yellow", NULL, 0, NULL, NULL, - &irc_config_change_color_item_lag, NULL, NULL, NULL); irc_config_color_reason_quit = weechat_config_new_option ( irc_config_file, ptr_section, "reason_quit", "color", N_("color for reason in part/quit messages"), NULL, -1, 0, "default", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - irc_config_color_topic_old = weechat_config_new_option ( - irc_config_file, ptr_section, - "topic_old", "color", - N_("color for old channel topic (when topic is changed)"), - NULL, -1, 0, "darkgray", NULL, 0, NULL, NULL, - NULL, NULL, NULL, NULL); irc_config_color_topic_new = weechat_config_new_option ( irc_config_file, ptr_section, "topic_new", "color", N_("color for new channel topic (when topic is changed)"), NULL, -1, 0, "white", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_color_topic_old = weechat_config_new_option ( + irc_config_file, ptr_section, + "topic_old", "color", + N_("color for old channel topic (when topic is changed)"), + NULL, -1, 0, "darkgray", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); /* network */ ptr_section = weechat_config_new_section (irc_config_file, "network", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index a032eded4..ddd4a0944 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -103,16 +103,6 @@ extern struct t_config_option *irc_config_look_color_nicks_in_nicklist; extern struct t_config_option *irc_config_look_color_nicks_in_server_messages; extern struct t_config_option *irc_config_look_color_pv_nick_like_channel; extern struct t_config_option *irc_config_look_ctcp_time_format; -extern struct t_config_option *irc_config_look_server_buffer; -extern struct t_config_option *irc_config_look_pv_buffer; -extern struct t_config_option *irc_config_look_new_channel_position; -extern struct t_config_option *irc_config_look_new_pv_position; -extern struct t_config_option *irc_config_look_nick_mode; -extern struct t_config_option *irc_config_look_nick_mode_empty; -extern struct t_config_option *irc_config_look_nick_color_force; -extern struct t_config_option *irc_config_look_nick_color_hash; -extern struct t_config_option *irc_config_look_nick_color_stop_chars; -extern struct t_config_option *irc_config_look_nick_completion_smart; extern struct t_config_option *irc_config_look_display_away; extern struct t_config_option *irc_config_look_display_ctcp_blocked; extern struct t_config_option *irc_config_look_display_ctcp_reply; @@ -124,43 +114,53 @@ extern struct t_config_option *irc_config_look_display_join_message; extern struct t_config_option *irc_config_look_display_old_topic; extern struct t_config_option *irc_config_look_display_pv_away_once; extern struct t_config_option *irc_config_look_display_pv_back; -extern struct t_config_option *irc_config_look_item_away_message; -extern struct t_config_option *irc_config_look_item_channel_modes_hide_key; -extern struct t_config_option *irc_config_look_item_nick_modes; -extern struct t_config_option *irc_config_look_item_nick_prefix; extern struct t_config_option *irc_config_look_highlight_server; extern struct t_config_option *irc_config_look_highlight_channel; extern struct t_config_option *irc_config_look_highlight_pv; extern struct t_config_option *irc_config_look_highlight_tags; +extern struct t_config_option *irc_config_look_item_away_message; +extern struct t_config_option *irc_config_look_item_channel_modes_hide_key; extern struct t_config_option *irc_config_look_item_display_server; +extern struct t_config_option *irc_config_look_item_nick_modes; +extern struct t_config_option *irc_config_look_item_nick_prefix; extern struct t_config_option *irc_config_look_msgbuffer_fallback; +extern struct t_config_option *irc_config_look_new_channel_position; +extern struct t_config_option *irc_config_look_new_pv_position; extern struct t_config_option *irc_config_look_nicks_hide_password; +extern struct t_config_option *irc_config_look_nick_color_force; +extern struct t_config_option *irc_config_look_nick_color_hash; +extern struct t_config_option *irc_config_look_nick_color_stop_chars; +extern struct t_config_option *irc_config_look_nick_completion_smart; +extern struct t_config_option *irc_config_look_nick_mode; +extern struct t_config_option *irc_config_look_nick_mode_empty; extern struct t_config_option *irc_config_look_notice_as_pv; extern struct t_config_option *irc_config_look_notify_tags_ison; extern struct t_config_option *irc_config_look_notify_tags_whois; extern struct t_config_option *irc_config_look_part_closes_buffer; +extern struct t_config_option *irc_config_look_pv_buffer; extern struct t_config_option *irc_config_look_raw_messages; +extern struct t_config_option *irc_config_look_server_buffer; extern struct t_config_option *irc_config_look_smart_filter; extern struct t_config_option *irc_config_look_smart_filter_delay; extern struct t_config_option *irc_config_look_smart_filter_join; extern struct t_config_option *irc_config_look_smart_filter_join_unmask; -extern struct t_config_option *irc_config_look_smart_filter_quit; extern struct t_config_option *irc_config_look_smart_filter_nick; +extern struct t_config_option *irc_config_look_smart_filter_quit; extern struct t_config_option *irc_config_look_topic_strip_colors; -extern struct t_config_option *irc_config_color_message_join; -extern struct t_config_option *irc_config_color_message_quit; -extern struct t_config_option *irc_config_color_mirc_remap; -extern struct t_config_option *irc_config_color_nick_prefixes; -extern struct t_config_option *irc_config_color_notice; extern struct t_config_option *irc_config_color_input_nick; extern struct t_config_option *irc_config_color_item_away; extern struct t_config_option *irc_config_color_item_channel_modes; extern struct t_config_option *irc_config_color_item_lag_counting; extern struct t_config_option *irc_config_color_item_lag_finished; +extern struct t_config_option *irc_config_color_message_join; +extern struct t_config_option *irc_config_color_message_quit; +extern struct t_config_option *irc_config_color_mirc_remap; +extern struct t_config_option *irc_config_color_nick_prefixes; +extern struct t_config_option *irc_config_color_notice; extern struct t_config_option *irc_config_color_reason_quit; -extern struct t_config_option *irc_config_color_topic_old; extern struct t_config_option *irc_config_color_topic_new; +extern struct t_config_option *irc_config_color_topic_old; extern struct t_config_option *irc_config_network_alternate_nick; extern struct t_config_option *irc_config_network_autoreconnect_delay_growing; diff --git a/src/plugins/logger/logger-config.c b/src/plugins/logger/logger-config.c index a0e64d9da..60b2daf79 100644 --- a/src/plugins/logger/logger-config.c +++ b/src/plugins/logger/logger-config.c @@ -39,21 +39,21 @@ struct t_config_option *logger_config_look_backlog; /* logger config, color section */ -struct t_config_option *logger_config_color_backlog_line; struct t_config_option *logger_config_color_backlog_end; +struct t_config_option *logger_config_color_backlog_line; /* logger config, file section */ struct t_config_option *logger_config_file_auto_log; struct t_config_option *logger_config_file_flush_delay; +struct t_config_option *logger_config_file_info_lines; +struct t_config_option *logger_config_file_mask; struct t_config_option *logger_config_file_name_lower_case; +struct t_config_option *logger_config_file_nick_prefix; +struct t_config_option *logger_config_file_nick_suffix; struct t_config_option *logger_config_file_path; -struct t_config_option *logger_config_file_mask; struct t_config_option *logger_config_file_replacement_char; -struct t_config_option *logger_config_file_info_lines; struct t_config_option *logger_config_file_time_format; -struct t_config_option *logger_config_file_nick_prefix; -struct t_config_option *logger_config_file_nick_suffix; /* @@ -397,16 +397,16 @@ logger_config_init () return 0; } - logger_config_color_backlog_line = weechat_config_new_option ( - logger_config_file, ptr_section, - "backlog_line", "color", - N_("color for backlog lines"), - NULL, -1, 0, "darkgray", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); logger_config_color_backlog_end = weechat_config_new_option ( logger_config_file, ptr_section, "backlog_end", "color", N_("color for line ending the backlog"), NULL, -1, 0, "darkgray", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + logger_config_color_backlog_line = weechat_config_new_option ( + logger_config_file, ptr_section, + "backlog_line", "color", + N_("color for backlog lines"), + NULL, -1, 0, "darkgray", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); /* file */ ptr_section = weechat_config_new_section (logger_config_file, "file", @@ -433,12 +433,38 @@ logger_config_init () "files immediately for each line printed)"), NULL, 0, 3600, "120", NULL, 0, NULL, NULL, &logger_config_flush_delay_change, NULL, NULL, NULL); + logger_config_file_info_lines = weechat_config_new_option ( + logger_config_file, ptr_section, + "info_lines", "boolean", + N_("write information line in log file when log starts or ends for a " + "buffer"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + logger_config_file_mask = weechat_config_new_option ( + logger_config_file, ptr_section, + "mask", "string", + N_("default file name mask for log files (format is " + "\"directory/to/file\" or \"file\", without first \"/\" because " + "\"path\" option is used to build complete path to file); local " + "buffer variables are permitted; date specifiers are permitted " + "(see man strftime)"), + NULL, 0, 0, "$plugin.$name.weechatlog", NULL, 0, NULL, NULL, + &logger_config_change_file_option_restart_log, NULL, NULL, NULL); logger_config_file_name_lower_case = weechat_config_new_option ( logger_config_file, ptr_section, "name_lower_case", "boolean", N_("use only lower case for log filenames"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, &logger_config_change_file_option_restart_log, NULL, NULL, NULL); + logger_config_file_nick_prefix = weechat_config_new_option ( + logger_config_file, ptr_section, + "nick_prefix", "string", + N_("text to write before nick in prefix of message, example: \"<\""), + NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + logger_config_file_nick_suffix = weechat_config_new_option ( + logger_config_file, ptr_section, + "nick_suffix", "string", + N_("text to write after nick in prefix of message, example: \">\""), + NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); logger_config_file_path = weechat_config_new_option ( logger_config_file, ptr_section, "path", "string", @@ -447,16 +473,6 @@ logger_config_init () "specifiers are permitted (see man strftime)"), NULL, 0, 0, "%h/logs/", NULL, 0, NULL, NULL, &logger_config_change_file_option_restart_log, NULL, NULL, NULL); - logger_config_file_mask = weechat_config_new_option ( - logger_config_file, ptr_section, - "mask", "string", - N_("default file name mask for log files (format is " - "\"directory/to/file\" or \"file\", without first \"/\" because " - "\"path\" option is used to build complete path to file); local " - "buffer variables are permitted; date specifiers are permitted " - "(see man strftime)"), - NULL, 0, 0, "$plugin.$name.weechatlog", NULL, 0, NULL, NULL, - &logger_config_change_file_option_restart_log, NULL, NULL, NULL); logger_config_file_replacement_char = weechat_config_new_option ( logger_config_file, ptr_section, "replacement_char", "string", @@ -464,28 +480,12 @@ logger_config_init () "(like directory delimiter)"), NULL, 0, 0, "_", NULL, 0, NULL, NULL, &logger_config_change_file_option_restart_log, NULL, NULL, NULL); - logger_config_file_info_lines = weechat_config_new_option ( - logger_config_file, ptr_section, - "info_lines", "boolean", - N_("write information line in log file when log starts or ends for a " - "buffer"), - NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); logger_config_file_time_format = weechat_config_new_option ( logger_config_file, ptr_section, "time_format", "string", N_("timestamp used in log files (see man strftime for date/time " "specifiers)"), NULL, 0, 0, "%Y-%m-%d %H:%M:%S", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - logger_config_file_nick_prefix = weechat_config_new_option ( - logger_config_file, ptr_section, - "nick_prefix", "string", - N_("text to write before nick in prefix of message, example: \"<\""), - NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - logger_config_file_nick_suffix = weechat_config_new_option ( - logger_config_file, ptr_section, - "nick_suffix", "string", - N_("text to write after nick in prefix of message, example: \">\""), - NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); /* level */ ptr_section = weechat_config_new_section (logger_config_file, "level", diff --git a/src/plugins/logger/logger-config.h b/src/plugins/logger/logger-config.h index 099d1bd36..c1834a95a 100644 --- a/src/plugins/logger/logger-config.h +++ b/src/plugins/logger/logger-config.h @@ -25,18 +25,19 @@ extern struct t_config_option *logger_config_look_backlog; -extern struct t_config_option *logger_config_color_backlog_line; extern struct t_config_option *logger_config_color_backlog_end; +extern struct t_config_option *logger_config_color_backlog_line; extern struct t_config_option *logger_config_file_auto_log; +extern struct t_config_option *logger_config_file_flush_delay; +extern struct t_config_option *logger_config_file_info_lines; +extern struct t_config_option *logger_config_file_mask; extern struct t_config_option *logger_config_file_name_lower_case; +extern struct t_config_option *logger_config_file_nick_prefix; +extern struct t_config_option *logger_config_file_nick_suffix; extern struct t_config_option *logger_config_file_path; -extern struct t_config_option *logger_config_file_mask; extern struct t_config_option *logger_config_file_replacement_char; -extern struct t_config_option *logger_config_file_info_lines; extern struct t_config_option *logger_config_file_time_format; -extern struct t_config_option *logger_config_file_nick_prefix; -extern struct t_config_option *logger_config_file_nick_suffix; extern struct t_config_option *logger_config_get_level (const char *name); extern int logger_config_set_level (const char *name, const char *value); diff --git a/src/plugins/relay/relay-config.c b/src/plugins/relay/relay-config.c index 7ad6d4f73..caccadf70 100644 --- a/src/plugins/relay/relay-config.c +++ b/src/plugins/relay/relay-config.c @@ -43,10 +43,10 @@ struct t_config_option *relay_config_look_raw_messages; /* relay config, color section */ struct t_config_option *relay_config_color_client; +struct t_config_option *relay_config_color_status[RELAY_NUM_STATUS]; struct t_config_option *relay_config_color_text; struct t_config_option *relay_config_color_text_bg; struct t_config_option *relay_config_color_text_selected; -struct t_config_option *relay_config_color_status[RELAY_NUM_STATUS]; /* relay config, network section */ @@ -61,8 +61,8 @@ struct t_config_option *relay_config_network_websocket_allowed_origins; /* relay config, irc section */ -struct t_config_option *relay_config_irc_backlog_max_number; struct t_config_option *relay_config_irc_backlog_max_minutes; +struct t_config_option *relay_config_irc_backlog_max_number; struct t_config_option *relay_config_irc_backlog_since_last_disconnect; struct t_config_option *relay_config_irc_backlog_tags; struct t_config_option *relay_config_irc_backlog_time_format; @@ -524,24 +524,6 @@ relay_config_init () N_("text color for client description"), NULL, 0, 0, "cyan", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - relay_config_color_text = weechat_config_new_option ( - relay_config_file, ptr_section, - "text", "color", - N_("text color in relay buffer"), - NULL, 0, 0, "default", NULL, 0, - NULL, NULL, &relay_config_refresh_cb, NULL, NULL, NULL); - relay_config_color_text_bg = weechat_config_new_option ( - relay_config_file, ptr_section, - "text_bg", "color", - N_("background color in relay buffer"), - NULL, 0, 0, "default", NULL, 0, - NULL, NULL, &relay_config_refresh_cb, NULL, NULL, NULL); - relay_config_color_text_selected = weechat_config_new_option ( - relay_config_file, ptr_section, - "text_selected", "color", - N_("text color of selected line in relay buffer"), - NULL, 0, 0, "white", NULL, 0, - NULL, NULL, &relay_config_refresh_cb, NULL, NULL, NULL); relay_config_color_status[RELAY_STATUS_CONNECTING] = weechat_config_new_option ( relay_config_file, ptr_section, "status_connecting", "color", @@ -572,6 +554,24 @@ relay_config_init () N_("text color for \"disconnected\" status"), NULL, 0, 0, "lightred", NULL, 0, NULL, NULL, &relay_config_refresh_cb, NULL, NULL, NULL); + relay_config_color_text = weechat_config_new_option ( + relay_config_file, ptr_section, + "text", "color", + N_("text color in relay buffer"), + NULL, 0, 0, "default", NULL, 0, + NULL, NULL, &relay_config_refresh_cb, NULL, NULL, NULL); + relay_config_color_text_bg = weechat_config_new_option ( + relay_config_file, ptr_section, + "text_bg", "color", + N_("background color in relay buffer"), + NULL, 0, 0, "default", NULL, 0, + NULL, NULL, &relay_config_refresh_cb, NULL, NULL, NULL); + relay_config_color_text_selected = weechat_config_new_option ( + relay_config_file, ptr_section, + "text_selected", "color", + N_("text color of selected line in relay buffer"), + NULL, 0, 0, "white", NULL, 0, + NULL, NULL, &relay_config_refresh_cb, NULL, NULL, NULL); /* section network */ ptr_section = weechat_config_new_section (relay_config_file, "network", @@ -659,13 +659,6 @@ relay_config_init () return 0; } - relay_config_irc_backlog_max_number = weechat_config_new_option ( - relay_config_file, ptr_section, - "backlog_max_number", "integer", - N_("maximum number of lines in backlog per IRC channel " - "(0 = unlimited)"), - NULL, 0, INT_MAX, "256", NULL, 0, - NULL, NULL, NULL, NULL, NULL, NULL); relay_config_irc_backlog_max_minutes = weechat_config_new_option ( relay_config_file, ptr_section, "backlog_max_minutes", "integer", @@ -674,6 +667,13 @@ relay_config_init () "43200 = one month, 525600 = one year)"), NULL, 0, INT_MAX, "1440", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + relay_config_irc_backlog_max_number = weechat_config_new_option ( + relay_config_file, ptr_section, + "backlog_max_number", "integer", + N_("maximum number of lines in backlog per IRC channel " + "(0 = unlimited)"), + NULL, 0, INT_MAX, "256", NULL, 0, + NULL, NULL, NULL, NULL, NULL, NULL); relay_config_irc_backlog_since_last_disconnect = weechat_config_new_option ( relay_config_file, ptr_section, "backlog_since_last_disconnect", "boolean", diff --git a/src/plugins/relay/relay-config.h b/src/plugins/relay/relay-config.h index b25510179..21c088d03 100644 --- a/src/plugins/relay/relay-config.h +++ b/src/plugins/relay/relay-config.h @@ -31,10 +31,10 @@ extern struct t_config_option *relay_config_look_auto_open_buffer; extern struct t_config_option *relay_config_look_raw_messages; extern struct t_config_option *relay_config_color_client; +extern struct t_config_option *relay_config_color_status[]; extern struct t_config_option *relay_config_color_text; extern struct t_config_option *relay_config_color_text_bg; extern struct t_config_option *relay_config_color_text_selected; -extern struct t_config_option *relay_config_color_status[]; extern struct t_config_option *relay_config_network_allowed_ips; extern struct t_config_option *relay_config_network_bind_address; @@ -43,9 +43,10 @@ extern struct t_config_option *relay_config_network_ipv6; extern struct t_config_option *relay_config_network_max_clients; extern struct t_config_option *relay_config_network_password; extern struct t_config_option *relay_config_network_ssl_cert_key; +extern struct t_config_option *relay_config_network_websocket_allowed_origins; -extern struct t_config_option *relay_config_irc_backlog_max_number; extern struct t_config_option *relay_config_irc_backlog_max_minutes; +extern struct t_config_option *relay_config_irc_backlog_max_number; extern struct t_config_option *relay_config_irc_backlog_since_last_disconnect; extern struct t_config_option *relay_config_irc_backlog_tags; extern struct t_config_option *relay_config_irc_backlog_time_format; diff --git a/src/plugins/script/script-config.c b/src/plugins/script/script-config.c index 28f3d329f..6d40ab6a8 100644 --- a/src/plugins/script/script-config.c +++ b/src/plugins/script/script-config.c @@ -51,32 +51,32 @@ struct t_config_option *script_config_look_use_keys; /* script config, color section */ -struct t_config_option *script_config_color_status_popular; -struct t_config_option *script_config_color_status_installed; struct t_config_option *script_config_color_status_autoloaded; struct t_config_option *script_config_color_status_held; -struct t_config_option *script_config_color_status_running; +struct t_config_option *script_config_color_status_installed; struct t_config_option *script_config_color_status_obsolete; +struct t_config_option *script_config_color_status_popular; +struct t_config_option *script_config_color_status_running; struct t_config_option *script_config_color_status_unknown; struct t_config_option *script_config_color_text; +struct t_config_option *script_config_color_text_bg; +struct t_config_option *script_config_color_text_bg_selected; struct t_config_option *script_config_color_text_date; +struct t_config_option *script_config_color_text_date_selected; struct t_config_option *script_config_color_text_delimiters; struct t_config_option *script_config_color_text_description; +struct t_config_option *script_config_color_text_description_selected; struct t_config_option *script_config_color_text_extension; +struct t_config_option *script_config_color_text_extension_selected; struct t_config_option *script_config_color_text_name; +struct t_config_option *script_config_color_text_name_selected; +struct t_config_option *script_config_color_text_selected; struct t_config_option *script_config_color_text_tags; +struct t_config_option *script_config_color_text_tags_selected; struct t_config_option *script_config_color_text_version; struct t_config_option *script_config_color_text_version_loaded; -struct t_config_option *script_config_color_text_bg; -struct t_config_option *script_config_color_text_selected; -struct t_config_option *script_config_color_text_date_selected; -struct t_config_option *script_config_color_text_description_selected; -struct t_config_option *script_config_color_text_extension_selected; -struct t_config_option *script_config_color_text_name_selected; -struct t_config_option *script_config_color_text_tags_selected; -struct t_config_option *script_config_color_text_version_selected; struct t_config_option *script_config_color_text_version_loaded_selected; -struct t_config_option *script_config_color_text_bg_selected; +struct t_config_option *script_config_color_text_version_selected; /* script config, scripts section */ @@ -502,18 +502,6 @@ script_config_init () return 0; } - script_config_color_status_popular = weechat_config_new_option ( - script_config_file, ptr_section, - "status_popular", "color", - N_("color for status \"popular\" (\"*\")"), - NULL, 0, 0, "yellow", NULL, 0, - NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_status_installed = weechat_config_new_option ( - script_config_file, ptr_section, - "status_installed", "color", - N_("color for status \"installed\" (\"i\")"), - NULL, 0, 0, "lightcyan", NULL, 0, - NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); script_config_color_status_autoloaded = weechat_config_new_option ( script_config_file, ptr_section, "status_autoloaded", "color", @@ -526,11 +514,11 @@ script_config_init () N_("color for status \"held\" (\"H\")"), NULL, 0, 0, "white", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_status_running = weechat_config_new_option ( + script_config_color_status_installed = weechat_config_new_option ( script_config_file, ptr_section, - "status_running", "color", - N_("color for status \"running\" (\"r\")"), - NULL, 0, 0, "lightgreen", NULL, 0, + "status_installed", "color", + N_("color for status \"installed\" (\"i\")"), + NULL, 0, 0, "lightcyan", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); script_config_color_status_obsolete = weechat_config_new_option ( script_config_file, ptr_section, @@ -538,6 +526,18 @@ script_config_init () N_("color for status \"obsolete\" (\"N\")"), NULL, 0, 0, "lightmagenta", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); + script_config_color_status_popular = weechat_config_new_option ( + script_config_file, ptr_section, + "status_popular", "color", + N_("color for status \"popular\" (\"*\")"), + NULL, 0, 0, "yellow", NULL, 0, + NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); + script_config_color_status_running = weechat_config_new_option ( + script_config_file, ptr_section, + "status_running", "color", + N_("color for status \"running\" (\"r\")"), + NULL, 0, 0, "lightgreen", NULL, 0, + NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); script_config_color_status_unknown = weechat_config_new_option ( script_config_file, ptr_section, "status_unknown", "color", @@ -550,12 +550,30 @@ script_config_init () N_("text color in script buffer"), NULL, 0, 0, "default", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); + script_config_color_text_bg = weechat_config_new_option ( + script_config_file, ptr_section, + "text_bg", "color", + N_("background color in script buffer"), + NULL, 0, 0, "default", NULL, 0, + NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); + script_config_color_text_bg_selected = weechat_config_new_option ( + script_config_file, ptr_section, + "text_bg_selected", "color", + N_("background color for selected line in script buffer"), + NULL, 0, 0, "red", NULL, 0, + NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); script_config_color_text_date = weechat_config_new_option ( script_config_file, ptr_section, "text_date", "color", N_("text color of dates in script buffer"), NULL, 0, 0, "default", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); + script_config_color_text_date_selected = weechat_config_new_option ( + script_config_file, ptr_section, + "text_date_selected", "color", + N_("text color of dates for selected line in script buffer"), + NULL, 0, 0, "white", NULL, 0, + NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); script_config_color_text_delimiters = weechat_config_new_option ( script_config_file, ptr_section, "text_delimiters", "color", @@ -568,24 +586,54 @@ script_config_init () N_("text color of description in script buffer"), NULL, 0, 0, "default", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); + script_config_color_text_description_selected = weechat_config_new_option ( + script_config_file, ptr_section, + "text_description_selected", "color", + N_("text color of description for selected line in script buffer"), + NULL, 0, 0, "white", NULL, 0, + NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); script_config_color_text_extension = weechat_config_new_option ( script_config_file, ptr_section, "text_extension", "color", N_("text color of extension in script buffer"), NULL, 0, 0, "default", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); + script_config_color_text_extension_selected = weechat_config_new_option ( + script_config_file, ptr_section, + "text_extension_selected", "color", + N_("text color of extension for selected line in script buffer"), + NULL, 0, 0, "white", NULL, 0, + NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); script_config_color_text_name = weechat_config_new_option ( script_config_file, ptr_section, "text_name", "color", N_("text color of script name in script buffer"), NULL, 0, 0, "cyan", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); + script_config_color_text_name_selected = weechat_config_new_option ( + script_config_file, ptr_section, + "text_name_selected", "color", + N_("text color of script name for selected line in script buffer"), + NULL, 0, 0, "lightcyan", NULL, 0, + NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); + script_config_color_text_selected = weechat_config_new_option ( + script_config_file, ptr_section, + "text_selected", "color", + N_("text color for selected line in script buffer"), + NULL, 0, 0, "white", NULL, 0, + NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); script_config_color_text_tags = weechat_config_new_option ( script_config_file, ptr_section, "text_tags", "color", N_("text color of tags in script buffer"), NULL, 0, 0, "brown", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); + script_config_color_text_tags_selected = weechat_config_new_option ( + script_config_file, ptr_section, + "text_tags_selected", "color", + N_("text color of tags for selected line in script buffer"), + NULL, 0, 0, "yellow", NULL, 0, + NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); script_config_color_text_version = weechat_config_new_option ( script_config_file, ptr_section, "text_version", "color", @@ -598,66 +646,18 @@ script_config_init () N_("text color of version loaded in script buffer"), NULL, 0, 0, "default", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_text_bg = weechat_config_new_option ( - script_config_file, ptr_section, - "text_bg", "color", - N_("background color in script buffer"), - NULL, 0, 0, "default", NULL, 0, - NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_text_selected = weechat_config_new_option ( - script_config_file, ptr_section, - "text_selected", "color", - N_("text color for selected line in script buffer"), - NULL, 0, 0, "white", NULL, 0, - NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_text_date_selected = weechat_config_new_option ( - script_config_file, ptr_section, - "text_date_selected", "color", - N_("text color of dates for selected line in script buffer"), - NULL, 0, 0, "white", NULL, 0, - NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_text_description_selected = weechat_config_new_option ( - script_config_file, ptr_section, - "text_description_selected", "color", - N_("text color of description for selected line in script buffer"), - NULL, 0, 0, "white", NULL, 0, - NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_text_extension_selected = weechat_config_new_option ( + script_config_color_text_version_loaded_selected = weechat_config_new_option ( script_config_file, ptr_section, - "text_extension_selected", "color", - N_("text color of extension for selected line in script buffer"), + "text_version_loaded_selected", "color", + N_("text color of version loaded for selected line in script buffer"), NULL, 0, 0, "white", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_text_name_selected = weechat_config_new_option ( - script_config_file, ptr_section, - "text_name_selected", "color", - N_("text color of script name for selected line in script buffer"), - NULL, 0, 0, "lightcyan", NULL, 0, - NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_text_tags_selected = weechat_config_new_option ( - script_config_file, ptr_section, - "text_tags_selected", "color", - N_("text color of tags for selected line in script buffer"), - NULL, 0, 0, "yellow", NULL, 0, - NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); script_config_color_text_version_selected = weechat_config_new_option ( script_config_file, ptr_section, "text_version_selected", "color", N_("text color of version for selected line in script buffer"), NULL, 0, 0, "lightmagenta", NULL, 0, NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_text_version_loaded_selected = weechat_config_new_option ( - script_config_file, ptr_section, - "text_version_loaded_selected", "color", - N_("text color of version loaded for selected line in script buffer"), - NULL, 0, 0, "white", NULL, 0, - NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); - script_config_color_text_bg_selected = weechat_config_new_option ( - script_config_file, ptr_section, - "text_bg_selected", "color", - N_("background color for selected line in script buffer"), - NULL, 0, 0, "red", NULL, 0, - NULL, NULL, &script_config_refresh_cb, NULL, NULL, NULL); /* scripts */ ptr_section = weechat_config_new_section (script_config_file, "scripts", diff --git a/src/plugins/script/script-config.h b/src/plugins/script/script-config.h index cead7f3ee..ea0ccba33 100644 --- a/src/plugins/script/script-config.h +++ b/src/plugins/script/script-config.h @@ -33,32 +33,32 @@ extern struct t_config_option *script_config_look_sort; extern struct t_config_option *script_config_look_translate_description; extern struct t_config_option *script_config_look_use_keys; -extern struct t_config_option *script_config_color_status_popular; -extern struct t_config_option *script_config_color_status_installed; extern struct t_config_option *script_config_color_status_autoloaded; extern struct t_config_option *script_config_color_status_held; -extern struct t_config_option *script_config_color_status_running; +extern struct t_config_option *script_config_color_status_installed; extern struct t_config_option *script_config_color_status_obsolete; +extern struct t_config_option *script_config_color_status_popular; +extern struct t_config_option *script_config_color_status_running; extern struct t_config_option *script_config_color_status_unknown; extern struct t_config_option *script_config_color_text; +extern struct t_config_option *script_config_color_text_bg; +extern struct t_config_option *script_config_color_text_bg_selected; extern struct t_config_option *script_config_color_text_date; +extern struct t_config_option *script_config_color_text_date_selected; extern struct t_config_option *script_config_color_text_delimiters; extern struct t_config_option *script_config_color_text_description; +extern struct t_config_option *script_config_color_text_description_selected; extern struct t_config_option *script_config_color_text_extension; +extern struct t_config_option *script_config_color_text_extension_selected; extern struct t_config_option *script_config_color_text_name; +extern struct t_config_option *script_config_color_text_name_selected; +extern struct t_config_option *script_config_color_text_selected; extern struct t_config_option *script_config_color_text_tags; +extern struct t_config_option *script_config_color_text_tags_selected; extern struct t_config_option *script_config_color_text_version; extern struct t_config_option *script_config_color_text_version_loaded; -extern struct t_config_option *script_config_color_text_bg; -extern struct t_config_option *script_config_color_text_selected; -extern struct t_config_option *script_config_color_text_date_selected; -extern struct t_config_option *script_config_color_text_description_selected; -extern struct t_config_option *script_config_color_text_extension_selected; -extern struct t_config_option *script_config_color_text_name_selected; -extern struct t_config_option *script_config_color_text_tags_selected; -extern struct t_config_option *script_config_color_text_version_selected; extern struct t_config_option *script_config_color_text_version_loaded_selected; -extern struct t_config_option *script_config_color_text_bg_selected; +extern struct t_config_option *script_config_color_text_version_selected; extern struct t_config_option *script_config_scripts_autoload; extern struct t_config_option *script_config_scripts_cache_expire; diff --git a/src/plugins/xfer/xfer-config.c b/src/plugins/xfer/xfer-config.c index 6c35c66a7..64ccf2806 100644 --- a/src/plugins/xfer/xfer-config.c +++ b/src/plugins/xfer/xfer-config.c @@ -37,31 +37,31 @@ struct t_config_option *xfer_config_look_progress_bar_size; /* xfer config, color section */ +struct t_config_option *xfer_config_color_status[XFER_NUM_STATUS]; struct t_config_option *xfer_config_color_text; struct t_config_option *xfer_config_color_text_bg; struct t_config_option *xfer_config_color_text_selected; -struct t_config_option *xfer_config_color_status[XFER_NUM_STATUS]; /* xfer config, network section */ -struct t_config_option *xfer_config_network_timeout; struct t_config_option *xfer_config_network_blocksize; struct t_config_option *xfer_config_network_fast_send; -struct t_config_option *xfer_config_network_port_range; struct t_config_option *xfer_config_network_own_ip; +struct t_config_option *xfer_config_network_port_range; struct t_config_option *xfer_config_network_speed_limit; +struct t_config_option *xfer_config_network_timeout; /* xfer config, file section */ +struct t_config_option *xfer_config_file_auto_accept_chats; +struct t_config_option *xfer_config_file_auto_accept_files; +struct t_config_option *xfer_config_file_auto_accept_nicks; +struct t_config_option *xfer_config_file_auto_rename; +struct t_config_option *xfer_config_file_auto_resume; +struct t_config_option *xfer_config_file_convert_spaces; struct t_config_option *xfer_config_file_download_path; struct t_config_option *xfer_config_file_upload_path; struct t_config_option *xfer_config_file_use_nick_in_filename; -struct t_config_option *xfer_config_file_convert_spaces; -struct t_config_option *xfer_config_file_auto_rename; -struct t_config_option *xfer_config_file_auto_resume; -struct t_config_option *xfer_config_file_auto_accept_files; -struct t_config_option *xfer_config_file_auto_accept_chats; -struct t_config_option *xfer_config_file_auto_accept_nicks; @@ -146,24 +146,6 @@ xfer_config_init () return 0; } - xfer_config_color_text = weechat_config_new_option ( - xfer_config_file, ptr_section, - "text", "color", - N_("text color in xfer buffer"), - NULL, 0, 0, "default", NULL, 0, - NULL, NULL, &xfer_config_refresh_cb, NULL, NULL, NULL); - xfer_config_color_text_bg = weechat_config_new_option ( - xfer_config_file, ptr_section, - "text_bg", "color", - N_("background color in xfer buffer"), - NULL, 0, 0, "default", NULL, 0, - NULL, NULL, &xfer_config_refresh_cb, NULL, NULL, NULL); - xfer_config_color_text_selected = weechat_config_new_option ( - xfer_config_file, ptr_section, - "text_selected", "color", - N_("text color of selected line in xfer buffer"), - NULL, 0, 0, "white", NULL, 0, - NULL, NULL, &xfer_config_refresh_cb, NULL, NULL, NULL); xfer_config_color_status[XFER_STATUS_WAITING] = weechat_config_new_option ( xfer_config_file, ptr_section, "status_waiting", "color", @@ -200,6 +182,24 @@ xfer_config_init () N_("text color for \"aborted\" status"), NULL, 0, 0, "lightred", NULL, 0, NULL, NULL, &xfer_config_refresh_cb, NULL, NULL, NULL); + xfer_config_color_text = weechat_config_new_option ( + xfer_config_file, ptr_section, + "text", "color", + N_("text color in xfer buffer"), + NULL, 0, 0, "default", NULL, 0, + NULL, NULL, &xfer_config_refresh_cb, NULL, NULL, NULL); + xfer_config_color_text_bg = weechat_config_new_option ( + xfer_config_file, ptr_section, + "text_bg", "color", + N_("background color in xfer buffer"), + NULL, 0, 0, "default", NULL, 0, + NULL, NULL, &xfer_config_refresh_cb, NULL, NULL, NULL); + xfer_config_color_text_selected = weechat_config_new_option ( + xfer_config_file, ptr_section, + "text_selected", "color", + N_("text color of selected line in xfer buffer"), + NULL, 0, 0, "white", NULL, 0, + NULL, NULL, &xfer_config_refresh_cb, NULL, NULL, NULL); ptr_section = weechat_config_new_section (xfer_config_file, "network", 0, 0, @@ -212,11 +212,6 @@ xfer_config_init () return 0; } - xfer_config_network_timeout = weechat_config_new_option ( - xfer_config_file, ptr_section, - "timeout", "integer", - N_("timeout for xfer request (in seconds)"), - NULL, 5, INT_MAX, "300", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); xfer_config_network_blocksize = weechat_config_new_option ( xfer_config_file, ptr_section, "blocksize", "integer", @@ -228,6 +223,12 @@ xfer_config_init () "fast_send", "boolean", N_("does not wait for ACK when sending file"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + xfer_config_network_own_ip = weechat_config_new_option ( + xfer_config_file, ptr_section, + "own_ip", "string", + N_("IP or DNS address used for sending files/chats " + "(if empty, local interface IP is used)"), + NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); xfer_config_network_port_range = weechat_config_new_option ( xfer_config_file, ptr_section, "port_range", "string", @@ -237,18 +238,17 @@ xfer_config_init () "to use ports greater than 1024, because only root can use ports " "below 1024)"), NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - xfer_config_network_own_ip = weechat_config_new_option ( - xfer_config_file, ptr_section, - "own_ip", "string", - N_("IP or DNS address used for sending files/chats " - "(if empty, local interface IP is used)"), - NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); xfer_config_network_speed_limit = weechat_config_new_option ( xfer_config_file, ptr_section, "speed_limit", "integer", N_("speed limit for sending files, in kilo-bytes by second (0 means " "no limit)"), NULL, 0, INT_MAX, "0", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + xfer_config_network_timeout = weechat_config_new_option ( + xfer_config_file, ptr_section, + "timeout", "integer", + N_("timeout for xfer request (in seconds)"), + NULL, 5, INT_MAX, "300", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ptr_section = weechat_config_new_section (xfer_config_file, "file", 0, 0, @@ -261,6 +261,40 @@ xfer_config_init () return 0; } + xfer_config_file_auto_accept_chats = weechat_config_new_option ( + xfer_config_file, ptr_section, + "auto_accept_chats", "boolean", + N_("automatically accept chat requests (use carefully!)"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + xfer_config_file_auto_accept_files = weechat_config_new_option ( + xfer_config_file, ptr_section, + "auto_accept_files", "boolean", + N_("automatically accept incoming files (use carefully!)"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + xfer_config_file_auto_accept_nicks = weechat_config_new_option ( + xfer_config_file, ptr_section, + "auto_accept_nicks", "string", + N_("comma-separated list of nicks for which the incoming files and " + "chats are automatically accepted; format is \"server.nick\" (for a " + "specific server) or \"nick\" (for all servers); example: " + "\"freenode.FlashCode,andrew\""), + NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + xfer_config_file_auto_rename = weechat_config_new_option ( + xfer_config_file, ptr_section, + "auto_rename", "boolean", + N_("rename incoming files if already exists (add \".1\", \".2\", ...)"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + xfer_config_file_auto_resume = weechat_config_new_option ( + xfer_config_file, ptr_section, + "auto_resume", "boolean", + N_("automatically resume file transfer if connection with remote host " + "is lost"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + xfer_config_file_convert_spaces = weechat_config_new_option ( + xfer_config_file, ptr_section, + "convert_spaces", "boolean", + N_("convert spaces to underscores when sending files"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); xfer_config_file_download_path = weechat_config_new_option ( xfer_config_file, ptr_section, "download_path", "string", @@ -279,40 +313,6 @@ xfer_config_init () "use_nick_in_filename", "boolean", N_("use remote nick as prefix in local filename when receiving a file"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - xfer_config_file_convert_spaces = weechat_config_new_option ( - xfer_config_file, ptr_section, - "convert_spaces", "boolean", - N_("convert spaces to underscores when sending files"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - xfer_config_file_auto_rename = weechat_config_new_option ( - xfer_config_file, ptr_section, - "auto_rename", "boolean", - N_("rename incoming files if already exists (add \".1\", \".2\", ...)"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - xfer_config_file_auto_resume = weechat_config_new_option ( - xfer_config_file, ptr_section, - "auto_resume", "boolean", - N_("automatically resume file transfer if connection with remote host " - "is lost"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - xfer_config_file_auto_accept_files = weechat_config_new_option ( - xfer_config_file, ptr_section, - "auto_accept_files", "boolean", - N_("automatically accept incoming files (use carefully!)"), - NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - xfer_config_file_auto_accept_chats = weechat_config_new_option ( - xfer_config_file, ptr_section, - "auto_accept_chats", "boolean", - N_("automatically accept chat requests (use carefully!)"), - NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - xfer_config_file_auto_accept_nicks = weechat_config_new_option ( - xfer_config_file, ptr_section, - "auto_accept_nicks", "string", - N_("comma-separated list of nicks for which the incoming files and " - "chats are automatically accepted; format is \"server.nick\" (for a " - "specific server) or \"nick\" (for all servers); example: " - "\"freenode.FlashCode,andrew\""), - NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); return 1; } diff --git a/src/plugins/xfer/xfer-config.h b/src/plugins/xfer/xfer-config.h index e43727831..17b9f1399 100644 --- a/src/plugins/xfer/xfer-config.h +++ b/src/plugins/xfer/xfer-config.h @@ -29,27 +29,27 @@ extern struct t_config_file *xfer_config; extern struct t_config_option *xfer_config_look_auto_open_buffer; extern struct t_config_option *xfer_config_look_progress_bar_size; +extern struct t_config_option *xfer_config_color_status[]; extern struct t_config_option *xfer_config_color_text; extern struct t_config_option *xfer_config_color_text_bg; extern struct t_config_option *xfer_config_color_text_selected; -extern struct t_config_option *xfer_config_color_status[]; -extern struct t_config_option *xfer_config_network_timeout; extern struct t_config_option *xfer_config_network_blocksize; extern struct t_config_option *xfer_config_network_fast_send; -extern struct t_config_option *xfer_config_network_port_range; extern struct t_config_option *xfer_config_network_own_ip; +extern struct t_config_option *xfer_config_network_port_range; extern struct t_config_option *xfer_config_network_speed_limit; +extern struct t_config_option *xfer_config_network_timeout; +struct t_config_option *xfer_config_file_auto_accept_chats; +struct t_config_option *xfer_config_file_auto_accept_files; +struct t_config_option *xfer_config_file_auto_accept_nicks; +extern struct t_config_option *xfer_config_file_auto_rename; +extern struct t_config_option *xfer_config_file_auto_resume; +extern struct t_config_option *xfer_config_file_convert_spaces; extern struct t_config_option *xfer_config_file_download_path; extern struct t_config_option *xfer_config_file_upload_path; extern struct t_config_option *xfer_config_file_use_nick_in_filename; -extern struct t_config_option *xfer_config_file_convert_spaces; -extern struct t_config_option *xfer_config_file_auto_rename; -extern struct t_config_option *xfer_config_file_auto_resume; -extern struct t_config_option *xfer_config_file_auto_accept_files; -extern struct t_config_option *xfer_config_file_auto_accept_chats; -extern struct t_config_option *xfer_config_file_auto_accept_nicks; extern int xfer_config_init (); extern int xfer_config_read (); |