[geany/geany-plugins] 4eb3c9: Merge pull request #112 from scriptum/defineformat

Frank Lanitz git-noreply at xxxxx
Tue Oct 22 17:54:32 UTC 2013


Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   Frank Lanitz <frank at frank.uvena.de>
Date:        Tue, 22 Oct 2013 17:54:32 UTC
Commit:      4eb3c916eac89c54a876972d375513215b17c0a5
             https://github.com/geany/geany-plugins/commit/4eb3c916eac89c54a876972d375513215b17c0a5

Log Message:
-----------
Merge pull request #112 from scriptum/defineformat

Defineformat: new plugin that helps with multiline defines in C-like languages


Modified Paths:
--------------
    MAINTAINERS
    Makefile.am
    README
    build/defineformat.m4
    configure.ac
    defineformat/AUTHORS
    defineformat/COPYING
    defineformat/ChangeLog
    defineformat/Makefile.am
    defineformat/NEWS
    defineformat/README
    defineformat/src/Makefile.am
    defineformat/src/defineformat.c
    po/POTFILES.in

Modified: MAINTAINERS
6 files changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -42,6 +42,12 @@ M: Alexander Petukhov <devel at apetukhov.ru>
 W: http://plugins.geany.org/debugger.html
 S: Maintained
 
+defineformat
+P: Pavel Roschin <rpg89(at)post(dot)ru>
+M: Pavel Roschin <rpg89(at)post(dot)ru>
+W: http://plugins.geany.org/defineformat.html
+S: Maintained
+
 devhelp
 P: Matthew Brush <matt at geany.org>
 M: Matthew Brush <matt at geany.org>


Modified: Makefile.am
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -22,6 +22,10 @@ if ENABLE_DEBUGGER
 SUBDIRS += debugger
 endif
 
+if ENABLE_DEFINEFORMAT
+SUBDIRS += defineformat
+endif
+
 if ENABLE_DEVHELP
 SUBDIRS += devhelp
 endif


Modified: README
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -45,6 +45,7 @@ Available plugins are:
 * codenav -- the CodeNav plugin
 * commander -- the Commander plugin
 * debugger -- the Debugger plugin
+* defineformat -- the Defineformat plugin
 * devhelp -- the devhelp plugin
 * geanydoc -- the GeanyDoc plugin
 * geanyextrasel -- the GeanyExtraSel plugin


Modified: build/defineformat.m4
11 files changed, 11 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,11 @@
+AC_DEFUN([GP_CHECK_DEFINEFORMAT],
+[
+    GP_ARG_DISABLE([Defineformat], [auto])
+    GP_CHECK_PLUGIN_DEPS([Defineformat], [DEFINEFORMAT],
+                         [$GP_GTK_PACKAGE >= 2.8])
+    GP_COMMIT_PLUGIN_STATUS([Defineformat])
+    AC_CONFIG_FILES([
+        defineformat/Makefile
+        defineformat/src/Makefile
+    ])
+])


Modified: configure.ac
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -30,6 +30,7 @@ GP_CHECK_AUTOCLOSE
 GP_CHECK_CODENAV
 GP_CHECK_COMMANDER
 GP_CHECK_DEBUGGER
+GP_CHECK_DEFINEFORMAT
 GP_CHECK_DEVHELP
 GP_CHECK_GEANYDOC
 GP_CHECK_GEANYEXTRASEL


Modified: defineformat/AUTHORS
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1 @@
+Pavel Roschin <rpg89(at)post(dot)ru>


Modified: defineformat/COPYING
339 files changed, 339 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.


Modified: defineformat/ChangeLog
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1 @@
+


Modified: defineformat/Makefile.am
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,4 @@
+include $(top_srcdir)/build/vars.auxfiles.mk
+
+SUBDIRS = src
+plugin = defineformat


Modified: defineformat/NEWS
0 files changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online


Modified: defineformat/README
28 files changed, 28 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,28 @@
+Defineformat
+============
+
+.. contents::
+
+About
+-----
+
+Defineformat -- on-the-fly #define prettyprinter. This plugin will help you to
+write multiline defines with aligned backslash.
+
+Usage
+-----
+
+After installed successfully, load the plugin in Geany's plugin manager.
+Try it: open C/C++ file and type:
+
+#define A() do { \
+
+Requirements
+------------
+
+* GTK >= 2.8.0
+
+Contact developers
+------------------
+
+Pavel Roschin <rpg89(at)post(dot)ru>


Modified: defineformat/src/Makefile.am
8 files changed, 8 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/vars.build.mk
+
+geanyplugins_LTLIBRARIES = defineformat.la
+
+defineformat_la_SOURCES = defineformat.c
+defineformat_la_LIBADD = $(COMMONLIBS)
+
+include $(top_srcdir)/build/cppcheck.mk


Modified: defineformat/src/defineformat.c
263 files changed, 263 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,263 @@
+/*      defineformat.c
+ *
+ *      Copyright 2013 Pavel Roschin <rpg89(at)post(dot)ru>
+ *
+ *      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.
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "config.h" /* for the gettext domain */
+#endif
+
+#include <string.h>
+#ifdef HAVE_LOCALE_H
+	#include <locale.h>
+#endif
+
+#include <gdk/gdkkeysyms.h>
+
+#include <geanyplugin.h>
+#include <geany.h>
+
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+/* #define DEBUG */
+
+#ifdef DEBUG
+#define dprintf(arg...) fprintf(stderr, arg)
+#else
+#define dprintf(...);
+#endif
+
+#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l)
+
+GeanyPlugin		*geany_plugin;
+GeanyData		*geany_data;
+GeanyFunctions		*geany_functions;
+
+PLUGIN_VERSION_CHECK(216)
+PLUGIN_SET_TRANSLATABLE_INFO(
+	LOCALEDIR,
+	GETTEXT_PACKAGE,
+	_("Define formatter"),
+	_("Automatically align backslash in multi-line defines"),
+	"0.1",
+	"Pavel Roschin <rpg89(at)post(dot)ru>")
+
+static GArray *lines_stack = NULL;
+
+static gint
+get_line_end(ScintillaObject *sci, gint line)
+{
+	gint end;
+	gchar ch;
+	end = sci_get_line_end_position(sci, line);
+	ch = sci_get_char_at(sci, end - 1);
+	while(ch == ' ' || ch == '\t')
+	{
+		end--;
+		ch = sci_get_char_at(sci, end - 1);
+	}
+	return end;
+}
+
+static gint
+get_indent_pos(ScintillaObject *sci, gint line)
+{
+	return (gint)SSM(sci, SCI_GETLINEINDENTPOSITION, (uptr_t)line, 0);
+}
+
+static const gchar *
+get_char_range(ScintillaObject *sci, gint start, gint length)
+{
+	return (const gchar *) SSM(sci, SCI_GETRANGEPOINTER, start, length);
+}
+
+static gboolean
+inside_define(ScintillaObject *sci, gint line, gboolean newline)
+{
+	gint    lexer;
+	gint    start_pos;
+	gint    end_pos;
+	gchar   end_char;
+
+	lexer = sci_get_lexer(sci);
+	if(lexer != SCLEX_CPP)
+		return FALSE;
+
+	end_pos = get_line_end(sci, line);
+	end_char = sci_get_char_at(sci, end_pos - 1);
+	if(end_char != '\\')
+	{
+		dprintf("End char is not \\, exit\n");
+		return FALSE;
+	}
+	if(newline)
+		line--;
+	do {
+		line--;
+		end_pos = get_line_end(sci, line);
+		end_char = sci_get_char_at(sci, end_pos - 1);
+	} while(end_char == '\\' && line >= 0);
+	line++;
+	dprintf("Expecting define on line %d\n", line + 1);
+	start_pos = (gint)SSM(sci, SCI_GETLINEINDENTPOSITION, (uptr_t)line, 0);
+	end_pos = sci_get_line_end_position(sci, line);
+	if(start_pos == end_pos)
+	{
+		dprintf("line empty, exit\n");
+		return FALSE;
+	}
+	const gchar *start_line = get_char_range(sci, start_pos, 7);
+	g_return_val_if_fail(NULL != start_line, FALSE);
+	if(0 != strncmp(start_line, "#define ", strlen("#define ")))
+	{
+		dprintf("Start line is not \"#define\", exit\n");
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static void
+define_format_newline(ScintillaObject *sci)
+{
+	gint    end_pos;
+	gint    line;
+
+	line = sci_get_current_line(sci);
+	if(!inside_define(sci, line, TRUE))
+		return;
+	line--;
+	end_pos = sci_get_line_end_position(sci, line);
+	sci_insert_text(sci, end_pos,  "\\");
+	line += 2;
+	dprintf("Added line: %d\n", line);
+	g_array_append_val(lines_stack, line);
+}
+
+static void
+define_format_line(ScintillaObject *sci, gint current_line)
+{
+	gint    length;
+	gint    first_line;
+	gint    first_end;
+	gint    max = geany_data->editor_prefs->long_line_column;
+
+	if(!inside_define(sci, current_line, FALSE))
+		return;
+
+	first_line = current_line;
+	first_end = get_line_end(sci, first_line);
+	for (first_end--; sci_get_char_at(sci, first_end - 1) == ' '; first_end--) {}
+	SSM(sci, SCI_DELETERANGE, first_end, sci_get_line_end_position(sci, first_line) - first_end);
+	length = first_end - get_indent_pos(sci, first_line) + sci_get_line_indentation(sci, first_line);
+	for(; length < max - 1; length++, first_end++)
+		sci_insert_text(sci, first_end, " ");
+	sci_insert_text(sci, first_end, "\\");
+}
+
+static gboolean
+editor_notify_cb(GObject *object, GeanyEditor *editor, SCNotification *nt, gpointer data)
+{
+	gint i = 0, val;
+	gint old_position = 0;
+	gint old_lposition = 0;
+	gint old_line = 0;
+	gint pos;
+	if(NULL == editor || NULL == editor->sci)
+		return FALSE;
+	if(nt->nmhdr.code == SCN_CHARADDED)
+	{
+		if('\n' == nt->ch)
+			define_format_newline(editor->sci);
+	}
+	if(nt->nmhdr.code == SCN_UPDATEUI)
+	{
+		if(g_array_index(lines_stack, gint, 0))
+		{
+			/* save current position */
+			old_line = sci_get_current_line(editor->sci);
+			old_lposition = sci_get_line_end_position(editor->sci, old_line) - sci_get_line_length(editor->sci, old_line);
+			old_position = sci_get_current_position(editor->sci);
+			sci_start_undo_action(editor->sci);
+		}
+		while((val = g_array_index(lines_stack, gint, i)))
+		{
+			i++;
+			define_format_line(editor->sci, val - 1);
+			dprintf("Removed from stack: %d\n", val);
+		}
+		if(i > 0)
+		{
+			sci_end_undo_action(editor->sci);
+			g_array_remove_range(lines_stack, 0, i);
+			/* restore current position */
+			pos = sci_get_line_end_position(editor->sci, old_line) - sci_get_line_length(editor->sci, old_line);
+			sci_set_current_position(editor->sci, old_position + pos - old_lposition, FALSE);
+		}
+	}
+	if(nt->nmhdr.code == SCN_MODIFIED)
+	{
+		if(nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT))
+		{
+			if(nt->modificationType & (SC_PERFORMED_UNDO | SC_PERFORMED_REDO))
+				return FALSE;
+			gint line = sci_get_line_from_position(editor->sci, nt->position) + 1;
+			if(sci_get_char_at(editor->sci, get_line_end(editor->sci, line - 1) - 1) == '\\')
+			{
+				gboolean found = FALSE;
+				while((val = g_array_index(lines_stack, gint, i)))
+				{
+					if(val == line)
+					{
+						found = TRUE;
+						break;
+					}
+					i++;
+				}
+				if(!found)
+				{
+					dprintf("Added line: %d\n", line);
+					g_array_append_val(lines_stack, line);
+				}
+			}
+		}
+	}
+	return FALSE;
+}
+
+PluginCallback plugin_callbacks[] =
+{
+	{ "editor-notify", (GCallback) &editor_notify_cb, FALSE, NULL },
+	{ NULL, NULL, FALSE, NULL }
+};
+
+void plugin_init(GeanyData *data)
+{
+	lines_stack = g_array_new (TRUE, FALSE, sizeof(gint));
+}
+
+void plugin_cleanup(void)
+{
+	g_array_free(lines_stack, TRUE);
+}
+
+void
+plugin_help(void)
+{
+	utils_open_browser("http://plugins.geany.org/defineformat.html");
+}


Modified: po/POTFILES.in
3 files changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -52,6 +52,9 @@ debugger/src/pixbuf.h
 debugger/src/atree.h
 debugger/src/atree.c
 
+# defineformat
+defineformat/src/defineformat.c
+
 # devhelp
 devhelp/src/dhp.h
 devhelp/src/dhp-object.c



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Plugins-Commits mailing list