[gnome-builder: 127/139] terminal: port plugin to libide-terminal

From: Christian Hergert <chergert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-builder: 127/139] terminal: port plugin to libide-terminal
Date: Thu, 10 Jan 2019 04:27:59 +0000 (UTC)
commit 04e7431d40ad26706208abe32199db0966999b3e
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 9 17:40:26 2019 -0800

    terminal: port plugin to libide-terminal
    
    Mostly renames, also some cleanup to be safer against creating foundry
    objects before a project is loaded.

 src/plugins/terminal/gb-terminal-view-actions.c    | 334 ---------
 src/plugins/terminal/gb-terminal-view-actions.h    |  29 -
 src/plugins/terminal/gb-terminal-view-private.h    |  65 --
 src/plugins/terminal/gb-terminal-view.c            | 760 ---------------------
 src/plugins/terminal/gb-terminal-view.h            |  37 -
 src/plugins/terminal/gb-terminal-view.ui           |  41 --
 src/plugins/terminal/gb-terminal-workbench-addin.c | 437 ------------
 .../terminal/gbp-terminal-application-addin.c      |  88 +++
 ...-private.h => gbp-terminal-application-addin.h} |   9 +-
 .../terminal/gbp-terminal-workspace-addin.c        | 460 +++++++++++++
 ...ench-addin.h => gbp-terminal-workspace-addin.h} |   8 +-
 src/plugins/terminal/gtk/menus.ui                  |  38 +-
 src/plugins/terminal/meson.build                   |  29 +-
 .../{gb-terminal-plugin.c => terminal-plugin.c}    |  26 +-
 src/plugins/terminal/terminal.gresource.xml        |   7 +-
 src/plugins/terminal/terminal.plugin               |  15 +-
 16 files changed, 596 insertions(+), 1787 deletions(-)
---
diff --git a/src/plugins/terminal/gbp-terminal-application-addin.c 
b/src/plugins/terminal/gbp-terminal-application-addin.c
new file mode 100644
index 000000000..9964b74cc
--- /dev/null
+++ b/src/plugins/terminal/gbp-terminal-application-addin.c
@@ -0,0 +1,88 @@
+/* gbp-terminal-application-addin.c
+ *
+ * Copyright 2018 Christian Hergert <unknown domain org>
+ *
+ * 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/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#define G_LOG_DOMAIN "gbp-terminal-application-addin"
+
+#include "config.h"
+
+#include <glib/gi18n.h>
+#include <libide-gui.h>
+#include <libide-terminal.h>
+
+#include "gbp-terminal-application-addin.h"
+
+struct _GbpTerminalApplicationAddin
+{
+  GObject parent_instance;
+};
+
+static void
+gbp_terminal_application_addin_handle_command_line (IdeApplicationAddin     *addin,
+                                                    IdeApplication          *application,
+                                                    GApplicationCommandLine *cmdline)
+{
+  IdeApplication *app = (IdeApplication *)application;
+  GVariantDict *options;
+
+  g_assert (IDE_IS_APPLICATION_ADDIN (addin));
+  g_assert (IDE_IS_APPLICATION (app));
+  g_assert (G_IS_APPLICATION_COMMAND_LINE (cmdline));
+
+  if ((options = g_application_command_line_get_options_dict (cmdline)) &&
+      g_variant_dict_contains (options, "terminal"))
+    ide_application_set_workspace_type (application, IDE_TYPE_TERMINAL_WORKSPACE);
+}
+
+static void
+gbp_terminal_application_addin_add_option_entries (IdeApplicationAddin *addin,
+                                                   IdeApplication      *app)
+{
+  g_assert (GBP_IS_TERMINAL_APPLICATION_ADDIN (addin));
+  g_assert (G_IS_APPLICATION (app));
+
+  g_application_add_main_option (G_APPLICATION (app),
+                                 "terminal",
+                                 't',
+                                 G_OPTION_FLAG_IN_MAIN,
+                                 G_OPTION_ARG_NONE,
+                                 _("Use terminal interface"),
+                                 NULL);
+}
+
+static void
+application_addin_iface_init (IdeApplicationAddinInterface *iface)
+{
+  iface->add_option_entries = gbp_terminal_application_addin_add_option_entries;
+  iface->handle_command_line = gbp_terminal_application_addin_handle_command_line;
+}
+
+G_DEFINE_TYPE_WITH_CODE (GbpTerminalApplicationAddin, gbp_terminal_application_addin, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (IDE_TYPE_APPLICATION_ADDIN,
+                                                application_addin_iface_init))
+
+static void
+gbp_terminal_application_addin_class_init (GbpTerminalApplicationAddinClass *klass)
+{
+}
+
+static void
+gbp_terminal_application_addin_init (GbpTerminalApplicationAddin *self)
+{
+}
diff --git a/src/plugins/terminal/gb-terminal-private.h 
b/src/plugins/terminal/gbp-terminal-application-addin.h
similarity index 71%
rename from src/plugins/terminal/gb-terminal-private.h
rename to src/plugins/terminal/gbp-terminal-application-addin.h
index ebd922c09..383ec54cb 100644
--- a/src/plugins/terminal/gb-terminal-private.h
+++ b/src/plugins/terminal/gbp-terminal-application-addin.h
@@ -1,6 +1,6 @@
-/* gb-terminal-private.h
+/* gbp-terminal-application-addin.h
  *
- * Copyright 2015-2019 Christian Hergert <christian hergert me>
+ * Copyright 2018 Christian Hergert <unknown domain org>
  *
  * 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
@@ -24,7 +24,8 @@
 
 G_BEGIN_DECLS
 
-void _gb_terminal_application_addin_register_type (GTypeModule *module);
-void _gb_terminal_workbench_addin_register_type   (GTypeModule *module);
+#define GBP_TYPE_TERMINAL_APPLICATION_ADDIN (gbp_terminal_application_addin_get_type())
+
+G_DECLARE_FINAL_TYPE (GbpTerminalApplicationAddin, gbp_terminal_application_addin, GBP, 
TERMINAL_APPLICATION_ADDIN, GObject)
 
 G_END_DECLS
diff --git a/src/plugins/terminal/gbp-terminal-workspace-addin.c 
b/src/plugins/terminal/gbp-terminal-workspace-addin.c
new file mode 100644
index 000000000..9d7b79c35
--- /dev/null
+++ b/src/plugins/terminal/gbp-terminal-workspace-addin.c
@@ -0,0 +1,460 @@
+/* gbp-terminal-workspace-addin.c
+ *
+ * Copyright 2018-2019 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/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#define G_LOG_DOMAIN "gbp-terminal-workspace-addin"
+
+#include "config.h"
+
+#include <glib/gi18n.h>
+#include <libide-editor.h>
+#include <libide-foundry.h>
+#include <libide-terminal.h>
+#include <libide-gui.h>
+
+#include "gbp-terminal-workspace-addin.h"
+
+struct _GbpTerminalWorkspaceAddin
+{
+  GObject          parent_instance;
+
+  IdeWorkspace    *workspace;
+
+  DzlDockWidget   *bottom_dock;
+  IdeTerminalPage *bottom;
+
+  DzlDockWidget   *run_panel;
+  IdeTerminalPage *run_terminal;
+};
+
+static IdeRuntime *
+find_runtime (IdeWorkspace *workspace)
+{
+  IdeContext *context;
+  IdeConfigurationManager *config_manager;
+  IdeConfiguration *config;
+
+  g_assert (IDE_IS_WORKSPACE (workspace));
+
+  context = ide_workspace_get_context (workspace);
+  config_manager = ide_configuration_manager_from_context (context);
+  config = ide_configuration_manager_get_current (config_manager);
+
+  return ide_configuration_get_runtime (config);
+}
+
+static gchar *
+find_builddir (IdeWorkspace *workspace)
+{
+  IdeContext *context;
+  IdeBuildManager *build_manager;
+  IdeBuildPipeline *pipeline;
+  const gchar *builddir = NULL;
+
+  if ((context = ide_workspace_get_context (workspace)) &&
+      (build_manager = ide_build_manager_from_context (context)) &&
+      (pipeline = ide_build_manager_get_pipeline (build_manager)) &&
+      (builddir = ide_build_pipeline_get_builddir (pipeline)) &&
+      g_file_test (builddir, G_FILE_TEST_IS_DIR))
+    return g_strdup (builddir);
+
+  return NULL;
+}
+
+static void
+new_terminal_activate (GSimpleAction *action,
+                       GVariant      *param,
+                       gpointer       user_data)
+{
+  GbpTerminalWorkspaceAddin *self = user_data;
+  g_autofree gchar *cwd = NULL;
+  IdeTerminalPage *page;
+  IdeSurface *surface;
+  IdeRuntime *runtime = NULL;
+  const gchar *name;
+  gboolean run_on_host = TRUE;
+  gboolean use_runner = FALSE;
+
+  g_assert (IDE_IS_MAIN_THREAD ());
+  g_assert (G_IS_SIMPLE_ACTION (action));
+  g_assert (GBP_IS_TERMINAL_WORKSPACE_ADDIN (self));
+
+  name = g_action_get_name (G_ACTION (action));
+
+  if (ide_str_equal0 (name, "new-terminal-in-runtime"))
+    {
+      runtime = find_runtime (self->workspace);
+      cwd = find_builddir (self->workspace);
+    }
+  else if (ide_str_equal0 (name, "debug-terminal"))
+    run_on_host = FALSE;
+
+  if (ide_str_equal0 (name, "new-terminal-in-runner"))
+    {
+      runtime = find_runtime (self->workspace);
+      use_runner = TRUE;
+    }
+
+  if (!(surface = ide_workspace_get_surface_by_name (self->workspace, "editor")) &&
+      !(surface = ide_workspace_get_surface_by_name (self->workspace, "terminal")))
+    return;
+
+  ide_workspace_set_visible_surface (self->workspace, surface);
+
+  if (IDE_IS_EDITOR_SURFACE (surface) && ide_str_equal0 (name, "new-terminal-in-dir"))
+    {
+      IdePage *editor = ide_editor_surface_get_active_page (IDE_EDITOR_SURFACE (surface));
+
+      if (IDE_IS_EDITOR_PAGE (editor))
+        {
+          IdeBuffer *buffer = ide_editor_page_get_buffer (IDE_EDITOR_PAGE (editor));
+
+          if (buffer != NULL)
+            {
+              GFile *file = ide_buffer_get_file (buffer);
+              g_autoptr(GFile) parent = g_file_get_parent (file);
+
+              cwd = g_file_get_path (parent);
+            }
+        }
+    }
+
+  page = g_object_new (IDE_TYPE_TERMINAL_PAGE,
+                       "cwd", cwd,
+                       "run-on-host", run_on_host,
+                       "runtime", runtime,
+                       "use-runner", use_runner,
+                       "visible", TRUE,
+                       NULL);
+  gtk_container_add (GTK_CONTAINER (surface), GTK_WIDGET (page));
+
+  ide_widget_reveal_and_grab (GTK_WIDGET (page));
+}
+
+static void
+on_run_manager_run (GbpTerminalWorkspaceAddin *self,
+                    IdeRunner                *runner,
+                    IdeRunManager            *run_manager)
+{
+  IdeEnvironment *env;
+  VtePty *pty = NULL;
+  int tty_fd;
+  g_autoptr(GDateTime) now = NULL;
+  g_autofree gchar *formatted = NULL;
+  g_autofree gchar *tmp = NULL;
+
+  IDE_ENTRY;
+
+  g_assert (GBP_IS_TERMINAL_WORKSPACE_ADDIN (self));
+  g_assert (IDE_IS_RUNNER (runner));
+  g_assert (IDE_IS_RUN_MANAGER (run_manager));
+
+  /*
+   * We need to create a new or re-use our existing terminal page
+   * for run output. Additionally, we need to override the stdin,
+   * stdout, and stderr file-descriptors to our pty master for the
+   * terminal instance.
+   */
+
+  pty = vte_pty_new_sync (VTE_PTY_DEFAULT, NULL, NULL);
+
+  if (pty == NULL)
+    {
+      g_warning ("Failed to allocate PTY for run output");
+      IDE_GOTO (failure);
+    }
+
+  if (self->run_terminal == NULL)
+    {
+      IdeSurface *surface;
+      GtkWidget *bottom_pane;
+
+      self->run_terminal = g_object_new (IDE_TYPE_TERMINAL_PAGE,
+                                         "manage-spawn", FALSE,
+                                         "pty", pty,
+                                         "visible", TRUE,
+                                         NULL);
+      g_signal_connect (self->run_terminal,
+                        "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &self->run_terminal);
+
+      self->run_panel = g_object_new (DZL_TYPE_DOCK_WIDGET,
+                                      "child", self->run_terminal,
+                                      "expand", TRUE,
+                                      "icon-name", "system-run-symbolic",
+                                      "title", _("Application Output"),
+                                      "visible", TRUE,
+                                      NULL);
+      g_signal_connect (self->run_panel,
+                        "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &self->run_panel);
+
+      surface = ide_workspace_get_surface_by_name (self->workspace, "editor");
+      g_assert (IDE_IS_EDITOR_SURFACE (surface));
+
+      bottom_pane = ide_editor_surface_get_utilities (IDE_EDITOR_SURFACE (surface));
+      gtk_container_add (GTK_CONTAINER (bottom_pane), GTK_WIDGET (self->run_panel));
+    }
+  else
+    {
+      ide_terminal_page_set_pty (self->run_terminal, pty);
+    }
+
+  if (-1 != (tty_fd = ide_vte_pty_create_slave (pty)))
+    {
+      ide_runner_set_tty (runner, tty_fd);
+      close (tty_fd);
+    }
+
+  env = ide_runner_get_environment (runner);
+  ide_environment_setenv (env, "TERM", "xterm-256color");
+  ide_environment_setenv (env, "INSIDE_GNOME_BUILDER", PACKAGE_VERSION);
+
+  now = g_date_time_new_now_local ();
+  tmp = g_date_time_format (now, "%X");
+
+  /* translators: %s is replaced with the current local time of day */
+  formatted = g_strdup_printf (_("Application started at %s\r\n"), tmp);
+
+  ide_terminal_page_feed (self->run_terminal, formatted);
+
+  dzl_dock_item_present (DZL_DOCK_ITEM (self->run_panel));
+
+failure:
+
+  g_clear_object (&pty);
+
+  IDE_EXIT;
+}
+
+static void
+on_run_manager_stopped (GbpTerminalWorkspaceAddin *self,
+                        IdeRunManager             *run_manager)
+{
+  g_assert (IDE_IS_MAIN_THREAD ());
+  g_assert (GBP_IS_TERMINAL_WORKSPACE_ADDIN (self));
+  g_assert (IDE_IS_RUN_MANAGER (run_manager));
+
+  ide_terminal_page_feed (self->run_terminal, _("Application exited\r\n"));
+}
+
+static const GActionEntry terminal_actions[] = {
+  { "new-terminal", new_terminal_activate },
+  { "new-terminal-in-runner", new_terminal_activate },
+  { "new-terminal-in-runtime", new_terminal_activate },
+  { "new-terminal-in-dir", new_terminal_activate },
+  { "debug-terminal", new_terminal_activate },
+};
+
+#define I_ g_intern_string
+
+static const DzlShortcutEntry gbp_terminal_shortcut_entries[] = {
+  { "org.gnome.builder.workspace.new-terminal",
+    0, NULL,
+    NC_("shortcut window", "Workspace shortcuts"),
+    NC_("shortcut window", "General"),
+    NC_("shortcut window", "Terminal") },
+
+  { "org.gnome.builder.workspace.new-terminal-in-runtime",
+    0, NULL,
+    NC_("shortcut window", "Workspace shortcuts"),
+    NC_("shortcut window", "General"),
+    NC_("shortcut window", "Terminal in Build Runtime") },
+
+  { "org.gnome.builder.workspace.new-terminal-in-runner",
+    0, NULL,
+    NC_("shortcut window", "Workspace shortcuts"),
+    NC_("shortcut window", "General"),
+    NC_("shortcut window", "Terminal in Runtime") },
+};
+
+static void
+gbp_terminal_workspace_addin_setup_shortcuts (GbpTerminalWorkspaceAddin *self,
+                                              IdeWorkspace              *workspace)
+{
+  DzlShortcutController *controller;
+
+  g_assert (GBP_IS_TERMINAL_WORKSPACE_ADDIN (self));
+  g_assert (IDE_IS_WORKSPACE (workspace));
+
+  controller = dzl_shortcut_controller_find (GTK_WIDGET (workspace));
+
+  dzl_shortcut_controller_add_command_action (controller,
+                                              "org.gnome.builder.workspace.new-terminal",
+                                              I_("<primary><shift>t"),
+                                              DZL_SHORTCUT_PHASE_DISPATCH,
+                                              "win.new-terminal");
+
+  dzl_shortcut_controller_add_command_action (controller,
+                                              "org.gnome.builder.workspace.new-terminal-in-runtime",
+                                              I_("<primary><alt><shift>t"),
+                                              DZL_SHORTCUT_PHASE_DISPATCH,
+                                              "win.new-terminal-in-runtime");
+
+  dzl_shortcut_controller_add_command_action (controller,
+                                              "org.gnome.builder.workspace.new-terminal-in-runner",
+                                              I_("<primary><alt>t"),
+                                              DZL_SHORTCUT_PHASE_DISPATCH,
+                                              "win.new-terminal-in-runner");
+
+  dzl_shortcut_manager_add_shortcut_entries (NULL,
+                                             gbp_terminal_shortcut_entries,
+                                             G_N_ELEMENTS (gbp_terminal_shortcut_entries),
+                                             GETTEXT_PACKAGE);
+}
+
+static void
+gbp_terminal_workspace_addin_load (IdeWorkspaceAddin *addin,
+                                   IdeWorkspace      *workspace)
+{
+  GbpTerminalWorkspaceAddin *self = (GbpTerminalWorkspaceAddin *)addin;
+  IdeWorkbench *workbench;
+  IdeSurface *surface;
+  GtkWidget *utilities;
+
+  g_assert (GBP_IS_TERMINAL_WORKSPACE_ADDIN (self));
+  g_assert (IDE_IS_PRIMARY_WORKSPACE (workspace) ||
+            IDE_IS_EDITOR_WORKSPACE (workspace) ||
+            IDE_IS_TERMINAL_WORKSPACE (workspace));
+
+  self->workspace = workspace;
+
+  gbp_terminal_workspace_addin_setup_shortcuts (self, workspace);
+  g_action_map_add_action_entries (G_ACTION_MAP (workspace),
+                                   terminal_actions,
+                                   G_N_ELEMENTS (terminal_actions),
+                                   self);
+
+  if ((surface = ide_workspace_get_surface_by_name (workspace, "editor")) &&
+      IDE_IS_EDITOR_SURFACE (surface) &&
+      (utilities = ide_editor_surface_get_utilities (IDE_EDITOR_SURFACE (surface))))
+    {
+      IdeRunManager *run_manager;
+      IdeContext *context;
+
+      self->bottom_dock = g_object_new (DZL_TYPE_DOCK_WIDGET,
+                                        "title", _("Terminal"),
+                                        "icon-name", "utilities-terminal-symbolic",
+                                        "visible", TRUE,
+                                        NULL);
+      g_signal_connect (self->bottom_dock,
+                        "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &self->bottom_dock);
+      gtk_container_add (GTK_CONTAINER (utilities), GTK_WIDGET (self->bottom_dock));
+
+      self->bottom = g_object_new (IDE_TYPE_TERMINAL_PAGE,
+                                   "visible", TRUE,
+                                   NULL);
+      g_signal_connect (self->bottom,
+                        "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &self->bottom);
+      gtk_container_add (GTK_CONTAINER (self->bottom_dock), GTK_WIDGET (self->bottom));
+
+      workbench = ide_widget_get_workbench (GTK_WIDGET (workspace));
+
+      if (ide_workbench_has_project (workbench))
+        {
+          /* Setup terminals when a project is run */
+          context = ide_widget_get_context (GTK_WIDGET (workspace));
+          run_manager = ide_run_manager_from_context (context);
+          g_signal_connect_object (run_manager,
+                                   "run",
+                                   G_CALLBACK (on_run_manager_run),
+                                   self,
+                                   G_CONNECT_SWAPPED);
+          g_signal_connect_object (run_manager,
+                                   "stopped",
+                                   G_CALLBACK (on_run_manager_stopped),
+                                   self,
+                                   G_CONNECT_SWAPPED);
+        }
+    }
+}
+
+static void
+gbp_terminal_workspace_addin_unload (IdeWorkspaceAddin *addin,
+                                     IdeWorkspace      *workspace)
+{
+  GbpTerminalWorkspaceAddin *self = (GbpTerminalWorkspaceAddin *)addin;
+  IdeWorkbench *workbench;
+
+  g_assert (IDE_IS_MAIN_THREAD ());
+  g_assert (GBP_IS_TERMINAL_WORKSPACE_ADDIN (self));
+  g_assert (IDE_IS_PRIMARY_WORKSPACE (workspace) ||
+            IDE_IS_EDITOR_WORKSPACE (workspace) ||
+            IDE_IS_TERMINAL_WORKSPACE (workspace));
+
+  workbench = ide_widget_get_workbench (GTK_WIDGET (workspace));
+
+  if (ide_workbench_has_project (workbench))
+    {
+      IdeRunManager *run_manager;
+      IdeContext *context;
+
+      context = ide_widget_get_context (GTK_WIDGET (workspace));
+      run_manager = ide_run_manager_from_context (context);
+      g_signal_handlers_disconnect_by_func (run_manager,
+                                            G_CALLBACK (on_run_manager_run),
+                                            self);
+      g_signal_handlers_disconnect_by_func (run_manager,
+                                            G_CALLBACK (on_run_manager_stopped),
+                                            self);
+    }
+
+  for (guint i = 0; i < G_N_ELEMENTS (terminal_actions); i++)
+    g_action_map_remove_action (G_ACTION_MAP (workspace), terminal_actions[i].name);
+
+  if (self->bottom_dock != NULL)
+    gtk_widget_destroy (GTK_WIDGET (self->bottom_dock));
+
+  if (self->run_panel != NULL)
+    gtk_widget_destroy (GTK_WIDGET (self->run_panel));
+
+  g_assert (self->bottom == NULL);
+  g_assert (self->bottom_dock == NULL);
+
+  g_assert (self->run_terminal == NULL);
+  g_assert (self->run_panel == NULL);
+
+  self->workspace = NULL;
+}
+
+static void
+workspace_addin_iface_init (IdeWorkspaceAddinInterface *iface)
+{
+  iface->load = gbp_terminal_workspace_addin_load;
+  iface->unload = gbp_terminal_workspace_addin_unload;
+}
+
+G_DEFINE_TYPE_WITH_CODE (GbpTerminalWorkspaceAddin, gbp_terminal_workspace_addin, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (IDE_TYPE_WORKSPACE_ADDIN, workspace_addin_iface_init))
+
+static void
+gbp_terminal_workspace_addin_class_init (GbpTerminalWorkspaceAddinClass *klass)
+{
+}
+
+static void
+gbp_terminal_workspace_addin_init (GbpTerminalWorkspaceAddin *self)
+{
+}
diff --git a/src/plugins/terminal/gb-terminal-workbench-addin.h 
b/src/plugins/terminal/gbp-terminal-workspace-addin.h
similarity index 72%
rename from src/plugins/terminal/gb-terminal-workbench-addin.h
rename to src/plugins/terminal/gbp-terminal-workspace-addin.h
index ec1d8ccc6..aceef9a47 100644
--- a/src/plugins/terminal/gb-terminal-workbench-addin.h
+++ b/src/plugins/terminal/gbp-terminal-workspace-addin.h
@@ -1,6 +1,6 @@
-/* gb-terminal-addin.h
+/* gbp-terminal-workspace-addin.h
  *
- * Copyright 2015-2019 Christian Hergert <christian hergert me>
+ * Copyright 2018-2019 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
@@ -24,8 +24,8 @@
 
 G_BEGIN_DECLS
 
-#define GB_TYPE_TERMINAL_WORKBENCH_ADDIN (gb_terminal_workbench_addin_get_type())
+#define GBP_TYPE_TERMINAL_WORKSPACE_ADDIN (gbp_terminal_workspace_addin_get_type())
 
-G_DECLARE_FINAL_TYPE (GbTerminalWorkbenchAddin, gb_terminal_workbench_addin, GB, TERMINAL_WORKBENCH_ADDIN, 
GObject)
+G_DECLARE_FINAL_TYPE (GbpTerminalWorkspaceAddin, gbp_terminal_workspace_addin, GBP, 
TERMINAL_WORKSPACE_ADDIN, GObject)
 
 G_END_DECLS
diff --git a/src/plugins/terminal/gtk/menus.ui b/src/plugins/terminal/gtk/menus.ui
index 9e4ef30aa..7405b8307 100644
--- a/src/plugins/terminal/gtk/menus.ui
+++ b/src/plugins/terminal/gtk/menus.ui
@@ -1,32 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <menu id="terminal-view-document-menu">
-    <section id="terminal-document-section">
-      <attribute name="label" translatable="yes">Terminal</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Split</attribute>
-        <attribute name="action">layoutstack.split-view</attribute>
-        <attribute name="target" type="s">''</attribute>
-        <attribute name="verb-icon-name">builder-split-tab-symbolic</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Reset</attribute>
-        <attribute name="action">terminal-view.reset</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Reset and Clear</attribute>
-        <attribute name="action">terminal-view.reset-and-clear</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Save As</attribute>
-        <attribute name="action">terminal-view.save-as</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Close</attribute>
-        <attribute name="action">layoutstack.close-view</attribute>
-      </item>
-    </section>
-  </menu>
   <menu id="new-document-menu">
     <section id="new-document-section">
       <item>
@@ -53,13 +26,4 @@
       </item>
     </section>
   </menu>
-  <menu id="ide-source-view-popup-menu">
-    <section id="ide-source-view-popup-menu-terminal-section">
-      <attribute name="after">ide-source-view-popup-menu-zoom-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">New terminal in directory</attribute>
-        <attribute name="action">win.new-terminal-in-dir</attribute>
-      </item>
-    </section>
-  </menu>
 </interface>
diff --git a/src/plugins/terminal/meson.build b/src/plugins/terminal/meson.build
index e697221d1..f13204f81 100644
--- a/src/plugins/terminal/meson.build
+++ b/src/plugins/terminal/meson.build
@@ -1,22 +1,13 @@
-terminal_resources = gnome.compile_resources(
-  'terminal-resources',
+plugins_sources += files([
+  'gbp-terminal-application-addin.c',
+  'gbp-terminal-workspace-addin.c',
+  'terminal-plugin.c',
+])
+
+plugin_terminal_resources = gnome.compile_resources(
+  'gbp-terminal-resources',
   'terminal.gresource.xml',
-  c_name: 'gb_terminal',
+  c_name: 'gbp_terminal',
 )
 
-terminal_sources = [
-  'gb-terminal-plugin.c',
-  'gb-terminal-private.h',
-  'gb-terminal-view.c',
-  'gb-terminal-view.h',
-  'gb-terminal-view-private.h',
-  'gb-terminal-view-actions.c',
-  'gb-terminal-view-actions.h',
-  'gb-terminal-workbench-addin.c',
-  'gb-terminal-workbench-addin.h',
-]
-
-gnome_builder_plugins_deps += [libvte_dep]
-
-gnome_builder_plugins_sources += files(terminal_sources)
-gnome_builder_plugins_sources += terminal_resources[0]
+plugins_sources += plugin_terminal_resources[0]
diff --git a/src/plugins/terminal/gb-terminal-plugin.c b/src/plugins/terminal/terminal-plugin.c
similarity index 52%
rename from src/plugins/terminal/gb-terminal-plugin.c
rename to src/plugins/terminal/terminal-plugin.c
index 5ba43342b..06a97dc19 100644
--- a/src/plugins/terminal/gb-terminal-plugin.c
+++ b/src/plugins/terminal/terminal-plugin.c
@@ -1,6 +1,6 @@
-/* gb-terminal-plugin.c
+/* terminal-plugin.c
  *
- * Copyright 2015-2019 Christian Hergert <christian hergert me>
+ * Copyright 2018-2019 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
@@ -18,16 +18,24 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+#define G_LOG_DOMAIN "terminal-plugin"
+
+#include "config.h"
+
 #include <libpeas/peas.h>
-#include <ide.h>
+#include <libide-gui.h>
+#include <libide-terminal.h>
 
-#include "gb-terminal-private.h"
-#include "gb-terminal-workbench-addin.h"
+#include "gbp-terminal-application-addin.h"
+#include "gbp-terminal-workspace-addin.h"
 
-void
-gb_terminal_register_types (PeasObjectModule *module)
+_IDE_EXTERN void
+_gbp_terminal_register_types (PeasObjectModule *module)
 {
   peas_object_module_register_extension_type (module,
-                                              IDE_TYPE_WORKBENCH_ADDIN,
-                                              GB_TYPE_TERMINAL_WORKBENCH_ADDIN);
+                                              IDE_TYPE_APPLICATION_ADDIN,
+                                              GBP_TYPE_TERMINAL_APPLICATION_ADDIN);
+  peas_object_module_register_extension_type (module,
+                                              IDE_TYPE_WORKSPACE_ADDIN,
+                                              GBP_TYPE_TERMINAL_WORKSPACE_ADDIN);
 }
diff --git a/src/plugins/terminal/terminal.gresource.xml b/src/plugins/terminal/terminal.gresource.xml
index 2cdd9c33c..e6e7bcefa 100644
--- a/src/plugins/terminal/terminal.gresource.xml
+++ b/src/plugins/terminal/terminal.gresource.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/builder/plugins">
+  <gresource prefix="/plugins/terminal">
+    <file preprocess="xml-stripblanks">gtk/menus.ui</file>
     <file>terminal.plugin</file>
   </gresource>
-  <gresource prefix="/org/gnome/builder/plugins/terminal">
-    <file>gb-terminal-view.ui</file>
-    <file>gtk/menus.ui</file>
-  </gresource>
 </gresources>
diff --git a/src/plugins/terminal/terminal.plugin b/src/plugins/terminal/terminal.plugin
index 0a81faf5d..fa450841f 100644
--- a/src/plugins/terminal/terminal.plugin
+++ b/src/plugins/terminal/terminal.plugin
@@ -1,9 +1,12 @@
 [Plugin]
-Module=terminal
-Name=Terminal
-Description=A terminal for Builder
 Authors=Christian Hergert <christian hergert me>
-Copyright=Copyright © 2015 Christian Hergert
-Depends=editor
 Builtin=true
-Embedded=gb_terminal_register_types
+Copyright=Copyright © 2014-2018 Christian Hergert
+Depends=editor;
+Description=Builder's terminal support
+Embedded=_gbp_terminal_register_types
+Hidden=true
+Module=terminal
+Name=Terminal
+X-At-Startup=true
+X-Workspace-Kind=editor;primary;terminal;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]