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

Recode patch by decadix/senneth

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3283 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2004-08-20 00:03:40 +00:00 • committed by cras
commit 226a567562
20 changed files with 289 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/fe-text/statusbar.c
View file

@ -21,6 +21,7 @@
#include "module.h"
#include "signals.h"
#include "expandos.h"
#include "recode.h"
#include "special-vars.h"
#include "themes.h"
@ -684,8 +685,10 @@ void statusbar_item_default_handler(SBAR_ITEM_REC *item, int get_size_only,
int escape_vars)
{
SERVER_REC *server;
WI_ITEM_REC *wiitem;
char *tmpstr, *tmpstr2;
WI_ITEM_REC *wiitem;
char *tmpstr, *tmpstr2;
const char *target;
char *recoded;
int len;
if (str == NULL)
@ -724,7 +727,11 @@ void statusbar_item_default_handler(SBAR_ITEM_REC *item, int get_size_only,
tmpstr2 = reverse_controls(tmpstr);
g_free(tmpstr);
tmpstr = tmpstr2;
target = wiitem ? window_item_get_target(wiitem) : NULL;
recoded = recode_in(tmpstr2, target);
g_free(tmpstr2);
tmpstr = recoded;
if (get_size_only) {
item->min_size = item->max_size = format_get_length(tmpstr);
} else {

4
src/fe-text/term.c
View file

@ -119,7 +119,7 @@ static void read_settings(void)
term_auto_detach(settings_get_bool("term_auto_detach"));
/* set terminal type */
str = settings_get_str("term_type");
str = settings_get_str("term_charset");
if (g_strcasecmp(str, "utf-8") == 0)
term_type = TERM_TYPE_UTF8;
else if (g_strcasecmp(str, "big5") == 0)
@ -152,7 +152,7 @@ void term_common_init(void)
settings_add_bool("lookandfeel", "term_force_colors", FALSE);
settings_add_bool("lookandfeel", "term_auto_detach", FALSE);
settings_add_bool("lookandfeel", "mirc_blink_fix", FALSE);
settings_add_str("lookandfeel", "term_type", "8bit");
settings_add_str("lookandfeel", "term_charset", "ISO8859-1");
force_colors = FALSE;
term_use_colors = term_has_colors() && settings_get_bool("colors");