[gnome-builder] build: add IdeTerminal to libide
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: add IdeTerminal to libide
- Date: Wed, 22 Nov 2017 04:38:16 +0000 (UTC)
commit 85bef40d1bcd5b00a92a1525416df8ae2b306c6d
Author: Christian Hergert <chergert redhat com>
Date: Tue Nov 21 20:36:09 2017 -0800
build: add IdeTerminal to libide
This starts porting the terminal into core libide by adding
IdeTerminal. Some source cleanup occurred as part of this
transition.
meson.build | 3 +-
src/libide/ide.h | 1 +
src/libide/meson.build | 9 +-
src/libide/terminal/ide-terminal.c | 378 ++++++++++++++++++++++++++++++++++++
src/libide/terminal/ide-terminal.h | 49 +++++
src/libide/terminal/meson.build | 12 ++
6 files changed, 448 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index de12191..dc2bbeb 100644
--- a/meson.build
+++ b/meson.build
@@ -181,7 +181,8 @@ libm_dep = cc.find_library('m', required: false)
libpangoft2_dep = dependency('pangoft2', version: '>= 1.38.0')
libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0')
libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.27.2')
-libxml2_dep = dependency('libxml-2.0', version: '>=2.9.0')
+libvte_dep = dependency('vte-2.91', version: '>= 0.40.2')
+libxml2_dep = dependency('libxml-2.0', version: '>= 2.9.0')
if get_option('with_flatpak') or get_option('with_git')
libgit_dep = dependency('libgit2-glib-1.0', version: '>= 0.25.0')
diff --git a/src/libide/ide.h b/src/libide/ide.h
index 320ce4a..cc92ff7 100644
--- a/src/libide/ide.h
+++ b/src/libide/ide.h
@@ -172,6 +172,7 @@ G_BEGIN_DECLS
#include "testing/ide-test-manager.h"
#include "testing/ide-test-provider.h"
#include "threading/ide-thread-pool.h"
+#include "terminal/ide-terminal.h"
#include "transfers/ide-pkcon-transfer.h"
#include "transfers/ide-transfer.h"
#include "transfers/ide-transfer-button.h"
diff --git a/src/libide/meson.build b/src/libide/meson.build
index b5fcc8b..b69b817 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -87,6 +87,7 @@ subdir('sourceview')
subdir('subprocess')
subdir('symbols')
subdir('template')
+subdir('terminal')
subdir('testing')
subdir('threading')
subdir('transfers')
@@ -204,6 +205,7 @@ libide_deps = [
libpangoft2_dep,
libpeas_dep,
libtemplate_glib_dep,
+ libvte_dep,
libxml2_dep,
]
@@ -249,7 +251,8 @@ libide_plugin_dep = declare_dependency(
libgtksource_dep,
libtemplate_glib_dep,
libjson_glib_dep,
- libjsonrpc_glib_dep ],
+ libjsonrpc_glib_dep,
+ libvte_dep ],
)
pkgg = import('pkgconfig')
@@ -261,7 +264,7 @@ pkgg.generate(
name: 'Libide',
filebase: 'libide-1.0',
description: 'Libide contains the components used to build the GNOME Builder IDE.',
- requires: [ 'gtk+-3.0', 'gtksourceview-3.0', 'libdazzle-1.0', 'template-glib-1.0', 'jsonrpc-glib-1.0',
'libpeas-1.0' ],
+ requires: [ 'gtk+-3.0', 'gtksourceview-3.0', 'libdazzle-1.0', 'template-glib-1.0', 'jsonrpc-glib-1.0',
'libpeas-1.0', 'vte-2.91' ],
install_dir: join_paths(pkglibdir, 'pkgconfig'),
)
@@ -271,7 +274,7 @@ libide_gir = gnome.generate_gir(libide,
namespace: 'Ide',
symbol_prefix: 'ide',
identifier_prefix: 'Ide',
- includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', 'Dazzle-1.0', 'Json-1.0', 'Template-1.0'],
+ includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', 'Dazzle-1.0', 'Json-1.0', 'Template-1.0',
'Vte-2.91' ],
install: true,
install_dir_gir: pkggirdir,
install_dir_typelib: pkgtypelibdir,
diff --git a/src/libide/terminal/ide-terminal.c b/src/libide/terminal/ide-terminal.c
new file mode 100644
index 0000000..4e3696f
--- /dev/null
+++ b/src/libide/terminal/ide-terminal.c
@@ -0,0 +1,378 @@
+/* ide-terminal.c
+ *
+ * Copyright © 2016-2017 Christian Hergert <christian hergert me>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <dazzle.h>
+#include <glib/gi18n.h>
+#include <ide.h>
+
+#include "terminal/ide-terminal.h"
+
+#define BUILDER_PCRE2_MULTILINE 0x00000400u
+
+typedef struct
+{
+ GtkWidget *popup_menu;
+ gchar *url;
+} IdeTerminalPrivate;
+
+typedef struct
+{
+ IdeTerminal *terminal;
+ GdkEvent *event;
+} PopupInfo;
+
+G_DEFINE_TYPE_WITH_PRIVATE (IdeTerminal, ide_terminal, VTE_TYPE_TERMINAL)
+
+enum {
+ COPY_LINK_ADDRESS,
+ OPEN_LINK,
+ POPULATE_POPUP,
+ SELECT_ALL,
+ SEARCH_REVEAL,
+ N_SIGNALS
+};
+
+/* From vteapp.c */
+#define DINGUS1
"(((gopher|news|telnet|nntp|file|http|ftp|https)://)|(www|ftp)[-A-Za-z0-9]*\\.)[-A-Za-z0-9\\.]+(:[0-9]*)?"
+#define DINGUS2 DINGUS1 "/[-A-Za-z0-9_\\$\\.\\+\\!\\*\\(\\),;:@&=\\?/~\\#\\%]*[^]'\\.}>\\) ,\\\"]"
+
+static guint signals[N_SIGNALS];
+static const gchar *url_regexes[] = { DINGUS1, DINGUS2 };
+
+static void
+popup_menu_detach (GtkWidget *attach_widget,
+ GtkMenu *menu)
+{
+ IdeTerminal *self = IDE_TERMINAL (attach_widget);
+ IdeTerminalPrivate *priv = ide_terminal_get_instance_private (self);
+
+ g_assert (IDE_IS_TERMINAL (self));
+ g_assert (GTK_IS_MENU (menu));
+ g_assert (priv->popup_menu == NULL || GTK_IS_WIDGET (priv->popup_menu));
+
+ g_clear_pointer (&priv->url, g_free);
+
+ if (priv->popup_menu == GTK_WIDGET (menu))
+ g_clear_pointer (&priv->popup_menu, gtk_widget_destroy);
+}
+
+static void
+popup_targets_received (GtkClipboard *clipboard,
+ GtkSelectionData *data,
+ gpointer user_data)
+{
+ PopupInfo *popup_info = user_data;
+ g_autoptr(IdeTerminal) self = NULL;
+ g_autoptr(GdkEvent) event = NULL;
+ IdeTerminalPrivate *priv;
+
+ g_assert (popup_info != NULL);
+ g_assert (IDE_IS_TERMINAL (popup_info->terminal));
+
+ self = g_steal_pointer (&popup_info->terminal);
+ priv = ide_terminal_get_instance_private (self);
+ event = g_steal_pointer (&popup_info->event);
+
+ if (gtk_widget_get_realized (GTK_WIDGET (self)))
+ {
+ DzlWidgetActionGroup *group;
+ GMenu *menu;
+ gboolean clipboard_contains_text;
+ gboolean have_selection;
+
+ clipboard_contains_text = gtk_selection_data_targets_include_text (data);
+ have_selection = vte_terminal_get_has_selection (VTE_TERMINAL (self));
+
+ g_clear_pointer (&priv->popup_menu, gtk_widget_destroy);
+
+ priv->url = vte_terminal_match_check_event (VTE_TERMINAL (self), event, NULL);
+
+ menu = dzl_application_get_menu_by_id (DZL_APPLICATION_DEFAULT, "ide-terminal-view-popup-menu");
+ priv->popup_menu = gtk_menu_new_from_model (G_MENU_MODEL (menu));
+
+ group = DZL_WIDGET_ACTION_GROUP (gtk_widget_get_action_group (GTK_WIDGET (self), "terminal"));
+
+ dzl_widget_action_group_set_action_enabled (group, "copy-link-address", priv->url != NULL);
+ dzl_widget_action_group_set_action_enabled (group, "open-link", priv->url != NULL);
+ dzl_widget_action_group_set_action_enabled (group, "copy-clipboard", have_selection);
+ dzl_widget_action_group_set_action_enabled (group, "paste-clipboard", clipboard_contains_text);
+
+ dzl_gtk_widget_add_style_class (priv->popup_menu, GTK_STYLE_CLASS_CONTEXT_MENU);
+ gtk_menu_attach_to_widget (GTK_MENU (priv->popup_menu), GTK_WIDGET (self), popup_menu_detach);
+
+ g_signal_emit (self, signals[POPULATE_POPUP], 0, priv->popup_menu);
+
+ gtk_menu_popup_at_pointer (GTK_MENU (priv->popup_menu), event);
+ }
+
+ g_slice_free (PopupInfo, popup_info);
+}
+
+static void
+ide_terminal_do_popup (IdeTerminal *self,
+ const GdkEvent *event)
+{
+ PopupInfo *popup_info;
+ GtkClipboard *clipboard;
+
+ g_assert (IDE_IS_TERMINAL (self));
+
+ popup_info = g_slice_new0 (PopupInfo);
+ popup_info->event = event ? gdk_event_copy (event) : gtk_get_current_event ();
+ popup_info->terminal = g_object_ref (self);
+
+ clipboard = gtk_widget_get_clipboard (GTK_WIDGET (self), GDK_SELECTION_CLIPBOARD);
+
+ gtk_clipboard_request_contents (clipboard,
+ gdk_atom_intern_static_string ("TARGETS"),
+ popup_targets_received,
+ popup_info);
+}
+
+static gboolean
+ide_terminal_popup_menu (GtkWidget *widget)
+{
+ IdeTerminal *self = (IdeTerminal *)widget;
+
+ g_assert (IDE_IS_TERMINAL (self));
+
+ ide_terminal_do_popup (self, NULL);
+
+ return TRUE;
+}
+
+static gboolean
+ide_terminal_button_press_event (GtkWidget *widget,
+ GdkEventButton *button)
+{
+ IdeTerminal *self = (IdeTerminal *)widget;
+
+ g_assert (IDE_IS_TERMINAL (self));
+ g_assert (button != NULL);
+
+ if ((button->type == GDK_BUTTON_PRESS) && (button->button == GDK_BUTTON_SECONDARY))
+ {
+ if (!gtk_widget_has_focus (GTK_WIDGET (self)))
+ gtk_widget_grab_focus (GTK_WIDGET (self));
+
+ ide_terminal_do_popup (self, (GdkEvent *)button);
+
+ return GDK_EVENT_STOP;
+ }
+ else if ((button->type == GDK_BUTTON_PRESS) && (button->button == GDK_BUTTON_PRIMARY)
+ && ((button->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK))
+ {
+ g_autofree gchar *pattern = NULL;
+
+ pattern = vte_terminal_match_check_event (VTE_TERMINAL (self), (GdkEvent *)button, NULL);
+
+ if (pattern != NULL)
+ {
+ GtkApplication *app;
+ GtkWindow *focused_window;
+
+ if (NULL != (app = GTK_APPLICATION (g_application_get_default ())) &&
+ NULL != (focused_window = gtk_application_get_active_window (app)))
+ gtk_show_uri_on_window (focused_window,
+ pattern,
+ gtk_get_current_event_time (),
+ NULL);
+ }
+
+ return GDK_EVENT_STOP;
+ }
+
+ return GTK_WIDGET_CLASS (ide_terminal_parent_class)->button_press_event (widget, button);
+}
+
+static void
+ide_terminal_real_select_all (IdeTerminal *self,
+ gboolean all)
+{
+ g_assert (IDE_IS_TERMINAL (self));
+
+ if (all)
+ vte_terminal_select_all (VTE_TERMINAL (self));
+ else
+ vte_terminal_unselect_all (VTE_TERMINAL (self));
+}
+
+static gboolean
+ide_terminal_copy_link_address (IdeTerminal *self)
+{
+ IdeTerminalPrivate *priv = ide_terminal_get_instance_private (self);
+
+ g_assert (IDE_IS_TERMINAL (self));
+ g_assert (priv->url != NULL);
+
+ if (ide_str_empty0 (priv->url))
+ return FALSE;
+
+ gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (self), GDK_SELECTION_CLIPBOARD),
+ priv->url, strlen (priv->url));
+
+ return TRUE;
+}
+
+static gboolean
+ide_terminal_open_link (IdeTerminal *self)
+{
+ IdeTerminalPrivate *priv = ide_terminal_get_instance_private (self);
+ GtkApplication *app;
+ GtkWindow *focused_window;
+
+ g_assert (IDE_IS_TERMINAL (self));
+ g_assert (priv->url != NULL);
+
+ if (ide_str_empty0 (priv->url))
+ return FALSE;
+
+ if (NULL != (app = GTK_APPLICATION (g_application_get_default ())) &&
+ NULL != (focused_window = gtk_application_get_active_window (app)))
+ return gtk_show_uri_on_window (focused_window,
+ priv->url,
+ gtk_get_current_event_time (),
+ NULL);
+
+ return FALSE;
+}
+
+static void
+ide_terminal_real_search_reveal (IdeTerminal *self)
+{
+ GtkWidget *parent_overlay;
+
+ g_assert (IDE_IS_TERMINAL (self));
+
+ parent_overlay = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_OVERLAY);
+
+ if (parent_overlay != NULL)
+ {
+ GtkRevealer *revealer = dzl_gtk_widget_find_child_typed (parent_overlay, GTK_TYPE_REVEALER);
+
+ if (revealer != NULL && !gtk_revealer_get_child_revealed (revealer))
+ gtk_revealer_set_reveal_child (revealer, TRUE);
+ }
+}
+
+static void
+ide_terminal_class_init (IdeTerminalClass *klass)
+{
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+ GtkBindingSet *binding_set;
+
+ widget_class->button_press_event = ide_terminal_button_press_event;
+ widget_class->popup_menu = ide_terminal_popup_menu;
+
+ klass->copy_link_address = ide_terminal_copy_link_address;
+ klass->open_link = ide_terminal_open_link;
+ klass->select_all = ide_terminal_real_select_all;
+ klass->search_reveal = ide_terminal_real_search_reveal;
+
+ signals [COPY_LINK_ADDRESS] =
+ g_signal_new ("copy-link-address",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (IdeTerminalClass, copy_link_address),
+ NULL, NULL, NULL,
+ G_TYPE_BOOLEAN,
+ 0);
+
+ signals [SEARCH_REVEAL] =
+ g_signal_new ("search-reveal",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (IdeTerminalClass, search_reveal),
+ NULL, NULL, NULL,
+ G_TYPE_NONE,
+ 0);
+
+ signals [OPEN_LINK] =
+ g_signal_new ("open-link",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (IdeTerminalClass, open_link),
+ NULL, NULL, NULL,
+ G_TYPE_BOOLEAN,
+ 0);
+
+ signals [POPULATE_POPUP] =
+ g_signal_new ("populate-popup",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (IdeTerminalClass, populate_popup),
+ NULL, NULL, NULL,
+ G_TYPE_NONE,
+ 1,
+ GTK_TYPE_WIDGET);
+
+ signals [SELECT_ALL] =
+ g_signal_new ("select-all",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (IdeTerminalClass, select_all),
+ NULL, NULL, NULL,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_BOOLEAN);
+
+ binding_set = gtk_binding_set_by_class (klass);
+
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_KEY_c,
+ GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ "copy-clipboard",
+ 0);
+
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_KEY_v,
+ GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ "paste-clipboard",
+ 0);
+
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_KEY_f,
+ GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ "search-reveal",
+ 0);
+}
+
+static void
+ide_terminal_init (IdeTerminal *self)
+{
+ dzl_widget_action_group_attach (self, "terminal");
+
+ for (guint i = 0; i < G_N_ELEMENTS (url_regexes); i++)
+ {
+ g_autoptr(VteRegex) regex = NULL;
+ const gchar *pattern = url_regexes[i];
+ gint tag;
+
+ regex = vte_regex_new_for_match (pattern, IDE_LITERAL_LENGTH (pattern),
+ VTE_REGEX_FLAGS_DEFAULT | BUILDER_PCRE2_MULTILINE,
+ NULL);
+ tag = vte_terminal_match_add_regex (VTE_TERMINAL (self), regex, 0);
+ vte_terminal_match_set_cursor_type (VTE_TERMINAL (self), tag, GDK_HAND2);
+ }
+}
+
+GtkWidget *
+ide_terminal_new (void)
+{
+ return g_object_new (IDE_TYPE_TERMINAL, NULL);
+}
diff --git a/src/libide/terminal/ide-terminal.h b/src/libide/terminal/ide-terminal.h
new file mode 100644
index 0000000..6ff1547
--- /dev/null
+++ b/src/libide/terminal/ide-terminal.h
@@ -0,0 +1,49 @@
+/* ide-terminal.h
+ *
+ * Copyright (C) 2017 Christian Hergert <chergert redhat com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <vte/vte.h>
+
+#include "ide-version-macros.h"
+
+G_BEGIN_DECLS
+
+#define IDE_TYPE_TERMINAL (ide_terminal_get_type())
+
+G_DECLARE_DERIVABLE_TYPE (IdeTerminal, ide_terminal, IDE, TERMINAL, VteTerminal)
+
+struct _IdeTerminalClass
+{
+ VteTerminalClass parent_class;
+
+ void (*populate_popup) (IdeTerminal *self,
+ GtkWidget *widget);
+ void (*select_all) (IdeTerminal *self,
+ gboolean all);
+ void (*search_reveal) (IdeTerminal *self);
+ gboolean (*open_link) (IdeTerminal *self);
+ gboolean (*copy_link_address) (IdeTerminal *self);
+
+ gpointer padding[16];
+};
+
+IDE_AVAILABLE_IN_3_28
+GtkWidget *ide_terminal_new (void);
+
+G_END_DECLS
diff --git a/src/libide/terminal/meson.build b/src/libide/terminal/meson.build
new file mode 100644
index 0000000..d232763
--- /dev/null
+++ b/src/libide/terminal/meson.build
@@ -0,0 +1,12 @@
+terminal_headers = [
+ 'ide-terminal.h',
+]
+
+terminal_sources = [
+ 'ide-terminal.c',
+]
+
+libide_public_headers += files(terminal_headers)
+libide_public_sources += files(terminal_sources)
+
+install_headers(terminal_headers, subdir: join_paths(libide_header_subdir, 'terminal'))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
