gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

drop old code for VTE < 0.38 (it was used in GTK+2 build)

master-1.22
monsta 2016-05-26 17:33:01 +03:00
parent ea302a83da
commit b2919d25fa
6 changed files with 17 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/profile-editor.c
View File

@ -141,7 +141,6 @@ profile_notify_sensitivity_cb (TerminalProfile *profile,
!terminal_profile_property_locked (profile, TERMINAL_PROFILE_CUSTOM_COMMAND)); !terminal_profile_property_locked (profile, TERMINAL_PROFILE_CUSTOM_COMMAND));
} }
#if VTE_CHECK_VERSION (0, 38, 0)
gtk_widget_hide (profile_editor_get_widget (editor, "background-image")); gtk_widget_hide (profile_editor_get_widget (editor, "background-image"));
gtk_widget_hide (profile_editor_get_widget (editor, "darken-background-transparent-or-image-scale-label")); gtk_widget_hide (profile_editor_get_widget (editor, "darken-background-transparent-or-image-scale-label"));
gtk_widget_show (profile_editor_get_widget (editor, "darken-background-transparent-scale-label")); gtk_widget_show (profile_editor_get_widget (editor, "darken-background-transparent-scale-label"));
@ -161,35 +160,6 @@ profile_notify_sensitivity_cb (TerminalProfile *profile,
SET_SENSITIVE ("darken-background-vbox", FALSE); SET_SENSITIVE ("darken-background-vbox", FALSE);
} }
} }
#else
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TYPE))
{
gboolean bg_type_locked = terminal_profile_property_locked (profile, TERMINAL_PROFILE_BACKGROUND_TYPE);
SET_SENSITIVE ("solid-radiobutton", !bg_type_locked);
SET_SENSITIVE ("image-radiobutton", !bg_type_locked);
SET_SENSITIVE ("transparent-radiobutton", !bg_type_locked);
bg_type = terminal_profile_get_property_enum (profile, TERMINAL_PROFILE_BACKGROUND_TYPE);
if (bg_type == TERMINAL_BACKGROUND_IMAGE)
{
SET_SENSITIVE ("background-image-filechooser", !terminal_profile_property_locked (profile, TERMINAL_PROFILE_BACKGROUND_IMAGE_FILE));
SET_SENSITIVE ("scroll-background-checkbutton", !terminal_profile_property_locked (profile, TERMINAL_PROFILE_SCROLL_BACKGROUND));
SET_SENSITIVE ("darken-background-vbox", !terminal_profile_property_locked (profile, TERMINAL_PROFILE_BACKGROUND_DARKNESS));
}
else if (bg_type == TERMINAL_BACKGROUND_TRANSPARENT)
{
SET_SENSITIVE ("background-image-filechooser", FALSE);
SET_SENSITIVE ("scroll-background-checkbutton", FALSE);
SET_SENSITIVE ("darken-background-vbox", !terminal_profile_property_locked (profile, TERMINAL_PROFILE_BACKGROUND_DARKNESS));
}
else
{
SET_SENSITIVE ("background-image-filechooser", FALSE);
SET_SENSITIVE ("scroll-background-checkbutton", FALSE);
SET_SENSITIVE ("darken-background-vbox", FALSE);
}
}
#endif
if (!prop_name || if (!prop_name ||
prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT) || prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT) ||

7
src/terminal-profile.c
View File

@ -1271,17 +1271,10 @@ terminal_profile_class_init (TerminalProfileClass *klass)
TERMINAL_PROFILE_PROPERTY_DOUBLE (BACKGROUND_DARKNESS, 0.0, 1.0, DEFAULT_BACKGROUND_DARKNESS, KEY_BACKGROUND_DARKNESS); TERMINAL_PROFILE_PROPERTY_DOUBLE (BACKGROUND_DARKNESS, 0.0, 1.0, DEFAULT_BACKGROUND_DARKNESS, KEY_BACKGROUND_DARKNESS);
TERMINAL_PROFILE_PROPERTY_ENUM (BACKGROUND_TYPE, TERMINAL_TYPE_BACKGROUND_TYPE, DEFAULT_BACKGROUND_TYPE, KEY_BACKGROUND_TYPE); TERMINAL_PROFILE_PROPERTY_ENUM (BACKGROUND_TYPE, TERMINAL_TYPE_BACKGROUND_TYPE, DEFAULT_BACKGROUND_TYPE, KEY_BACKGROUND_TYPE);
#if VTE_CHECK_VERSION (0, 38, 0)
TERMINAL_PROFILE_PROPERTY_ENUM (BACKSPACE_BINDING, VTE_TYPE_ERASE_BINDING, DEFAULT_BACKSPACE_BINDING, KEY_BACKSPACE_BINDING); TERMINAL_PROFILE_PROPERTY_ENUM (BACKSPACE_BINDING, VTE_TYPE_ERASE_BINDING, DEFAULT_BACKSPACE_BINDING, KEY_BACKSPACE_BINDING);
TERMINAL_PROFILE_PROPERTY_ENUM (CURSOR_BLINK_MODE, VTE_TYPE_CURSOR_BLINK_MODE, DEFAULT_CURSOR_BLINK_MODE, KEY_CURSOR_BLINK_MODE); TERMINAL_PROFILE_PROPERTY_ENUM (CURSOR_BLINK_MODE, VTE_TYPE_CURSOR_BLINK_MODE, DEFAULT_CURSOR_BLINK_MODE, KEY_CURSOR_BLINK_MODE);
TERMINAL_PROFILE_PROPERTY_ENUM (CURSOR_SHAPE, VTE_TYPE_CURSOR_SHAPE, DEFAULT_CURSOR_SHAPE, KEY_CURSOR_SHAPE); TERMINAL_PROFILE_PROPERTY_ENUM (CURSOR_SHAPE, VTE_TYPE_CURSOR_SHAPE, DEFAULT_CURSOR_SHAPE, KEY_CURSOR_SHAPE);
TERMINAL_PROFILE_PROPERTY_ENUM (DELETE_BINDING, VTE_TYPE_ERASE_BINDING, DEFAULT_DELETE_BINDING, KEY_DELETE_BINDING); TERMINAL_PROFILE_PROPERTY_ENUM (DELETE_BINDING, VTE_TYPE_ERASE_BINDING, DEFAULT_DELETE_BINDING, KEY_DELETE_BINDING);
#else
TERMINAL_PROFILE_PROPERTY_ENUM (BACKSPACE_BINDING, VTE_TYPE_TERMINAL_ERASE_BINDING, DEFAULT_BACKSPACE_BINDING, KEY_BACKSPACE_BINDING);
TERMINAL_PROFILE_PROPERTY_ENUM (CURSOR_BLINK_MODE, VTE_TYPE_TERMINAL_CURSOR_BLINK_MODE, DEFAULT_CURSOR_BLINK_MODE, KEY_CURSOR_BLINK_MODE);
TERMINAL_PROFILE_PROPERTY_ENUM (CURSOR_SHAPE, VTE_TYPE_TERMINAL_CURSOR_SHAPE, DEFAULT_CURSOR_SHAPE, KEY_CURSOR_SHAPE);
TERMINAL_PROFILE_PROPERTY_ENUM (DELETE_BINDING, VTE_TYPE_TERMINAL_ERASE_BINDING, DEFAULT_DELETE_BINDING, KEY_DELETE_BINDING);
#endif
TERMINAL_PROFILE_PROPERTY_ENUM (EXIT_ACTION, TERMINAL_TYPE_EXIT_ACTION, DEFAULT_EXIT_ACTION, KEY_EXIT_ACTION); TERMINAL_PROFILE_PROPERTY_ENUM (EXIT_ACTION, TERMINAL_TYPE_EXIT_ACTION, DEFAULT_EXIT_ACTION, KEY_EXIT_ACTION);
TERMINAL_PROFILE_PROPERTY_ENUM (SCROLLBAR_POSITION, TERMINAL_TYPE_SCROLLBAR_POSITION, DEFAULT_SCROLLBAR_POSITION, KEY_SCROLLBAR_POSITION); TERMINAL_PROFILE_PROPERTY_ENUM (SCROLLBAR_POSITION, TERMINAL_TYPE_SCROLLBAR_POSITION, DEFAULT_SCROLLBAR_POSITION, KEY_SCROLLBAR_POSITION);
TERMINAL_PROFILE_PROPERTY_ENUM (TITLE_MODE, TERMINAL_TYPE_TITLE_MODE, DEFAULT_TITLE_MODE, KEY_TITLE_MODE); TERMINAL_PROFILE_PROPERTY_ENUM (TITLE_MODE, TERMINAL_TYPE_TITLE_MODE, DEFAULT_TITLE_MODE, KEY_TITLE_MODE);

8
src/terminal-screen-container.c
View File

@ -145,11 +145,7 @@ terminal_screen_container_constructor (GType type,
g_assert (priv->screen != NULL); g_assert (priv->screen != NULL);
#ifdef USE_SCROLLED_WINDOW #ifdef USE_SCROLLED_WINDOW
#if VTE_CHECK_VERSION (0, 38, 0)
priv->scrolled_window = gtk_scrolled_window_new (NULL, gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); priv->scrolled_window = gtk_scrolled_window_new (NULL, gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen)));
#else
priv->scrolled_window = gtk_scrolled_window_new (NULL, vte_terminal_get_adjustment (VTE_TERMINAL (priv->screen)));
#endif
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window),
priv->hscrollbar_policy, priv->hscrollbar_policy,
@ -169,11 +165,7 @@ terminal_screen_container_constructor (GType type,
priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
#if VTE_CHECK_VERSION (0, 38, 0)
priv->vscrollbar = gtk_vscrollbar_new (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); priv->vscrollbar = gtk_vscrollbar_new (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen)));
#else
priv->vscrollbar = gtk_vscrollbar_new (vte_terminal_get_adjustment (VTE_TERMINAL (priv->screen)));
#endif
gtk_box_pack_start (GTK_BOX (priv->hbox), GTK_WIDGET (priv->screen), TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (priv->hbox), GTK_WIDGET (priv->screen), TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (priv->hbox), priv->vscrollbar, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (priv->hbox), priv->vscrollbar, FALSE, FALSE, 0);

145
src/terminal-screen.c
View File

@ -119,11 +119,7 @@ static gboolean terminal_screen_popup_menu (GtkWidget *widget);
static gboolean terminal_screen_button_press (GtkWidget *widget, static gboolean terminal_screen_button_press (GtkWidget *widget,
GdkEventButton *event); GdkEventButton *event);
static void terminal_screen_launch_child_on_idle (TerminalScreen *screen); static void terminal_screen_launch_child_on_idle (TerminalScreen *screen);
#if VTE_CHECK_VERSION (0, 38, 0)
static void terminal_screen_child_exited (VteTerminal *terminal, int status); static void terminal_screen_child_exited (VteTerminal *terminal, int status);
#else
static void terminal_screen_child_exited (VteTerminal *terminal);
#endif
static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, static void terminal_screen_window_title_changed (VteTerminal *vte_terminal,
TerminalScreen *screen); TerminalScreen *screen);
@ -138,12 +134,7 @@ static void terminal_screen_cook_title (TerminalScreen *screen);
static void terminal_screen_cook_icon_title (TerminalScreen *screen); static void terminal_screen_cook_icon_title (TerminalScreen *screen);
static char* terminal_screen_check_match (TerminalScreen *screen, static char* terminal_screen_check_match (TerminalScreen *screen,
#if VTE_CHECK_VERSION (0, 38, 0)
GdkEvent *event, GdkEvent *event,
#else
int column,
int row,
#endif
int *flavor); int *flavor);
static guint signals[LAST_SIGNAL] = { 0 }; static guint signals[LAST_SIGNAL] = { 0 };
@ -292,38 +283,10 @@ terminal_screen_get_window (TerminalScreen *screen)
return TERMINAL_WINDOW (toplevel); return TERMINAL_WINDOW (toplevel);
} }
#if !VTE_CHECK_VERSION (0, 38, 0)
static gboolean
window_uses_argb_visual (TerminalScreen *screen)
{
TerminalWindow *window;
window = terminal_screen_get_window (screen);
if (window == NULL || !gtk_widget_get_realized (GTK_WIDGET (window)))
return FALSE;
return terminal_window_uses_argb_visual (window);
}
#endif
static void static void
terminal_screen_realize (GtkWidget *widget) terminal_screen_realize (GtkWidget *widget)
{ {
#if !VTE_CHECK_VERSION (0, 38, 0)
TerminalScreen *screen = TERMINAL_SCREEN (widget);
TerminalScreenPrivate *priv = screen->priv;
TerminalBackgroundType bg_type;
#endif
GTK_WIDGET_CLASS (terminal_screen_parent_class)->realize (widget); GTK_WIDGET_CLASS (terminal_screen_parent_class)->realize (widget);
#if !VTE_CHECK_VERSION (0, 38, 0)
/* FIXME: Don't enable this if we have a compmgr. */
bg_type = terminal_profile_get_property_enum (priv->profile, TERMINAL_PROFILE_BACKGROUND_TYPE);
vte_terminal_set_background_transparent (VTE_TERMINAL (screen),
bg_type == TERMINAL_BACKGROUND_TRANSPARENT &&
!window_uses_argb_visual (screen));
#endif
} }
static void static void
@ -923,9 +886,6 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile,
GObject *object = G_OBJECT (screen); GObject *object = G_OBJECT (screen);
VteTerminal *vte_terminal = VTE_TERMINAL (screen); VteTerminal *vte_terminal = VTE_TERMINAL (screen);
const char *prop_name; const char *prop_name;
#if !VTE_CHECK_VERSION (0, 38, 0)
TerminalBackgroundType bg_type;
#endif
TerminalWindow *window; TerminalWindow *window;
if (pspec) if (pspec)
@ -969,10 +929,8 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile,
prop_name == I_(TERMINAL_PROFILE_USE_THEME_COLORS) || prop_name == I_(TERMINAL_PROFILE_USE_THEME_COLORS) ||
prop_name == I_(TERMINAL_PROFILE_FOREGROUND_COLOR) || prop_name == I_(TERMINAL_PROFILE_FOREGROUND_COLOR) ||
prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR) || prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR) ||
#if VTE_CHECK_VERSION (0, 38, 0)
prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TYPE) || prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TYPE) ||
prop_name == I_(TERMINAL_PROFILE_BACKGROUND_DARKNESS) || prop_name == I_(TERMINAL_PROFILE_BACKGROUND_DARKNESS) ||
#endif
prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG) || prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG) ||
prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR) || prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR) ||
prop_name == I_(TERMINAL_PROFILE_PALETTE)) prop_name == I_(TERMINAL_PROFILE_PALETTE))
@ -981,15 +939,10 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile,
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SILENT_BELL)) if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SILENT_BELL))
vte_terminal_set_audible_bell (vte_terminal, !terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_SILENT_BELL)); vte_terminal_set_audible_bell (vte_terminal, !terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_SILENT_BELL));
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_WORD_CHARS))
#if VTE_CHECK_VERSION (0, 40, 0) #if VTE_CHECK_VERSION (0, 40, 0)
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_WORD_CHARS))
vte_terminal_set_word_char_exceptions (vte_terminal, vte_terminal_set_word_char_exceptions (vte_terminal,
terminal_profile_get_property_string (profile, TERMINAL_PROFILE_WORD_CHARS)); terminal_profile_get_property_string (profile, TERMINAL_PROFILE_WORD_CHARS));
#elif !VTE_CHECK_VERSION (0, 38, 0)
vte_terminal_set_word_chars (vte_terminal,
terminal_profile_get_property_string (profile, TERMINAL_PROFILE_WORD_CHARS));
#else
{}
#endif #endif
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE)) if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE))
vte_terminal_set_scroll_on_keystroke (vte_terminal, vte_terminal_set_scroll_on_keystroke (vte_terminal,
@ -1032,51 +985,6 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile,
} }
#endif /* ENABLE_SKEY */ #endif /* ENABLE_SKEY */
/* Background image support was removed in vte 0.38.
* Transparency for 0.38+ is handled above next to TERMINAL_PROFILE_BACKGROUND_COLOR. */
#if !VTE_CHECK_VERSION (0, 38, 0)
if (!prop_name ||
prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TYPE) ||
prop_name == I_(TERMINAL_PROFILE_BACKGROUND_IMAGE) ||
prop_name == I_(TERMINAL_PROFILE_BACKGROUND_DARKNESS) ||
prop_name == I_(TERMINAL_PROFILE_SCROLL_BACKGROUND))
{
bg_type = terminal_profile_get_property_enum (profile, TERMINAL_PROFILE_BACKGROUND_TYPE);
if (bg_type == TERMINAL_BACKGROUND_IMAGE)
{
vte_terminal_set_background_image (vte_terminal,
terminal_profile_get_property_object (profile, TERMINAL_PROFILE_BACKGROUND_IMAGE));
vte_terminal_set_scroll_background (vte_terminal,
terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_SCROLL_BACKGROUND));
}
else
{
vte_terminal_set_background_image (vte_terminal, NULL);
vte_terminal_set_scroll_background (vte_terminal, FALSE);
}
if (bg_type == TERMINAL_BACKGROUND_IMAGE ||
bg_type == TERMINAL_BACKGROUND_TRANSPARENT)
{
vte_terminal_set_background_saturation (vte_terminal,
1.0 - terminal_profile_get_property_double (profile, TERMINAL_PROFILE_BACKGROUND_DARKNESS));
vte_terminal_set_opacity (vte_terminal,
0xffff * terminal_profile_get_property_double (profile, TERMINAL_PROFILE_BACKGROUND_DARKNESS));
}
else
{
vte_terminal_set_background_saturation (vte_terminal, 1.0); /* normal color */
vte_terminal_set_opacity (vte_terminal, 0xffff);
}
/* FIXME: Don't enable this if we have a compmgr. */
vte_terminal_set_background_transparent (vte_terminal,
bg_type == TERMINAL_BACKGROUND_TRANSPARENT &&
!window_uses_argb_visual (screen));
}
#endif
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_BACKSPACE_BINDING)) if (!prop_name || prop_name == I_(TERMINAL_PROFILE_BACKSPACE_BINDING))
vte_terminal_set_backspace_binding (vte_terminal, vte_terminal_set_backspace_binding (vte_terminal,
terminal_profile_get_property_enum (profile, TERMINAL_PROFILE_BACKSPACE_BINDING)); terminal_profile_get_property_enum (profile, TERMINAL_PROFILE_BACKSPACE_BINDING));
@ -1101,7 +1009,6 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile,
} }
/* TODO: Once Gtk2 support is dropped, mate-terminal should be converted to use GdkRGBA everywhere instead of GdkColor. */ /* TODO: Once Gtk2 support is dropped, mate-terminal should be converted to use GdkRGBA everywhere instead of GdkColor. */
#if VTE_CHECK_VERSION (0, 38, 0)
static GdkRGBA * static GdkRGBA *
gdk_color_to_rgba (const GdkColor *color, gdk_color_to_rgba (const GdkColor *color,
double alpha, double alpha,
@ -1115,7 +1022,6 @@ gdk_color_to_rgba (const GdkColor *color,
rgba->alpha = alpha; rgba->alpha = alpha;
return rgba; return rgba;
} }
#endif
static void static void
update_color_scheme (TerminalScreen *screen) update_color_scheme (TerminalScreen *screen)
@ -1152,8 +1058,6 @@ update_color_scheme (TerminalScreen *screen)
n_colors = G_N_ELEMENTS (colors); n_colors = G_N_ELEMENTS (colors);
terminal_profile_get_palette (priv->profile, colors, &n_colors); terminal_profile_get_palette (priv->profile, colors, &n_colors);
#if VTE_CHECK_VERSION (0, 38, 0)
{
GdkRGBA colors_rgba[TERMINAL_PALETTE_SIZE]; GdkRGBA colors_rgba[TERMINAL_PALETTE_SIZE];
GdkRGBA fg_rgba, bg_rgba, bold_rgba; GdkRGBA fg_rgba, bg_rgba, bold_rgba;
double alpha = 1.0; double alpha = 1.0;
@ -1172,14 +1076,6 @@ update_color_scheme (TerminalScreen *screen)
vte_terminal_set_color_bold (VTE_TERMINAL (screen), vte_terminal_set_color_bold (VTE_TERMINAL (screen),
gdk_color_to_rgba (bold_color, 1.0, &bold_rgba)); gdk_color_to_rgba (bold_color, 1.0, &bold_rgba));
} }
#else
vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
colors, n_colors);
if (bold_color)
vte_terminal_set_color_bold (VTE_TERMINAL (screen), bold_color);
vte_terminal_set_background_tint_color (VTE_TERMINAL (screen), &bg);
#endif
}
void void
terminal_screen_set_font (TerminalScreen *screen) terminal_screen_set_font (TerminalScreen *screen)
@ -1564,11 +1460,7 @@ terminal_screen_launch_child_cb (TerminalScreen *screen)
pty_flags |= VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP; pty_flags |= VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP;
if (!get_child_command (screen, shell, &spawn_flags, &argv, &err) || if (!get_child_command (screen, shell, &spawn_flags, &argv, &err) ||
#if VTE_CHECK_VERSION (0, 38, 0)
!vte_terminal_spawn_sync ( !vte_terminal_spawn_sync (
#else
!vte_terminal_fork_command_full (
#endif
terminal, terminal,
pty_flags, pty_flags,
working_dir, working_dir,
@ -1577,9 +1469,7 @@ terminal_screen_launch_child_cb (TerminalScreen *screen)
spawn_flags, spawn_flags,
NULL, NULL, NULL, NULL,
&pid, &pid,
#if VTE_CHECK_VERSION (0, 38, 0)
NULL, NULL,
#endif
&err)) &err))
{ {
GtkWidget *info_bar; GtkWidget *info_bar;
@ -1693,25 +1583,10 @@ terminal_screen_button_press (GtkWidget *widget,
char *matched_string; char *matched_string;
int matched_flavor = 0; int matched_flavor = 0;
guint state; guint state;
#if !VTE_CHECK_VERSION (0, 38, 0)
int char_width, char_height, row, col;
GtkBorder *inner_border = NULL;
#endif
state = event->state & gtk_accelerator_get_default_mod_mask (); state = event->state & gtk_accelerator_get_default_mod_mask ();
#if VTE_CHECK_VERSION (0, 38, 0)
matched_string = terminal_screen_check_match (screen, event, &matched_flavor); matched_string = terminal_screen_check_match (screen, event, &matched_flavor);
#else
terminal_screen_get_cell_size (screen, &char_width, &char_height);
gtk_widget_style_get (widget, "inner-border", &inner_border, NULL);
row = (event->x - (inner_border ? inner_border->left : 0)) / char_width;
col = (event->y - (inner_border ? inner_border->top : 0)) / char_height;
gtk_border_free (inner_border);
matched_string = terminal_screen_check_match (screen, row, col, &matched_flavor);
#endif
if (matched_string != NULL && if (matched_string != NULL &&
(event->button == 1 || event->button == 2) && (event->button == 1 || event->button == 2) &&
@ -1947,11 +1822,7 @@ terminal_screen_icon_title_changed (VteTerminal *vte_terminal,
} }
static void static void
#if VTE_CHECK_VERSION (0, 38, 0)
terminal_screen_child_exited (VteTerminal *terminal, int status) terminal_screen_child_exited (VteTerminal *terminal, int status)
#else
terminal_screen_child_exited (VteTerminal *terminal)
#endif
{ {
TerminalScreen *screen = TERMINAL_SCREEN (terminal); TerminalScreen *screen = TERMINAL_SCREEN (terminal);
TerminalScreenPrivate *priv = screen->priv; TerminalScreenPrivate *priv = screen->priv;
@ -1979,11 +1850,6 @@ terminal_screen_child_exited (VteTerminal *terminal)
case TERMINAL_EXIT_HOLD: case TERMINAL_EXIT_HOLD:
{ {
GtkWidget *info_bar; GtkWidget *info_bar;
#if !VTE_CHECK_VERSION (0, 38, 0)
int status;
status = vte_terminal_get_child_exit_status (terminal);
#endif
info_bar = terminal_info_bar_new (GTK_MESSAGE_INFO, info_bar = terminal_info_bar_new (GTK_MESSAGE_INFO,
_("_Relaunch"), RESPONSE_RELAUNCH, _("_Relaunch"), RESPONSE_RELAUNCH,
@ -2350,12 +2216,7 @@ terminal_screen_skey_match_remove (TerminalScreen *screen)
static char* static char*
terminal_screen_check_match (TerminalScreen *screen, terminal_screen_check_match (TerminalScreen *screen,
#if VTE_CHECK_VERSION (0, 38, 0)
GdkEvent *event, GdkEvent *event,
#else
int column,
int row,
#endif
int *flavor) int *flavor)
{ {
TerminalScreenPrivate *priv = screen->priv; TerminalScreenPrivate *priv = screen->priv;
@ -2363,11 +2224,7 @@ terminal_screen_check_match (TerminalScreen *screen,
int tag; int tag;
char *match; char *match;
#if VTE_CHECK_VERSION (0, 38, 0)
match = vte_terminal_match_check_event (VTE_TERMINAL (screen), event, &tag); match = vte_terminal_match_check_event (VTE_TERMINAL (screen), event, &tag);
#else
match = vte_terminal_match_check (VTE_TERMINAL (screen), column, row, &tag);
#endif
for (tags = priv->match_tags; tags != NULL; tags = tags->next) for (tags = priv->match_tags; tags != NULL; tags = tags->next)
{ {
TagData *tag_data = (TagData*) tags->data; TagData *tag_data = (TagData*) tags->data;

81
src/terminal-window.c
View File

@ -763,11 +763,7 @@ terminal_set_encoding_callback (GtkToggleAction *action,
g_assert (encoding); g_assert (encoding);
vte_terminal_set_encoding (VTE_TERMINAL (priv->active_screen), vte_terminal_set_encoding (VTE_TERMINAL (priv->active_screen),
#if VTE_CHECK_VERSION (0, 38, 0)
terminal_encoding_get_charset (encoding), NULL); terminal_encoding_get_charset (encoding), NULL);
#else
terminal_encoding_get_charset (encoding));
#endif
} }
static void static void
@ -1057,7 +1053,6 @@ update_edit_menu(TerminalWindow *window)
g_object_ref (window)); g_object_ref (window));
} }
/* width and height are character-based in vte 0.38, pixel-based in previous versions */
static void static void
screen_resize_window_cb (TerminalScreen *screen, screen_resize_window_cb (TerminalScreen *screen,
guint width, guint width,
@ -1067,12 +1062,6 @@ screen_resize_window_cb (TerminalScreen *screen,
TerminalWindowPrivate *priv = window->priv; TerminalWindowPrivate *priv = window->priv;
VteTerminal *terminal = VTE_TERMINAL (screen); VteTerminal *terminal = VTE_TERMINAL (screen);
GtkWidget *widget = GTK_WIDGET (screen); GtkWidget *widget = GTK_WIDGET (screen);
#if !VTE_CHECK_VERSION (0, 38, 0)
guint grid_width, grid_height;
int char_width, char_height;
GtkBorder *inner_border = NULL;
GtkAllocation widget_allocation;
#endif
/* Don't do anything if we're maximised or fullscreened */ /* Don't do anything if we're maximised or fullscreened */
// FIXME: realized && ... instead? // FIXME: realized && ... instead?
@ -1080,35 +1069,12 @@ screen_resize_window_cb (TerminalScreen *screen,
(gdk_window_get_state (gtk_widget_get_window (widget)) & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0) (gdk_window_get_state (gtk_widget_get_window (widget)) & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0)
return; return;
/* NOTE: width and height already include the VteTerminal's padding! */
#if VTE_CHECK_VERSION (0, 38, 0)
vte_terminal_set_size (terminal, width, height); vte_terminal_set_size (terminal, width, height);
#else
gtk_widget_get_allocation (widget, &widget_allocation);
/* Short-circuit */
if (((int) width) == widget_allocation.width &&
((int) height) == widget_allocation.height)
return;
/* The resize-window signal sucks. Re-compute grid widths */
char_width = vte_terminal_get_char_width (terminal);
char_height = vte_terminal_get_char_height (terminal);
gtk_widget_style_get (GTK_WIDGET (terminal), "inner-border", &inner_border, NULL);
grid_width = (width - (inner_border ? (inner_border->left + inner_border->right) : 0)) / char_width;
grid_height = (height - (inner_border ? (inner_border->top + inner_border->bottom) : 0)) / char_height;
gtk_border_free (inner_border);
vte_terminal_set_size (terminal, grid_width, grid_height);
#endif
if (screen != priv->active_screen) if (screen != priv->active_screen)
return; return;
terminal_window_set_size_force_grid (window, screen, TRUE, -1, -1); //grid_width, grid_height); terminal_window_set_size_force_grid (window, screen, TRUE, -1, -1);
} }
static void static void
@ -1162,15 +1128,6 @@ terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window)
gtk_action_set_sensitive (action, num_pages > 1); gtk_action_set_sensitive (action, num_pages > 1);
} }
#if !VTE_CHECK_VERSION (0, 38, 0)
gboolean
terminal_window_uses_argb_visual (TerminalWindow *window)
{
TerminalWindowPrivate *priv = window->priv;
return priv->have_argb_visual;
}
#endif
static void static void
update_tab_visibility (TerminalWindow *window, update_tab_visibility (TerminalWindow *window,
int change) int change)
@ -1377,24 +1334,6 @@ popup_clipboard_targets_received_cb (GtkClipboard *clipboard,
action = gtk_action_group_get_action (priv->action_group, "PopupInputMethods"); action = gtk_action_group_get_action (priv->action_group, "PopupInputMethods");
gtk_action_set_visible (action, show_input_method_menu); gtk_action_set_visible (action, show_input_method_menu);
#if !VTE_CHECK_VERSION (0, 38, 0)
im_menu_item = gtk_ui_manager_get_widget (priv->ui_manager,
"/Popup/PopupInputMethods");
/* FIXME: fix this when gtk+ bug #500065 is done, use vte_terminal_im_merge_ui */
if (show_input_method_menu)
{
im_menu = gtk_menu_new ();
vte_terminal_im_append_menuitems (VTE_TERMINAL (screen),
GTK_MENU_SHELL (im_menu));
gtk_widget_show (im_menu);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), im_menu);
}
else
{
gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), NULL);
}
#endif
popup_menu = gtk_ui_manager_get_widget (priv->ui_manager, "/Popup"); popup_menu = gtk_ui_manager_get_widget (priv->ui_manager, "/Popup");
g_signal_connect (popup_menu, "deactivate", g_signal_connect (popup_menu, "deactivate",
G_CALLBACK (popup_menu_deactivate_callback), window); G_CALLBACK (popup_menu_deactivate_callback), window);
@ -3261,20 +3200,12 @@ save_contents_dialog_on_response (GtkDialog *dialog, gint response_id, gpointer
if (stream) if (stream)
{ {
/* XXX /* FIXME
* FIXME
* This is a sync operation.
* Should be replaced with the async version when vte implements that. * Should be replaced with the async version when vte implements that.
*/ */
#if VTE_CHECK_VERSION (0, 38, 0)
vte_terminal_write_contents_sync (terminal, stream, vte_terminal_write_contents_sync (terminal, stream,
VTE_WRITE_DEFAULT, VTE_WRITE_DEFAULT,
NULL, &error); NULL, &error);
#else
vte_terminal_write_contents (terminal, stream,
VTE_TERMINAL_WRITE_DEFAULT,
NULL, &error);
#endif
g_object_unref (stream); g_object_unref (stream);
} }
@ -3642,11 +3573,7 @@ search_find_response_callback (GtkWidget *dialog,
flags = terminal_search_dialog_get_search_flags (dialog); flags = terminal_search_dialog_get_search_flags (dialog);
#if VTE_CHECK_VERSION (0, 38, 0)
vte_terminal_search_set_gregex (VTE_TERMINAL (priv->active_screen), regex, 0); vte_terminal_search_set_gregex (VTE_TERMINAL (priv->active_screen), regex, 0);
#else
vte_terminal_search_set_gregex (VTE_TERMINAL (priv->active_screen), regex);
#endif
vte_terminal_search_set_wrap_around (VTE_TERMINAL (priv->active_screen), vte_terminal_search_set_wrap_around (VTE_TERMINAL (priv->active_screen),
(flags & TERMINAL_SEARCH_FLAG_WRAP_AROUND)); (flags & TERMINAL_SEARCH_FLAG_WRAP_AROUND));
@ -3717,11 +3644,7 @@ search_clear_highlight_callback (GtkAction *action,
if (G_UNLIKELY (!window->priv->active_screen)) if (G_UNLIKELY (!window->priv->active_screen))
return; return;
#if VTE_CHECK_VERSION (0, 38, 0)
vte_terminal_search_set_gregex (VTE_TERMINAL (window->priv->active_screen), NULL, 0); vte_terminal_search_set_gregex (VTE_TERMINAL (window->priv->active_screen), NULL, 0);
#else
vte_terminal_search_set_gregex (VTE_TERMINAL (window->priv->active_screen), NULL);
#endif
} }
static void static void

4
src/terminal-window.h
View File

@ -95,10 +95,6 @@ void terminal_window_set_size_force_grid (TerminalWindow *window,
GtkWidget* terminal_window_get_notebook (TerminalWindow *window); GtkWidget* terminal_window_get_notebook (TerminalWindow *window);
#if !VTE_CHECK_VERSION (0, 38, 0)
gboolean terminal_window_uses_argb_visual (TerminalWindow *window);
#endif
void terminal_window_save_state (TerminalWindow *window, void terminal_window_save_state (TerminalWindow *window,
GKeyFile *key_file, GKeyFile *key_file,
const char *group); const char *group);