Commit de0363de authored by Nalin Dahyabhai's avatar Nalin Dahyabhai

if we can't convert from the locale encoding to UTF-8, use UTF-8 as the

* src/iso2022.c(_vte_iso2022_state_new): if we can't convert from the locale
	encoding to UTF-8, use UTF-8 as the locale encoding (#112614).
* src/vtegl.c(_vte_gl_start): enable point smoothing.
parent 06f5955c
2003-05-12 nalin
* src/iso2022.c(_vte_iso2022_state_new): if we can't convert from the
locale encoding to UTF-8, use UTF-8 as the locale encoding (#112614).
* src/vtegl.c(_vte_gl_start): enable point smoothing.
2003-05-08 nalin
* src/vtedraw.c, src/vtedraw.h (_vte_draw_get_colormap): let the caller
control whether or not we return the default colormap.
......
......@@ -715,12 +715,26 @@ _vte_iso2022_state_new(const char *native_codeset,
state->native_codeset, state->codeset);
}
#endif
state->conv = _vte_conv_open(state->target_codeset,
state->codeset);
state->conv = _vte_conv_open(state->target_codeset, state->codeset);
state->codeset_changed = fn;
state->codeset_changed_data = data;
state->buffer = _vte_buffer_new();
g_assert(state->conv != (VteConv) -1);
if (state->conv == (VteConv) -1) {
g_warning(_("Unable to convert characters from %s to %s."),
state->codeset, state->target_codeset);
#ifdef VTE_DEBUG
if (_vte_debug_on(VTE_DEBUG_SUBSTITUTION)) {
fprintf(stderr, "Using UTF-8 instead.\n");
}
#endif
state->codeset = state->utf8_codeset;
state->conv = _vte_conv_open(state->target_codeset,
state->codeset);
if (state->conv == (VteConv) -1) {
g_error(_("Unable to convert characters from %s to %s."),
state->codeset, state->target_codeset);
}
}
return state;
}
......
......@@ -14,7 +14,7 @@ ISO-2022-KR/158: [$)C1hD!)B] [김치]
#
US-ASCII: [(B#$@[\]^_{|}~(B] [#$@[\]^_{|}~]
Graphics: [(0abcdefghijklmnopqrstuvwxyz_{|}~(B]
[▒␉␌␍␊°±␤␋┘┐┌└┼⎺⎻─⎼⎽├┤┴┬│≤≥_π≠£·]
[▒␉␌␍␊°±␤␋┘┐┌└┼⎺⎻─⎼⎽├┤┴┬│≤≥_π≠£·]
British: [(A#$@[\]^_{|}~(B] [#£@[\]^_{|}~]
Dutch: [(4#$@[\]^_{|}~(B] [£$¾ÿ½|^_¨f¼´]
Finnish: [(C#$@[\]^_{|}~(B] [#$@ÄÖÅÜ_äöåü]
......
......@@ -12185,8 +12185,7 @@ vte_terminal_draw_cells(VteTerminal *terminal,
struct _vte_draw_text_request *items, gssize n,
gint fore, gint back, gboolean draw_default_bg,
gboolean bold, gboolean underline,
gboolean strikethrough,
gboolean hilite, gboolean boxed,
gboolean strikethrough, gboolean hilite, gboolean boxed,
gint column_width, gint row_height)
{
int i, x, y, ascent;
......@@ -12492,7 +12491,8 @@ vte_terminal_draw_row(VteTerminal *terminal,
0),
items->len,
fore, back, FALSE,
bold, underline, strikethrough, hilite, FALSE,
bold, underline,
strikethrough, hilite, FALSE,
column_width, row_height);
g_array_set_size(items, 0);
/* We'll need to continue at the first cell which didn't
......
......@@ -236,6 +236,7 @@ _vte_gl_start(struct _vte_draw *draw)
gluOrtho2D(0, width - 1, 0, height - 1);
glViewport(0, 0, width, height);
glEnable(GL_BLEND);
glEnable(GL_POINT_SMOOTH);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment