philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework formatting of /NAMES and /SCAN output.

Browse Source 
The formatting of /NAMES and /SCAN output has been substantially reworked.
The old /FSETs NAMES_BOTCOLOR, NAMES_FRIENDCOLOR, NAMES_NICKCOLOR,
NAMES_OPCOLOR, NAMES_SHITCOLOR and NAMES_VOICECOLOR have been replaced
with these new /FSETs:

....................NAMES_NICK %B$[10]0
................NAMES_NICK_BOT %G$[10]0
.............NAMES_NICK_FRIEND %Y$[10]0
.................NAMES_NICK_ME %W$[10]0
...............NAMES_NICK_SHIT %R$[10]0
....................NAMES_USER %K[ %n$1-%K]
.............NAMES_USER_CHANOP %K[%C$0%n$1-%K]
..............NAMES_USER_IRCOP %K[%R$0%n$1-%K]
..............NAMES_USER_VOICE %K[%M$0%n$1-%K]

The NAMES_NICK formats control how the nick itself is displayed, depending
on the status of the nick as recognised by BitchX (the priority order is
NAMES_NICK_ME > NAMES_NICK_BOT > NAMES_NICK_FRIEND > NAMES_NICK_SHIT >
NAMES_NICK).  The NAMES_USER formats control how the overall entry appears in
the /NAMES or /SCAN line, depending on the channel status of the nick (the
priority order is NAMES_USER_CHANOP > NAMES_USER_VOICE > NAMES_USER_IRCOP >
NAMES_USER).

You'll need to update any scripts or custom formats that altered the old
formats.  If you just use the defaults, the main difference you'll see is
that your own nick is now shown in white, and voiced users are shown with
the '+' sent by the server instead of the 'v'.  You can go back to the old
look by setting these formats:

/FSET NAMES_NICK_ME %B$[10]0
/FSET NAMES_USER_VOICE %K[%Mv%n$1-%K]



git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@46 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2008-05-27 04:53:19 +00:00
parent 56a414feb6
commit 1e81f1ed7b
8 changed files with 178 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/commands.c
View File

@@ -1414,6 +1414,8 @@ int cols = get_int_var(NAMES_COLUMNS_VAR);
for (nick = snick; nick; nick = nick->next)
{
char *nick_format;
char *user_format;
char *nick_buffer = NULL;
char nick_sym;
if (match_host)
@@ -1435,36 +1437,54 @@ int cols = get_int_var(NAMES_COLUMNS_VAR);
|| (shit && !nick->shitlist))
continue;
/* Determine the format string to use */
if (nick->userlist)
nick_format = fget_string_var(FORMAT_NAMES_FRIENDCOLOR_FSET);
/* Determine the nick format string to use */
if (my_stricmp(nick->nick, get_server_nickname(server)) == 0)
nick_format = fget_string_var(FORMAT_NAMES_NICK_ME_FSET);
else if (nick->userlist && (nick->userlist->flags & ADD_BOT))
nick_format = fget_string_var(FORMAT_NAMES_NICK_BOT_FSET);
else if (nick->userlist)
nick_format = fget_string_var(FORMAT_NAMES_NICK_FRIEND_FSET);
else if (nick->shitlist)
nick_format = fget_string_var(FORMAT_NAMES_SHITCOLOR_FSET);
else if (nick_isop(nick) || nick_ishalfop(nick))
nick_format = fget_string_var(FORMAT_NAMES_OPCOLOR_FSET);
else if (nick_isvoice(nick))
nick_format = fget_string_var(FORMAT_NAMES_VOICECOLOR_FSET);
else if (nick_isircop(nick))
nick_format = fget_string_var(FORMAT_NAMES_OPCOLOR_FSET);
nick_format = fget_string_var(FORMAT_NAMES_NICK_SHIT_FSET);
else
nick_format = fget_string_var(FORMAT_NAMES_NICKCOLOR_FSET);
nick_format = fget_string_var(FORMAT_NAMES_NICK_FSET);
/* Determine the special symbol, if any, to use. */
/* Determine the user format and indicator symbol to use. */
if (nick_isop(nick))
{
user_format = fget_string_var(FORMAT_NAMES_USER_CHANOP_FSET);
nick_sym = '@';
}
else if (nick_ishalfop(nick))
{
user_format = fget_string_var(FORMAT_NAMES_USER_CHANOP_FSET);
nick_sym = '%';
}
else if (nick_isvoice(nick))
{
user_format = fget_string_var(FORMAT_NAMES_USER_VOICE_FSET);
nick_sym = '+';
}
else if (nick_isircop(nick))
{
user_format = fget_string_var(FORMAT_NAMES_USER_IRCOP_FSET);
nick_sym = '*';
}
else
{
user_format = fget_string_var(FORMAT_NAMES_USER_FSET);
nick_sym = '.';
}
/* Construct the string */
malloc_strcpy(&nick_buffer, convert_output_format(nick_format,
"%s", nick->nick));
malloc_strcat(&buffer,
convert_output_format(nick_format, "%c %s", nick_sym,
nick->nick));
convert_output_format(user_format, "%c %s", nick_sym,
nick_buffer));
malloc_strcat(&buffer, space);
new_free(&nick_buffer);
if (count++ >= (cols - 1))
{
if (fget_string_var(FORMAT_NAMES_BANNER_FSET))