Attachment #449294 for bug #595904

View | Details | Raw Unified | Return to bug 595904
Collapse All | Expand All

Lines 56-62 PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.6.0]) Link Here

(-)a/configure.ac (-1 / +3 lines)
56	PKG_CHECK_MODULES(x11, [x11 >= 1.0])	56	PKG_CHECK_MODULES(x11, [x11 >= 1.0])
57		57
58	if test "x$enable_gtk3" = "xyes" ; then	58	if test "x$enable_gtk3" = "xyes" ; then
59	PKG_CHECK_MODULES(vte, [vte-2.90 >= 0.20.0])	59	PKG_CHECK_MODULES(vte, [vte-2.91 >= 0.20.0],, [
		60	PKG_CHECK_MODULES(vte, [vte-2.90 >= 0.20.0])
		61	])
60	else	62	else
61	PKG_CHECK_MODULES(vte, [vte >= 0.20.0])	63	PKG_CHECK_MODULES(vte, [vte >= 0.20.0])
62	fi	64	fi




#include "unixsocket.h"

/* Linux color for palette. */
#if VTE_CHECK_VERSION (0, 38, 0)
static const GdkRGBA linux_color[16] =
{
    { 0, 0, 0, 1 },
    { 0.67, 0, 0, 1 },
    { 0, 0.67, 0, 1 },
    { 0.67, 0.33, 0, 1 },
    { 0, 0, 0.67, 1 },
    { 0.67, 0, 0.67, 1 },
    { 0, 0.67, 0.67, 1 },
    { 0.67, 0.67, 0.67, 1 },
    { 0.33, 0.33, 0.33, 1 },
    { 1, 0.33, 0.33, 1 },
    { 0.33, 1, 0.33, 1 },
    { 1, 1, 0.33, 1 },
    { 0.33, 0.33, 1, 1 },
    { 1, 0.33, 1, 1 },
    { 0.33, 1, 1, 1 },
    { 1, 1, 1, 1 }
};
#else
static const GdkColor linux_color[16] =
{
    { 0, 0x0000, 0x0000, 0x0000 },

    { 0, 0x5555, 0xffff, 0xffff },
    { 0, 0xffff, 0xffff, 0xffff }
};
#endif

/* X accessor. */
static void gdk_window_get_geometry_hints(GdkWindow * window, GdkGeometry * geometry, GdkWindowHints * geometry_mask);

/* Accessor for border values from VteTerminal. */
static GtkBorder * terminal_get_border(Term * term)
{
#if VTE_CHECK_VERSION (0, 38, 0)
    GtkBorder padding;
    gtk_style_context_get_padding(gtk_widget_get_style_context(term->vte),
                                  gtk_widget_get_state_flags(term->vte),
                                  &padding);
    GtkBorder * border = gtk_border_new();
    border->left = padding.left;
    border->right = padding.right;
    border->top = padding.top;
    border->bottom = padding.bottom;
    return border;
#elif VTE_CHECK_VERSION(0, 24, 0)
    /* Style property, new in 0.24.0, replaces the function below. */
    GtkBorder * border;
    gtk_widget_style_get(term->vte, "inner-border", &border, NULL);

static void terminal_settings_apply_to_term(LXTerminal * terminal, Term * term)
{
    Setting * setting = get_setting();
#if VTE_CHECK_VERSION (0, 38, 0)
    PangoFontDescription * font_desc;
#endif

    /* Terminal properties. */
#if VTE_CHECK_VERSION (0, 38, 0)
    font_desc = pango_font_description_from_string(setting->font_name);
    vte_terminal_set_font(VTE_TERMINAL(term->vte), font_desc);
    pango_font_description_free(font_desc);
#else
    vte_terminal_set_font_from_string(VTE_TERMINAL(term->vte), setting->font_name);
    vte_terminal_set_word_chars(VTE_TERMINAL(term->vte), setting->word_selection_characters);
#endif
    vte_terminal_set_scrollback_lines(VTE_TERMINAL(term->vte), setting->scrollback);
    vte_terminal_set_allow_bold(VTE_TERMINAL(term->vte), ! setting->disallow_bold);
    vte_terminal_set_cursor_blink_mode(VTE_TERMINAL(term->vte), ((setting->cursor_blink) ? VTE_CURSOR_BLINK_ON : VTE_CURSOR_BLINK_OFF));

    vte_terminal_set_mouse_autohide(VTE_TERMINAL(term->vte), setting->hide_pointer);

    /* Background and foreground colors. */
#if !VTE_CHECK_VERSION (0, 38, 0)
    if (terminal->rgba)
    {
        /* vte_terminal_queue_background_update doesn't run without changing background. */

        vte_terminal_set_background_transparent(VTE_TERMINAL(term->vte), setting->background_alpha == 65535 ? FALSE : TRUE);
        vte_terminal_set_background_saturation(VTE_TERMINAL(term->vte), 1 - ((double) setting->background_alpha / 65535));
    }
#endif
    vte_terminal_set_colors(VTE_TERMINAL(term->vte), &setting->foreground_color, &setting->background_color, &linux_color[0], 16);

    /* Hide or show scrollbar. */


    /* Set up the VTE. */
    setlocale(LC_ALL, "");
#if VTE_CHECK_VERSION (0, 38, 0)
    vte_terminal_set_encoding(VTE_TERMINAL(term->vte), nl_langinfo(CODESET), NULL);
#else
    vte_terminal_set_emulation(VTE_TERMINAL(term->vte), "xterm");
    vte_terminal_set_encoding(VTE_TERMINAL(term->vte), nl_langinfo(CODESET));
#endif
    vte_terminal_set_backspace_binding(VTE_TERMINAL(term->vte), VTE_ERASE_ASCII_DELETE);
    vte_terminal_set_delete_binding(VTE_TERMINAL(term->vte), VTE_ERASE_DELETE_SEQUENCE);


    gtk_widget_show_all(term->tab);

    /* Set up scrollbar. */
#if VTE_CHECK_VERSION (0, 38, 0)
    gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(term->vte)));
#else
    gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), vte_terminal_get_adjustment(VTE_TERMINAL(term->vte)));
#endif

    /* Fork the process that will have the VTE as its controlling terminal. */
    if (exec == NULL)

    gchar ** command;
    g_shell_parse_argv(exec, NULL, &command, NULL);

#if VTE_CHECK_VERSION (0, 38, 0)
    vte_terminal_spawn_sync(
                    VTE_TERMINAL(term->vte),
                    VTE_PTY_NO_LASTLOG | VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP,
                    pwd,
                    command,
                    env,
                    G_SPAWN_SEARCH_PATH,
                    NULL,
                    NULL,
                    &term->pid,
                    NULL,
                    NULL);
#else
    vte_terminal_fork_command_full(
                    VTE_TERMINAL(term->vte),
                    VTE_PTY_NO_LASTLOG | VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP,

                    NULL,
                    &term->pid,
                    NULL);
#endif
    g_strfreev(command);

    /* Connect signals. */

Lines 21-26 Link Here

(-)a/src/preferences.c (+17 lines)
21	#include <glib.h>	21	#include <glib.h>
22	#include <gtk/gtk.h>	22	#include <gtk/gtk.h>
23	#include <glib/gi18n.h>	23	#include <glib/gi18n.h>
		24	#include <vte/vte.h>
24		25
25	#include "lxterminal.h"	26	#include "lxterminal.h"
26	#include "setting.h"	27	#include "setting.h"
Lines 37-43 static void preferences_dialog_font_set_event(GtkFontButton * widget, Setting * Link Here
37	/* Handler for "color-set" signal on Background Color color button. */	38	/* Handler for "color-set" signal on Background Color color button. */
38	static void preferences_dialog_background_color_set_event(GtkColorButton * widget, Setting * setting)	39	static void preferences_dialog_background_color_set_event(GtkColorButton * widget, Setting * setting)
39	{	40	{
		41	#if VTE_CHECK_VERSION (0, 38, 0)
		42	gtk_color_button_get_rgba(widget, &setting->background_color);
		43	#else
40	gtk_color_button_get_color(widget, &setting->background_color);	44	gtk_color_button_get_color(widget, &setting->background_color);
		45	#endif
41	setting->background_alpha = gtk_color_button_get_alpha(widget);	46	setting->background_alpha = gtk_color_button_get_alpha(widget);
42		47
43	if (setting->background_alpha == 0)	48	if (setting->background_alpha == 0)
Lines 49-55 static void preferences_dialog_background_color_set_event(GtkColorButton * widge Link Here
49	/* Handler for "color-set" signal on Foreground Color color button. */	54	/* Handler for "color-set" signal on Foreground Color color button. */
50	static void preferences_dialog_foreground_color_set_event(GtkColorButton * widget, Setting * setting)	55	static void preferences_dialog_foreground_color_set_event(GtkColorButton * widget, Setting * setting)
51	{	56	{
		57	#if VTE_CHECK_VERSION (0, 38, 0)
		58	gtk_color_button_get_rgba(widget, &setting->foreground_color);
		59	#else
52	gtk_color_button_get_color(widget, &setting->foreground_color);	60	gtk_color_button_get_color(widget, &setting->foreground_color);
		61	#endif
53	}	62	}
54		63
55	/* Handler for "toggled" signal on Allow Bold toggle button.	64	/* Handler for "toggled" signal on Allow Bold toggle button.
Lines 183-195 void terminal_preferences_dialog(GtkAction * action, LXTerminal * terminal) Link Here
183	g_signal_connect(G_OBJECT(w), "font-set", G_CALLBACK(preferences_dialog_font_set_event), setting);	192	g_signal_connect(G_OBJECT(w), "font-set", G_CALLBACK(preferences_dialog_font_set_event), setting);
184		193
185	w = GTK_WIDGET(gtk_builder_get_object(builder, "background_color"));	194	w = GTK_WIDGET(gtk_builder_get_object(builder, "background_color"));
		195	#if VTE_CHECK_VERSION (0, 38, 0)
		196	gtk_color_button_set_rgba(GTK_COLOR_BUTTON(w), &setting->background_color);
		197	#else
186	gtk_color_button_set_color(GTK_COLOR_BUTTON(w), &setting->background_color);	198	gtk_color_button_set_color(GTK_COLOR_BUTTON(w), &setting->background_color);
		199	#endif
187	gtk_color_button_set_alpha(GTK_COLOR_BUTTON(w), setting->background_alpha);	200	gtk_color_button_set_alpha(GTK_COLOR_BUTTON(w), setting->background_alpha);
188	g_signal_connect(G_OBJECT(w), "color-set",	201	g_signal_connect(G_OBJECT(w), "color-set",
189	G_CALLBACK(preferences_dialog_background_color_set_event), setting);	202	G_CALLBACK(preferences_dialog_background_color_set_event), setting);
190		203
191	w = GTK_WIDGET(gtk_builder_get_object(builder, "foreground_color"));	204	w = GTK_WIDGET(gtk_builder_get_object(builder, "foreground_color"));
		205	#if VTE_CHECK_VERSION (0, 38, 0)
		206	gtk_color_button_set_rgba(GTK_COLOR_BUTTON(w), &setting->foreground_color);
		207	#else
192	gtk_color_button_set_color(GTK_COLOR_BUTTON(w), &setting->foreground_color);	208	gtk_color_button_set_color(GTK_COLOR_BUTTON(w), &setting->foreground_color);
		209	#endif
193	g_signal_connect(G_OBJECT(w), "color-set",	210	g_signal_connect(G_OBJECT(w), "color-set",
194	G_CALLBACK(preferences_dialog_foreground_color_set_event), setting);	211	G_CALLBACK(preferences_dialog_foreground_color_set_event), setting);
195		212

Lines 22-27 Link Here

(-)a/src/setting.c (+25 lines)
22	#include <gtk/gtk.h>	22	#include <gtk/gtk.h>
23	#include <glib/gi18n.h>	23	#include <glib/gi18n.h>
24	#include <glib/gstdio.h>	24	#include <glib/gstdio.h>
		25	#include <vte/vte.h>
25	#include <sys/types.h>	26	#include <sys/types.h>
26	#include <sys/stat.h>	27	#include <sys/stat.h>
27	#include <errno.h>	28	#include <errno.h>
Lines 40-50 void print_setting() Link Here
40	g_return_if_fail (setting != NULL);	41	g_return_if_fail (setting != NULL);
41		42
42	printf("Font name: %s\n", setting->font_name);	43	printf("Font name: %s\n", setting->font_name);
		44	#if VTE_CHECK_VERSION (0, 38, 0)
		45	gchar * p = gdk_rgba_to_string(&setting->background_color);
		46	#else
43	gchar * p = gdk_color_to_string(&setting->background_color);	47	gchar * p = gdk_color_to_string(&setting->background_color);
		48	#endif
44	printf("Background color: %s\n", p);	49	printf("Background color: %s\n", p);
45	g_free(p);	50	g_free(p);
46	printf("Background Alpha: %i\n", setting->background_alpha);	51	printf("Background Alpha: %i\n", setting->background_alpha);
		52	#if VTE_CHECK_VERSION (0, 38, 0)
		53	p = gdk_rgba_to_string(&setting->foreground_color);
		54	#else
47	p = gdk_color_to_string(&setting->foreground_color);	55	p = gdk_color_to_string(&setting->foreground_color);
		56	#endif
48	printf("Foreground color: %s\n", p);	57	printf("Foreground color: %s\n", p);
49	g_free(p);	58	g_free(p);
50	printf("Disallow bolding by VTE: %i\n", setting->disallow_bold);	59	printf("Disallow bolding by VTE: %i\n", setting->disallow_bold);
Lines 98-109 void save_setting() Link Here
98		107
99	/* Push settings to GKeyFile. */	108	/* Push settings to GKeyFile. */
100	g_key_file_set_string(setting->keyfile, GENERAL_GROUP, FONT_NAME, setting->font_name);	109	g_key_file_set_string(setting->keyfile, GENERAL_GROUP, FONT_NAME, setting->font_name);
		110	#if VTE_CHECK_VERSION (0, 38, 0)
		111	gchar * p = gdk_rgba_to_string(&setting->background_color);
		112	#else
101	gchar * p = gdk_color_to_string(&setting->background_color);	113	gchar * p = gdk_color_to_string(&setting->background_color);
		114	#endif
102	if (p != NULL)	115	if (p != NULL)
103	g_key_file_set_string(setting->keyfile, GENERAL_GROUP, BG_COLOR, p);	116	g_key_file_set_string(setting->keyfile, GENERAL_GROUP, BG_COLOR, p);
104	g_free(p);	117	g_free(p);
105	g_key_file_set_integer(setting->keyfile, GENERAL_GROUP, BG_ALPHA, setting->background_alpha);	118	g_key_file_set_integer(setting->keyfile, GENERAL_GROUP, BG_ALPHA, setting->background_alpha);
		119	#if VTE_CHECK_VERSION (0, 38, 0)
		120	p = gdk_rgba_to_string(&setting->foreground_color);
		121	#else
106	p = gdk_color_to_string(&setting->foreground_color);	122	p = gdk_color_to_string(&setting->foreground_color);
		123	#endif
107	if (p != NULL)	124	if (p != NULL)
108	g_key_file_set_string(setting->keyfile, GENERAL_GROUP, FG_COLOR, p);	125	g_key_file_set_string(setting->keyfile, GENERAL_GROUP, FG_COLOR, p);
109	g_free(p);	126	g_free(p);
Lines 248-254 Setting * load_setting() Link Here
248	char * p = g_key_file_get_string(setting->keyfile, GENERAL_GROUP, BG_COLOR, NULL);	265	char * p = g_key_file_get_string(setting->keyfile, GENERAL_GROUP, BG_COLOR, NULL);
249	if (p != NULL)	266	if (p != NULL)
250	{	267	{
		268	#if VTE_CHECK_VERSION (0, 38, 0)
		269	gdk_rgba_parse(&setting->background_color, p);
		270	#else
251	gdk_color_parse(p, &setting->background_color);	271	gdk_color_parse(p, &setting->background_color);
		272	#endif
252	}	273	}
253	setting->background_alpha = g_key_file_get_integer(setting->keyfile, GENERAL_GROUP, BG_ALPHA, &error);	274	setting->background_alpha = g_key_file_get_integer(setting->keyfile, GENERAL_GROUP, BG_ALPHA, &error);
254	if (error && (error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND))	275	if (error && (error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND))
Lines 259-265 Setting * load_setting() Link Here
259	p = g_key_file_get_string(setting->keyfile, GENERAL_GROUP, FG_COLOR, NULL);	280	p = g_key_file_get_string(setting->keyfile, GENERAL_GROUP, FG_COLOR, NULL);
260	if (p != NULL)	281	if (p != NULL)
261	{	282	{
		283	#if VTE_CHECK_VERSION (0, 38, 0)
		284	gdk_rgba_parse(&setting->foreground_color, p);
		285	#else
262	gdk_color_parse(p, &setting->foreground_color);	286	gdk_color_parse(p, &setting->foreground_color);
		287	#endif
263	}	288	}
264	setting->disallow_bold = g_key_file_get_boolean(setting->keyfile, GENERAL_GROUP, DISALLOW_BOLD, NULL);	289	setting->disallow_bold = g_key_file_get_boolean(setting->keyfile, GENERAL_GROUP, DISALLOW_BOLD, NULL);
265	setting->cursor_blink = g_key_file_get_boolean(setting->keyfile, GENERAL_GROUP, CURSOR_BLINKS, NULL);	290	setting->cursor_blink = g_key_file_get_boolean(setting->keyfile, GENERAL_GROUP, CURSOR_BLINKS, NULL);

Lines 22-27 Link Here

(-)a/src/setting.h (-2 / +7 lines)
22	#define LXTERMINAL_SETTING_H	22	#define LXTERMINAL_SETTING_H
23		23
24	#include <gtk/gtk.h>	24	#include <gtk/gtk.h>
		25	#include <vte/vte.h>
25		26
26	#define GENERAL_GROUP "general"	27	#define GENERAL_GROUP "general"
27	#define FONT_NAME "fontname"	28	#define FONT_NAME "fontname"
Lines 72-80 typedef struct _setting { Link Here
72		73
73	GKeyFile * keyfile; /* Pointer to GKeyFile containing settings */	74	GKeyFile * keyfile; /* Pointer to GKeyFile containing settings */
74	char * font_name; /* Font name */	75	char * font_name; /* Font name */
		76	#if VTE_CHECK_VERSION (0, 38, 0)
		77	GdkRGBA background_color; /* Background color */
		78	GdkRGBA foreground_color; /* Foreground color */
		79	#else
75	GdkColor background_color; /* Background color */	80	GdkColor background_color; /* Background color */
76	guint16 background_alpha; /* Alpha value to go with background color */
77	GdkColor foreground_color; /* Foreground color */	81	GdkColor foreground_color; /* Foreground color */
		82	#endif
		83	guint16 background_alpha; /* Alpha value to go with background color */
78	gboolean disallow_bold; /* Disallow bolding by VTE */	84	gboolean disallow_bold; /* Disallow bolding by VTE */
79	gboolean cursor_blink; /* True if cursor blinks */	85	gboolean cursor_blink; /* True if cursor blinks */
80	gboolean cursor_underline; /* True if underline cursor; false if block cursor */	86	gboolean cursor_underline; /* True if underline cursor; false if block cursor */
81	-

Return to bug 595904

Lines 39-44 Link Here

(-)a/src/lxterminal.c (-1 / +68 lines)
39	#include "unixsocket.h"	39	#include "unixsocket.h"
40		40
41	/* Linux color for palette. */	41	/* Linux color for palette. */
		42	#if VTE_CHECK_VERSION (0, 38, 0)
		43	static const GdkRGBA linux_color[16] =
		44	{
		45	{ 0, 0, 0, 1 },
		46	{ 0.67, 0, 0, 1 },
		47	{ 0, 0.67, 0, 1 },
		48	{ 0.67, 0.33, 0, 1 },
		49	{ 0, 0, 0.67, 1 },
		50	{ 0.67, 0, 0.67, 1 },
		51	{ 0, 0.67, 0.67, 1 },
		52	{ 0.67, 0.67, 0.67, 1 },
		53	{ 0.33, 0.33, 0.33, 1 },
		54	{ 1, 0.33, 0.33, 1 },
		55	{ 0.33, 1, 0.33, 1 },
		56	{ 1, 1, 0.33, 1 },
		57	{ 0.33, 0.33, 1, 1 },
		58	{ 1, 0.33, 1, 1 },
		59	{ 0.33, 1, 1, 1 },
		60	{ 1, 1, 1, 1 }
		61	};
		62	#else
42	static const GdkColor linux_color[16] =	63	static const GdkColor linux_color[16] =
43	{	64	{
44	{ 0, 0x0000, 0x0000, 0x0000 },	65	{ 0, 0x0000, 0x0000, 0x0000 },
Lines 58-63 static const GdkColor linux_color[16] = Link Here
58	{ 0, 0x5555, 0xffff, 0xffff },	79	{ 0, 0x5555, 0xffff, 0xffff },
59	{ 0, 0xffff, 0xffff, 0xffff }	80	{ 0, 0xffff, 0xffff, 0xffff }
60	};	81	};
		82	#endif
61		83
62	/* X accessor. */	84	/* X accessor. */
63	static void gdk_window_get_geometry_hints(GdkWindow * window, GdkGeometry * geometry, GdkWindowHints * geometry_mask);	85	static void gdk_window_get_geometry_hints(GdkWindow * window, GdkGeometry * geometry, GdkWindowHints * geometry_mask);
Lines 239-245 static void gdk_window_get_geometry_hints(GdkWindow * window, GdkGeometry * geom Link Here
239	/* Accessor for border values from VteTerminal. */	261	/* Accessor for border values from VteTerminal. */
240	static GtkBorder * terminal_get_border(Term * term)	262	static GtkBorder * terminal_get_border(Term * term)
241	{	263	{
242	#if VTE_CHECK_VERSION(0, 24, 0)	264	#if VTE_CHECK_VERSION (0, 38, 0)
		265	GtkBorder padding;
		266	gtk_style_context_get_padding(gtk_widget_get_style_context(term->vte),
		267	gtk_widget_get_state_flags(term->vte),
		268	&padding);
		269	GtkBorder * border = gtk_border_new();
		270	border->left = padding.left;
		271	border->right = padding.right;
		272	border->top = padding.top;
		273	border->bottom = padding.bottom;
		274	return border;
		275	#elif VTE_CHECK_VERSION(0, 24, 0)
243	/* Style property, new in 0.24.0, replaces the function below. */	276	/* Style property, new in 0.24.0, replaces the function below. */
244	GtkBorder * border;	277	GtkBorder * border;
245	gtk_widget_style_get(term->vte, "inner-border", &border, NULL);	278	gtk_widget_style_get(term->vte, "inner-border", &border, NULL);
Lines 1016-1025 static void terminal_vte_commit(VteTerminal * vte, gchar * text, guint size, Ter Link Here
1016	static void terminal_settings_apply_to_term(LXTerminal * terminal, Term * term)	1049	static void terminal_settings_apply_to_term(LXTerminal * terminal, Term * term)
1017	{	1050	{
1018	Setting * setting = get_setting();	1051	Setting * setting = get_setting();
		1052	#if VTE_CHECK_VERSION (0, 38, 0)
		1053	PangoFontDescription * font_desc;
		1054	#endif
1019		1055
1020	/* Terminal properties. */	1056	/* Terminal properties. */
		1057	#if VTE_CHECK_VERSION (0, 38, 0)
		1058	font_desc = pango_font_description_from_string(setting->font_name);
		1059	vte_terminal_set_font(VTE_TERMINAL(term->vte), font_desc);
		1060	pango_font_description_free(font_desc);
		1061	#else
1021	vte_terminal_set_font_from_string(VTE_TERMINAL(term->vte), setting->font_name);	1062	vte_terminal_set_font_from_string(VTE_TERMINAL(term->vte), setting->font_name);
1022	vte_terminal_set_word_chars(VTE_TERMINAL(term->vte), setting->word_selection_characters);	1063	vte_terminal_set_word_chars(VTE_TERMINAL(term->vte), setting->word_selection_characters);
		1064	#endif
1023	vte_terminal_set_scrollback_lines(VTE_TERMINAL(term->vte), setting->scrollback);	1065	vte_terminal_set_scrollback_lines(VTE_TERMINAL(term->vte), setting->scrollback);
1024	vte_terminal_set_allow_bold(VTE_TERMINAL(term->vte), ! setting->disallow_bold);	1066	vte_terminal_set_allow_bold(VTE_TERMINAL(term->vte), ! setting->disallow_bold);
1025	vte_terminal_set_cursor_blink_mode(VTE_TERMINAL(term->vte), ((setting->cursor_blink) ? VTE_CURSOR_BLINK_ON : VTE_CURSOR_BLINK_OFF));	1067	vte_terminal_set_cursor_blink_mode(VTE_TERMINAL(term->vte), ((setting->cursor_blink) ? VTE_CURSOR_BLINK_ON : VTE_CURSOR_BLINK_OFF));
Lines 1028-1033 static void terminal_settings_apply_to_term(LXTerminal * terminal, Term * term) Link Here
1028	vte_terminal_set_mouse_autohide(VTE_TERMINAL(term->vte), setting->hide_pointer);	1070	vte_terminal_set_mouse_autohide(VTE_TERMINAL(term->vte), setting->hide_pointer);
1029		1071
1030	/* Background and foreground colors. */	1072	/* Background and foreground colors. */
		1073	#if !VTE_CHECK_VERSION (0, 38, 0)
1031	if (terminal->rgba)	1074	if (terminal->rgba)
1032	{	1075	{
1033	/* vte_terminal_queue_background_update doesn't run without changing background. */	1076	/* vte_terminal_queue_background_update doesn't run without changing background. */
Lines 1040-1045 static void terminal_settings_apply_to_term(LXTerminal * terminal, Term * term) Link Here
1040	vte_terminal_set_background_transparent(VTE_TERMINAL(term->vte), setting->background_alpha == 65535 ? FALSE : TRUE);	1083	vte_terminal_set_background_transparent(VTE_TERMINAL(term->vte), setting->background_alpha == 65535 ? FALSE : TRUE);
1041	vte_terminal_set_background_saturation(VTE_TERMINAL(term->vte), 1 - ((double) setting->background_alpha / 65535));	1084	vte_terminal_set_background_saturation(VTE_TERMINAL(term->vte), 1 - ((double) setting->background_alpha / 65535));
1042	}	1085	}
		1086	#endif
1043	vte_terminal_set_colors(VTE_TERMINAL(term->vte), &setting->foreground_color, &setting->background_color, &linux_color[0], 16);	1087	vte_terminal_set_colors(VTE_TERMINAL(term->vte), &setting->foreground_color, &setting->background_color, &linux_color[0], 16);
1044		1088
1045	/* Hide or show scrollbar. */	1089	/* Hide or show scrollbar. */
Lines 1086-1093 static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch Link Here
1086		1130
1087	/* Set up the VTE. */	1131	/* Set up the VTE. */
1088	setlocale(LC_ALL, "");	1132	setlocale(LC_ALL, "");
		1133	#if VTE_CHECK_VERSION (0, 38, 0)
		1134	vte_terminal_set_encoding(VTE_TERMINAL(term->vte), nl_langinfo(CODESET), NULL);
		1135	#else
1089	vte_terminal_set_emulation(VTE_TERMINAL(term->vte), "xterm");	1136	vte_terminal_set_emulation(VTE_TERMINAL(term->vte), "xterm");
1090	vte_terminal_set_encoding(VTE_TERMINAL(term->vte), nl_langinfo(CODESET));	1137	vte_terminal_set_encoding(VTE_TERMINAL(term->vte), nl_langinfo(CODESET));
		1138	#endif
1091	vte_terminal_set_backspace_binding(VTE_TERMINAL(term->vte), VTE_ERASE_ASCII_DELETE);	1139	vte_terminal_set_backspace_binding(VTE_TERMINAL(term->vte), VTE_ERASE_ASCII_DELETE);
1092	vte_terminal_set_delete_binding(VTE_TERMINAL(term->vte), VTE_ERASE_DELETE_SEQUENCE);	1140	vte_terminal_set_delete_binding(VTE_TERMINAL(term->vte), VTE_ERASE_DELETE_SEQUENCE);
1093		1141
Lines 1133-1139 static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch Link Here
1133	gtk_widget_show_all(term->tab);	1181	gtk_widget_show_all(term->tab);
1134		1182
1135	/* Set up scrollbar. */	1183	/* Set up scrollbar. */
		1184	#if VTE_CHECK_VERSION (0, 38, 0)
		1185	gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(term->vte)));
		1186	#else
1136	gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), vte_terminal_get_adjustment(VTE_TERMINAL(term->vte)));	1187	gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), vte_terminal_get_adjustment(VTE_TERMINAL(term->vte)));
		1188	#endif
1137		1189
1138	/* Fork the process that will have the VTE as its controlling terminal. */	1190	/* Fork the process that will have the VTE as its controlling terminal. */
1139	if (exec == NULL)	1191	if (exec == NULL)
Lines 1144-1149 static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch Link Here
1144	gchar ** command;	1196	gchar ** command;
1145	g_shell_parse_argv(exec, NULL, &command, NULL);	1197	g_shell_parse_argv(exec, NULL, &command, NULL);
1146		1198
		1199	#if VTE_CHECK_VERSION (0, 38, 0)
		1200	vte_terminal_spawn_sync(
		1201	VTE_TERMINAL(term->vte),
		1202	VTE_PTY_NO_LASTLOG \| VTE_PTY_NO_UTMP \| VTE_PTY_NO_WTMP,
		1203	pwd,
		1204	command,
		1205	env,
		1206	G_SPAWN_SEARCH_PATH,
		1207	NULL,
		1208	NULL,
		1209	&term->pid,
		1210	NULL,
		1211	NULL);
		1212	#else
1147	vte_terminal_fork_command_full(	1213	vte_terminal_fork_command_full(
1148	VTE_TERMINAL(term->vte),	1214	VTE_TERMINAL(term->vte),
1149	VTE_PTY_NO_LASTLOG \| VTE_PTY_NO_UTMP \| VTE_PTY_NO_WTMP,	1215	VTE_PTY_NO_LASTLOG \| VTE_PTY_NO_UTMP \| VTE_PTY_NO_WTMP,
Lines 1155-1160 static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch Link Here
1155	NULL,	1221	NULL,
1156	&term->pid,	1222	&term->pid,
1157	NULL);	1223	NULL);
		1224	#endif
1158	g_strfreev(command);	1225	g_strfreev(command);
1159		1226
1160	/* Connect signals. */	1227	/* Connect signals. */