From d27831fa30998c4404676777469ccac518d17719 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Thu, 25 Sep 2014 14:47:37 +0200 Subject: [PATCH 01/11] VTE: use proper accessor for the vertical adjustment Use vte_terminal_get_adjustment() to get the adjustment, and provide an appropriate default implementation for use if it isn't available (on VTE < 0.9 or > 0.36). --- src/vte.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/vte.c b/src/vte.c index 859d41d176..497c42256b 100644 --- a/src/vte.c +++ b/src/vte.c @@ -120,6 +120,7 @@ struct VteFunctions void (*vte_terminal_select_all) (VteTerminal *terminal); void (*vte_terminal_set_audible_bell) (VteTerminal *terminal, gboolean is_audible); void (*vte_terminal_set_background_image_file) (VteTerminal *terminal, const char *path); + GtkAdjustment* (*vte_terminal_get_adjustment) (VteTerminal *terminal); }; @@ -162,6 +163,18 @@ static const GtkTargetEntry dnd_targets[] = }; +/* replacement for vte_terminal_get_adjustment() when it's not available */ +static GtkAdjustment *default_vte_terminal_get_adjustment(VteTerminal *vte) +{ +#if GTK_CHECK_VERSION(3, 0, 0) + if (GTK_IS_SCROLLABLE(vte)) + return gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vte)); +#endif + /* this is only valid in < 0.38, 0.38 broke ABI */ + return vte->adjustment; +} + + static gchar **vte_get_child_environment(void) { const gchar *exclude_vars[] = {"COLUMNS", "LINES", "TERM", "TERM_PROGRAM", NULL}; @@ -283,7 +296,7 @@ static void create_vte(void) GtkWidget *vte, *scrollbar, *hbox; vc->vte = vte = vf->vte_terminal_new(); - scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(vte)->adjustment)); + scrollbar = gtk_vscrollbar_new(vf->vte_terminal_get_adjustment(VTE_TERMINAL(vte))); gtk_widget_set_can_focus(scrollbar, FALSE); /* create menu now so copy/paste shortcuts work */ @@ -517,6 +530,9 @@ static gboolean vte_register_symbols(GModule *mod) BIND_REQUIRED_SYMBOL(vte_terminal_set_cursor_blinks); BIND_REQUIRED_SYMBOL(vte_terminal_select_all); BIND_REQUIRED_SYMBOL(vte_terminal_set_audible_bell); + if (! BIND_SYMBOL(vte_terminal_get_adjustment)) + /* vte_terminal_get_adjustment() is available since 0.9 and removed in 0.38 */ + vf->vte_terminal_get_adjustment = default_vte_terminal_get_adjustment; #undef BIND_REQUIRED_SYMBOL #undef BIND_SYMBOL From 20cb94255bd132c7ff1370cd3fd62b6cfd15e1c6 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Thu, 25 Sep 2014 16:07:00 +0200 Subject: [PATCH 02/11] VTE: stop using vte_terminal_set_font_from_string() vte_terminal_set_font_from_string() has been removed in 0.38, so use vte_terminal_set_font() instead. --- src/vte.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/vte.c b/src/vte.c index 497c42256b..c206d94b0a 100644 --- a/src/vte.c +++ b/src/vte.c @@ -103,7 +103,7 @@ struct VteFunctions GType (*vte_terminal_get_type) (void); void (*vte_terminal_set_scroll_on_output) (VteTerminal *terminal, gboolean scroll); void (*vte_terminal_set_scroll_on_keystroke) (VteTerminal *terminal, gboolean scroll); - void (*vte_terminal_set_font_from_string) (VteTerminal *terminal, const char *name); + void (*vte_terminal_set_font) (VteTerminal *terminal, const PangoFontDescription *font_desc); void (*vte_terminal_set_scrollback_lines) (VteTerminal *terminal, glong lines); gboolean (*vte_terminal_get_has_selection) (VteTerminal *terminal); void (*vte_terminal_copy_clipboard) (VteTerminal *terminal); @@ -512,7 +512,7 @@ static gboolean vte_register_symbols(GModule *mod) BIND_REQUIRED_SYMBOL(vte_terminal_get_type); BIND_REQUIRED_SYMBOL(vte_terminal_set_scroll_on_output); BIND_REQUIRED_SYMBOL(vte_terminal_set_scroll_on_keystroke); - BIND_REQUIRED_SYMBOL(vte_terminal_set_font_from_string); + BIND_REQUIRED_SYMBOL(vte_terminal_set_font); BIND_REQUIRED_SYMBOL(vte_terminal_set_scrollback_lines); BIND_REQUIRED_SYMBOL(vte_terminal_get_has_selection); BIND_REQUIRED_SYMBOL(vte_terminal_copy_clipboard); @@ -543,6 +543,8 @@ static gboolean vte_register_symbols(GModule *mod) void vte_apply_user_settings(void) { + PangoFontDescription *font_desc; + if (! ui_prefs.msgwindow_visible) return; @@ -550,7 +552,9 @@ void vte_apply_user_settings(void) vf->vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(vc->vte), vc->scroll_on_key); vf->vte_terminal_set_scroll_on_output(VTE_TERMINAL(vc->vte), vc->scroll_on_out); vf->vte_terminal_set_emulation(VTE_TERMINAL(vc->vte), vc->emulation); - vf->vte_terminal_set_font_from_string(VTE_TERMINAL(vc->vte), vc->font); + font_desc = pango_font_description_from_string(vc->font); + vf->vte_terminal_set_font(VTE_TERMINAL(vc->vte), font_desc); + pango_font_description_free(font_desc); vf->vte_terminal_set_color_foreground(VTE_TERMINAL(vc->vte), &vc->colour_fore); vf->vte_terminal_set_color_bold(VTE_TERMINAL(vc->vte), &vc->colour_fore); vf->vte_terminal_set_color_background(VTE_TERMINAL(vc->vte), &vc->colour_back); From f789aa138d1f43532998bfc61c642f9abd64ff0f Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Thu, 25 Sep 2014 16:18:32 +0200 Subject: [PATCH 03/11] VTE: drop support for selecting the emulated terminal VTE 0.38 dropped the capability to emulate various terminals to only support xterm. This shouldn't be so much of a problem for us, as our setting to select the emulated terminal is hidden since 2008 and defaults to xterm since forever, and xterm is highly compatible. --- doc/geany.txt | 3 --- src/keyfile.c | 3 --- src/vte.c | 4 ---- src/vte.h | 1 - 4 files changed, 11 deletions(-) diff --git a/doc/geany.txt b/doc/geany.txt index 65e38f597a..6934e976d6 100644 --- a/doc/geany.txt +++ b/doc/geany.txt @@ -2554,9 +2554,6 @@ msgwin_messages_visible Whether to show the Messages tab in the t msgwin_scribble_visible Whether to show the Scribble tab in the true immediately Messages Window **VTE related** -emulation Terminal emulation mode. Only change this xterm immediately - if you have VTE termcap files other than - ``vte/termcap/xterm``. send_selection_unsafe By default, Geany strips any trailing false immediately newline characters from the current selection before sending it to the terminal diff --git a/src/keyfile.c b/src/keyfile.c index 0f7511b069..b85e18366f 100644 --- a/src/keyfile.c +++ b/src/keyfile.c @@ -524,8 +524,6 @@ static void save_dialog_prefs(GKeyFile *config) { gchar *tmp_string; - if (!g_key_file_has_key(config, "VTE", "emulation", NULL)) /* hidden */ - g_key_file_set_string(config, "VTE", "emulation", vc->emulation); g_key_file_set_string(config, "VTE", "font", vc->font); g_key_file_set_boolean(config, "VTE", "scroll_on_key", vc->scroll_on_key); g_key_file_set_boolean(config, "VTE", "scroll_on_out", vc->scroll_on_out); @@ -881,7 +879,6 @@ static void load_dialog_prefs(GKeyFile *config) /* fallback to root */ vte_info.dir = g_strdup("/"); - vc->emulation = utils_get_setting_string(config, "VTE", "emulation", "xterm"); vc->image = utils_get_setting_string(config, "VTE", "image", ""); vc->shell = utils_get_setting_string(config, "VTE", "shell", shell); vc->font = utils_get_setting_string(config, "VTE", "font", GEANY_DEFAULT_FONT_EDITOR); diff --git a/src/vte.c b/src/vte.c index c206d94b0a..34591035c2 100644 --- a/src/vte.c +++ b/src/vte.c @@ -108,7 +108,6 @@ struct VteFunctions gboolean (*vte_terminal_get_has_selection) (VteTerminal *terminal); void (*vte_terminal_copy_clipboard) (VteTerminal *terminal); void (*vte_terminal_paste_clipboard) (VteTerminal *terminal); - void (*vte_terminal_set_emulation) (VteTerminal *terminal, const gchar *emulation); void (*vte_terminal_set_color_foreground) (VteTerminal *terminal, const GdkColor *foreground); void (*vte_terminal_set_color_bold) (VteTerminal *terminal, const GdkColor *foreground); void (*vte_terminal_set_color_background) (VteTerminal *terminal, const GdkColor *background); @@ -345,7 +344,6 @@ void vte_close(void) gtk_widget_destroy(vc->vte); gtk_widget_destroy(vc->menu); g_object_unref(vc->menu); - g_free(vc->emulation); g_free(vc->shell); g_free(vc->image); g_free(vc->font); @@ -517,7 +515,6 @@ static gboolean vte_register_symbols(GModule *mod) BIND_REQUIRED_SYMBOL(vte_terminal_get_has_selection); BIND_REQUIRED_SYMBOL(vte_terminal_copy_clipboard); BIND_REQUIRED_SYMBOL(vte_terminal_paste_clipboard); - BIND_REQUIRED_SYMBOL(vte_terminal_set_emulation); BIND_REQUIRED_SYMBOL(vte_terminal_set_color_foreground); BIND_REQUIRED_SYMBOL(vte_terminal_set_color_bold); BIND_REQUIRED_SYMBOL(vte_terminal_set_color_background); @@ -551,7 +548,6 @@ void vte_apply_user_settings(void) vf->vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->vte), vc->scrollback_lines); vf->vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(vc->vte), vc->scroll_on_key); vf->vte_terminal_set_scroll_on_output(VTE_TERMINAL(vc->vte), vc->scroll_on_out); - vf->vte_terminal_set_emulation(VTE_TERMINAL(vc->vte), vc->emulation); font_desc = pango_font_description_from_string(vc->font); vf->vte_terminal_set_font(VTE_TERMINAL(vc->vte), font_desc); pango_font_description_free(font_desc); diff --git a/src/vte.h b/src/vte.h index 72ad883596..c13326bcf2 100644 --- a/src/vte.h +++ b/src/vte.h @@ -56,7 +56,6 @@ typedef struct gboolean cursor_blinks; gboolean send_selection_unsafe; gint scrollback_lines; - gchar *emulation; gchar *shell; gchar *image; gchar *font; From 079fe58ce9e75be3be2dbf8bae5be01024d937be Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Thu, 25 Sep 2014 16:50:46 +0200 Subject: [PATCH 04/11] VTE: add support for vte_terminal_spawn_sync() VTE 0.38 removed vte_terminal_fork_command() in favor of the new vte_terminal_spawn_sync(), so add support for this. --- src/vte.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/vte.c b/src/vte.c index 34591035c2..3b6acbc160 100644 --- a/src/vte.c +++ b/src/vte.c @@ -59,7 +59,7 @@ VteInfo vte_info = { FALSE, FALSE, FALSE, NULL, NULL }; VteConfig *vc; -static pid_t pid = 0; +static GPid pid = 0; static gboolean clean = TRUE; static GModule *module = NULL; static struct VteFunctions *vf; @@ -88,6 +88,11 @@ typedef enum { VTE_CURSOR_BLINK_OFF } VteTerminalCursorBlinkMode; +typedef enum { + /* we don't care for the other possible values */ + VTE_PTY_DEFAULT = 0 +} VtePtyFlags; + /* Holds function pointers we need to access the VTE API. */ struct VteFunctions @@ -96,6 +101,11 @@ struct VteFunctions pid_t (*vte_terminal_fork_command) (VteTerminal *terminal, const char *command, char **argv, char **envv, const char *directory, gboolean lastlog, gboolean utmp, gboolean wtmp); + gboolean (*vte_terminal_spawn_sync) (VteTerminal *terminal, VtePtyFlags pty_flags, + const char *working_directory, char **argv, char **envv, + GSpawnFlags spawn_flags, GSpawnChildSetupFunc child_setup, + gpointer child_setup_data, GPid *child_pid, + GCancellable *cancellable, GError **error); void (*vte_terminal_set_size) (VteTerminal *terminal, glong columns, glong rows); void (*vte_terminal_set_word_chars) (VteTerminal *terminal, const char *spec); void (*vte_terminal_set_mouse_autohide) (VteTerminal *terminal, gboolean setting); @@ -435,8 +445,20 @@ static void vte_start(GtkWidget *widget) { gchar **env = vte_get_child_environment(); - pid = vf->vte_terminal_fork_command(VTE_TERMINAL(widget), argv[0], argv, env, - vte_info.dir, TRUE, TRUE, TRUE); + if (vf->vte_terminal_spawn_sync) + { + if (! vf->vte_terminal_spawn_sync(VTE_TERMINAL(widget), VTE_PTY_DEFAULT, + vte_info.dir, argv, env, 0, NULL, NULL, + &pid, NULL, NULL)) + { + pid = -1; + } + } + else + { + pid = vf->vte_terminal_fork_command(VTE_TERMINAL(widget), argv[0], argv, env, + vte_info.dir, TRUE, TRUE, TRUE); + } g_strfreev(env); g_strfreev(argv); } @@ -503,7 +525,9 @@ static gboolean vte_register_symbols(GModule *mod) BIND_REQUIRED_SYMBOL(vte_terminal_new); BIND_REQUIRED_SYMBOL(vte_terminal_set_size); - BIND_REQUIRED_SYMBOL(vte_terminal_fork_command); + if (! BIND_SYMBOL(vte_terminal_spawn_sync)) + /* vte_terminal_spawn_sync() is available only in 0.38 */ + BIND_REQUIRED_SYMBOL(vte_terminal_fork_command); BIND_REQUIRED_SYMBOL(vte_terminal_set_word_chars); BIND_REQUIRED_SYMBOL(vte_terminal_set_mouse_autohide); BIND_REQUIRED_SYMBOL(vte_terminal_reset); From 5c757d9ec2f088709a6b743660168af52f301017 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Thu, 25 Sep 2014 16:52:05 +0200 Subject: [PATCH 05/11] VTE: add debugging info to known which library was actually loaded --- src/vte.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vte.c b/src/vte.c index 3b6acbc160..87d20a73fe 100644 --- a/src/vte.c +++ b/src/vte.c @@ -261,6 +261,7 @@ void vte_init(void) } else { + geany_debug("Loaded libvte from %s", g_module_name(module)); vf = g_new0(struct VteFunctions, 1); if (vte_register_symbols(module)) vte_info.have_vte = TRUE; From 65e2c7cb05916debb919b6f6d1b60e7e711e0b1d Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Fri, 19 Aug 2016 00:12:39 +0200 Subject: [PATCH 06/11] VTE: don't hard-require vte_terminal_set_word_chars() VTE 0.38 removed it, so only use it when available. With >= 0.40, use vte_terminal_set_word_char_exceptions() instead. --- src/vte.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/vte.c b/src/vte.c index 87d20a73fe..7179e44428 100644 --- a/src/vte.c +++ b/src/vte.c @@ -69,6 +69,7 @@ static guint terminal_label_update_source = 0; /* use vte wordchars to select paths */ static const gchar VTE_WORDCHARS[] = "-A-Za-z0-9,./?%&#:_"; +static const gchar VTE_ADDITIONAL_WORDCHARS[] = "-,./?%&#:_"; /* Incomplete VteTerminal struct from vte/vte.h. */ @@ -108,6 +109,7 @@ struct VteFunctions GCancellable *cancellable, GError **error); void (*vte_terminal_set_size) (VteTerminal *terminal, glong columns, glong rows); void (*vte_terminal_set_word_chars) (VteTerminal *terminal, const char *spec); + void (*vte_terminal_set_word_char_exceptions) (VteTerminal *terminal, const char *exceptions); void (*vte_terminal_set_mouse_autohide) (VteTerminal *terminal, gboolean setting); void (*vte_terminal_reset) (VteTerminal *terminal, gboolean full, gboolean clear_history); GType (*vte_terminal_get_type) (void); @@ -323,7 +325,10 @@ static void create_vte(void) vf->vte_terminal_set_size(VTE_TERMINAL(vte), 30, 1); vf->vte_terminal_set_mouse_autohide(VTE_TERMINAL(vte), TRUE); - vf->vte_terminal_set_word_chars(VTE_TERMINAL(vte), VTE_WORDCHARS); + if (vf->vte_terminal_set_word_chars) + vf->vte_terminal_set_word_chars(VTE_TERMINAL(vte), VTE_WORDCHARS); + else if (vf->vte_terminal_set_word_char_exceptions) + vf->vte_terminal_set_word_char_exceptions(VTE_TERMINAL(vte), VTE_ADDITIONAL_WORDCHARS); gtk_drag_dest_set(vte, GTK_DEST_DEFAULT_ALL, dnd_targets, G_N_ELEMENTS(dnd_targets), GDK_ACTION_COPY); @@ -529,7 +534,10 @@ static gboolean vte_register_symbols(GModule *mod) if (! BIND_SYMBOL(vte_terminal_spawn_sync)) /* vte_terminal_spawn_sync() is available only in 0.38 */ BIND_REQUIRED_SYMBOL(vte_terminal_fork_command); - BIND_REQUIRED_SYMBOL(vte_terminal_set_word_chars); + /* 0.38 removed vte_terminal_set_word_chars() */ + BIND_SYMBOL(vte_terminal_set_word_chars); + /* 0.40 introduced it under a different API */ + BIND_SYMBOL(vte_terminal_set_word_char_exceptions); BIND_REQUIRED_SYMBOL(vte_terminal_set_mouse_autohide); BIND_REQUIRED_SYMBOL(vte_terminal_reset); BIND_REQUIRED_SYMBOL(vte_terminal_get_type); From 65710c526a5c605705cbaf8c333ea86d898f5845 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Fri, 19 Aug 2016 00:20:31 +0200 Subject: [PATCH 07/11] VTE: Add support for 2.91 GdkRGBA API variant The 2.91 API switched from GdkColor to GdkRGBA, but kept the same function names, so we need to detect this version and wrap the affected API to convert our GdkColors to GdkRGBAs. --- src/vte.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 7 deletions(-) diff --git a/src/vte.c b/src/vte.c index 7179e44428..eccafeb3e1 100644 --- a/src/vte.c +++ b/src/vte.c @@ -98,6 +98,8 @@ typedef enum { /* Holds function pointers we need to access the VTE API. */ struct VteFunctions { + guint (*vte_get_major_version) (void); + guint (*vte_get_minor_version) (void); GtkWidget* (*vte_terminal_new) (void); pid_t (*vte_terminal_fork_command) (VteTerminal *terminal, const char *command, char **argv, char **envv, const char *directory, gboolean lastlog, @@ -132,6 +134,12 @@ struct VteFunctions void (*vte_terminal_set_audible_bell) (VteTerminal *terminal, gboolean is_audible); void (*vte_terminal_set_background_image_file) (VteTerminal *terminal, const char *path); GtkAdjustment* (*vte_terminal_get_adjustment) (VteTerminal *terminal); +#if GTK_CHECK_VERSION(3, 0, 0) + /* hack for the VTE 2.91 API using GdkRGBA: we wrap the API to keep using GdkColor on our side */ + void (*vte_terminal_set_color_foreground_rgba) (VteTerminal *terminal, const GdkRGBA *foreground); + void (*vte_terminal_set_color_bold_rgba) (VteTerminal *terminal, const GdkRGBA *foreground); + void (*vte_terminal_set_color_background_rgba) (VteTerminal *terminal, const GdkRGBA *background); +#endif }; @@ -186,6 +194,33 @@ static GtkAdjustment *default_vte_terminal_get_adjustment(VteTerminal *vte) } +#if GTK_CHECK_VERSION(3, 0, 0) +/* Wrap VTE 2.91 API using GdkRGBA with GdkColor so we use a single API on our side */ + +static void rgba_from_color(GdkRGBA *rgba, const GdkColor *color) +{ + rgba->red = color->red / 65535.0; + rgba->green = color->green / 65535.0; + rgba->blue = color->blue / 65535.0; + rgba->alpha = 1.0; +} + +# define WRAP_RGBA_SETTER(name) \ + static void wrap_##name(VteTerminal *terminal, const GdkColor *color) \ + { \ + GdkRGBA rgba; \ + rgba_from_color(&rgba, color); \ + vf->name##_rgba(terminal, &rgba); \ + } + +WRAP_RGBA_SETTER(vte_terminal_set_color_background) +WRAP_RGBA_SETTER(vte_terminal_set_color_bold) +WRAP_RGBA_SETTER(vte_terminal_set_color_foreground) + +# undef WRAP_RGBA_SETTER +#endif + + static gchar **vte_get_child_environment(void) { const gchar *exclude_vars[] = {"COLUMNS", "LINES", "TERM", "TERM_PROGRAM", NULL}; @@ -515,20 +550,45 @@ static void vte_set_cursor_blink_mode(void) } +#if GTK_CHECK_VERSION(3, 0, 0) +static gboolean vte_is_2_91(void) +{ + guint major = vf->vte_get_major_version ? vf->vte_get_major_version() : 0; + guint minor = vf->vte_get_minor_version ? vf->vte_get_minor_version() : 0; + + /* 2.91 API started at 0.38 */ + return ((major > 0 || (major == 0 && minor >= 38)) || + /* 0.38 doesn't have runtime version checks, so check a symbol that didn't exist before */ + vf->vte_terminal_spawn_sync != NULL); +} +#endif + + static gboolean vte_register_symbols(GModule *mod) { + #define BIND_SYMBOL_FULL(name, dest) \ + g_module_symbol(mod, name, (void*)(dest)) #define BIND_SYMBOL(field) \ - g_module_symbol(mod, #field, (void*)&vf->field) - #define BIND_REQUIRED_SYMBOL(field) \ + BIND_SYMBOL_FULL(#field, &vf->field) + #define BIND_REQUIRED_SYMBOL_FULL(name, dest) \ G_STMT_START { \ - if (! BIND_SYMBOL(field)) \ + if (! BIND_SYMBOL_FULL(name, dest)) \ { \ g_critical(_("invalid VTE library \"%s\": missing symbol \"%s\""), \ - g_module_name(mod), #field); \ + g_module_name(mod), name); \ return FALSE; \ } \ } G_STMT_END + #define BIND_REQUIRED_SYMBOL(field) \ + BIND_REQUIRED_SYMBOL_FULL(#field, &vf->field) + #define BIND_REQUIRED_SYMBOL_RGBA_WRAPPED(field) \ + G_STMT_START { \ + BIND_REQUIRED_SYMBOL_FULL(#field, &vf->field##_rgba); \ + vf->field = wrap_##field; \ + } G_STMT_END + BIND_SYMBOL(vte_get_major_version); + BIND_SYMBOL(vte_get_minor_version); BIND_REQUIRED_SYMBOL(vte_terminal_new); BIND_REQUIRED_SYMBOL(vte_terminal_set_size); if (! BIND_SYMBOL(vte_terminal_spawn_sync)) @@ -548,9 +608,20 @@ static gboolean vte_register_symbols(GModule *mod) BIND_REQUIRED_SYMBOL(vte_terminal_get_has_selection); BIND_REQUIRED_SYMBOL(vte_terminal_copy_clipboard); BIND_REQUIRED_SYMBOL(vte_terminal_paste_clipboard); - BIND_REQUIRED_SYMBOL(vte_terminal_set_color_foreground); - BIND_REQUIRED_SYMBOL(vte_terminal_set_color_bold); - BIND_REQUIRED_SYMBOL(vte_terminal_set_color_background); +#if GTK_CHECK_VERSION(3, 0, 0) + if (vte_is_2_91()) + { + BIND_REQUIRED_SYMBOL_RGBA_WRAPPED(vte_terminal_set_color_foreground); + BIND_REQUIRED_SYMBOL_RGBA_WRAPPED(vte_terminal_set_color_bold); + BIND_REQUIRED_SYMBOL_RGBA_WRAPPED(vte_terminal_set_color_background); + } + else +#endif + { + BIND_REQUIRED_SYMBOL(vte_terminal_set_color_foreground); + BIND_REQUIRED_SYMBOL(vte_terminal_set_color_bold); + BIND_REQUIRED_SYMBOL(vte_terminal_set_color_background); + } BIND_REQUIRED_SYMBOL(vte_terminal_set_background_image_file); BIND_REQUIRED_SYMBOL(vte_terminal_feed_child); BIND_REQUIRED_SYMBOL(vte_terminal_im_append_menuitems); @@ -564,8 +635,11 @@ static gboolean vte_register_symbols(GModule *mod) /* vte_terminal_get_adjustment() is available since 0.9 and removed in 0.38 */ vf->vte_terminal_get_adjustment = default_vte_terminal_get_adjustment; + #undef BIND_REQUIRED_SYMBOL_RGBA_WRAPPED #undef BIND_REQUIRED_SYMBOL + #undef BIND_REQUIRED_SYMBOL_FULL #undef BIND_SYMBOL + #undef BIND_SYMBOL_FULL return TRUE; } From f4b4f2b540452e34e1cdaf1b256b1a9d35ae712e Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Fri, 19 Aug 2016 00:23:34 +0200 Subject: [PATCH 08/11] VTE: Don't hard-require vte_terminal_im_append_menuitems() VTE 2.91 dropped it, and it seems that recent GTK3 doesn't have IM context menu entries in input field's popups anymore anyway. --- src/vte.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/vte.c b/src/vte.c index eccafeb3e1..f083891758 100644 --- a/src/vte.c +++ b/src/vte.c @@ -327,7 +327,8 @@ static void on_vte_realize(void) /* the vte widget has to be realised before color changes take effect */ vte_apply_user_settings(); - vf->vte_terminal_im_append_menuitems(VTE_TERMINAL(vc->vte), GTK_MENU_SHELL(vc->im_submenu)); + if (vf->vte_terminal_im_append_menuitems) + vf->vte_terminal_im_append_menuitems(VTE_TERMINAL(vc->vte), GTK_MENU_SHELL(vc->im_submenu)); } @@ -624,7 +625,7 @@ static gboolean vte_register_symbols(GModule *mod) } BIND_REQUIRED_SYMBOL(vte_terminal_set_background_image_file); BIND_REQUIRED_SYMBOL(vte_terminal_feed_child); - BIND_REQUIRED_SYMBOL(vte_terminal_im_append_menuitems); + BIND_SYMBOL(vte_terminal_im_append_menuitems); if (! BIND_SYMBOL(vte_terminal_set_cursor_blink_mode)) /* vte_terminal_set_cursor_blink_mode() is only available since 0.17.1, so if we don't find * this symbol, we are probably on an older version and use the old API instead */ @@ -777,18 +778,23 @@ static GtkWidget *vte_create_popup_menu(void) msgwin_menu_add_common_items(GTK_MENU(menu)); - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); + /* VTE 2.91 doesn't have IM context items -- but neither does newer GTK3 apparently */ + if (vf->vte_terminal_im_append_menuitems) + { + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); - /* the IM submenu should always be the last item to be consistent with other GTK popup menus */ - vc->im_submenu = gtk_menu_new(); + /* the IM submenu should always be the last item to be consistent with other GTK popup menus */ + vc->im_submenu = gtk_menu_new(); - item = gtk_image_menu_item_new_with_mnemonic(_("_Input Methods")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); + item = gtk_image_menu_item_new_with_mnemonic(_("_Input Methods")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + + gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu); + } - gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu); /* submenu populated after vte realized */ return menu; } From 16e90968c7d01d7435b2f21f8ea7fc89c6d7f46a Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Fri, 19 Aug 2016 01:48:09 +0200 Subject: [PATCH 09/11] VTE: add VTE 2.91 DSO names --- src/vte.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vte.c b/src/vte.c index f083891758..e09306c51f 100644 --- a/src/vte.c +++ b/src/vte.c @@ -277,6 +277,7 @@ void vte_init(void) gint i; const gchar *sonames[] = { #if GTK_CHECK_VERSION(3, 0, 0) + "libvte-2.91.so", "libvte-2.91.so.0", "libvte-2.91.dylib", "libvte2_90.so", "libvte2_90.so.9", "libvte2_90.dylib", #else "libvte.so", "libvte.so.4", "libvte.so.8", "libvte.so.9", "libvte.dylib", From 6cdb1842be9e3a5ff8fe994c44ed212b26575e7b Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Fri, 19 Aug 2016 01:49:12 +0200 Subject: [PATCH 10/11] VTE: Remove support for background image It's a more than questionable feature that was dropped in VTE 2.91, so remove it altogether instead of conditionally supporting it. --- data/geany.glade | 76 +++++++----------------------------------------- src/keyfile.c | 2 -- src/prefs.c | 7 ----- src/vte.c | 10 ------- src/vte.h | 1 - 5 files changed, 10 insertions(+), 86 deletions(-) diff --git a/data/geany.glade b/data/geany.glade index 56276b4ae0..29b719250a 100644 --- a/data/geany.glade +++ b/data/geany.glade @@ -5857,20 +5857,6 @@ GTK_FILL - - - True - False - 0 - Background image: - - - 3 - 4 - GTK_FILL - GTK_FILL - - True @@ -5879,8 +5865,8 @@ Scrollback lines: - 4 - 5 + 3 + 4 GTK_FILL GTK_FILL @@ -5893,8 +5879,8 @@ Shell: - 5 - 6 + 4 + 5 GTK_FILL GTK_FILL @@ -5933,48 +5919,6 @@ GTK_FILL - - - True - True - Sets the path to the background image in the terminal widget - • - False - False - True - True - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - True - True - True - - - True - False - gtk-open - 1 - - - - - 2 - 3 - 3 - 4 - GTK_FILL - GTK_FILL - - True @@ -5992,8 +5936,8 @@ 1 3 - 4 - 5 + 3 + 4 GTK_FILL @@ -6011,8 +5955,8 @@ 1 2 - 5 - 6 + 4 + 5 GTK_FILL @@ -6033,8 +5977,8 @@ 2 3 - 5 - 6 + 4 + 5 GTK_FILL GTK_FILL diff --git a/src/keyfile.c b/src/keyfile.c index b85e18366f..6a91988b5d 100644 --- a/src/keyfile.c +++ b/src/keyfile.c @@ -535,7 +535,6 @@ static void save_dialog_prefs(GKeyFile *config) g_key_file_set_boolean(config, "VTE", "cursor_blinks", vc->cursor_blinks); g_key_file_set_integer(config, "VTE", "scrollback_lines", vc->scrollback_lines); g_key_file_set_string(config, "VTE", "font", vc->font); - g_key_file_set_string(config, "VTE", "image", vc->image); g_key_file_set_string(config, "VTE", "shell", vc->shell); tmp_string = utils_get_hex_from_color(&vc->colour_fore); g_key_file_set_string(config, "VTE", "colour_fore", tmp_string); @@ -879,7 +878,6 @@ static void load_dialog_prefs(GKeyFile *config) /* fallback to root */ vte_info.dir = g_strdup("/"); - vc->image = utils_get_setting_string(config, "VTE", "image", ""); vc->shell = utils_get_setting_string(config, "VTE", "shell", shell); vc->font = utils_get_setting_string(config, "VTE", "font", GEANY_DEFAULT_FONT_EDITOR); vc->scroll_on_key = utils_get_setting_boolean(config, "VTE", "scroll_on_key", TRUE); diff --git a/src/prefs.c b/src/prefs.c index ed8d80c3f3..714b7bc5cd 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -770,9 +770,6 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "color_back"); gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), &vc->colour_back); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_image"); - gtk_entry_set_text(GTK_ENTRY(widget), vc->image); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_scrollback"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), vc->scrollback_lines); @@ -1241,10 +1238,6 @@ on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); vc->scrollback_lines = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_image"); - g_free(vc->image); - vc->image = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_shell"); g_free(vc->shell); vc->shell = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); diff --git a/src/vte.c b/src/vte.c index e09306c51f..88e87a9845 100644 --- a/src/vte.c +++ b/src/vte.c @@ -132,7 +132,6 @@ struct VteFunctions void (*vte_terminal_set_cursor_blinks) (VteTerminal *terminal, gboolean blink); void (*vte_terminal_select_all) (VteTerminal *terminal); void (*vte_terminal_set_audible_bell) (VteTerminal *terminal, gboolean is_audible); - void (*vte_terminal_set_background_image_file) (VteTerminal *terminal, const char *path); GtkAdjustment* (*vte_terminal_get_adjustment) (VteTerminal *terminal); #if GTK_CHECK_VERSION(3, 0, 0) /* hack for the VTE 2.91 API using GdkRGBA: we wrap the API to keep using GdkColor on our side */ @@ -398,7 +397,6 @@ void vte_close(void) gtk_widget_destroy(vc->menu); g_object_unref(vc->menu); g_free(vc->shell); - g_free(vc->image); g_free(vc->font); g_free(vc->send_cmd_prefix); g_free(vc); @@ -624,7 +622,6 @@ static gboolean vte_register_symbols(GModule *mod) BIND_REQUIRED_SYMBOL(vte_terminal_set_color_bold); BIND_REQUIRED_SYMBOL(vte_terminal_set_color_background); } - BIND_REQUIRED_SYMBOL(vte_terminal_set_background_image_file); BIND_REQUIRED_SYMBOL(vte_terminal_feed_child); BIND_SYMBOL(vte_terminal_im_append_menuitems); if (! BIND_SYMBOL(vte_terminal_set_cursor_blink_mode)) @@ -663,7 +660,6 @@ void vte_apply_user_settings(void) vf->vte_terminal_set_color_foreground(VTE_TERMINAL(vc->vte), &vc->colour_fore); vf->vte_terminal_set_color_bold(VTE_TERMINAL(vc->vte), &vc->colour_fore); vf->vte_terminal_set_color_background(VTE_TERMINAL(vc->vte), &vc->colour_back); - vf->vte_terminal_set_background_image_file(VTE_TERMINAL(vc->vte), vc->image); vf->vte_terminal_set_audible_bell(VTE_TERMINAL(vc->vte), prefs.beep_on_errors); vte_set_cursor_blink_mode(); @@ -952,18 +948,12 @@ void vte_append_preferences_tab(void) GtkWidget *frame_term, *button_shell, *entry_shell; GtkWidget *check_run_in_vte, *check_skip_script; GtkWidget *font_button, *fg_color_button, *bg_color_button; - GtkWidget *entry_image, *button_image; button_shell = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "button_term_shell")); entry_shell = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_shell")); ui_setup_open_button_callback(button_shell, NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_ENTRY(entry_shell)); - button_image = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "button_term_image")); - entry_image = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_image")); - ui_setup_open_button_callback(button_image, NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, GTK_ENTRY(entry_image)); - check_skip_script = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "check_skip_script")); gtk_widget_set_sensitive(check_skip_script, vc->run_in_vte); diff --git a/src/vte.h b/src/vte.h index c13326bcf2..b1af879811 100644 --- a/src/vte.h +++ b/src/vte.h @@ -57,7 +57,6 @@ typedef struct gboolean send_selection_unsafe; gint scrollback_lines; gchar *shell; - gchar *image; gchar *font; gchar *send_cmd_prefix; GdkColor colour_fore; From b0cb8440b15b08368d28ae643ad9ed051969969e Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Mon, 22 Aug 2016 15:03:46 +0200 Subject: [PATCH 11/11] VTE: Respect GTK setting for whether to show the IM method menu --- src/vte.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/vte.c b/src/vte.c index 88e87a9845..20492ea81e 100644 --- a/src/vte.c +++ b/src/vte.c @@ -327,7 +327,7 @@ static void on_vte_realize(void) /* the vte widget has to be realised before color changes take effect */ vte_apply_user_settings(); - if (vf->vte_terminal_im_append_menuitems) + if (vf->vte_terminal_im_append_menuitems && vc->im_submenu) vf->vte_terminal_im_append_menuitems(VTE_TERMINAL(vc->vte), GTK_MENU_SHELL(vc->im_submenu)); } @@ -721,6 +721,7 @@ static GtkWidget *vte_create_popup_menu(void) { GtkWidget *menu, *item; GtkAccelGroup *accel_group; + gboolean show_im_menu = TRUE; menu = gtk_menu_new(); @@ -775,8 +776,15 @@ static GtkWidget *vte_create_popup_menu(void) msgwin_menu_add_common_items(GTK_MENU(menu)); - /* VTE 2.91 doesn't have IM context items -- but neither does newer GTK3 apparently */ - if (vf->vte_terminal_im_append_menuitems) + /* VTE 2.91 doesn't have IM context items, and GTK >= 3.10 doesn't show them anyway */ + if (! vf->vte_terminal_im_append_menuitems || gtk_check_version(3, 10, 0) == NULL) + show_im_menu = FALSE; + else /* otherwise, query the setting */ + g_object_get(gtk_settings_get_default(), "gtk-show-input-method-menu", &show_im_menu, NULL); + + if (! show_im_menu) + vc->im_submenu = NULL; + else { item = gtk_separator_menu_item_new(); gtk_widget_show(item); @@ -790,9 +798,9 @@ static GtkWidget *vte_create_popup_menu(void) gtk_container_add(GTK_CONTAINER(menu), item); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu); + /* submenu populated after vte realized */ } - /* submenu populated after vte realized */ return menu; }