1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-25 04:16:38 +02:00

Compare commits

...

12 Commits

Author SHA1 Message Date
Sébastien Helleu 120b048efb Version 4.6.2 2025-04-18 20:39:02 +02:00
Sébastien Helleu 600e438b90 debian: update changelog 2025-04-18 20:03:35 +02:00
Sébastien Helleu bf3a8628ae debian: bump Standards-Version to 4.7.2 2025-04-18 20:01:08 +02:00
Sébastien Helleu 1478ecd77d core: fix write of weechat.log to stdout with weechat-headless --stdout (issue #2247) 2025-04-15 08:16:06 +02:00
Sébastien Helleu 5c9d9bc8fc core: add refresh of window title on buffer switch, when option weechat.look.window_title is set 2025-04-11 19:32:43 +02:00
Sébastien Helleu ff00323363 Version 4.6.2-dev 2025-04-09 13:37:27 +02:00
Sébastien Helleu 1d2e5ce700 Version 4.6.1 2025-04-09 13:33:19 +02:00
Sébastien Helleu 2eebe241ab core: consider all keys are safe in cursor context (issue #2244) 2025-04-04 18:55:46 +02:00
Sébastien Helleu e93cebf02c core: update ChangeLog (issue #2243) 2025-04-02 23:05:16 +02:00
Alvar Penning c3db4946b2 perl: fix build when multiplicity is not available
Building WeeChat 4.6.0 on OpenBSD failed with the following error.

> /usr/ports/pobj/weechat-4.6.0/weechat-4.6.0/src/plugins/perl/weechat-perl.c:356:13: error: expected ')'
>             function) < 0)
>             ^
> /usr/ports/pobj/weechat-4.6.0/weechat-4.6.0/src/plugins/perl/weechat-perl.c:352:9: note: to match this '('
>     if (weechat_asprintf (
>         ^
> /usr/ports/pobj/weechat-4.6.0/weechat-4.6.0/src/plugins/perl/../weechat-plugin.h:1312:31: note: expanded from macro 'weechat_asprintf'
>     (weechat_plugin->asprintf)(__result, __fmt, ##__argz)

On further inspection, the line in question was recently altered in
099e11d7b8, where a comma was forgotten in the
else branch of the MULTIPLICITY ifdef.

After adding the comma, WeeChat builds as usual.
2025-04-02 23:05:14 +02:00
Sébastien Helleu 86d4da2fd1 irc: display nick changes and quit messages when option irc.look.ignore_tag_messages is enabled (closes #2241) 2025-03-28 12:11:29 +01:00
Sébastien Helleu e39ef93903 Version 4.6.1-dev 2025-03-28 12:10:53 +01:00
17 changed files with 72 additions and 65 deletions
+15
View File
@@ -1,5 +1,20 @@
# WeeChat ChangeLog # WeeChat ChangeLog
## Version 4.6.2 (2025-04-18)
### Fixed
- core: fix write of weechat.log to stdout with `weechat-headless --stdout` ([#2247](https://github.com/weechat/weechat/issues/2247))
- core: add refresh of window title on buffer switch, when option weechat.look.window_title is set
## Version 4.6.1 (2025-04-09)
### Fixed
- core: consider all keys are safe in cursor context ([#2244](https://github.com/weechat/weechat/issues/2244))
- irc: display nick changes and quit messages when option irc.look.ignore_tag_messages is enabled ([#2241](https://github.com/weechat/weechat/issues/2241))
- perl: fix build when multiplicity is not available ([#2243](https://github.com/weechat/weechat/issues/2243))
## Version 4.6.0 (2025-03-23) ## Version 4.6.0 (2025-03-23)
### Changed ### Changed
+1 -1
View File
@@ -24,7 +24,7 @@ Build-Depends:
libzstd-dev, libzstd-dev,
zlib1g-dev, zlib1g-dev,
libcjson-dev libcjson-dev
Standards-Version: 4.7.0 Standards-Version: 4.7.2
Homepage: https://weechat.org/ Homepage: https://weechat.org/
Vcs-Git: https://salsa.debian.org/kolter/weechat.git Vcs-Git: https://salsa.debian.org/kolter/weechat.git
Vcs-Browser: https://salsa.debian.org/kolter/weechat Vcs-Browser: https://salsa.debian.org/kolter/weechat
+6
View File
@@ -1,3 +1,9 @@
weechat (4.6.1-1) unstable; urgency=medium
* New upstream release (Closes: #1102450, #1098090)
-- Emmanuel Bouthenot <kolter@debian.org> Wed, 16 Apr 2025 20:31:07 +0000
weechat (4.5.1-1) unstable; urgency=medium weechat (4.5.1-1) unstable; urgency=medium
* New upstream release * New upstream release
+1 -1
View File
@@ -24,7 +24,7 @@ Build-Depends:
libzstd-dev, libzstd-dev,
zlib1g-dev, zlib1g-dev,
libcjson-dev libcjson-dev
Standards-Version: 4.7.0 Standards-Version: 4.7.2
Homepage: https://weechat.org/ Homepage: https://weechat.org/
Vcs-Git: https://salsa.debian.org/kolter/weechat.git Vcs-Git: https://salsa.debian.org/kolter/weechat.git
Vcs-Browser: https://salsa.debian.org/kolter/weechat Vcs-Browser: https://salsa.debian.org/kolter/weechat
+2 -2
View File
@@ -15528,8 +15528,8 @@ void weechat_window_set_title (const char *title);
Arguments: Arguments:
* _title_: new title for terminal (NULL to reset title); string is evaluated, * _title_: new title for terminal; string is evaluated, so variables like
so variables like `${info:version}` can be used `${info:version}` can be used
(see <<_string_eval_expression,string_eval_expression>>) (see <<_string_eval_expression,string_eval_expression>>)
C example: C example:
+3 -3
View File
@@ -15869,9 +15869,9 @@ void weechat_window_set_title (const char *title);
Paramètres : Paramètres :
* _title_ : nouveau titre pour le terminal (NULL pour réinitialiser le titre) ; * _title_ : nouveau titre pour le terminal ; la chaîne est évaluée, donc les variables
la chaîne est évaluée, donc les variables comme `${info:version}` peuvent comme `${info:version}` peuvent être utilisées
être utilisées (voir <<_string_eval_expression,string_eval_expression>>) (voir <<_string_eval_expression,string_eval_expression>>)
Exemple en C : Exemple en C :
+2 -2
View File
@@ -16302,8 +16302,8 @@ void weechat_window_set_title (const char *title);
Argomenti: Argomenti:
// TRANSLATION MISSING // TRANSLATION MISSING
* _title_: nuovo titolo per il terminale (NULL per resettarlo); * _title_: nuovo titolo per il terminale; string is evaluated, so variables
string is evaluated, so variables like `${info:version}` can be used like `${info:version}` can be used
(see <<_string_eval_expression,string_eval_expression>>) (see <<_string_eval_expression,string_eval_expression>>)
Esempio in C: Esempio in C:
+2 -2
View File
@@ -15797,8 +15797,8 @@ void weechat_window_set_title (const char *title);
引数: 引数:
* _title_: 端末の新しいタイトル (タイトルをリセットする場合は NULL); * _title_: 端末の新しいタイトル; この文字列は評価されるため、文字列内に
この文字列は評価されるため、文字列内に `${info:version}` などの変数を含めることが可能です `${info:version}` などの変数を含めることが可能です
(<<_string_eval_expression,string_eval_expression>> を参照) (<<_string_eval_expression,string_eval_expression>> を参照)
C 言語での使用例: C 言語での使用例:
+3 -1
View File
@@ -15104,7 +15104,9 @@ void weechat_window_set_title (const char *title);
Аргументи: Аргументи:
* _title_: нови наслов за терминал (NULL ако желите да ресетујете наслов); стринг се израчунава, тако да је могуће коришћење променљивих као што је `${info:version}` (погледајте <<_string_eval_expression,string_eval_expression>>) * _title_: нови наслов за терминал; стринг се израчунава, тако да је могуће
коришћење променљивих као што је `${info:version}`
(погледајте <<_string_eval_expression,string_eval_expression>>)
C пример: C пример:
+1 -5
View File
@@ -498,12 +498,8 @@ config_change_window_title (const void *pointer, void *data,
(void) data; (void) data;
(void) option; (void) option;
if (gui_init_ok if (gui_init_ok)
|| (CONFIG_STRING(config_look_window_title)
&& CONFIG_STRING(config_look_window_title)[0]))
{
gui_window_set_title (CONFIG_STRING(config_look_window_title)); gui_window_set_title (CONFIG_STRING(config_look_window_title));
}
} }
/* /*
+12 -11
View File
@@ -70,21 +70,22 @@ log_open (const char *filename, const char *mode)
{ {
weechat_log_file = stdout; weechat_log_file = stdout;
} }
else if (filename)
{
weechat_log_filename = strdup (filename);
}
else else
{ {
string_asprintf (&weechat_log_filename, if (filename)
"%s/%s", weechat_state_dir, WEECHAT_LOG_NAME); {
weechat_log_filename = strdup (filename);
}
else
{
string_asprintf (&weechat_log_filename,
"%s/%s", weechat_state_dir, WEECHAT_LOG_NAME);
}
if (!weechat_log_filename)
return 0;
weechat_log_file = fopen (weechat_log_filename, mode);
} }
if (!weechat_log_filename)
return 0;
weechat_log_file = fopen (weechat_log_filename, mode);
if (!weechat_log_file) if (!weechat_log_file)
{ {
if (weechat_log_filename) if (weechat_log_filename)
+1 -13
View File
@@ -231,12 +231,7 @@ gui_main_init (void)
gui_term_cols, gui_term_lines, 100, 100)) gui_term_cols, gui_term_lines, 100, 100))
{ {
gui_current_window = gui_windows; gui_current_window = gui_windows;
gui_window_set_title (CONFIG_STRING(config_look_window_title));
if (CONFIG_STRING(config_look_window_title)
&& CONFIG_STRING(config_look_window_title)[0])
{
gui_window_set_title (CONFIG_STRING(config_look_window_title));
}
} }
/* switch to buffer */ /* switch to buffer */
@@ -526,13 +521,6 @@ gui_main_end (int clean_exit)
/* delete global history */ /* delete global history */
gui_history_global_free (); gui_history_global_free ();
/* reset title */
if (CONFIG_STRING(config_look_window_title)
&& CONFIG_STRING(config_look_window_title)[0])
{
gui_window_set_title (NULL);
}
/* end color */ /* end color */
gui_color_end (); gui_color_end ();
+8 -8
View File
@@ -2479,13 +2479,11 @@ gui_window_refresh_screen (int full_refresh)
refresh (); refresh ();
gui_window_read_terminal_size (); gui_window_read_terminal_size ();
refresh (); refresh ();
gui_window_set_title (
(CONFIG_STRING(config_look_window_title)
&& CONFIG_STRING(config_look_window_title)[0]) ?
CONFIG_STRING(config_look_window_title) : NULL);
} }
gui_window_refresh_windows (); gui_window_refresh_windows ();
gui_window_set_title (CONFIG_STRING(config_look_window_title));
} }
/* /*
@@ -2573,15 +2571,17 @@ gui_window_set_title (const char *title)
{ {
char *new_title, *envterm, *envshell, *shell, *shellname; char *new_title, *envterm, *envshell, *shell, *shellname;
envterm = getenv ("TERM"); if (!title || !title[0])
if (!envterm)
return; return;
new_title = (title && title[0]) ? new_title = eval_expression (title, NULL, NULL, NULL);
eval_expression (title, NULL, NULL, NULL) : NULL;
if (!new_title) if (!new_title)
return; return;
envterm = getenv ("TERM");
if (!envterm)
return;
if (strcmp (envterm, "sun-cmd") == 0) if (strcmp (envterm, "sun-cmd") == 0)
{ {
printf ("\033]l%s\033\\", new_title); printf ("\033]l%s\033\\", new_title);
+10 -10
View File
@@ -1213,12 +1213,12 @@ gui_key_set_score (struct t_gui_key *key)
} }
/* /*
* Checks if a key is safe or not: a safe key begins always with the "meta" or * Checks if a key is safe or not: a safe key should begin with the "meta" or
* "ctrl" code (except "@" allowed in cursor/mouse contexts). * "ctrl" code (there are exceptions).
* *
* Returns: * Returns:
* 1: key is safe * 1: key is safe for the given context
* 0: key is NOT safe * 0: key is NOT safe for the given context
*/ */
int int
@@ -1229,13 +1229,13 @@ gui_key_is_safe (int context, const char *key)
if (!key || !key[0]) if (!key || !key[0])
return 0; return 0;
/* "@" is allowed at beginning for cursor/mouse contexts */ /* all keys are safe in cursor mode */
if ((key[0] == '@') if (context == GUI_KEY_CONTEXT_CURSOR)
&& ((context == GUI_KEY_CONTEXT_CURSOR) return 1;
|| (context == GUI_KEY_CONTEXT_MOUSE)))
{ /* "@" is allowed at beginning for mouse context */
if ((key[0] == '@') && (context == GUI_KEY_CONTEXT_MOUSE))
return 1; return 1;
}
if (strncmp (key, "comma", 5) == 0) if (strncmp (key, "comma", 5) == 0)
return 0; return 0;
+2 -3
View File
@@ -2393,8 +2393,7 @@ IRC_PROTOCOL_CALLBACK(nick)
} }
else else
{ {
if (!irc_ignore_check (ctxt->server, ptr_channel->name, if (!ctxt->ignore_remove)
ctxt->nick, ctxt->host))
{ {
ptr_nick_speaking = ((weechat_config_boolean (irc_config_look_smart_filter)) ptr_nick_speaking = ((weechat_config_boolean (irc_config_look_smart_filter))
&& (weechat_config_boolean (irc_config_look_smart_filter_nick))) ? && (weechat_config_boolean (irc_config_look_smart_filter_nick))) ?
@@ -3401,7 +3400,7 @@ IRC_PROTOCOL_CALLBACK(quit)
if (ptr_nick if (ptr_nick
|| (irc_server_strcasecmp (ctxt->server, ptr_channel->name, ctxt->nick) == 0)) || (irc_server_strcasecmp (ctxt->server, ptr_channel->name, ctxt->nick) == 0))
{ {
if (!irc_ignore_check (ctxt->server, ptr_channel->name, ctxt->nick, ctxt->host)) if (!ctxt->ignore_remove)
{ {
/* display quit message */ /* display quit message */
ptr_nick_speaking = NULL; ptr_nick_speaking = NULL;
+1 -1
View File
@@ -352,7 +352,7 @@ weechat_perl_exec (struct t_plugin_script *script,
if (weechat_asprintf ( if (weechat_asprintf (
&func, &func,
"%s::%s", "%s::%s",
(char *) ((script->interpreter) ? script->interpreter : perl_main) (char *) ((script->interpreter) ? script->interpreter : perl_main),
function) < 0) function) < 0)
{ {
return NULL; return NULL;
+2 -2
View File
@@ -39,8 +39,8 @@
# devel-number the devel version as hex number ("0x04010000" for "4.1.0-dev") # devel-number the devel version as hex number ("0x04010000" for "4.1.0-dev")
# #
weechat_stable="4.6.0" weechat_stable="4.6.2"
weechat_devel="4.6.0" weechat_devel="4.6.2"
stable_major=$(echo "${weechat_stable}" | cut -d"." -f1) stable_major=$(echo "${weechat_stable}" | cut -d"." -f1)
stable_minor=$(echo "${weechat_stable}" | cut -d"." -f2) stable_minor=$(echo "${weechat_stable}" | cut -d"." -f2)