SF.net SVN: geany:[2906] branches/split-window-plugin
ntrel at users.sourceforge.net
ntrel at xxxxx
Tue Aug 26 15:58:08 UTC 2008
Revision: 2906
http://geany.svn.sourceforge.net/geany/?rev=2906&view=rev
Author: ntrel
Date: 2008-08-26 15:58:07 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
Add Split Window plugin (work-in-progress).
Modified Paths:
--------------
branches/split-window-plugin/ChangeLog
branches/split-window-plugin/plugins/Makefile.am
branches/split-window-plugin/plugins/makefile.win32
branches/split-window-plugin/po/POTFILES.in
branches/split-window-plugin/src/plugindata.h
branches/split-window-plugin/src/plugins.c
Added Paths:
-----------
branches/split-window-plugin/plugins/splitwindow.c
Modified: branches/split-window-plugin/ChangeLog
===================================================================
--- branches/split-window-plugin/ChangeLog 2008-08-26 15:25:50 UTC (rev 2905)
+++ branches/split-window-plugin/ChangeLog 2008-08-26 15:58:07 UTC (rev 2906)
@@ -1,5 +1,12 @@
2008-08-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * src/plugindata.h, src/plugins.c, po/POTFILES.in,
+ plugins/splitwindow.c, plugins/Makefile.am, plugins/makefile.win32:
+ Add Split Window plugin (work-in-progress).
+
+
+2008-08-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
* src/highlighting.c:
Add assert statements to check that the StyleSet styling arrays are
not exceeded.
Modified: branches/split-window-plugin/plugins/Makefile.am
===================================================================
--- branches/split-window-plugin/plugins/Makefile.am 2008-08-26 15:25:50 UTC (rev 2905)
+++ branches/split-window-plugin/plugins/Makefile.am 2008-08-26 15:58:07 UTC (rev 2906)
@@ -16,6 +16,7 @@
vcdiff_la_LDFLAGS = -module -avoid-version
autosave_la_LDFLAGS = -module -avoid-version
filebrowser_la_LDFLAGS = -module -avoid-version
+splitwindow_la_LDFLAGS = -module -avoid-version
if PLUGINS
@@ -26,7 +27,8 @@
export.la \
vcdiff.la \
autosave.la \
- filebrowser.la
+ filebrowser.la \
+ splitwindow.la
# Plugins not to be installed
noinst_LTLIBRARIES = \
@@ -39,6 +41,7 @@
vcdiff_la_SOURCES = vcdiff.c
autosave_la_SOURCES = autosave.c
filebrowser_la_SOURCES = filebrowser.c
+splitwindow_la_SOURCES = splitwindow.c
# instead of linking against all in $(GTK_LIBS), we link only against needed libs
demoplugin_la_LIBADD = $(GTK_LIBS)
@@ -48,6 +51,7 @@
vcdiff_la_LIBADD = $(GTK_LIBS)
autosave_la_LIBADD = $(GTK_LIBS)
filebrowser_la_LIBADD = $(GTK_LIBS)
+splitwindow_la_LIBADD = $(GTK_LIBS)
endif # PLUGINS
Modified: branches/split-window-plugin/plugins/makefile.win32
===================================================================
--- branches/split-window-plugin/plugins/makefile.win32 2008-08-26 15:25:50 UTC (rev 2905)
+++ branches/split-window-plugin/plugins/makefile.win32 2008-08-26 15:58:07 UTC (rev 2906)
@@ -54,6 +54,7 @@
demoplugin.dll \
classbuilder.dll \
export.dll \
+ splitwindow.dll \
vcdiff.dll \
autosave.dll \
filebrowser.dll
Added: branches/split-window-plugin/plugins/splitwindow.c
===================================================================
--- branches/split-window-plugin/plugins/splitwindow.c (rev 0)
+++ branches/split-window-plugin/plugins/splitwindow.c 2008-08-26 15:58:07 UTC (rev 2906)
@@ -0,0 +1,194 @@
+/*
+ * splitview.c
+ *
+ * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)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 2 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "geany.h"
+#include <glib/gi18n.h>
+#include "Scintilla.h"
+#include "ScintillaWidget.h"
+#include "SciLexer.h"
+
+#include "ui_utils.h"
+#include "document.h"
+#include "editor.h"
+#include "plugindata.h"
+#include "pluginmacros.h"
+
+
+PLUGIN_VERSION_CHECK(76)
+PLUGIN_SET_INFO(_("Split Window"), _("Splits the editor view into two windows."),
+ "0.1", _("The Geany developer team"))
+
+
+GeanyData *geany_data;
+GeanyFunctions *geany_functions;
+
+static GeanyEditor *our_editor = NULL;
+
+
+static gint sci_get_value(ScintillaObject *sci, gint message_id, gint param)
+{
+ return p_sci->send_message(sci, message_id, param, 0);
+}
+
+
+static void set_styles(ScintillaObject *oldsci, ScintillaObject *newsci)
+{
+ gint style_id;
+
+ for (style_id = 0; style_id <= 127; style_id++)
+ {
+ gint val;
+
+ val = sci_get_value(oldsci, SCI_STYLEGETFORE, style_id);
+ p_sci->send_message(newsci, SCI_STYLESETFORE, style_id, val);
+ val = sci_get_value(oldsci, SCI_STYLEGETBACK, style_id);
+ p_sci->send_message(newsci, SCI_STYLESETBACK, style_id, val);
+ val = sci_get_value(oldsci, SCI_STYLEGETBOLD, style_id);
+ p_sci->send_message(newsci, SCI_STYLESETBOLD, style_id, val);
+ val = sci_get_value(oldsci, SCI_STYLEGETITALIC, style_id);
+ p_sci->send_message(newsci, SCI_STYLESETITALIC, style_id, val);
+ }
+}
+
+
+static void sci_set_font(ScintillaObject *sci, gint style, const gchar *font,
+ G_GNUC_UNUSED gint size)
+{
+ p_sci->send_message(sci, SCI_STYLESETFONT, style, (sptr_t) font);
+ p_sci->send_message(sci, SCI_STYLESETSIZE, style, size);
+}
+
+
+static void set_font(ScintillaObject *sci, const gchar *font_name, gint size)
+{
+ gint style;
+
+ for (style = 0; style <= 127; style++)
+ sci_set_font(sci, style, font_name, size);
+ /* line number and braces */
+ sci_set_font(sci, STYLE_LINENUMBER, font_name, size);
+ sci_set_font(sci, STYLE_BRACELIGHT, font_name, size);
+ sci_set_font(sci, STYLE_BRACEBAD, font_name, size);
+}
+
+
+static void update_font(ScintillaObject *sci, const gchar *font_name, gint size)
+{
+ gchar *fname;
+ PangoFontDescription *font_desc;
+
+ g_return_if_fail(font_name != NULL);
+
+ font_desc = pango_font_description_from_string(font_name);
+
+ fname = g_strdup_printf("!%s", pango_font_description_get_family(font_desc));
+ size = pango_font_description_get_size(font_desc) / PANGO_SCALE;
+
+ set_font(sci, fname, size);
+
+ g_free(fname);
+ pango_font_description_free(font_desc);
+}
+
+
+/* line numbers visibility */
+static void set_line_numbers(ScintillaObject * sci, gboolean set, gint extra_width)
+{
+ if (set)
+ {
+ gchar tmp_str[15];
+ gint len = p_sci->send_message(sci, SCI_GETLINECOUNT, 0, 0);
+ gint width;
+ g_snprintf(tmp_str, 15, "_%d%d", len, extra_width);
+ width = p_sci->send_message(sci, SCI_TEXTWIDTH, STYLE_LINENUMBER, (sptr_t) tmp_str);
+ p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 0, width);
+ p_sci->send_message(sci, SCI_SETMARGINSENSITIVEN, 0, FALSE); /* use default behaviour */
+ }
+ else
+ {
+ p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 0, 0 );
+ }
+}
+
+
+static void update_view(ScintillaObject *sci)
+{
+ ScintillaObject *current = p_document->get_current()->editor->sci;
+ gint lexer;
+
+ update_font(sci, geany->interface_prefs->editor_font, 0);
+
+ lexer = p_sci->send_message(current, SCI_GETLEXER, 0, 0);
+ p_sci->send_message(sci, SCI_SETLEXER, lexer, 0);
+ set_styles(current, sci);
+
+ set_line_numbers(sci, TRUE, 0);
+ p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin */
+}
+
+
+static void on_split_view(GtkMenuItem *menuitem, GeanyData *data)
+{
+ GtkWidget *notebook = data->main_widgets->notebook;
+ GtkWidget *parent = gtk_widget_get_parent(notebook);
+ GtkWidget *pane;
+ GeanyDocument *doc = p_document->get_current();
+ ScintillaObject *sci;
+ gpointer sdoc;
+
+ g_return_if_fail(doc);
+ g_return_if_fail(our_editor == NULL);
+
+ /* reparent document notebook */
+ g_object_ref(notebook);
+ gtk_container_remove(GTK_CONTAINER(parent), notebook);
+ pane = gtk_hpaned_new();
+ gtk_container_add(GTK_CONTAINER(parent), pane);
+ gtk_paned_add1(GTK_PANED(pane), notebook);
+ g_object_unref(notebook);
+
+ sci = doc->editor->sci;
+ sdoc = (gpointer) p_sci->send_message(sci, SCI_GETDOCPOINTER, 0, 0);
+ our_editor = p_editor->create(doc);
+ sci = our_editor->sci;
+ p_sci->send_message(sci, SCI_SETDOCPOINTER, 0, GPOINTER_TO_INT(sdoc));
+ update_view(sci);
+ gtk_paned_add2(GTK_PANED(pane), GTK_WIDGET(sci));
+ gtk_widget_show_all(pane);
+}
+
+
+void plugin_init(GeanyData *data)
+{
+ GtkWidget *item = gtk_menu_item_new_with_mnemonic(_("_Split Horizontally"));
+
+ gtk_widget_show(item);
+ gtk_menu_append(data->main_widgets->tools_menu, item);
+ g_signal_connect(item, "activate", G_CALLBACK(on_split_view), data);
+}
+
+
+void plugin_cleanup()
+{
+ if (our_editor)
+ p_editor->destroy(our_editor);
+ /* TODO: reparent doc notebook etc */
+}
Property changes on: branches/split-window-plugin/plugins/splitwindow.c
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: branches/split-window-plugin/po/POTFILES.in
===================================================================
--- branches/split-window-plugin/po/POTFILES.in 2008-08-26 15:25:50 UTC (rev 2905)
+++ branches/split-window-plugin/po/POTFILES.in 2008-08-26 15:58:07 UTC (rev 2906)
@@ -42,3 +42,4 @@
plugins/vcdiff.c
plugins/filebrowser.c
plugins/autosave.c
+plugins/splitwindow.c
Modified: branches/split-window-plugin/src/plugindata.h
===================================================================
--- branches/split-window-plugin/src/plugindata.h 2008-08-26 15:25:50 UTC (rev 2905)
+++ branches/split-window-plugin/src/plugindata.h 2008-08-26 15:58:07 UTC (rev 2906)
@@ -41,7 +41,7 @@
enum {
/** The Application Programming Interface (API) version, incremented
* whenever any plugin data types are modified or appended to. */
- GEANY_API_VERSION = 89,
+ GEANY_API_VERSION = 90,
/** The Application Binary Interface (ABI) version, incremented whenever
* existing fields in the plugin data types have to be changed or reordered. */
@@ -455,6 +455,8 @@
void (*clear_indicators) (struct GeanyEditor *editor);
const struct GeanyIndentPrefs* (*get_indent_prefs)(struct GeanyEditor *editor);
+ struct GeanyEditor* (*create)(struct GeanyDocument *doc);
+ void (*destroy)(struct GeanyEditor *editor);
/* Remember to convert any GeanyDocument or ScintillaObject pointers in any
* appended functions to GeanyEditor pointers. */
}
Modified: branches/split-window-plugin/src/plugins.c
===================================================================
--- branches/split-window-plugin/src/plugins.c 2008-08-26 15:25:50 UTC (rev 2905)
+++ branches/split-window-plugin/src/plugins.c 2008-08-26 15:58:07 UTC (rev 2906)
@@ -115,7 +115,9 @@
&editor_set_indicator,
&editor_set_indicator_on_line,
&editor_clear_indicators,
- &editor_get_indent_prefs
+ &editor_get_indent_prefs,
+ &editor_create,
+ &editor_destroy
};
static ScintillaFuncs sci_funcs = {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list