aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Fix indentation of display_sorted_nicks().

Browse Source 
This was done assuming an "indent with tab, align with spaces" approach.
get_alignment also benefited from a minor indentation fix.
This commit is contained in:
Xavier G 2016-05-13 03:31:23 +02:00
parent 719efc44a3
commit 09ca3ad48f
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/special-vars.c
View File

@ -340,7 +340,7 @@ static char *get_alignment(const char *text, int align, int flags, char pad)
} }
ret = str->str; ret = str->str;
g_string_free(str, FALSE); g_string_free(str, FALSE);
return ret; return ret;
} }

64
src/fe-common/core/fe-channels.c
View File

@ -328,35 +328,35 @@ static int get_nick_length(void *data)
static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist) static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
{ {
WINDOW_REC *window; WINDOW_REC *window;
TEXT_DEST_REC dest; TEXT_DEST_REC dest;
GString *str; GString *str;
GSList *tmp; GSList *tmp;
char *format, *stripped, *prefix_format; char *format, *stripped, *prefix_format;
char *linebuf, nickmode[2] = { 0, 0 }; char *linebuf, nickmode[2] = { 0, 0 };
int *columns, cols, rows, last_col_rows, col, row, max_width; int *columns, cols, rows, last_col_rows, col, row, max_width;
int item_extra, linebuf_size, formatnum; int item_extra, linebuf_size, formatnum;
window = window_find_closest(channel->server, channel->visible_name, window = window_find_closest(channel->server, channel->visible_name,
MSGLEVEL_CLIENTCRAP); MSGLEVEL_CLIENTCRAP);
max_width = window->width; max_width = window->width;
/* get the length of item extra stuff ("[ ] ") */ /* get the length of item extra stuff ("[ ] ") */
format = format_get_text(MODULE_NAME, NULL, format = format_get_text(MODULE_NAME, NULL,
channel->server, channel->visible_name, channel->server, channel->visible_name,
TXT_NAMES_NICK, " ", ""); TXT_NAMES_NICK, " ", "");
stripped = strip_codes(format); stripped = strip_codes(format);
item_extra = strlen(stripped); item_extra = strlen(stripped);
g_free(stripped); g_free(stripped);
g_free(format); g_free(format);
if (settings_get_int("names_max_width") > 0 && if (settings_get_int("names_max_width") > 0 &&
settings_get_int("names_max_width") < max_width) settings_get_int("names_max_width") < max_width)
max_width = settings_get_int("names_max_width"); max_width = settings_get_int("names_max_width");
/* remove width of the timestamp from max_width */ /* remove width of the timestamp from max_width */
format_create_dest(&dest, channel->server, channel->visible_name, format_create_dest(&dest, channel->server, channel->visible_name,
MSGLEVEL_CLIENTCRAP, NULL); MSGLEVEL_CLIENTCRAP, NULL);
format = format_get_line_start(current_theme, &dest, time(NULL)); format = format_get_line_start(current_theme, &dest, time(NULL));
if (format != NULL) { if (format != NULL) {
stripped = strip_codes(format); stripped = strip_codes(format);
@ -365,11 +365,11 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
g_free(format); g_free(format);
} }
/* remove width of the prefix from max_width */ /* remove width of the prefix from max_width */
prefix_format = format_get_text(MODULE_NAME, NULL, prefix_format = format_get_text(MODULE_NAME, NULL,
channel->server, channel->visible_name, channel->server, channel->visible_name,
TXT_NAMES_PREFIX, TXT_NAMES_PREFIX,
channel->visible_name); channel->visible_name);
if (prefix_format != NULL) { if (prefix_format != NULL) {
stripped = strip_codes(prefix_format); stripped = strip_codes(prefix_format);
max_width -= strlen(stripped); max_width -= strlen(stripped);
@ -384,19 +384,19 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
/* calculate columns */ /* calculate columns */
cols = get_max_column_count(nicklist, get_nick_length, max_width, cols = get_max_column_count(nicklist, get_nick_length, max_width,
settings_get_int("names_max_columns"), settings_get_int("names_max_columns"),
item_extra, 3, &columns, &rows); item_extra, 3, &columns, &rows);
nicklist = columns_sort_list(nicklist, rows); nicklist = columns_sort_list(nicklist, rows);
/* rows in last column */ /* rows in last column */
last_col_rows = rows-(cols*rows-g_slist_length(nicklist)); last_col_rows = rows-(cols*rows-g_slist_length(nicklist));
if (last_col_rows == 0) if (last_col_rows == 0)
last_col_rows = rows; last_col_rows = rows;
str = g_string_new(prefix_format); str = g_string_new(prefix_format);
linebuf_size = max_width+1; linebuf = g_malloc(linebuf_size); linebuf_size = max_width+1; linebuf = g_malloc(linebuf_size);
col = 0; row = 0; col = 0; row = 0;
for (tmp = nicklist; tmp != NULL; tmp = tmp->next) { for (tmp = nicklist; tmp != NULL; tmp = tmp->next) {
NICK_REC *rec = tmp->data; NICK_REC *rec = tmp->data;
@ -407,39 +407,39 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
if (linebuf_size < columns[col]-item_extra+1) { if (linebuf_size < columns[col]-item_extra+1) {
linebuf_size = (columns[col]-item_extra+1)*2; linebuf_size = (columns[col]-item_extra+1)*2;
linebuf = g_realloc(linebuf, linebuf_size); linebuf = g_realloc(linebuf, linebuf_size);
} }
memset(linebuf, ' ', columns[col]-item_extra); memset(linebuf, ' ', columns[col]-item_extra);
linebuf[columns[col]-item_extra] = '\0'; linebuf[columns[col]-item_extra] = '\0';
memcpy(linebuf, rec->nick, strlen(rec->nick)); memcpy(linebuf, rec->nick, strlen(rec->nick));
formatnum = rec->op ? TXT_NAMES_NICK_OP : formatnum = rec->op ? TXT_NAMES_NICK_OP :
rec->halfop ? TXT_NAMES_NICK_HALFOP : rec->halfop ? TXT_NAMES_NICK_HALFOP :
rec->voice ? TXT_NAMES_NICK_VOICE : rec->voice ? TXT_NAMES_NICK_VOICE :
TXT_NAMES_NICK; TXT_NAMES_NICK;
format = format_get_text(MODULE_NAME, NULL, format = format_get_text(MODULE_NAME, NULL,
channel->server, channel->server,
channel->visible_name, channel->visible_name,
formatnum, nickmode, linebuf); formatnum, nickmode, linebuf);
g_string_append(str, format); g_string_append(str, format);
g_free(format); g_free(format);
if (++col == cols) { if (++col == cols) {
printtext(channel->server, channel->visible_name, printtext(channel->server, channel->visible_name,
MSGLEVEL_CLIENTCRAP, "%s", str->str); MSGLEVEL_CLIENTCRAP, "%s", str->str);
g_string_truncate(str, 0); g_string_truncate(str, 0);
if (prefix_format != NULL) if (prefix_format != NULL)
g_string_assign(str, prefix_format); g_string_assign(str, prefix_format);
col = 0; row++; col = 0; row++;
if (row == last_col_rows) if (row == last_col_rows)
cols--; cols--;
} }
} }
if (str->len > strlen(prefix_format)) { if (str->len > strlen(prefix_format)) {
printtext(channel->server, channel->visible_name, printtext(channel->server, channel->visible_name,
MSGLEVEL_CLIENTCRAP, "%s", str->str); MSGLEVEL_CLIENTCRAP, "%s", str->str);
} }
g_slist_free(nicklist); g_slist_free(nicklist);