Revision: 1348 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1348&view=re... Author: sheckley Date: 2010-05-11 14:33:41 +0000 (Tue, 11 May 2010)

Log Message: ----------- extra selection plugin - initial revision

Modified Paths: -------------- trunk/geany-plugins/Makefile.am trunk/geany-plugins/build/geany-plugins.nsi trunk/geany-plugins/configure.ac trunk/geany-plugins/po/POTFILES.in trunk/geany-plugins/po/geany-plugins.pot trunk/geany-plugins/wscript

Added Paths: ----------- trunk/geany-plugins/build/geanyextrasel.m4 trunk/geany-plugins/geanyextrasel/ trunk/geany-plugins/geanyextrasel/AUTHORS trunk/geany-plugins/geanyextrasel/COPYING trunk/geany-plugins/geanyextrasel/ChangeLog trunk/geany-plugins/geanyextrasel/Makefile.am trunk/geany-plugins/geanyextrasel/NEWS trunk/geany-plugins/geanyextrasel/README trunk/geany-plugins/geanyextrasel/src/ trunk/geany-plugins/geanyextrasel/src/Makefile.am trunk/geany-plugins/geanyextrasel/src/extrasel.c

Modified: trunk/geany-plugins/Makefile.am =================================================================== --- trunk/geany-plugins/Makefile.am 2010-05-11 14:09:34 UTC (rev 1347) +++ trunk/geany-plugins/Makefile.am 2010-05-11 14:33:41 UTC (rev 1348) @@ -2,6 +2,7 @@ addons \ codenav \ geanydoc \ + geanyextrasel \ geanygdb \ geanyinsertnum \ geanylatex \

Modified: trunk/geany-plugins/build/geany-plugins.nsi =================================================================== --- trunk/geany-plugins/build/geany-plugins.nsi 2010-05-11 14:09:34 UTC (rev 1347) +++ trunk/geany-plugins/build/geany-plugins.nsi 2010-05-11 14:33:41 UTC (rev 1348) @@ -149,6 +149,7 @@ Delete "$INSTDIR\ReadMe.Windows.txt" Delete "$INSTDIR\uninst-plugins.exe" Delete "$INSTDIR\lib\addons.dll" + Delete "$INSTDIR\lib\geanyextrasel.dll" Delete "$INSTDIR\lib\geanyinsertnum.dll" Delete "$INSTDIR\lib\geanylatex.dll" Delete "$INSTDIR\lib\geanylipsum.dll"

Added: trunk/geany-plugins/build/geanyextrasel.m4 =================================================================== --- trunk/geany-plugins/build/geanyextrasel.m4 (rev 0) +++ trunk/geany-plugins/build/geanyextrasel.m4 2010-05-11 14:33:41 UTC (rev 1348) @@ -0,0 +1,8 @@ +AC_DEFUN([GP_CHECK_GEANYEXTRASEL], +[ + GP_STATUS_PLUGIN_ADD([GeanyExtraSel], [yes]) + AC_CONFIG_FILES([ + geanyextrasel/Makefile + geanyextrasel/src/Makefile + ]) +])

Modified: trunk/geany-plugins/configure.ac =================================================================== --- trunk/geany-plugins/configure.ac 2010-05-11 14:09:34 UTC (rev 1347) +++ trunk/geany-plugins/configure.ac 2010-05-11 14:33:41 UTC (rev 1348) @@ -24,6 +24,7 @@ GP_CHECK_ADDONS GP_CHECK_CODENAV GP_CHECK_GEANYDOC +GP_CHECK_GEANYEXTRASEL GP_CHECK_GEANYGDB GP_CHECK_GEANYINSERTNUM GP_CHECK_GEANYLATEX

Added: trunk/geany-plugins/geanyextrasel/AUTHORS =================================================================== --- trunk/geany-plugins/geanyextrasel/AUTHORS (rev 0) +++ trunk/geany-plugins/geanyextrasel/AUTHORS 2010-05-11 14:33:41 UTC (rev 1348) @@ -0,0 +1 @@ +Dimitar Toshkov Zhekov jimmy@is-vn.bg

Added: trunk/geany-plugins/geanyextrasel/COPYING =================================================================== --- trunk/geany-plugins/geanyextrasel/COPYING (rev 0) +++ trunk/geany-plugins/geanyextrasel/COPYING 2010-05-11 14:33:41 UTC (rev 1348) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, 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 Library 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 St, 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 Library General +Public License instead of this License.

Added: trunk/geany-plugins/geanyextrasel/ChangeLog =================================================================== --- trunk/geany-plugins/geanyextrasel/ChangeLog (rev 0) +++ trunk/geany-plugins/geanyextrasel/ChangeLog 2010-05-11 14:33:41 UTC (rev 1348) @@ -0,0 +1 @@ +

Added: trunk/geany-plugins/geanyextrasel/Makefile.am =================================================================== --- trunk/geany-plugins/geanyextrasel/Makefile.am (rev 0) +++ trunk/geany-plugins/geanyextrasel/Makefile.am 2010-05-11 14:33:41 UTC (rev 1348) @@ -0,0 +1,4 @@ +include $(top_srcdir)/build/vars.auxfiles.mk + +SUBDIRS = src +plugin = geanyextrasel

Added: trunk/geany-plugins/geanyextrasel/NEWS =================================================================== Added: trunk/geany-plugins/geanyextrasel/README =================================================================== --- trunk/geany-plugins/geanyextrasel/README (rev 0) +++ trunk/geany-plugins/geanyextrasel/README 2010-05-11 14:33:41 UTC (rev 1348) @@ -0,0 +1,65 @@ +Extra Selection Plugin +====================== + +About +----- +This plugin adds the following functions: + +Goto matching brace and select (Select to matching brace). + +Goto line and select (Select to line). + +Ctrl-Shift-Alt Left/Right/Home/End keys - same as Ctrl-Shift, but for +rectangular selection. + +Column mode - while active, the [Ctrl-]Shift-movement keys do rectangle +selection (instead of stream), while the [Ctrl-]Shift-Alt-movement keys +are blocked. + + +Requirements +------------ +Geany 0.18 or later and the respective headers and development libraries. + + +Installation +------------ +Compiling and installing the code is done by the following three +commands: + +$ ./waf configure +$ ./waf build +$ ./waf install + +For more configuration details run +$ ./waf --help + +If there are any errors during compilation, check your build environment. + + +Usage +----- +Select a rectangle and choose Tools -> Insert Numbers. + + +Known issues +------------ +The column mode is global, not per-document. However, (de)activating it +will change the selection (if any) type for the current document only. + +The column mode applies to the movement keys only - not to mouse +selection, find functions etc. + + +License +------- +Insert Numbers is distributed 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. A copy of this license +can be found in the file COPYING included with the source code of this +program. + + +Ideas, questions, patches and bug reports +----------------------------------------- +Dimitar Toshkov Zhekov jimmy@is-vn.bg

Added: trunk/geany-plugins/geanyextrasel/src/Makefile.am =================================================================== --- trunk/geany-plugins/geanyextrasel/src/Makefile.am (rev 0) +++ trunk/geany-plugins/geanyextrasel/src/Makefile.am 2010-05-11 14:33:41 UTC (rev 1348) @@ -0,0 +1,5 @@ +include $(top_srcdir)/build/vars.build.mk + +geanyplugins_LTLIBRARIES = geanyextrasel.la +geanyextrasel_la_SOURCES = extrasel.c +geanyextrasel_la_LIBADD = $(COMMONLIBS)

Added: trunk/geany-plugins/geanyextrasel/src/extrasel.c =================================================================== --- trunk/geany-plugins/geanyextrasel/src/extrasel.c (rev 0) +++ trunk/geany-plugins/geanyextrasel/src/extrasel.c 2010-05-11 14:33:41 UTC (rev 1348) @@ -0,0 +1,304 @@ +/* + * extrasel.c + * + * Copyright 2010 Dimitar Toshkov Zhekov jimmy@is-vn.bg + * + * 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, see http://www.gnu.org/licenses/. + */ + +#include <gdk/gdkkeysyms.h> + +#include "geanyplugin.h" + +GeanyPlugin *geany_plugin; +GeanyData *geany_data; +GeanyFunctions *geany_functions; + +PLUGIN_VERSION_CHECK(150) + +PLUGIN_SET_INFO(_("Extra Selection"), _("Column mode, select to line / matching brace."), + "0.1", "Dimitar Toshkov Zhekov jimmy@is-vn.bg"); + +/* Keybinding(s) */ +enum +{ + COLUMN_MODE_KB, + GOTO_LINE_EXTEND_KB, + BRACE_MATCH_EXTEND_KB, + COUNT_KB +}; + +PLUGIN_KEY_GROUP(extra_select, COUNT_KB) + +static GtkWidget *main_menu_item = NULL; +static GtkWidget *column_mode_item; +static GtkWidget *goto_line_item; +static GtkWidget *brace_match_item; + +static gboolean column_mode = FALSE; + +typedef struct _command_key +{ + guint key; + gint command; +} command_key; + +static const command_key command_keys[] = +{ + { GDK_Left, SCI_WORDLEFT }, + { GDK_Right, SCI_WORDRIGHTEND }, + { GDK_Home, SCI_DOCUMENTSTART }, + { GDK_End, SCI_DOCUMENTEND }, + { GDK_Up, SCI_PARAUP }, + { GDK_Down, SCI_PARADOWN }, + { 0, 0 } +}; + +/* not #defined in 0.18 */ +#define sci_get_anchor(sci) scintilla_send_message((sci), SCI_GETANCHOR, 0, 0) +#define sci_set_anchor(sci, pos) scintilla_send_message((sci), SCI_SETANCHOR, (pos), 0) + +static void column_mode_command(ScintillaObject *sci, int command) +{ + gboolean set_anchor = sci_get_selection_mode(sci) != SC_SEL_RECTANGLE; + int anchor; + + if (set_anchor) + anchor = sci_get_anchor(sci); + sci_set_selection_mode(sci, SC_SEL_RECTANGLE); + sci_send_command(sci, command); + if (set_anchor) + sci_set_anchor(sci, anchor); + sci_send_command(sci, SCI_CANCEL); +} + +static gboolean on_key_press_event(GtkWidget *widget, GdkEventKey *event, G_GNUC_UNUSED + gpointer user_data) +{ + guint state = GDK_CONTROL_MASK | GDK_SHIFT_MASK | (column_mode ? 0 : GDK_MOD1_MASK); + + if ((event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)) == state) + { + const command_key *ck; + + for (ck = command_keys; ck->key; ck++) + { + if (event->keyval == ck->key) + { + GeanyDocument *doc = document_get_current(); + + if (doc) + { + ScintillaObject *sci = doc->editor->sci; + + if (gtk_window_get_focus(GTK_WINDOW(widget)) == sci) + { + column_mode_command(sci, ck->command); + return TRUE; + } + } + /* no document or not focused */ + break; + } + } + } + + return FALSE; +} + +typedef struct _select_key +{ + gint key; + gint stream; + gint rectangle; +} select_key; + +static const select_key select_keys[] = +{ + { SCK_DOWN | (SCMOD_SHIFT << 16), SCI_LINEDOWNEXTEND, SCI_LINEDOWNRECTEXTEND }, + { SCK_UP | (SCMOD_SHIFT << 16), SCI_LINEUPEXTEND, SCI_LINEUPRECTEXTEND }, + { SCK_LEFT | (SCMOD_SHIFT << 16), SCI_CHARLEFTEXTEND, SCI_CHARLEFTRECTEXTEND }, + { SCK_RIGHT | (SCMOD_SHIFT << 16), SCI_CHARRIGHTEXTEND, SCI_CHARRIGHTRECTEXTEND }, + { SCK_HOME | (SCMOD_SHIFT << 16), SCI_VCHOMEEXTEND, SCI_VCHOMERECTEXTEND }, + { SCK_END | (SCMOD_SHIFT << 16), SCI_LINEENDEXTEND, SCI_LINEENDRECTEXTEND }, + { SCK_PRIOR | (SCMOD_SHIFT << 16), SCI_PAGEUPEXTEND, SCI_PAGEUPRECTEXTEND }, + { SCK_NEXT | (SCMOD_SHIFT << 16), SCI_PAGEDOWNEXTEND, SCI_PAGEDOWNRECTEXTEND }, + { 0, 0, 0 } +}; + +/* not #defined in 0.18 */ +#define sci_clear_cmdkey(sci, key) scintilla_send_message((sci), SCI_CLEARCMDKEY, (key), 0) +#define sci_assign_cmdkey(sci, key, command) \ + scintilla_send_message((sci), SCI_ASSIGNCMDKEY, (key), (command)) + +static void assign_column_keys(ScintillaObject *sci) +{ + const select_key *sk; + + for (sk = select_keys; sk->key; sk++) + { + if (column_mode) + { + sci_clear_cmdkey(sci, sk->key | (SCMOD_ALT << 16)); + sci_assign_cmdkey(sci, sk->key, sk->rectangle); + } + else + { + sci_assign_cmdkey(sci, sk->key, sk->stream); + sci_assign_cmdkey(sci, sk->key | (SCMOD_ALT << 16), sk->rectangle); + } + } +} + +static void on_document_switch(G_GNUC_UNUSED GObject *obj, GeanyDocument *doc, + G_GNUC_UNUSED gpointer user_data) +{ + assign_column_keys(doc->editor->sci); +} + +PluginCallback plugin_callbacks[] = +{ + { "document-new", (GCallback) &on_document_switch, FALSE, NULL }, + { "document-open", (GCallback) &on_document_switch, FALSE, NULL }, + { "document-activate", (GCallback) &on_document_switch, FALSE, NULL }, + { NULL, NULL, FALSE, NULL } +}; + +static void on_extra_select_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, + G_GNUC_UNUSED gpointer gdata) +{ + gtk_widget_set_sensitive(goto_line_item, document_get_current() != NULL); + gtk_widget_set_sensitive(brace_match_item, document_get_current() != NULL); +} + +static void on_column_mode_toggled(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED + gpointer gdata) +{ + GeanyDocument *doc = document_get_current(); + + column_mode = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(column_mode_item)); + if (doc) + { + ScintillaObject *sci = doc->editor->sci; + int select_mode = sci_get_selection_mode(sci); + int anchor = sci_get_anchor(sci); + int cursor = sci_get_current_position(sci); + + assign_column_keys(sci); + if (column_mode && select_mode == SC_SEL_STREAM) + { + sci_set_selection_mode(sci, SC_SEL_RECTANGLE); + sci_set_anchor(sci, anchor); + /* sci_set_current_pos() clears the selection, bypass */ + scintilla_send_message(sci, SCI_SETCURRENTPOS, cursor, 0); + } + else if (!column_mode && select_mode == SC_SEL_RECTANGLE) + { + sci_set_selection_mode(sci, SC_SEL_STREAM); + scintilla_send_message(sci, SCI_SETSEL, anchor, cursor); + } + sci_send_command(sci, SCI_CANCEL); + } +} + +static void on_column_mode_key(G_GNUC_UNUSED guint key_id) +{ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(column_mode_item), !column_mode); +} + +static void doit_and_select(guint group_id, guint key_id) +{ + GeanyDocument *doc = document_get_current(); + + if (doc) + { + ScintillaObject *sci = doc->editor->sci; + int before = sci_get_current_position(sci), after; + + keybindings_send_command(group_id, key_id); + after = sci_get_current_position(sci); + if (before != after) + sci_set_anchor(sci, before); + } +} + +static void on_goto_line_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED + gpointer gdata) +{ + doit_and_select(GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_LINE); +} + +static void on_goto_line_key(G_GNUC_UNUSED guint key_id) +{ + on_goto_line_activate(NULL, NULL); +} + +static void on_brace_match_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED + gpointer gdata) +{ + doit_and_select(GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_MATCHINGBRACE); +} + +static void on_brace_match_key(G_GNUC_UNUSED guint key_id) +{ + on_brace_match_activate(NULL, NULL); +} + +void plugin_init(G_GNUC_UNUSED GeanyData *data) +{ + GtkWidget *extra_select_menu; + + main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); + + main_menu_item = gtk_menu_item_new_with_mnemonic(_("E_xtra selection")); + gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), main_menu_item); + g_signal_connect(main_menu_item, "activate", G_CALLBACK(on_extra_select_activate), NULL); + extra_select_menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(main_menu_item), extra_select_menu); + + column_mode_item = gtk_check_menu_item_new_with_mnemonic(_("_Column mode")); + gtk_container_add(GTK_CONTAINER(extra_select_menu), column_mode_item); + g_signal_connect(column_mode_item, "toggled", G_CALLBACK(on_column_mode_toggled), NULL); + keybindings_set_item(plugin_key_group, COLUMN_MODE_KB, on_column_mode_key, 0, 0, + "column_mode", _("Column mode"), column_mode_item); + + goto_line_item = gtk_menu_item_new_with_mnemonic(_("Select to _Line")); + gtk_container_add(GTK_CONTAINER(extra_select_menu), goto_line_item); + g_signal_connect(goto_line_item, "activate", G_CALLBACK(on_goto_line_activate), NULL); + keybindings_set_item(plugin_key_group, GOTO_LINE_EXTEND_KB, on_goto_line_key, 0, 0, + "goto_line_extend", _("Select to line"), goto_line_item); + + brace_match_item = gtk_menu_item_new_with_mnemonic(_("Select to Matching _Brace")); + gtk_container_add(GTK_CONTAINER(extra_select_menu), brace_match_item); + g_signal_connect(brace_match_item, "activate", G_CALLBACK(on_brace_match_activate), + NULL); + keybindings_set_item(plugin_key_group, BRACE_MATCH_EXTEND_KB, on_brace_match_key, 0, 0, + "brace_match_extend", _("Select to matching brace"), brace_match_item); + + gtk_widget_show_all(main_menu_item); + + // testing + plugin_signal_connect(geany_plugin, G_OBJECT(geany->main_widgets->window), + "key-press-event", FALSE, G_CALLBACK(on_key_press_event), NULL); +} + +void plugin_cleanup(void) +{ + gint i, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(geany->main_widgets->notebook)); + + column_mode = FALSE; + for (i = 0; i < max; i++) + assign_column_keys(document_get_from_page(i)->editor->sci); + gtk_widget_destroy(main_menu_item); +}

Modified: trunk/geany-plugins/po/POTFILES.in =================================================================== --- trunk/geany-plugins/po/POTFILES.in 2010-05-11 14:09:34 UTC (rev 1347) +++ trunk/geany-plugins/po/POTFILES.in 2010-05-11 14:33:41 UTC (rev 1348) @@ -101,3 +101,6 @@

# treebrowser treebrowser/src/treebrowser.c + +# GeanyExtraSel +geanyextrasel/src/extrasel.c

Modified: trunk/geany-plugins/po/geany-plugins.pot =================================================================== --- trunk/geany-plugins/po/geany-plugins.pot 2010-05-11 14:09:34 UTC (rev 1347) +++ trunk/geany-plugins/po/geany-plugins.pot 2010-05-11 14:33:41 UTC (rev 1348) @@ -2563,3 +2563,39 @@ #: ../geanyinsertnum/src/insertnum.c:497 msgid "Insert _Numbers" msgstr "" + +#: extrasel.c:30 +msgid "Extra Selection" +msgstr "" + +#: extrasel.c:30 +msgid "Column mode, select to line / matching brace." +msgstr "" + +#: extrasel.c:264 +msgid "E_xtra selection" +msgstr "" + +#: extrasel.c:270 +msgid "_Column mode" +msgstr "" + +#: extrasel.c:274 +msgid "Column mode" +msgstr "" + +#: extrasel.c:276 +msgid "Select to _Line" +msgstr "" + +#: extrasel.c:280 +msgid "Select to line" +msgstr "" + +#: extrasel.c:282 +msgid "Select to Matching _Brace" +msgstr "" + +#: extrasel.c:287 +msgid "Select to matching brace" +msgstr ""

Modified: trunk/geany-plugins/wscript =================================================================== --- trunk/geany-plugins/wscript 2010-05-11 14:09:34 UTC (rev 1347) +++ trunk/geany-plugins/wscript 2010-05-11 14:33:41 UTC (rev 1348) @@ -77,6 +77,7 @@ Plugin('addons', None, [ 'addons/src' ]), Plugin('codenav', None, [ 'codenav/src' ]), Plugin('geanydoc', None, [ 'geanydoc/src' ]), + Plugin('geanyextrasel', None, [ 'geanyextrasel/src' ]), Plugin('geanyinsertnum', None, [ 'geanyinsertnum/src' ]), Plugin('geanylatex', None, [ 'geanylatex/src']), Plugin('geanylipsum', None, [ 'geanylipsum/src']),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.