blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hotlist not changed when self away or nick change

Browse Source
This commit is contained in:
Sebastien Helleu 2005-04-09 08:03:53 +00:00
parent ae8a4633ef
commit a92ca4961b
10 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/curses/gui-display.c
View File

@ -65,6 +65,7 @@ char *nicks_colors[COLOR_WIN_NICK_NUMBER] =
int color_attr[NUM_COLORS];
/*
* gui_assign_color: assign a color (read from config)
*/
@ -2398,7 +2399,7 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message)
pos[0] = '\n';
if (buffer->num_displayed > 0)
gui_draw_buffer_chat (buffer, 0);
if (buffer->num_displayed == 0)
if (gui_add_hotlist && (buffer->num_displayed == 0))
{
if (3 - buffer->last_line->line_with_message -
buffer->last_line->line_with_highlight <=

2
src/gui/gui-common.c
View File

@ -43,6 +43,8 @@
int gui_init_ok = 0; /* = 1 if GUI is initialized */
int gui_ok = 0; /* = 1 if GUI is ok */
/* (0 when term size too small) */
int gui_add_hotlist = 1; /* 0 is for temporarly disable */
/* hotlist add for all buffers */
t_gui_window *gui_windows = NULL; /* pointer to first window */
t_gui_window *last_gui_window = NULL; /* pointer to last window */

1
src/gui/gui.h
View File

@ -250,6 +250,7 @@ struct t_gui_window
extern int gui_init_ok;
extern int gui_ok;
extern int gui_add_hotlist;
extern t_gui_window *gui_windows;
extern t_gui_window *last_gui_window;
extern t_gui_window *gui_current_window;

34
src/irc/irc-recv.c
View File

@ -740,29 +740,30 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
if (pos)
pos[0] = '\0';
/* change nickname in any opened private window */
for (ptr_buffer = gui_buffers; ptr_buffer;
ptr_buffer = ptr_buffer->next_buffer)
{
if ((SERVER(ptr_buffer) == server) && BUFFER_IS_PRIVATE(ptr_buffer))
{
if ((CHANNEL(ptr_buffer)->name)
&& (strcasecmp (host, CHANNEL(ptr_buffer)->name) == 0))
{
free (CHANNEL(ptr_buffer)->name);
CHANNEL(ptr_buffer)->name = strdup (arguments);
}
}
}
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
ptr_nick = nick_search (ptr_channel, host);
if (ptr_nick)
{
/* change nickname in any opened private window */
for (ptr_buffer = gui_buffers; ptr_buffer;
ptr_buffer = ptr_buffer->next_buffer)
{
if ((SERVER(ptr_buffer) == server) && BUFFER_IS_PRIVATE(ptr_buffer))
{
if ((CHANNEL(ptr_buffer)->name)
&& (strcmp (ptr_nick->nick, CHANNEL(ptr_buffer)->name) == 0))
{
free (CHANNEL(ptr_buffer)->name);
CHANNEL(ptr_buffer)->name = strdup (arguments);
}
}
}
/* change nickname on channel */
nick_is_me = (strcmp (ptr_nick->nick, server->nick) == 0) ? 1 : 0;
if (nick_is_me)
gui_add_hotlist = 0;
nick_change (ptr_channel, ptr_nick, arguments);
irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
if (nick_is_me)
@ -786,6 +787,7 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
arguments);
if (gui_buffer_has_nicklist (ptr_channel->buffer))
gui_draw_buffer_nick (ptr_channel->buffer, 1);
gui_add_hotlist = 1;
}
}

2
src/irc/irc-send.c
View File

@ -94,6 +94,7 @@ irc_cmd_send_away (t_irc_server *server, char *arguments)
time_t elapsed;
char buffer[4096];
gui_add_hotlist = 0;
if (arguments && (strncmp (arguments, "-all", 4) == 0))
{
pos = arguments + 4;
@ -184,6 +185,7 @@ irc_cmd_send_away (t_irc_server *server, char *arguments)
}
}
gui_draw_buffer_status (gui_current_window->buffer, 1);
gui_add_hotlist = 1;
return 0;
}

3
weechat/src/gui/curses/gui-display.c
View File

@ -65,6 +65,7 @@ char *nicks_colors[COLOR_WIN_NICK_NUMBER] =
int color_attr[NUM_COLORS];
/*
* gui_assign_color: assign a color (read from config)
*/
@ -2398,7 +2399,7 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message)
pos[0] = '\n';
if (buffer->num_displayed > 0)
gui_draw_buffer_chat (buffer, 0);
if (buffer->num_displayed == 0)
if (gui_add_hotlist && (buffer->num_displayed == 0))
{
if (3 - buffer->last_line->line_with_message -
buffer->last_line->line_with_highlight <=

2
weechat/src/gui/gui-common.c
View File

@ -43,6 +43,8 @@
int gui_init_ok = 0; /* = 1 if GUI is initialized */
int gui_ok = 0; /* = 1 if GUI is ok */
/* (0 when term size too small) */
int gui_add_hotlist = 1; /* 0 is for temporarly disable */
/* hotlist add for all buffers */
t_gui_window *gui_windows = NULL; /* pointer to first window */
t_gui_window *last_gui_window = NULL; /* pointer to last window */

1
weechat/src/gui/gui.h
View File

@ -250,6 +250,7 @@ struct t_gui_window
extern int gui_init_ok;
extern int gui_ok;
extern int gui_add_hotlist;
extern t_gui_window *gui_windows;
extern t_gui_window *last_gui_window;
extern t_gui_window *gui_current_window;

34
weechat/src/irc/irc-recv.c
View File

@ -740,29 +740,30 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
if (pos)
pos[0] = '\0';
/* change nickname in any opened private window */
for (ptr_buffer = gui_buffers; ptr_buffer;
ptr_buffer = ptr_buffer->next_buffer)
{
if ((SERVER(ptr_buffer) == server) && BUFFER_IS_PRIVATE(ptr_buffer))
{
if ((CHANNEL(ptr_buffer)->name)
&& (strcasecmp (host, CHANNEL(ptr_buffer)->name) == 0))
{
free (CHANNEL(ptr_buffer)->name);
CHANNEL(ptr_buffer)->name = strdup (arguments);
}
}
}
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
ptr_nick = nick_search (ptr_channel, host);
if (ptr_nick)
{
/* change nickname in any opened private window */
for (ptr_buffer = gui_buffers; ptr_buffer;
ptr_buffer = ptr_buffer->next_buffer)
{
if ((SERVER(ptr_buffer) == server) && BUFFER_IS_PRIVATE(ptr_buffer))
{
if ((CHANNEL(ptr_buffer)->name)
&& (strcmp (ptr_nick->nick, CHANNEL(ptr_buffer)->name) == 0))
{
free (CHANNEL(ptr_buffer)->name);
CHANNEL(ptr_buffer)->name = strdup (arguments);
}
}
}
/* change nickname on channel */
nick_is_me = (strcmp (ptr_nick->nick, server->nick) == 0) ? 1 : 0;
if (nick_is_me)
gui_add_hotlist = 0;
nick_change (ptr_channel, ptr_nick, arguments);
irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
if (nick_is_me)
@ -786,6 +787,7 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
arguments);
if (gui_buffer_has_nicklist (ptr_channel->buffer))
gui_draw_buffer_nick (ptr_channel->buffer, 1);
gui_add_hotlist = 1;
}
}

2
weechat/src/irc/irc-send.c
View File

@ -94,6 +94,7 @@ irc_cmd_send_away (t_irc_server *server, char *arguments)
time_t elapsed;
char buffer[4096];
gui_add_hotlist = 0;
if (arguments && (strncmp (arguments, "-all", 4) == 0))
{
pos = arguments + 4;
@ -184,6 +185,7 @@ irc_cmd_send_away (t_irc_server *server, char *arguments)
}
}
gui_draw_buffer_status (gui_current_window->buffer, 1);
gui_add_hotlist = 1;
return 0;
}