wp/xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add new (App/Window/View)Activatable interfaces for plugins

Browse Source 
Currently only the modelines and filebrowser plugins are updated to these new
interfaces
This commit is contained in:
JosephMcc
2017-01-09 11:57:48 -08:00
parent d45e07b7a1
commit b9e5097250
26 changed files with 5361 additions and 4484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
plugins/modelines/modeline-parser.c
View File

@@ -64,7 +64,7 @@ typedef struct _ModelineOptions
GtkWrapMode wrap_mode;
gboolean display_right_margin;
guint right_margin_position;
ModelineSet set;
} ModelineOptions;
@@ -80,7 +80,10 @@ has_option (ModelineOptions *options,
void
modeline_parser_init (const gchar *data_dir)
{
modelines_data_dir = g_strdup (data_dir);
if (modelines_data_dir == NULL)
{
modelines_data_dir = g_strdup (data_dir);
}
}
void
@@ -94,12 +97,13 @@ modeline_parser_shutdown ()
if (kate_languages != NULL)
g_hash_table_destroy (kate_languages);
vim_languages = NULL;
emacs_languages = NULL;
kate_languages = NULL;
g_free (modelines_data_dir);
modelines_data_dir = NULL;
}
static GHashTable *
@@ -224,7 +228,7 @@ skip_whitespaces (gchar **s)
}
/* Parse vi(m) modelines.
* Vi(m) modelines looks like this:
* Vi(m) modelines looks like this:
* - first form: [text]{white}{vi:|vim:|ex:}[white]{options}
* - second form: [text]{white}{vi:|vim:|ex:}[white]se[t] {options}:[text]
* They can happen on the three first or last lines.
@@ -289,7 +293,7 @@ parse_vim_modeline (gchar *s,
{
g_free (options->language_id);
options->language_id = get_language_id_vim (value->str);
options->set |= MODELINE_SET_LANGUAGE;
}
else if (strcmp (key->str, "et") == 0 ||
@@ -302,7 +306,7 @@ parse_vim_modeline (gchar *s,
strcmp (key->str, "tabstop") == 0)
{
intval = atoi (value->str);
if (intval)
{
options->tab_width = intval;
@@ -313,7 +317,7 @@ parse_vim_modeline (gchar *s,
strcmp (key->str, "shiftwidth") == 0)
{
intval = atoi (value->str);
if (intval)
{
options->indent_width = intval;
@@ -326,18 +330,18 @@ parse_vim_modeline (gchar *s,
options->set |= MODELINE_SET_WRAP_MODE;
}
else if (strcmp (key->str, "textwidth") == 0)
else if (strcmp (key->str, "textwidth") == 0 || strcmp (key->str, "tw") == 0)
{
intval = atoi (value->str);
if (intval)
{
options->right_margin_position = intval;
options->display_right_margin = TRUE;
options->set |= MODELINE_SET_SHOW_RIGHT_MARGIN |
MODELINE_SET_RIGHT_MARGIN_POSITION;
}
}
}
@@ -406,13 +410,13 @@ parse_emacs_modeline (gchar *s,
{
g_free (options->language_id);
options->language_id = get_language_id_emacs (value->str);
options->set |= MODELINE_SET_LANGUAGE;
}
else if (strcmp (key->str, "tab-width") == 0)
{
intval = atoi (value->str);
if (intval)
{
options->tab_width = intval;
@@ -422,7 +426,7 @@ parse_emacs_modeline (gchar *s,
else if (strcmp (key->str, "indent-offset") == 0)
{
intval = atoi (value->str);
if (intval)
{
options->indent_width = intval;
@@ -433,14 +437,14 @@ parse_emacs_modeline (gchar *s,
{
intval = strcmp (value->str, "nil") == 0;
options->insert_spaces = intval;
options->set |= MODELINE_SET_INSERT_SPACES;
}
else if (strcmp (key->str, "autowrap") == 0)
{
intval = strcmp (value->str, "nil") != 0;
options->wrap_mode = intval ? GTK_WRAP_WORD : GTK_WRAP_NONE;
options->set |= MODELINE_SET_WRAP_MODE;
}
}
@@ -504,13 +508,13 @@ parse_kate_modeline (gchar *s,
{
g_free (options->language_id);
options->language_id = get_language_id_kate (value->str);
options->set |= MODELINE_SET_LANGUAGE;
}
else if (strcmp (key->str, "tab-width") == 0)
{
intval = atoi (value->str);
if (intval)
{
options->tab_width = intval;
@@ -539,17 +543,17 @@ parse_kate_modeline (gchar *s,
options->wrap_mode = intval ? GTK_WRAP_WORD : GTK_WRAP_NONE;
options->set |= MODELINE_SET_WRAP_MODE;
options->set |= MODELINE_SET_WRAP_MODE;
}
else if (strcmp (key->str, "word-wrap-column") == 0)
{
intval = atoi (value->str);
if (intval)
{
options->right_margin_position = intval;
options->display_right_margin = TRUE;
options->set |= MODELINE_SET_RIGHT_MARGIN_POSITION |
MODELINE_SET_SHOW_RIGHT_MARGIN;
}
@@ -611,7 +615,7 @@ check_previous (GtkSourceView *view,
ModelineSet set)
{
GtkSourceBuffer *buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
/* Do not restore default when this is the first time */
if (!previous)
return FALSE;
@@ -648,7 +652,7 @@ check_previous (GtkSourceView *view,
case MODELINE_SET_LANGUAGE:
{
GtkSourceLanguage *language = gtk_source_buffer_get_language (buffer);
return (language == NULL && previous->language_id == NULL) ||
(language != NULL && g_strcmp0 (gtk_source_language_get_id (language),
previous->language_id) == 0);
@@ -674,7 +678,7 @@ modeline_parser_apply_modeline (GtkSourceView *view)
GtkTextBuffer *buffer;
GtkTextIter iter, liter;
gint line_count;
options.language_id = NULL;
options.set = MODELINE_SET_NONE;
@@ -757,7 +761,7 @@ modeline_parser_apply_modeline (GtkSourceView *view)
}
}
ModelineOptions *previous = g_object_get_data (G_OBJECT (buffer),
ModelineOptions *previous = g_object_get_data (G_OBJECT (buffer),
MODELINE_OPTIONS_DATA_KEY);
/* Apply the options we got from modelines and restore defaults if
@@ -773,17 +777,17 @@ modeline_parser_apply_modeline (GtkSourceView *view)
(view,
xed_prefs_manager_get_insert_spaces ());
}
if (has_option (&options, MODELINE_SET_TAB_WIDTH))
{
gtk_source_view_set_tab_width (view, options.tab_width);
}
else if (check_previous (view, previous, MODELINE_SET_TAB_WIDTH))
{
gtk_source_view_set_tab_width (view,
gtk_source_view_set_tab_width (view,
xed_prefs_manager_get_tabs_size ());
}
if (has_option (&options, MODELINE_SET_INDENT_WIDTH))
{
gtk_source_view_set_indent_width (view, options.indent_width);
@@ -792,39 +796,40 @@ modeline_parser_apply_modeline (GtkSourceView *view)
{
gtk_source_view_set_indent_width (view, -1);
}
if (has_option (&options, MODELINE_SET_WRAP_MODE))
{
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), options.wrap_mode);
}
else if (check_previous (view, previous, MODELINE_SET_WRAP_MODE))
{
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view),
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view),
xed_prefs_manager_get_wrap_mode ());
}
if (has_option (&options, MODELINE_SET_RIGHT_MARGIN_POSITION))
{
gtk_source_view_set_right_margin_position (view, options.right_margin_position);
}
else if (check_previous (view, previous, MODELINE_SET_RIGHT_MARGIN_POSITION))
{
gtk_source_view_set_right_margin_position (view,
gtk_source_view_set_right_margin_position (view,
xed_prefs_manager_get_right_margin_position ());
}
if (has_option (&options, MODELINE_SET_SHOW_RIGHT_MARGIN))
{
gtk_source_view_set_show_right_margin (view, options.display_right_margin);
}
else if (check_previous (view, previous, MODELINE_SET_SHOW_RIGHT_MARGIN))
{
gtk_source_view_set_show_right_margin (view,
gtk_source_view_set_show_right_margin (view,
xed_prefs_manager_get_display_right_margin ());
}
if (previous)
{
g_free (previous->language_id);
*previous = options;
previous->language_id = g_strdup (options.language_id);
}
@@ -833,13 +838,13 @@ modeline_parser_apply_modeline (GtkSourceView *view)
previous = g_slice_new (ModelineOptions);
*previous = options;
previous->language_id = g_strdup (options.language_id);
g_object_set_data_full (G_OBJECT (buffer),
MODELINE_OPTIONS_DATA_KEY,
g_object_set_data_full (G_OBJECT (buffer),
MODELINE_OPTIONS_DATA_KEY,
previous,
(GDestroyNotify)free_modeline_options);
}
g_free (options.language_id);
}

14
plugins/modelines/modeline-parser.h
View File

@@ -1,14 +1,14 @@
/*
* modelie-parser.h
* Emacs, Kate and Vim-style modelines support for xed.
*
*
* Copyright (C) 2005-2007 - Steve Frécinaux <code@istique.net>
*
* 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 2, 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
@@ -23,14 +23,14 @@
#define __MODELINE_PARSER_H__
#include <glib.h>
#include <gtksourceview/gtksourceview.h>
#include <gtksourceview/gtksource.h>
G_BEGIN_DECLS
void modeline_parser_init (const gchar *data_dir);
void modeline_parser_shutdown (void);
void modeline_parser_apply_modeline (GtkSourceView *view);
void modeline_parser_deactivate (GtkSourceView *view);
void modeline_parser_init (const gchar *data_dir);
void modeline_parser_shutdown (void);
void modeline_parser_apply_modeline (GtkSourceView *view);
void modeline_parser_deactivate (GtkSourceView *view);
G_END_DECLS

235
plugins/modelines/xed-modeline-plugin.c
View File

@@ -20,90 +20,65 @@
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
# include <config.h>
#endif
#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <libpeas/peas-activatable.h>
#include "xed-modeline-plugin.h"
#include "modeline-parser.h"
#include <xed/xed-window.h>
#include <xed/xed-debug.h>
#include <xed/xed-utils.h>
#define DOCUMENT_DATA_KEY "XedModelinePluginDocumentData"
#include <xed/xed-view-activatable.h>
#include <xed/xed-view.h>
struct _XedModelinePluginPrivate
{
GtkWidget *window;
XedView *view;
gulong tab_added_handler_id;
gulong tab_removed_handler_id;
gulong document_loaded_handler_id;
gulong document_saved_handler_id;
};
typedef struct
{
gulong document_loaded_handler_id;
gulong document_saved_handler_id;
} DocumentData;
enum
{
PROP_0,
PROP_OBJECT
PROP_VIEW
};
static void peas_activatable_iface_init (PeasActivatableInterface *iface);
static void xed_view_activatable_iface_init (XedViewActivatableInterface *iface);
G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedModelinePlugin,
xed_modeline_plugin,
PEAS_TYPE_EXTENSION_BASE,
0,
G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
peas_activatable_iface_init))
static void
document_data_free (DocumentData *ddata)
{
g_slice_free (DocumentData, ddata);
}
G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_VIEW_ACTIVATABLE,
xed_view_activatable_iface_init))
static void
xed_modeline_plugin_constructed (GObject *object)
{
gchar *data_dir;
gchar *data_dir;
data_dir = peas_extension_base_get_data_dir (PEAS_EXTENSION_BASE (object));
data_dir = peas_extension_base_get_data_dir (PEAS_EXTENSION_BASE (object));
modeline_parser_init (data_dir);
modeline_parser_init (data_dir);
g_free (data_dir);
g_free (data_dir);
G_OBJECT_CLASS (xed_modeline_plugin_parent_class)->constructed (object);
G_OBJECT_CLASS (xed_modeline_plugin_parent_class)->constructed (object);
}
static void
xed_modeline_plugin_init (XedModelinePlugin *plugin)
{
xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin initializing");
xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin initializing");
plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
XED_TYPE_MODELINE_PLUGIN,
XedModelinePluginPrivate);
}
static void
xed_modeline_plugin_finalize (GObject *object)
{
xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin finalizing");
modeline_parser_shutdown ();
G_OBJECT_CLASS (xed_modeline_plugin_parent_class)->finalize (object);
}
static void
xed_modeline_plugin_dispose (GObject *object)
{
@@ -111,15 +86,21 @@ xed_modeline_plugin_dispose (GObject *object)
xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin disposing");
if (plugin->priv->window != NULL)
{
g_object_unref (plugin->priv->window);
plugin->priv->window = NULL;
}
g_clear_object (&plugin->priv->view);
G_OBJECT_CLASS (xed_modeline_plugin_parent_class)->dispose (object);
}
static void
xed_modeline_plugin_finalize (GObject *object)
{
xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin finalizing");
modeline_parser_shutdown ();
G_OBJECT_CLASS (xed_modeline_plugin_parent_class)->finalize (object);
}
static void
xed_modeline_plugin_set_property (GObject *object,
guint prop_id,
@@ -130,8 +111,8 @@ xed_modeline_plugin_set_property (GObject *object,
switch (prop_id)
{
case PROP_OBJECT:
plugin->priv->window = GTK_WIDGET (g_value_dup_object (value));
case PROP_VIEW:
plugin->priv->view = XED_VIEW (g_value_dup_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -149,8 +130,8 @@ xed_modeline_plugin_get_property (GObject *object,
switch (prop_id)
{
case PROP_OBJECT:
g_value_set_object (value, plugin->priv->window);
case PROP_VIEW:
g_value_set_object (value, plugin->priv->view);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -159,131 +140,49 @@ xed_modeline_plugin_get_property (GObject *object,
}
static void
on_document_loaded_or_saved (XedDocument *document,
const GError *error,
GtkSourceView *view)
on_document_loaded_or_saved (XedDocument *document,
const GError *error,
GtkSourceView *view)
{
modeline_parser_apply_modeline (view);
modeline_parser_apply_modeline (view);
}
static void
connect_handlers (XedView *view)
xed_modeline_plugin_activate (XedViewActivatable *activatable)
{
DocumentData *data;
GtkTextBuffer *doc;
XedModelinePlugin *plugin;
GtkTextBuffer *doc;
doc = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
xed_debug (DEBUG_PLUGINS);
data = g_slice_new (DocumentData);
plugin = XED_MODELINE_PLUGIN (activatable);
data->document_loaded_handler_id =
g_signal_connect (doc, "loaded",
G_CALLBACK (on_document_loaded_or_saved),
view);
data->document_saved_handler_id =
g_signal_connect (doc, "saved",
G_CALLBACK (on_document_loaded_or_saved),
view);
modeline_parser_apply_modeline (GTK_SOURCE_VIEW (plugin->priv->view));
g_object_set_data_full (G_OBJECT (doc), DOCUMENT_DATA_KEY,
data, (GDestroyNotify) document_data_free);
doc = gtk_text_view_get_buffer (GTK_TEXT_VIEW (plugin->priv->view));
plugin->priv->document_loaded_handler_id =
g_signal_connect (doc, "loaded",
G_CALLBACK (on_document_loaded_or_saved), plugin->priv->view);
plugin->priv->document_saved_handler_id =
g_signal_connect (doc, "saved",
G_CALLBACK (on_document_loaded_or_saved), plugin->priv->view);
}
static void
disconnect_handlers (XedView *view)
xed_modeline_plugin_deactivate (XedViewActivatable *activatable)
{
DocumentData *data;
GtkTextBuffer *doc;
XedModelinePlugin *plugin;
GtkTextBuffer *doc;
doc = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
xed_debug (DEBUG_PLUGINS);
data = g_object_steal_data (G_OBJECT (doc), DOCUMENT_DATA_KEY);
plugin = XED_MODELINE_PLUGIN (activatable);
if (data)
{
g_signal_handler_disconnect (doc, data->document_loaded_handler_id);
g_signal_handler_disconnect (doc, data->document_saved_handler_id);
doc = gtk_text_view_get_buffer (GTK_TEXT_VIEW (plugin->priv->view));
document_data_free (data);
}
else
{
g_warning ("Modeline handlers not found");
}
}
static void
on_window_tab_added (XedWindow *window,
XedTab *tab,
gpointer user_data)
{
connect_handlers (xed_tab_get_view (tab));
}
static void
on_window_tab_removed (XedWindow *window,
XedTab *tab,
gpointer user_data)
{
disconnect_handlers (xed_tab_get_view (tab));
}
static void
xed_modeline_plugin_activate (PeasActivatable *activatable)
{
XedModelinePluginPrivate *data;
XedWindow *window;
GList *views;
GList *l;
xed_debug (DEBUG_PLUGINS);
data = XED_MODELINE_PLUGIN (activatable)->priv;
window = XED_WINDOW (data->window);
views = xed_window_get_views (window);
for (l = views; l != NULL; l = l->next)
{
connect_handlers (XED_VIEW (l->data));
modeline_parser_apply_modeline (GTK_SOURCE_VIEW (l->data));
}
g_list_free (views);
data->tab_added_handler_id =
g_signal_connect (window, "tab-added",
G_CALLBACK (on_window_tab_added), NULL);
data->tab_removed_handler_id =
g_signal_connect (window, "tab-removed",
G_CALLBACK (on_window_tab_removed), NULL);
}
static void
xed_modeline_plugin_deactivate (PeasActivatable *activatable)
{
XedModelinePluginPrivate *data;
XedWindow *window;
GList *views;
GList *l;
xed_debug (DEBUG_PLUGINS);
data = XED_MODELINE_PLUGIN (activatable)->priv;
window = XED_WINDOW (data->window);
g_signal_handler_disconnect (window, data->tab_added_handler_id);
g_signal_handler_disconnect (window, data->tab_removed_handler_id);
views = xed_window_get_views (window);
for (l = views; l != NULL; l = l->next)
{
disconnect_handlers (XED_VIEW (l->data));
modeline_parser_deactivate (GTK_SOURCE_VIEW (l->data));
}
g_list_free (views);
g_signal_handler_disconnect (doc, plugin->priv->document_loaded_handler_id);
g_signal_handler_disconnect (doc, plugin->priv->document_saved_handler_id);
}
static void
@@ -292,35 +191,35 @@ xed_modeline_plugin_class_init (XedModelinePluginClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->constructed = xed_modeline_plugin_constructed;
object_class->finalize = xed_modeline_plugin_finalize;
object_class->dispose = xed_modeline_plugin_dispose;
object_class->finalize = xed_modeline_plugin_finalize;
object_class->set_property = xed_modeline_plugin_set_property;
object_class->get_property = xed_modeline_plugin_get_property;
g_object_class_override_property (object_class, PROP_OBJECT, "object");
g_object_class_override_property (object_class, PROP_VIEW, "view");
g_type_class_add_private (klass, sizeof (XedModelinePluginPrivate));
}
static void
xed_view_activatable_iface_init (XedViewActivatableInterface *iface)
{
iface->activate = xed_modeline_plugin_activate;
iface->deactivate = xed_modeline_plugin_deactivate;
}
static void
xed_modeline_plugin_class_finalize (XedModelinePluginClass *klass)
{
/* dummy function - used by G_DEFINE_DYNAMIC_TYPE_EXTENDED */
}
static void
peas_activatable_iface_init (PeasActivatableInterface *iface)
{
iface->activate = xed_modeline_plugin_activate;
iface->deactivate = xed_modeline_plugin_deactivate;
}
G_MODULE_EXPORT void
peas_register_types (PeasObjectModule *module)
{
xed_modeline_plugin_register_type (G_TYPE_MODULE (module));
peas_object_module_register_extension_type (module,
PEAS_TYPE_ACTIVATABLE,
XED_TYPE_VIEW_ACTIVATABLE,
XED_TYPE_MODELINE_PLUGIN);
}

3
plugins/modelines/xed-modeline-plugin.h
View File

@@ -39,10 +39,11 @@ G_BEGIN_DECLS
/* Private structure type */
typedef struct _XedModelinePlugin XedModelinePlugin;
typedef struct _XedModelinePluginPrivate XedModelinePluginPrivate;
typedef struct _XedModelinePluginClass XedModelinePluginClass;
struct _XedModelinePlugin
{
PeasExtensionBase parent_instance;
PeasExtensionBase parent;
/*< private >*/
XedModelinePluginPrivate *priv;