Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Wed, 26 Jun 2013 07:07:52 UTC
Commit: 3d21dc1bb97dbb1e5f3b052eda78e3d660099d0c
https://github.com/geany/geany-plugins/commit/3d21dc1bb97dbb1e5f3b052eda78e…
Log Message:
-----------
Fix a litle typo
Modified Paths:
--------------
README
Modified: README
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -38,7 +38,7 @@ automatically based on whether the dependency exists on your system.
to fail with an error message if you have missing
dependencies. --disable-<option> causes the feature to be forcefully disabled.
-Avaialble plugins are:
+Available plugins are:
* addons -- the Addons plugin
* autoclose -- the Autoclose plugin
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 24 Jun 2013 22:27:22 UTC
Commit: b8c381b3c4c149be9863f7f5c4b6891e637b7f76
https://github.com/geany/geany-plugins/commit/b8c381b3c4c149be9863f7f5c4b68…
Log Message:
-----------
GeanyPy: Properly handle the absence of PyGTK
GeanyPy can be disabled automatically because of missing dependencies,
for real this time.
Modified Paths:
--------------
build/geanypy.m4
Modified: build/geanypy.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@ AC_DEFUN([GP_CHECK_GEANYPY],
[
GP_ARG_DISABLE([Geanypy], [auto])
GP_CHECK_PLUGIN_GTK2_ONLY([Geanypy])
- PKG_CHECK_MODULES([PYGTK], [pygtk-2.0])
+ GP_CHECK_PLUGIN_DEPS([Geanypy], [PYGTK], [pygtk-2.0])
dnl FIXME: Checks for Python below should gracefully disable the plugin
dnl if they don't succeed and enable_geanypy is set to `auto`.
dnl However, since these macros don't seem to gracefully handle
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 17 Jun 2013 20:10:18 UTC
Commit: e4276ee12e7c98d904d1e704d4560c5b750098ac
https://github.com/geany/geany-plugins/commit/e4276ee12e7c98d904d1e704d4560…
Log Message:
-----------
Autotools: Do not make a positive decision from GP_CHECK_PLUGIN_DEPS()
GP_CHECK_PLUGIN_DEPS() must never force-enable a plugin by setting
enable_$plugin=yes, even if the plugin was in auto mode and the
dependencies are met; otherwise a further check would assume the
user forcefully enabled the plugin, and then would abort if it failed.
So, only disable the plugin or error out, but never enable it. This
allows e.g. successive calls with one failing:
GP_CHECK_PLUGIN_DEPS(myplugin, A, existing-package)
GP_CHECK_PLUGIN_DEPS(myplugin, B, missing-package)
This should disable plugin "myplugin" by default; but it would have
had aborted on the second check because the first one would have set
"enable_myplugin" to "yes" instead of "auto".
Modified Paths:
--------------
build/common.m4
Modified: build/common.m4
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -14,8 +14,8 @@ AC_DEFUN([GP_ARG_DISABLE],
])
dnl GP_CHECK_PLUGIN_DEPS(PluginName, VARIABLE-PREFIX, modules...)
-dnl Checks whether modules exist using PKG_CHECK_MODULES, and enables/disables
-dnl plugins appropriately if enable_$plugin=auto
+dnl Checks whether modules exist using PKG_CHECK_MODULES, and error
+dnl out/disables plugins appropriately depending on enable_$plugin
AC_DEFUN([GP_CHECK_PLUGIN_DEPS],
[
AC_REQUIRE([GP_CHECK_GTK_VERSION])
@@ -29,7 +29,7 @@ AC_DEFUN([GP_CHECK_PLUGIN_DEPS],
PKG_CHECK_MODULES([$2], [$3])
elif test "$m4_tolower(AS_TR_SH(enable_$1))" = "auto"; then
PKG_CHECK_MODULES([$2], [$3],
- [m4_tolower(AS_TR_SH(enable_$1))=yes],
+ [],
[m4_tolower(AS_TR_SH(enable_$1))=no])
fi
])
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 17 Jun 2013 20:10:18 UTC
Commit: d52b48c29cbe7807c6463d188ab38913c360c12e
https://github.com/geany/geany-plugins/commit/d52b48c29cbe7807c6463d188ab38…
Log Message:
-----------
GeanyPy: Properly honor disabling/automatic choice with Autotools
Modified Paths:
--------------
build/geanypy.m4
Modified: build/geanypy.m4
24 files changed, 16 insertions(+), 8 deletions(-)
===================================================================
@@ -2,15 +2,23 @@ AC_DEFUN([GP_CHECK_GEANYPY],
[
GP_ARG_DISABLE([Geanypy], [auto])
GP_CHECK_PLUGIN_GTK2_ONLY([Geanypy])
- GP_COMMIT_PLUGIN_STATUS([Geanypy])
PKG_CHECK_MODULES([PYGTK], [pygtk-2.0])
- AX_PYTHON_DEVEL([>= '2.6'])
- AX_PYTHON_LIBRARY(,[AC_MSG_ERROR([Cannot find Python library])])
- AC_SUBST([PYTHON])
- AC_DEFINE_UNQUOTED(
- [GEANYPY_PYTHON_LIBRARY],
- ["$PYTHON_LIBRARY"],
- [Location of Python library to dlopen()])
+ dnl FIXME: Checks for Python below should gracefully disable the plugin
+ dnl if they don't succeed and enable_geanypy is set to `auto`.
+ dnl However, since these macros don't seem to gracefully handle
+ dnl failure, and since if PyGTK is found they are likely to succeed
+ dnl anyway, we assume that if the plugin is not disabled at this
+ dnl point it is OK for these checks to be fatal. The user can pass
+ dnl always pass --disable-geanypy anyway.
+ AS_IF([! test x$enable_geanypy = xno], [
+ AX_PYTHON_DEVEL([>= '2.6'])
+ AX_PYTHON_LIBRARY(,[AC_MSG_ERROR([Cannot find Python library])])
+ AC_SUBST([PYTHON])
+ AC_DEFINE_UNQUOTED([GEANYPY_PYTHON_LIBRARY],
+ ["$PYTHON_LIBRARY"],
+ [Location of Python library to dlopen()])
+ ])
+ GP_COMMIT_PLUGIN_STATUS([Geanypy])
AC_CONFIG_FILES([
geanypy/Makefile
geanypy/src/Makefile
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Mon, 17 Jun 2013 17:58:23 UTC
Commit: cecaa3ff1ce1fe7a3fdcd0af979c88c68520ef4c
https://github.com/geany/geany-plugins/commit/cecaa3ff1ce1fe7a3fdcd0af979c8…
Log Message:
-----------
Remove check while typing idle callback when unloading the plugin
This could fix SF bug #96, I assume the callback ran while Geany was already
about to quit and so the crash.
Modified Paths:
--------------
spellcheck/src/gui.c
Modified: spellcheck/src/gui.c
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -651,4 +651,8 @@ void sc_gui_init(void)
void sc_gui_free(void)
{
g_free(clickinfo.word);
+ if (check_line_data.check_while_typing_idle_source_id != 0)
+ {
+ g_source_remove(check_line_data.check_while_typing_idle_source_id);
+ }
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Sun, 16 Jun 2013 12:47:22 UTC
Commit: 2070283f9e576dee3326157792a05d3092427b59
https://github.com/geany/geany-plugins/commit/2070283f9e576dee3326157792a05…
Log Message:
-----------
Merge pull request #106 from scriptum/autoclose-plugin
Add autoclose plugin
Modified Paths:
--------------
MAINTAINERS
Makefile.am
README
autoclose/AUTHORS
autoclose/COPYING
autoclose/ChangeLog
autoclose/Makefile.am
autoclose/NEWS
autoclose/README
autoclose/src/Makefile.am
autoclose/src/autoclose.c
build/autoclose.m4
configure.ac
po/POTFILES.in
Modified: MAINTAINERS
6 files changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -17,6 +17,12 @@ M: Enrico Tröger <enrico.troeger(a)uvena.de>
W: http://plugins.geany.org/addons.html
S: Maintained
+autoclose
+P: Pavel Roschin <rpg89(a)post.ru>
+M: Pavel Roschin <rpg89(a)post.ru>
+W:
+S: Maintained
+
codenav
P:
M:
Modified: Makefile.am
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -6,6 +6,10 @@ if ENABLE_ADDONS
SUBDIRS += addons
endif
+if ENABLE_AUTOCLOSE
+SUBDIRS += autoclose
+endif
+
if ENABLE_CODENAV
SUBDIRS += codenav
endif
Modified: README
3 files changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -5,7 +5,7 @@ Geany-Plugins
Installation
------------
-You can build the plugins using either autotools or waf.
+You can build the plugins using either autotools or waf.
Building with autotools
^^^^^^^^^^^^^^^^^^^^^^^
@@ -41,6 +41,7 @@ dependencies. --disable-<option> causes the feature to be forcefully disabled.
Avaialble plugins are:
* addons -- the Addons plugin
+* autoclose -- the Autoclose plugin
* codenav -- the CodeNav plugin
* commander -- the Commander plugin
* debugger -- the Debugger plugin
Modified: autoclose/AUTHORS
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1 @@
+Pavel Roschin <rpg89(a)post.ru>
Modified: autoclose/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: autoclose/ChangeLog
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1 @@
+
Modified: autoclose/Makefile.am
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,4 @@
+include $(top_srcdir)/build/vars.auxfiles.mk
+
+SUBDIRS = src
+plugin = autoclose
Modified: autoclose/NEWS
0 files changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: autoclose/README
49 files changed, 49 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,49 @@
+Auto-close brackets
+=================
+
+.. contents::
+
+About
+-----
+
+Plugin enables auto-closing features.
+
+Features
+--------
+
+* auto-close for: { }, [ ], ( ), " ", ' ', < >, ` `
+* customizeable auto-closing inside strings and comments
+* delete pairing character if you pressed BackSpace
+* suppress inserting one char twice (if you type "{}" you will get "{}", not
+ "{}}")
+* enclose selected text into brackets instead of removing selection (select
+ text and type "(" or ")" to enclose selection into "()")
+* keep selection when enclosing
+* for C-like languages enclosing selection into "{}" makes auto-indentation
+ (select text and type "{" or "}" - text will be enclosed and indented)
+* enclosing in {} moves cursor to beginning (before "{" character)
+* for C-like languages to insert {}-block you do not need to select text
+ precisely: plugin detects boundaries automatically, just ensure that selection
+ covers lines you need to indent (works like TAB indentation)
+* fix auto-indent inside {} (makes full indent for this block)
+* auto-close curly bracket by pressing Enter
+* auto-close functions ("sin(|" -> "sin(|);") with doubling suppression
+ (for C/C++ languages only)
+* correctly set undo actions
+
+Usage
+-----
+
+After installed successfully, load the plugin in Geany's plugin manager
+and new menu items in the Edit menu will appear. You can
+change the keyboard shortcuts in Geany's preferences dialog.
+
+Requirements
+------------
+
+* GTK >= 2.8.0
+
+Contact developers
+------------------
+
+Pavel Roschin <rpg89(a)post.ru>
Modified: autoclose/src/Makefile.am
8 files changed, 8 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/vars.build.mk
+
+geanyplugins_LTLIBRARIES = autoclose.la
+
+autoclose_la_SOURCES = autoclose.c
+autoclose_la_LIBADD = $(COMMONLIBS)
+
+include $(top_srcdir)/build/cppcheck.mk
Modified: autoclose/src/autoclose.c
631 files changed, 631 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,631 @@
+/*
+ * autoclose.c
+ *
+ * Copyright 2013 Pavel Roschin <rpg89(a)post.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 AC_STOP_ACTION TRUE
+#define AC_CONTINUE_ACTION FALSE
+#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,
+ _("Auto-close"),
+ _("Auto-close braces and brackets with lot of features"),
+ "0.1",
+ "Pavel Roschin <rpg89(a)post.ru>")
+
+typedef struct {
+ /* close chars */
+ gboolean parenthesis;
+ gboolean abracket;
+ gboolean cbracket;
+ gboolean sbracket;
+ gboolean dquote;
+ gboolean squote;
+ gboolean backquote;
+ /* settings */
+ gboolean delete_pairing_brace;
+ gboolean suppress_doubling;
+ gboolean enclose_selections;
+ gboolean comments_ac_enable;
+ gboolean comments_enclose;
+ gboolean keep_selection;
+ gboolean make_indent_for_cbracket;
+ gboolean move_cursor_to_beginning;
+ gboolean improved_cbracket_indent;
+ gboolean close_functions;
+ /* others */
+ gchar *config_file;
+} AutocloseInfo;
+
+static AutocloseInfo *ac_info = NULL;
+
+static gboolean
+lexer_has_braces(ScintillaObject *sci)
+{
+ gint lexer = sci_get_lexer(sci);
+
+ switch (lexer)
+ {
+ case SCLEX_CPP:
+ case SCLEX_D:
+ case SCLEX_HTML: /* for PHP & JS */
+ case SCLEX_PASCAL: /* for multiline comments? */
+ case SCLEX_BASH:
+ case SCLEX_PERL:
+ case SCLEX_TCL:
+ case SCLEX_CSS: /* also useful for CSS */
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
+static gboolean
+lexer_cpp_like(gint lexer, gint style)
+{
+ if(lexer == SCLEX_CPP && style == SCE_C_IDENTIFIER)
+ return TRUE;
+ return FALSE;
+}
+
+static gboolean
+check_chars(gint ch, gchar *chars_left, gchar *chars_right)
+{
+ switch(ch)
+ {
+ case '(':
+ case ')':
+ if(!ac_info->parenthesis)
+ return FALSE;
+ *chars_left = '(';
+ *chars_right = ')';
+ break;
+ case ';':
+ if(!ac_info->close_functions)
+ return FALSE;
+ break;
+ case '{':
+ case '}':
+ if(!ac_info->cbracket)
+ return FALSE;
+ *chars_left = '{';
+ *chars_right = '}';
+ break;
+ case '[':
+ case ']':
+ if(!ac_info->sbracket)
+ return FALSE;
+ *chars_left = '[';
+ *chars_right = ']';
+ break;
+ case '<':
+ case '>':
+ if(!ac_info->abracket)
+ return FALSE;
+ *chars_left = '<';
+ *chars_right = '>';
+ break;
+ case '\'':
+ if(!ac_info->squote)
+ return FALSE;
+ *chars_left = *chars_right = ch;
+ break;
+ case '"':
+ if(!ac_info->dquote)
+ return FALSE;
+ *chars_left = *chars_right = ch;
+ break;
+ case '`':
+ if(!ac_info->backquote)
+ return FALSE;
+ *chars_left = *chars_right = ch;
+ break;
+ default:
+ return FALSE;
+ }
+ return TRUE;
+}
+
+static gboolean
+improve_indent(ScintillaObject *sci, GeanyEditor *editor, gint pos)
+{
+ gint ch, ch_next;
+ gint line;
+ gint indent, indent_width;
+ gint end_pos;
+ if(!ac_info->improved_cbracket_indent)
+ return AC_CONTINUE_ACTION;
+ ch = sci_get_char_at(sci, pos - 1);
+ if(ch != '{')
+ return AC_CONTINUE_ACTION;
+ /* if curly bracket completion is enabled - just make indents
+ * but ensure that second "}" exists. If disabled - make indent
+ * and complete second curly bracket */
+ ch_next = sci_get_char_at(sci, pos);
+ if(ac_info->cbracket && ch_next != '}')
+ return AC_CONTINUE_ACTION;
+ line = sci_get_line_from_position(sci, pos);
+ indent = sci_get_line_indentation(sci, line);
+ indent_width = editor_get_indent_prefs(editor)->width;
+ sci_start_undo_action(sci);
+ if(ac_info->cbracket)
+ SSM(sci, SCI_ADDTEXT, 2, (sptr_t)"\n\n");
+ else
+ SSM(sci, SCI_ADDTEXT, 3, (sptr_t)"\n\n}");
+ sci_set_line_indentation(sci, line + 1, indent + indent_width);
+ sci_set_line_indentation(sci, line + 2, indent);
+ /* move to the end of added line */
+ end_pos = sci_get_line_end_position(sci, line + 1);
+ sci_set_current_position(sci, end_pos, TRUE);
+ sci_end_undo_action(sci);
+ /* do not alow internal auto-indenter to do the work */
+ return AC_STOP_ACTION;
+}
+
+static gboolean
+auto_close_chars(GeanyDocument *doc, GdkEventKey *event)
+{
+ ScintillaObject *sci;
+ GeanyEditor *editor;
+ gint ch, ch_next, ch_buf;
+ gchar chars_left[2] = {0, 0};
+ gchar chars_right[3] = {0, 0, 0};
+ gint i;
+ gint lexer, style;
+ gint start_line, start_pos, end_line;
+ gint start_indent, indent_width, current_indent;
+ gint selection_start, selection_end;
+ gint pos, text_end_pos, line_end_pos, pos_lex_offset;
+ gboolean has_sel;
+ gboolean in_comment;
+ gint file_type_id = 0;
+
+ if(NULL == doc)
+ return AC_CONTINUE_ACTION;
+ editor = doc->editor;
+ if(NULL == editor)
+ return AC_CONTINUE_ACTION;
+ sci = editor->sci;
+ if(NULL == sci)
+ return AC_CONTINUE_ACTION;
+ if(doc->file_type)
+ file_type_id = doc->file_type->id;
+
+ pos = sci_get_current_position(sci);
+ ch = event->keyval;
+
+ if(ch == GDK_BackSpace)
+ {
+ if(!ac_info->delete_pairing_brace)
+ return AC_CONTINUE_ACTION;
+ ch = sci_get_char_at(sci, pos - 1);
+ if(check_chars(ch, chars_left, chars_right))
+ {
+ if(chars_left [0] == ch &&
+ chars_right[0] == sci_get_char_at(sci, pos))
+ {
+ SSM(sci, SCI_DELETERANGE, pos - 1, 2);
+ return AC_STOP_ACTION;
+ }
+ return AC_CONTINUE_ACTION;
+ }
+ else
+ return AC_CONTINUE_ACTION;
+ }
+ else if(ch == GDK_Return)
+ {
+ return improve_indent(sci, editor, pos);
+ }
+
+ /* set up completion chars */
+ if(!check_chars(ch, chars_left, chars_right))
+ return AC_CONTINUE_ACTION;
+
+ has_sel = sci_has_selection(sci);
+
+ lexer = sci_get_lexer(sci);
+
+ /* in C-like languages - complete functions with ; */
+
+ pos_lex_offset = -1;
+ ch_buf = sci_get_char_at(sci, pos + pos_lex_offset);
+ while('\t' == ch_buf || ' ' == ch_buf)
+ {
+ --pos_lex_offset;
+ ch_buf = sci_get_char_at(sci, pos + pos_lex_offset);
+ }
+ style = sci_get_style_at(sci, pos + pos_lex_offset);
+ line_end_pos = sci_get_line_end_position(sci, sci_get_current_line(sci));
+
+ if(lexer_cpp_like(lexer, style) &&
+ chars_left[0] == '(' &&
+ !has_sel && ac_info->close_functions &&
+ pos == line_end_pos)
+ {
+ chars_right[1] = ';';
+ }
+
+ style = sci_get_style_at(sci, pos);
+
+ /* suppress double completion symbols */
+ ch_next = sci_get_char_at(sci, pos);
+ if(ch == ch_next && !has_sel && ac_info->suppress_doubling)
+ {
+ /*if(sci_get_char_at(sci, pos - 1) != '\\') maybe...*/
+ /* puts("Suppress double completion"); */
+ if((!highlighting_is_code_style(lexer, style)) && ch != '"' && ch != '\'')
+ return AC_CONTINUE_ACTION;
+
+ /* suppress ; only at end of line */
+ if(ch == ';' && pos + 1 != line_end_pos)
+ return AC_CONTINUE_ACTION;
+
+ sci_set_current_position(sci, pos + 1, TRUE);
+ return AC_STOP_ACTION;
+ }
+
+ if(ch == ';')
+ return AC_CONTINUE_ACTION;
+
+ /* If we have selected text */
+ if(has_sel && ac_info->enclose_selections)
+ {
+ selection_start = sci_get_selection_start(sci);
+ selection_end = sci_get_selection_end(sci);
+
+ /* case if selection covers mixed style */
+ if(highlighting_is_code_style(lexer, sci_get_style_at(sci, selection_start)) !=
+ highlighting_is_code_style(lexer, sci_get_style_at(sci, selection_end)))
+ in_comment = FALSE;
+ else
+ in_comment = !highlighting_is_code_style(lexer, style);
+ if(!ac_info->comments_enclose && in_comment)
+ return AC_CONTINUE_ACTION;
+
+ sci_start_undo_action(sci);
+ /* Insert {} block - special case: make indents, move cursor to beginning */
+ if((ch == '{' || ch == '}') && lexer_has_braces(sci) &&
+ ac_info->make_indent_for_cbracket && !in_comment)
+ {
+ start_line = sci_get_line_from_position(sci, selection_start);
+ start_pos = SSM(sci, SCI_GETLINEINDENTPOSITION, (uptr_t)start_line, 0);
+ SSM(sci, SCI_INSERTTEXT, start_pos, (sptr_t)"{\n");
+
+ end_line = sci_get_line_from_position(sci, selection_end);
+ start_indent = sci_get_line_indentation(sci, start_line);
+ indent_width = editor_get_indent_prefs(editor)->width;
+ sci_set_line_indentation(sci, start_line, start_indent);
+ sci_set_line_indentation(sci, start_line + 1, start_indent + indent_width);
+ for(i = start_line + 2; i <= end_line; i++)
+ {
+ current_indent = sci_get_line_indentation(sci, i);
+ sci_set_line_indentation(sci, i, current_indent + indent_width);
+ }
+ text_end_pos = sci_get_line_end_position(sci, i - 1);
+ sci_set_current_position(sci, text_end_pos, FALSE);
+ SSM(sci, SCI_ADDTEXT, 2, (sptr_t)"\n}");
+ sci_set_line_indentation(sci, i, start_indent);
+ if(ac_info->move_cursor_to_beginning)
+ sci_set_current_position(sci, start_pos, TRUE);
+ }
+ else
+ {
+ SSM(sci, SCI_INSERTTEXT, selection_start, (sptr_t) chars_left);
+ SSM(sci, SCI_INSERTTEXT, selection_end + 1, (sptr_t) chars_right);
+ sci_set_current_position(sci, selection_end + 1, TRUE);
+ if(ac_info->keep_selection)
+ {
+ sci_set_selection_start(sci, selection_start + 1);
+ sci_set_selection_end(sci, selection_end + 1);
+ }
+ }
+ sci_end_undo_action(sci);
+ return AC_STOP_ACTION;
+ }
+
+ /* disable autocompletion inside comments and strings */
+ if(!ac_info->comments_ac_enable && !highlighting_is_code_style(lexer, style))
+ return AC_CONTINUE_ACTION;
+
+ if(ch == '}' || ch == ']' || ch ==')')
+ return AC_CONTINUE_ACTION;
+
+ /* just close char */
+ SSM(sci, SCI_INSERTTEXT, pos, (sptr_t)chars_right);
+ sci_set_current_position(sci, pos, TRUE);
+ return AC_CONTINUE_ACTION;
+}
+
+static gboolean
+on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+{
+ GeanyDocument *doc = user_data;
+ if(NULL == doc)
+ return AC_CONTINUE_ACTION;
+ return auto_close_chars(doc, event);
+}
+
+static void
+on_document_activate(GObject *obj, GeanyDocument *doc, gpointer user_data)
+{
+ ScintillaObject *sci = NULL;
+ if(NULL == doc || NULL == doc->editor)
+ return;
+ sci = doc->editor->sci;
+ if(NULL == sci)
+ return;
+ plugin_signal_connect(geany_plugin, G_OBJECT(sci), "key-press-event",
+ FALSE, G_CALLBACK(on_key_press), doc);
+}
+
+PluginCallback plugin_callbacks[] =
+{
+ { "document-open", (GCallback) &on_document_activate, FALSE, NULL },
+ { "document-new", (GCallback) &on_document_activate, FALSE, NULL },
+ { NULL, NULL, FALSE, NULL }
+};
+
+static void
+configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data)
+{
+ if(response != GTK_RESPONSE_OK && response != GTK_RESPONSE_APPLY)
+ return;
+ GKeyFile *config = g_key_file_new();
+ gchar *data;
+ gchar *config_dir = g_path_get_dirname(ac_info->config_file);
+
+ g_key_file_load_from_file(config, ac_info->config_file, G_KEY_FILE_NONE, NULL);
+
+ /* just to improve readability */
+ #define SAVE_CONF_BOOL(name) do {\
+ ac_info->name = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(dialog), "check_" #name)));\
+ g_key_file_set_boolean(config, "autoclose", #name, ac_info->name);\
+ } while(0)
+ SAVE_CONF_BOOL(parenthesis);
+ SAVE_CONF_BOOL(abracket);
+ SAVE_CONF_BOOL(cbracket);
+ SAVE_CONF_BOOL(sbracket);
+ SAVE_CONF_BOOL(dquote);
+ SAVE_CONF_BOOL(squote);
+ SAVE_CONF_BOOL(backquote);
+ SAVE_CONF_BOOL(comments_ac_enable);
+ SAVE_CONF_BOOL(delete_pairing_brace);
+ SAVE_CONF_BOOL(suppress_doubling);
+ SAVE_CONF_BOOL(enclose_selections);
+ SAVE_CONF_BOOL(comments_enclose);
+ SAVE_CONF_BOOL(keep_selection);
+ SAVE_CONF_BOOL(make_indent_for_cbracket);
+ SAVE_CONF_BOOL(move_cursor_to_beginning);
+ SAVE_CONF_BOOL(improved_cbracket_indent);
+ SAVE_CONF_BOOL(close_functions);
+ #undef SAVE_CONF_BOOL
+
+ if(!g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0)
+ {
+ dialogs_show_msgbox(GTK_MESSAGE_ERROR,
+ _("Plugin configuration directory could not be created."));
+ }
+ else
+ {
+ /* write config to file */
+ data = g_key_file_to_data(config, NULL, NULL);
+ utils_write_file(ac_info->config_file, data);
+ g_free(data);
+ }
+ g_free(config_dir);
+ g_key_file_free(config);
+}
+
+/* Called by Geany to initialize the plugin */
+void
+plugin_init(G_GNUC_UNUSED GeanyData *data)
+{
+ int i;
+ foreach_document(i)
+ {
+ on_document_activate(NULL, documents[i], NULL);
+ }
+ GKeyFile *config = g_key_file_new();
+
+ ac_info = g_new0(AutocloseInfo, 1);
+
+ ac_info->config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S,
+ "plugins", G_DIR_SEPARATOR_S, "autoclose", G_DIR_SEPARATOR_S, "autoclose.conf", NULL);
+
+ g_key_file_load_from_file(config, ac_info->config_file, G_KEY_FILE_NONE, NULL);
+
+ /* just to improve readability */
+ #define GET_CONF_BOOL(name, def) ac_info->name = utils_get_setting_boolean(config, "autoclose", #name, def)
+ GET_CONF_BOOL(parenthesis, TRUE);
+ /* Angular bracket conflicts with conditional statements */
+ GET_CONF_BOOL(abracket, FALSE);
+ GET_CONF_BOOL(cbracket, TRUE);
+ GET_CONF_BOOL(sbracket, TRUE);
+ GET_CONF_BOOL(dquote, TRUE);
+ GET_CONF_BOOL(squote, TRUE);
+ GET_CONF_BOOL(backquote, TRUE);
+ GET_CONF_BOOL(comments_ac_enable, FALSE);
+ GET_CONF_BOOL(delete_pairing_brace, TRUE);
+ GET_CONF_BOOL(suppress_doubling, TRUE);
+ GET_CONF_BOOL(enclose_selections, TRUE);
+ GET_CONF_BOOL(comments_enclose, FALSE);
+ GET_CONF_BOOL(keep_selection, TRUE);
+ GET_CONF_BOOL(make_indent_for_cbracket, TRUE);
+ GET_CONF_BOOL(move_cursor_to_beginning, TRUE);
+ GET_CONF_BOOL(improved_cbracket_indent, TRUE);
+ GET_CONF_BOOL(close_functions, FALSE);
+ #undef GET_CONF_BOOL
+
+ g_key_file_free(config);
+}
+
+/* for easy refactoring */
+#define GET_CHECKBOX_ACTIVE(name) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(data), "check_" #name)))
+#define SET_SENS(name) gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), "check_" #name), sens)
+
+static void
+ac_make_indent_for_cbracket_cb(GtkToggleButton *togglebutton, gpointer data)
+{
+ gboolean sens = GET_CHECKBOX_ACTIVE(make_indent_for_cbracket);
+ SET_SENS(move_cursor_to_beginning);
+}
+
+static void
+ac_parenthesis_cb(GtkToggleButton *togglebutton, gpointer data)
+{
+ gboolean sens = GET_CHECKBOX_ACTIVE(parenthesis);
+ SET_SENS(close_functions);
+}
+
+static void
+ac_cbracket_cb(GtkToggleButton *togglebutton, gpointer data)
+{
+ gboolean sens = GET_CHECKBOX_ACTIVE(cbracket);
+ SET_SENS(make_indent_for_cbracket);
+ SET_SENS(move_cursor_to_beginning);
+}
+
+static void
+ac_enclose_selections_cb(GtkToggleButton *togglebutton, gpointer data)
+{
+ gboolean sens = GET_CHECKBOX_ACTIVE(enclose_selections);
+ SET_SENS(keep_selection);
+ SET_SENS(comments_enclose);
+}
+
+GtkWidget *
+plugin_configure(GtkDialog *dialog)
+{
+ GtkWidget *widget, *vbox, *frame, *container;
+
+ vbox = gtk_vbox_new(FALSE, 0);
+
+ #define WIDGET_FRAME(description) do{\
+ container = gtk_vbox_new(FALSE, 0);\
+ frame = gtk_frame_new(NULL);\
+ gtk_frame_set_label(GTK_FRAME(frame), _(description));\
+ gtk_container_add(GTK_CONTAINER(frame), container);\
+ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 3);\
+ } while(0)
+
+ #define WIDGET_CONF_BOOL(name, description, tooltip) do { \
+ widget = gtk_check_button_new_with_label(_(description)); \
+ if(tooltip) gtk_widget_set_tooltip_text(widget, _(tooltip));\
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ac_info->name); \
+ gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 3); \
+ g_object_set_data(G_OBJECT(dialog), "check_" #name, widget); \
+ } while(0)
+
+ WIDGET_FRAME("Auto-close quotes and brackets");
+ WIDGET_CONF_BOOL(parenthesis, "Parenthesis ( )",
+ "Auto-close parenthesis \"(\" -> \"(|)\"");
+ g_signal_connect(widget, "toggled", G_CALLBACK(ac_parenthesis_cb), dialog);
+ WIDGET_CONF_BOOL(cbracket, "Curly brackets { }",
+ "Auto-close curly brackets \"{\" -> \"{|}\"");
+ g_signal_connect(widget, "toggled", G_CALLBACK(ac_cbracket_cb), dialog);
+ WIDGET_CONF_BOOL(sbracket, "Square brackets [ ]",
+ "Auto-close square brackets \"[\" -> \"[|]\"");
+ WIDGET_CONF_BOOL(abracket, "Angular brackets < >",
+ "Auto-close angular brackets \"<\" -> \"<|>\"");
+ WIDGET_CONF_BOOL(dquote, "Double quotes \" \"",
+ "Auto-close double quotes \" -> \"|\"");
+ WIDGET_CONF_BOOL(squote, "Single quotes \' \'",
+ "Auto-close single quotes ' -> '|'");
+ WIDGET_CONF_BOOL(backquote, "Backquote ` `",
+ "Auto-close backquote ` -> `|`");
+
+ WIDGET_FRAME("Improve curly brackets completion");
+ WIDGET_CONF_BOOL(make_indent_for_cbracket, "Indent when enclosing",
+ "If you select some text and press \"{\" or \"}\", plugin "
+ "will auto-close selected lines and make new block with indent."
+ "\nYou do not need to select block precisely - block enclosing "
+ "takes into account only lines.");
+ g_signal_connect(widget, "toggled", G_CALLBACK(ac_make_indent_for_cbracket_cb), dialog);
+ WIDGET_CONF_BOOL(move_cursor_to_beginning, "Move cursor to beginning",
+ "If you chacked \"Indent when enclosing\", moving cursor "
+ "to beginning may be useful: usually you make new block "
+ "and need to create new statement before this block.");
+ WIDGET_CONF_BOOL(improved_cbracket_indent, "Improved auto-indentation",
+ "Improved auto-indent for curly brackets: type \"{\" "
+ "and then press Enter - plugin will create full indented block. "
+ "Works without \"auto-close { }\" checkbox.");
+
+ container = vbox;
+ WIDGET_CONF_BOOL(delete_pairing_brace, "Delete pairing character while backspacing first",
+ "Check if you want to delete pairing bracket by pressing BackSpace.");
+ WIDGET_CONF_BOOL(suppress_doubling, "Suppress double-completion",
+ "Check if you want to allow editor automatically fix mistypes "
+ "with brackets: if you type \"{}\" you will get \"{}\", not \"{}}\".");
+ WIDGET_CONF_BOOL(enclose_selections, "Enclose selections",
+ "Automatically enclose selected text by pressing just one bracket key.");
+ g_signal_connect(widget, "toggled", G_CALLBACK(ac_enclose_selections_cb), dialog);
+ WIDGET_CONF_BOOL(keep_selection, "Keep selection when enclosing",
+ "Keep your previously selected text after enclosing.");
+
+ WIDGET_FRAME("Behaviour inside comments and strings");
+ WIDGET_CONF_BOOL(comments_ac_enable, "Allow auto-closing in strings and comments",
+ "Check if you wan to keep auto-closing inside strings and comments too.");
+ WIDGET_CONF_BOOL(comments_enclose, "Enclose selections in strings and comments",
+ "Check if you wan to enclose selections inside strings and comments too.");
+
+ container = vbox;
+ WIDGET_CONF_BOOL(close_functions, "Auto-complete \";\" for functions",
+ "Full function auto-closing (works only for C/C++): type \"sin(\" "
+ "and you will get \"sin(|);\".");
+ #undef WIDGET_CONF_BOOL
+
+ ac_make_indent_for_cbracket_cb(NULL, dialog);
+ ac_cbracket_cb(NULL, dialog);
+ ac_enclose_selections_cb(NULL, dialog);
+ ac_parenthesis_cb(NULL, dialog);
+ g_signal_connect(dialog, "response", G_CALLBACK(configure_response_cb), NULL);
+ gtk_widget_show_all(vbox);
+ return vbox;
+}
+
+/* Called by Geany before unloading the plugin. */
+void
+plugin_cleanup(void)
+{
+ g_free(ac_info->config_file);
+ g_free(ac_info);
+}
Modified: build/autoclose.m4
10 files changed, 10 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,10 @@
+AC_DEFUN([GP_CHECK_AUTOCLOSE],
+[
+ GP_ARG_DISABLE([Autoclose], [auto])
+ GP_CHECK_PLUGIN_GTK2_ONLY([Autoclose])
+ GP_COMMIT_PLUGIN_STATUS([Autoclose])
+ AC_CONFIG_FILES([
+ autoclose/Makefile
+ autoclose/src/Makefile
+ ])
+])
Modified: configure.ac
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -26,6 +26,7 @@ GP_CHECK_CFLAGS
dnl plugin checks
GP_CHECK_ADDONS
+GP_CHECK_AUTOCLOSE
GP_CHECK_CODENAV
GP_CHECK_COMMANDER
GP_CHECK_DEBUGGER
Modified: po/POTFILES.in
3 files changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -12,6 +12,9 @@ addons/src/ao_wrapwords.c
addons/src/ao_doclist.c
addons/src/addons.c
+# Autoclose
+autoclose/src/autoclose.c
+
# codenav
codenav/src/codenavigation.c
codenav/src/goto_file.c
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).