zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-20 17:12:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Renamed /SET query_auto_close to autoclose_query.

Browse source 
Added /SET autocreate_own_query - it specifies if we want to create
query window when we send /MSG to someone.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@343 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-06-14 19:05:51 +00:00 • committed by cras
commit 6140ab3704
5 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/fe-common/core/fe-common-core.c
View file

@ -72,7 +72,6 @@ void fe_common_core_init(void)
settings_add_bool("lookandfeel", "use_status_window", FALSE); settings_add_bool("lookandfeel", "use_status_window", FALSE);
settings_add_bool("lookandfeel", "use_msgs_window", FALSE); settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
/*settings_add_bool("lookandfeel", "autoraise_msgs_window", FALSE);*/ /*settings_add_bool("lookandfeel", "autoraise_msgs_window", FALSE);*/
settings_add_bool("lookandfeel", "autocreate_query", TRUE);
/*settings_add_bool("lookandfeel", "use_tabbed_windows", TRUE); /*settings_add_bool("lookandfeel", "use_tabbed_windows", TRUE);
settings_add_int("lookandfeel", "tab_orientation", 3);*/ settings_add_int("lookandfeel", "tab_orientation", 3);*/
settings_add_str("lookandfeel", "current_theme", "default"); settings_add_str("lookandfeel", "current_theme", "default");

4
src/fe-common/irc/fe-events.c
View file

@ -111,7 +111,7 @@ static void event_privmsg(const char *data, IRC_SERVER_REC *server, const char *
print_channel_msg(server, msg, nick, addr, target); print_channel_msg(server, msg, nick, addr, target);
} else { } else {
/* private message */ /* private message */
item = (WI_ITEM_REC *) privmsg_get_query(server, nick); item = (WI_ITEM_REC *) privmsg_get_query(server, nick, FALSE);
printformat(server, nick, MSGLEVEL_MSGS, printformat(server, nick, MSGLEVEL_MSGS,
item == NULL ? IRCTXT_MSG_PRIVATE : IRCTXT_MSG_PRIVATE_QUERY, nick, addr, msg); item == NULL ? IRCTXT_MSG_PRIVATE : IRCTXT_MSG_PRIVATE_QUERY, nick, addr, msg);
} }
@ -151,7 +151,7 @@ static void ctcp_msg_check_action(gchar *data, IRC_SERVER_REC *server, gchar *ni
} }
} else { } else {
/* private action */ /* private action */
item = (WI_ITEM_REC *) privmsg_get_query(server, nick); item = (WI_ITEM_REC *) privmsg_get_query(server, nick, FALSE);
printformat(server, nick, MSGLEVEL_ACTIONS, printformat(server, nick, MSGLEVEL_ACTIONS,
item == NULL ? IRCTXT_ACTION_PRIVATE : IRCTXT_ACTION_PRIVATE_QUERY, item == NULL ? IRCTXT_ACTION_PRIVATE : IRCTXT_ACTION_PRIVATE_QUERY,
nick, addr == NULL ? "" : addr, data); nick, addr == NULL ? "" : addr, data);

2
src/fe-common/irc/fe-irc-commands.c
View file

@ -154,7 +154,7 @@ static void cmd_msg(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
else else
{ {
/* private message */ /* private message */
item = (WI_ITEM_REC *) privmsg_get_query(server, target); item = (WI_ITEM_REC *) privmsg_get_query(server, target, TRUE);
printformat(server, target, MSGLEVEL_MSGS | MSGLEVEL_NOHILIGHT, printformat(server, target, MSGLEVEL_MSGS | MSGLEVEL_NOHILIGHT,
item == NULL ? IRCTXT_OWN_MSG_PRIVATE : IRCTXT_OWN_MSG_PRIVATE_QUERY, target, msg, server->nick); item == NULL ? IRCTXT_OWN_MSG_PRIVATE : IRCTXT_OWN_MSG_PRIVATE_QUERY, target, msg, server->nick);
} }

11
src/fe-common/irc/fe-query.c
View file

@ -35,12 +35,13 @@
static int queryclose_tag, query_auto_close; static int queryclose_tag, query_auto_close;
/* Return query where to put the private message. */ /* Return query where to put the private message. */
QUERY_REC *privmsg_get_query(IRC_SERVER_REC *server, const char *nick) QUERY_REC *privmsg_get_query(IRC_SERVER_REC *server, const char *nick, int own)
{ {
QUERY_REC *query; QUERY_REC *query;
query = query_find(server, nick); query = query_find(server, nick);
if (query == NULL && settings_get_bool("autocreate_query")) if (query == NULL && settings_get_bool("autocreate_query") &&
(!own || settings_get_bool("autocreate_own_query")))
query = query_create(server, nick, TRUE); query = query_create(server, nick, TRUE);
return query; return query;
@ -173,7 +174,7 @@ static int sig_query_autoclose(void)
static void read_settings(void) static void read_settings(void)
{ {
query_auto_close = settings_get_int("query_auto_close"); query_auto_close = settings_get_int("autoclose_query");
if (query_auto_close > 0 && queryclose_tag == -1) if (query_auto_close > 0 && queryclose_tag == -1)
queryclose_tag = g_timeout_add(5000, (GSourceFunc) sig_query_autoclose, NULL); queryclose_tag = g_timeout_add(5000, (GSourceFunc) sig_query_autoclose, NULL);
else if (query_auto_close <= 0 && queryclose_tag != -1) { else if (query_auto_close <= 0 && queryclose_tag != -1) {
@ -184,7 +185,9 @@ static void read_settings(void)
void fe_query_init(void) void fe_query_init(void)
{ {
settings_add_int("lookandfeel", "query_auto_close", 0); settings_add_bool("lookandfeel", "autocreate_query", TRUE);
settings_add_bool("lookandfeel", "autocreate_own_query", TRUE);
settings_add_int("lookandfeel", "autoclose_query", 0);
queryclose_tag = -1; queryclose_tag = -1;
read_settings(); read_settings();

2
src/fe-common/irc/fe-query.h
View file

@ -2,6 +2,6 @@
#define __FE_QUERY_H #define __FE_QUERY_H
/* Return query where to put the private message. */ /* Return query where to put the private message. */
QUERY_REC *privmsg_get_query(IRC_SERVER_REC *server, const char *nick); QUERY_REC *privmsg_get_query(IRC_SERVER_REC *server, const char *nick, int own);
#endif #endif