Branch: refs/heads/master
Author: Enrico <enrico.trt(a)gmail.com>
Committer: Enrico <enrico.trt(a)gmail.com>
Date: Mon, 30 Apr 2012 23:40:42
Commit: 86c394cb0c1dae3dd01e34bee550de83858d7b38
https://github.com/geany/geany-plugins/commit/86c394cb0c1dae3dd01e34bee550d…
Log Message:
-----------
GeniusPaste: first commit
Modified Paths:
--------------
configure.ac
geniuspaste/AUTHORS
geniuspaste/COPYING
geniuspaste/ChangeLog
geniuspaste/Makefile.am
geniuspaste/NEWS
geniuspaste/README
geniuspaste/TODO
geniuspaste/src/Makefile.am
geniuspaste/src/geniuspaste.c
Modified: configure.ac
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -43,6 +43,7 @@ GP_CHECK_GEANYPRJ
GP_CHECK_GEANYSENDMAIL
GP_CHECK_GEANYVC
GP_CHECK_GEANYPG
+GP_CHECK_GENIUSPASTE
GP_CHECK_GPROJECT
GP_CHECK_MULTITERM
GP_CHECK_PRETTYPRINTER
Modified: geniuspaste/AUTHORS
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1 @@
+Enrico Trotta <enrico(dot)trt(at)gmail(dot)com>
Modified: geniuspaste/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 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.
Modified: geniuspaste/ChangeLog
0 files changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: geniuspaste/Makefile.am
8 files changed, 8 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,8 @@
+if ENABLE_GENIUSPASTE
+include $(top_srcdir)/build/vars.auxfiles.mk
+else
+include $(top_srcdir)/build/vars.docs.mk
+endif
+
+SUBDIRS = src
+plugin = geniuspaste
Modified: geniuspaste/NEWS
0 files changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: geniuspaste/README
44 files changed, 44 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,44 @@
+GeniusPaste Plugin
+==================
+
+.. contents::
+
+About
+-----
+This plugin allows you to paste your code from Geany in five different
+pastebins. It supports this services:
+
+ * codepad.org
+ * pastebin.com
+ * pastebin.geany.org
+ * dpaste.de
+ * sprunge.us
+
+GeniusPaste detects automatically the syntax of your code and paste it
+with syntax highlighting enabled.
+It also redirects you to the pasted code opening a new browser tab.
+
+Requirements
+------------
+ * GTK+ >= 2.12
+ * libsoup 2.4 >= 2.4.0
+
+Installation
+------------
+This plugin is part of the geany-plugins project.
+See the README file of that package.
+
+License
+-------
+GeniusPaste 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. If not, you will be able to get a copy by contacting
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
+
+
+Info, questions and more
+------------------------
+Enrico Trotta <enrico(dot)trt(at)gmail(dot)com>
Modified: geniuspaste/TODO
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,4 @@
+TODO
+----
+
+ * Make the geany's pastebin the default pastebin
Modified: geniuspaste/src/Makefile.am
22 files changed, 22 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,22 @@
+include $(top_srcdir)/build/vars.build.mk
+plugin = geniuspaste
+
+if ENABLE_GENIUSPASTE
+geanyplugins_LTLIBRARIES = geniuspaste.la
+else
+EXTRA_LTLIBRARIES = geniuspaste.la
+endif
+
+geniuspaste_la_SOURCES = geniuspaste.c
+geniuspaste_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DGEANY_VERSION=\"$(GEANY_VERSION)\" \
+ -DG_LOG_DOMAIN=\"GeniusPaste\"
+geniuspaste_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(GENIUSPASTE_CFLAGS)
+geniuspaste_la_LIBADD = \
+ $(COMMONLIBS) \
+ $(GENIUSPASTE_LIBS)
+
+include $(top_srcdir)/build/cppcheck.mk
Modified: geniuspaste/src/geniuspaste.c
372 files changed, 372 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,372 @@
+/*
+ * geniuspaste - paste your code on your favorite pastebin.
+ *
+ * Copyright 2012 Enrico "Enrix835" Trotta <enrico.trt(a)gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "libsoup/soup.h"
+#include "stdlib.h"
+#include "string.h"
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h" /* for the gettext domain */
+#endif
+
+#include <geanyplugin.h>
+
+#ifdef G_OS_WIN32
+ #define OPEN_BROWSER "start"
+ #define USERNAME getenv("USERNAME")
+#else
+ #define OPEN_BROWSER "xdg-open"
+ #define USERNAME getenv("USER")
+#endif
+
+#define CODEPAD_ORG 0
+#define PASTEBIN_COM 1
+#define PASTEBIN_GEANY_ORG 2
+#define DPASTE_DE 3
+#define SPRUNGE_US 4
+
+GeanyPlugin *geany_plugin;
+GeanyData *geany_data;
+GeanyFunctions *geany_functions;
+
+static GtkWidget *main_menu_item = NULL;
+
+static const gchar *websites[] = {
+ "http://codepad.org",
+ "http://pastebin.com/api_public.php",
+ "http://pastebin.geany.org/api/",
+ "http://dpaste.de/api/",
+ "http://sprunge.us/",
+};
+
+static struct {
+ GtkWidget *combo;
+ GtkWidget *check_button;
+} widgets;
+
+
+static gint websites_num = 5;
+static gint website_selected;
+static gchar *welcome_text = NULL;
+static gboolean check_button_is_checked = FALSE;
+
+PLUGIN_VERSION_CHECK(147)
+PLUGIN_SET_INFO("GeniusPaste",
+ "Paste your code on your favorite pastebin",
+ "0.1",
+ "Enrico Trotta");
+
+
+static gint last_indexof(gchar * string, gchar c)
+{
+ gchar * occ = strrchr(string, c);
+ return occ ? strrchr(string, c) - string : -1;
+}
+
+static void paste(const gchar * website)
+{
+ g_type_init();
+
+ SoupSession *session = soup_session_async_new();
+ SoupMessage *msg = NULL;
+
+ GeanyDocument *doc = document_get_current();
+ GeanyFiletype *ft = doc->file_type;
+
+ GError *error;
+
+ gchar *buffer_shell_command;
+ gchar *f_content;
+ gchar *f_type = g_strdup(ft->name);
+ gchar *f_path = doc->real_path;
+ gchar *f_name = doc->file_name;
+ gchar *f_title;
+ gchar *p_url;
+ gchar *formdata = NULL;
+ gchar *temp_body;
+ gchar **tokens_array;
+
+ const gchar *langs_supported_codepad[] = { "C", "C++", "D", "Haskell",
+ "Lua", "OCaml", "PHP", "Perl", "Plain Text",
+ "Python", "Ruby", "Scheme", "Tcl"
+ };
+
+ const gchar *langs_supported_dpaste[] = { "Bash", "C", "CSS", "Diff",
+ "Django/Jinja", "HTML", "IRC logs", "JavaScript", "PHP",
+ "Python console session", "Python Traceback", "Python",
+ "Python3", "Restructured Text", "SQL", "Text only"
+ };
+
+ gint i;
+ gint occ_position;
+ guint status;
+ gsize f_lenght;
+ gboolean result;
+
+ occ_position = last_indexof(f_name, G_DIR_SEPARATOR);
+ f_title = f_name + occ_position + 1;
+
+ switch (website_selected) {
+
+ case CODEPAD_ORG:
+
+ for (i = 0; i < G_N_ELEMENTS(langs_supported_codepad); i++) {
+ if (g_strcmp0(f_type, langs_supported_codepad[i]) == 0)
+ break;
+ else
+ f_type = langs_supported_codepad[8];
+ }
+
+ if ((result =
+ g_file_get_contents(f_path, &f_content, &f_lenght,
+ &error)) == FALSE) {
+ dialogs_show_msgbox(GTK_MESSAGE_ERROR,
+ "Unable to the the content of the file");
+ g_error_free(error);
+ }
+
+ msg = soup_message_new("POST", website);
+ formdata =
+ soup_form_encode("lang", f_type, "code", f_content, "submit",
+ "Submit", NULL);
+ break;
+
+ case PASTEBIN_COM:
+
+ if ((result =
+ g_file_get_contents(f_path, &f_content, &f_lenght,
+ &error)) == FALSE) {
+ dialogs_show_msgbox(GTK_MESSAGE_ERROR,
+ "Unable to the the content of the file");
+ g_error_free(error);
+ }
+
+ msg = soup_message_new("POST", website);
+ formdata =
+ soup_form_encode("paste_code", f_content, "paste_format",
+ f_type, "paste_name", f_title, NULL);
+ break;
+
+
+ case DPASTE_DE:
+
+ for (i = 0; i < G_N_ELEMENTS(langs_supported_dpaste); i++) {
+ if (g_strcmp0(f_type, langs_supported_dpaste[i]) == 0)
+ break;
+ else
+ f_type = langs_supported_dpaste[15]; // Text only
+ }
+
+ if ((result =
+ g_file_get_contents(f_path, &f_content, &f_lenght,
+ &error)) == FALSE) {
+ dialogs_show_msgbox(GTK_MESSAGE_ERROR,
+ "Unable to the the content of the file");
+ g_error_free(error);
+ }
+
+ msg = soup_message_new("POST", website);
+ formdata =
+ soup_form_encode("content", f_content, "title", f_title,
+ "lexer", f_type, NULL);
+
+ break;
+
+ case SPRUNGE_US:
+
+ if ((result =
+ g_file_get_contents(f_path, &f_content, &f_lenght,
+ &error)) == FALSE) {
+ dialogs_show_msgbox(GTK_MESSAGE_ERROR,
+ "Unable to the the content of the file");
+ g_error_free(error);
+ }
+
+ msg = soup_message_new("POST", website);
+ formdata =
+ soup_form_encode("sprunge", f_content, NULL);
+
+ break;
+
+ case PASTEBIN_GEANY_ORG:
+
+ if ((result =
+ g_file_get_contents(f_path, &f_content, &f_lenght,
+ &error)) == FALSE) {
+ dialogs_show_msgbox(GTK_MESSAGE_ERROR,
+ "Unable to the the content of the file");
+ g_error_free(error);
+ }
+
+ msg = soup_message_new("POST", website);
+ formdata =
+ soup_form_encode("content", f_content, "author", USERNAME,
+ "title", f_title, "lexer", f_type, NULL);
+
+ break;
+
+ }
+
+ soup_message_set_request(msg, "application/x-www-form-urlencoded",
+ SOUP_MEMORY_COPY, formdata, strlen(formdata));
+
+ status = soup_session_send_message(session, msg);
+
+ if(status == 200) {
+
+ p_url = msg->response_body->data;
+
+ /*
+ * codepad.org doesn't return only the url of the new snippet pasted
+ * but an html page. This minimal parser will get the bare url.
+ */
+
+ if (website_selected == CODEPAD_ORG) {
+ temp_body = g_strdup(p_url);
+ tokens_array = g_strsplit(temp_body, "<a href=\"", 0);
+
+ /* copy the first 27 chars because the url is composed by 27 characters.
+ * codepad.org/XXXXXXXX
+ */
+ p_url = g_strndup(tokens_array[5], 27);
+
+ g_free(temp_body);
+ g_strfreev(tokens_array);
+
+ } else if(website_selected == DPASTE_DE) {
+ p_url = g_strndup(p_url + 1, strlen(p_url) - 2);
+
+ } else if(website_selected == SPRUNGE_US) {
+
+ /* in order to enable the syntax highlightning on sprunge.us
+ * it is necessary to append at the returned url a question
+ * mark '?' followed by the file type.
+ *
+ * e.g. sprunge.us/xxxx?c
+ */
+ p_url[strlen(p_url) - 1] = '\0';
+ f_type[0] = g_ascii_tolower(f_type[0]);
+ temp_body = g_strdup_printf("?%s", f_type);
+ g_strlcat(p_url + 1, temp_body, -1);
+ p_url = g_strchomp(p_url);
+ free(temp_body);
+ }
+
+ if (check_button_is_checked) {
+ buffer_shell_command = g_malloc(100 * sizeof(gchar));
+ sprintf(buffer_shell_command, "%s %s", OPEN_BROWSER, p_url);
+ system(buffer_shell_command);
+ g_free(buffer_shell_command);
+ } else {
+ dialogs_show_msgbox(GTK_MESSAGE_INFO, "%s", p_url);
+ }
+
+ if(website_selected == CODEPAD_ORG || website_selected == DPASTE_DE) {
+ g_free(p_url);
+ }
+
+ } else {
+ dialogs_show_msgbox(GTK_MESSAGE_INFO, "Unable to paste the code. Check your connection and retry.\n"
+ "Error code: %d\n", status);
+ }
+
+ g_free(f_content);
+
+}
+
+static void item_activate(GtkMenuItem * menuitem, gpointer gdata)
+{
+ paste(websites[website_selected]);
+}
+
+static void on_configure_response(GtkDialog * dialog, gint response, gpointer * user_data)
+{
+ if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) {
+
+ website_selected =
+ gtk_combo_box_get_active
+ (GTK_COMBO_BOX(widgets.combo));
+
+ if (gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON(widgets.check_button)))
+ check_button_is_checked = TRUE;
+ }
+}
+
+GtkWidget *plugin_configure(GtkDialog * dialog)
+{
+ gint i;
+ GtkWidget *label, *vbox;
+
+ vbox = gtk_vbox_new(FALSE, 6);
+
+ label = gtk_label_new(_("Select a pastebin:"));
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+
+ widgets.combo = gtk_combo_box_text_new();
+
+ for (i = 0; i < websites_num; i++)
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets.combo),
+ websites[i]);
+
+ gtk_combo_box_set_active(GTK_COMBO_BOX(widgets.combo), 0);
+
+ widgets.check_button =
+ gtk_check_button_new_with_label
+ ("show your paste in a new browser tab");
+
+ gtk_container_add(GTK_CONTAINER(vbox), label);
+ gtk_container_add(GTK_CONTAINER(vbox), widgets.combo);
+ gtk_container_add(GTK_CONTAINER(vbox), widgets.check_button);
+
+ gtk_widget_show_all(vbox);
+
+ g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response),
+ NULL);
+
+ return vbox;
+}
+
+static void add_menu_item()
+{
+ GtkWidget *paste_item;
+
+ paste_item = gtk_menu_item_new_with_mnemonic(_("_Paste it!"));
+ gtk_widget_show(paste_item);
+ gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu),
+ paste_item);
+ g_signal_connect(paste_item, "activate", G_CALLBACK(item_activate),
+ NULL);
+
+ main_menu_item = paste_item;
+}
+
+void plugin_init(GeanyData * data)
+{
+ add_menu_item();
+}
+
+
+void plugin_cleanup(void)
+{
+ gtk_widget_destroy(main_menu_item);
+ g_free(welcome_text);
+}
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/master
Author: William Fraser <william.fraser(a)virgin.net>
Committer: William Fraser <william.fraser(a)virgin.net>
Date: Sat, 28 Apr 2012 09:16:07
Commit: a0514d1f18bfd24f4ab6da3b9640923dfb11309d
https://github.com/geany/geany-plugins/commit/a0514d1f18bfd24f4ab6da3b96409…
Log Message:
-----------
updated README and ABOUT files
Modified Paths:
--------------
geanynumberedbookmarks/ABOUT
geanynumberedbookmarks/README
Modified: geanynumberedbookmarks/ABOUT
11 files changed, 10 insertions(+), 1 deletions(-)
===================================================================
@@ -47,7 +47,16 @@ Save file settings... - This allows you the option of saving the settings of a
or to a file with the same name but a suffix (by default this is ".gnbs.conf")
in the same directory as the file. This allows the user the ability to
synchronise the settings for a file along with the file itself across more
- than one computer.
+ than one computer. The default suffix can be changed by editing the
+ numbered bookmarks pluggin settings file. This will vary from OS to OS but
+ will always be "settings.conf" in a directory called
+ "Geany_Numbered_Bookmarks". On my OS it's
+ ".config/geany/plugins/Geany_Numbered_Bookmarks/settings.conf" in my home
+ directory, but otherwise you'll have to search for it. In the Settings
+ section of the file near the top will be a line
+ "File_Details_Suffix=.gnbs.conf". Simply change this to whatever you would
+ prefer (if geany is running while you edit this file it may over-write your
+ new suffix so best close geany before editing this file).
Remember normal Bookmarks - If this is set then the plugin will remember
standard non-numbered bookmarks, and restore them when the file is next
loaded.
Modified: geanynumberedbookmarks/README
11 files changed, 10 insertions(+), 1 deletions(-)
===================================================================
@@ -47,7 +47,16 @@ Save file settings... - This allows you the option of saving the settings of a
or to a file with the same name but a suffix (by default this is ".gnbs.conf")
in the same directory as the file. This allows the user the ability to
synchronise the settings for a file along with the file itself across more
- than one computer.
+ than one computer. The default suffix can be changed by editing the
+ numbered bookmarks pluggin settings file. This will vary from OS to OS but
+ will always be "settings.conf" in a directory called
+ "Geany_Numbered_Bookmarks". On my OS it's
+ ".config/geany/plugins/Geany_Numbered_Bookmarks/settings.conf" in my home
+ directory, but otherwise you'll have to search for it. In the Settings
+ section of the file near the top will be a line
+ "File_Details_Suffix=.gnbs.conf". Simply change this to whatever you would
+ prefer (if geany is running while you edit this file it may over-write your
+ new suffix so best close geany before editing this file).
Remember normal Bookmarks - If this is set then the plugin will remember
standard non-numbered bookmarks, and restore them when the file is next
loaded.
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/master
Author: William Fraser <william.fraser(a)virgin.net>
Committer: William Fraser <william.fraser(a)virgin.net>
Date: Fri, 27 Apr 2012 21:12:04
Commit: af272c8c3abfcc1ebc72f92fc14f4c72a98fec7a
https://github.com/geany/geany-plugins/commit/af272c8c3abfcc1ebc72f92fc14f4…
Log Message:
-----------
updated README and ABOUT files
Modified Paths:
--------------
geanynumberedbookmarks/ABOUT
geanynumberedbookmarks/README
Modified: geanynumberedbookmarks/ABOUT
29 files changed, 24 insertions(+), 5 deletions(-)
===================================================================
@@ -13,15 +13,22 @@ To set a numbered bookmark press Ctrl+Shift+(a number from 0 to 9). You will
see a marker apear next to the line number. If you press Ctrl+Shift+(a number)
on a line that already has that bookmark number then it removes the bookmark,
otherwise it will move the bookmark there if it was set on a different line,
-or create it if it had not already been set. Only the bookmark with the highest
-number on a line will be shown, but you can have more than one bookmark per
-line. This plugin does not interfer with regular bookmarks. When a file is
-saved, Geany will remember the numbered bookmarks and make sure that they are
-set the next time you open the file.
+or create it if it had not already been set. To move to a previously set
+bookmark press Ctrl+(bookmark number). You can also specify when in the
+bookmarked line the cursor is moved to when you move to a previously set
+bookmark. You can choose to move to the start of the line, the end of the line,
+how far into the line the cursor was when the bookmark was set, or try and keep
+the cursor in the column that you are in at the moment (line length allowing).
+Only the most recently set bookmark on a line will be shown, but you can have
+more than one bookmark per line. This plugin does not interfer with regular
+bookmarks. When a file is saved, Geany will remember the numbered bookmarks and
+make sure that they are set the next time you open the file.
This plugin also will remember the state of folds in a file (open or not) if
you want it to and re-apply this the next time you open the file.
+This plugin will also remember standard non-numbered bookmarks and restore
+these when a file is next reloaded if you want it to.
You can alter the default behaviour of this plugin by selecting Plugin Manager
under the Tools menu, selecting this plugin, and cliking Preferences.
@@ -32,3 +39,15 @@ Remember fold state - if this is set then this plugin will remember the state
Center view when goto bookmark - If this is set it will try to make sure that
the numbered bookmark that you are going to is in the center of the screen,
otherwise it will simply be on the screen somewhere.
+Move to... - This allows you to choose where in the bookmarked line the cursor
+ is placed when you move to a bookmarked line.
+Save file settings... - This allows you the option of saving the settings of a
+ file (the numbered bookmark positions, folding states, and standard
+ bookmark positions) in either the central settings file for geany plugins,
+ or to a file with the same name but a suffix (by default this is ".gnbs.conf")
+ in the same directory as the file. This allows the user the ability to
+ synchronise the settings for a file along with the file itself across more
+ than one computer.
+Remember normal Bookmarks - If this is set then the plugin will remember
+ standard non-numbered bookmarks, and restore them when the file is next
+ loaded.
Modified: geanynumberedbookmarks/README
29 files changed, 24 insertions(+), 5 deletions(-)
===================================================================
@@ -13,15 +13,22 @@ To set a numbered bookmark press Ctrl+Shift+(a number from 0 to 9). You will
see a marker apear next to the line number. If you press Ctrl+Shift+(a number)
on a line that already has that bookmark number then it removes the bookmark,
otherwise it will move the bookmark there if it was set on a different line,
-or create it if it had not already been set. Only the bookmark with the highest
-number on a line will be shown, but you can have more than one bookmark per
-line. This plugin does not interfer with regular bookmarks. When a file is
-saved, Geany will remember the numbered bookmarks and make sure that they are
-set the next time you open the file.
+or create it if it had not already been set. To move to a previously set
+bookmark press Ctrl+(bookmark number). You can also specify when in the
+bookmarked line the cursor is moved to when you move to a previously set
+bookmark. You can choose to move to the start of the line, the end of the line,
+how far into the line the cursor was when the bookmark was set, or try and keep
+the cursor in the column that you are in at the moment (line length allowing).
+Only the most recently set bookmark on a line will be shown, but you can have
+more than one bookmark per line. This plugin does not interfer with regular
+bookmarks. When a file is saved, Geany will remember the numbered bookmarks and
+make sure that they are set the next time you open the file.
This plugin also will remember the state of folds in a file (open or not) if
you want it to and re-apply this the next time you open the file.
+This plugin will also remember standard non-numbered bookmarks and restore
+these when a file is next reloaded if you want it to.
You can alter the default behaviour of this plugin by selecting Plugin Manager
under the Tools menu, selecting this plugin, and cliking Preferences.
@@ -32,3 +39,15 @@ Remember fold state - if this is set then this plugin will remember the state
Center view when goto bookmark - If this is set it will try to make sure that
the numbered bookmark that you are going to is in the center of the screen,
otherwise it will simply be on the screen somewhere.
+Move to... - This allows you to choose where in the bookmarked line the cursor
+ is placed when you move to a bookmarked line.
+Save file settings... - This allows you the option of saving the settings of a
+ file (the numbered bookmark positions, folding states, and standard
+ bookmark positions) in either the central settings file for geany plugins,
+ or to a file with the same name but a suffix (by default this is ".gnbs.conf")
+ in the same directory as the file. This allows the user the ability to
+ synchronise the settings for a file along with the file itself across more
+ than one computer.
+Remember normal Bookmarks - If this is set then the plugin will remember
+ standard non-numbered bookmarks, and restore them when the file is next
+ loaded.
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/master
Author: William Fraser <william.fraser(a)virgin.net>
Committer: William Fraser <william.fraser(a)virgin.net>
Date: Fri, 27 Apr 2012 20:50:58
Commit: 89c199dd444572c7493bb7c8438444dfc7d5a2e5
https://github.com/geany/geany-plugins/commit/89c199dd444572c7493bb7c843844…
Log Message:
-----------
Implemented saving non-numbered bookmarks and updated help text box, also updated version to 1.0
Modified Paths:
--------------
geanynumberedbookmarks/src/geanynumberedbookmarks.c
Modified: geanynumberedbookmarks/src/geanynumberedbookmarks.c
257 files changed, 168 insertions(+), 89 deletions(-)
===================================================================
@@ -44,6 +44,7 @@
gint iBookmarkLinePos[10]; /* holds position of cursor in line */
gchar *pcFolding; /* holds which folds are open and which not */
gint LastChangedTime; /* time file was last changed by this editor */
+ gchar *pcBookmarks; /* holds non-numbered bookmarks */
struct FileData * NextNode;
} FileData;
@@ -55,7 +56,7 @@
PLUGIN_VERSION_CHECK(147)
PLUGIN_SET_INFO("Numbered Bookmarks",_("Numbered Bookmarks for Geany"),
- "0.1","William Fraser <william.fraser(a)virgin.net>");
+ "1.0","William Fraser <william.fraser(a)virgin.net>");
/* Plugin user alterable settings */
static gboolean bCenterWhenGotoBookmark=TRUE;
@@ -63,6 +64,7 @@
static gint PositionInLine=0;
static gint WhereToSaveFileDetails=0;
static gchar *FileDetailsSuffix; /* initialised when settings loaded */
+static gboolean bRememberBookmarks=TRUE;
/* internal variables */
static gint iShiftNumbers[]={41,33,34,163,36,37,94,38,42,40};
@@ -75,6 +77,7 @@
"Center_When_Goto_Bookmark = true\n"
"Remember_Folds = true\n"
"Position_In_Line = 0\n"
+ "Remember_Bookmarks = true\n"
"[FileData]";
/* Definitions for bookmark images */
@@ -289,6 +292,7 @@
"...BBBBBBBBBB...."
};
+
static const gchar ** aszMarkerImages[]=
{
aszMarkerImage0,aszMarkerImage1,aszMarkerImage2,aszMarkerImage3,aszMarkerImage4,
@@ -318,6 +322,7 @@ static FileData * GetFileData(gchar *pcFileName)
/* don't need to initiate iBookmarkLinePos */
fdKnownFilesSettings->pcFolding=NULL;
fdKnownFilesSettings->LastChangedTime=-1;
+ fdKnownFilesSettings->pcBookmarks=NULL;
fdKnownFilesSettings->NextNode=NULL;
}
return fdKnownFilesSettings;
@@ -342,6 +347,7 @@ static FileData * GetFileData(gchar *pcFileName)
/* don't need to initiate iBookmarkLinePos */
fdTemp->NextNode->pcFolding=NULL;
fdTemp->NextNode->LastChangedTime=-1;
+ fdTemp->NextNode->pcBookmarks=NULL;
fdTemp->NextNode->NextNode=NULL;
}
return fdTemp->NextNode;
@@ -368,7 +374,8 @@ static gboolean SaveIndividualSetting(GKeyFile *gkf,FileData *fd,gint iNumber,gc
/* i==10 if no markers set */
/* skip if no folding data or markers */
- if(i==10 && fd->pcFolding==NULL)
+ if(i==10 && (bRememberFolds==FALSE || fd->pcFolding==NULL) &&
+ (bRememberBookmarks==FALSE || fd->pcBookmarks==NULL))
return FALSE;
/* now save file data */
@@ -383,7 +390,7 @@ static gboolean SaveIndividualSetting(GKeyFile *gkf,FileData *fd,gint iNumber,gc
/* save folding data */
cKey[0]='B';
- if(NZV(fd->pcFolding))
+ if(fd->pcFolding!=NULL && bRememberFolds==TRUE)
g_key_file_set_string(gkf,"FileData",cKey,fd->pcFolding);
/* save last saved time */
@@ -441,6 +448,11 @@ static gboolean SaveIndividualSetting(GKeyFile *gkf,FileData *fd,gint iNumber,gc
if(szMarkers[9]!=0)
g_key_file_set_string(gkf,"FileData",cKey,szMarkers);
+ /* save non-numbered bookmarks */
+ cKey[0]='F';
+ if(fd->pcBookmarks!=NULL && bRememberBookmarks==TRUE)
+ g_key_file_set_string(gkf,"FileData",cKey,fd->pcBookmarks);
+
g_free(cKey);
return TRUE;
@@ -464,6 +476,7 @@ static void SaveSettings(gchar *filename)
g_key_file_set_boolean(config,"Settings","Remember_Folds",bRememberFolds);
g_key_file_set_integer(config,"Settings","Position_In_Line",PositionInLine);
g_key_file_set_integer(config,"Settings","Where_To_Save_File_Details",WhereToSaveFileDetails);
+ g_key_file_set_boolean(config,"Settings","Remember_Bookmarks",bRememberBookmarks);
if(FileDetailsSuffix!=NULL)
g_key_file_set_string(config,"Settings","File_Details_Suffix",FileDetailsSuffix);
@@ -569,7 +582,11 @@ static gboolean LoadIndividualSetting(GKeyFile *gkf,gint iNumber,gchar *Filename
/* get folding data */
pcKey[0]='B';
- fd->pcFolding=(gchar*)(utils_get_setting_string(gkf,"FileData",pcKey,NULL));
+ if(bRememberFolds==TRUE)
+ fd->pcFolding=(gchar*)(utils_get_setting_string(gkf,"FileData",pcKey,NULL));
+ else
+ fd->pcFolding=NULL;
+
/* load last saved time */
pcKey[0]='C';
fd->LastChangedTime=utils_get_setting_integer(gkf,"FileData",pcKey,-1);
@@ -610,6 +627,13 @@ static gboolean LoadIndividualSetting(GKeyFile *gkf,gint iNumber,gchar *Filename
pcTemp2++;
}
+ /* get non-numbered bookmarks */
+ pcKey[0]='F';
+ if(bRememberBookmarks==TRUE)
+ fd->pcBookmarks=(gchar*)(utils_get_setting_string(gkf,"FileData",pcKey,NULL));
+ else
+ fd->pcBookmarks=NULL;
+
/* free used memory */
g_free(pcTemp);
g_free(pcKey);
@@ -647,6 +671,7 @@ static void LoadSettings(void)
PositionInLine=utils_get_setting_integer(config,"Settings","Position_In_Line",0);
WhereToSaveFileDetails=utils_get_setting_integer(config,"Settings",
"Where_To_Save_File_Details",0);
+ bRememberBookmarks=utils_get_setting_boolean(config,"Settings","Remember_Bookmarks",FALSE);
FileDetailsSuffix=utils_get_setting_string(config,"Settings","File_Details_Suffix",
".gnbs.conf");
@@ -861,8 +886,7 @@ static void ApplyBookmarks(ScintillaObject* sci,FileData *fd)
dialog=gtk_message_dialog_new(GTK_WINDOW(geany->main_widgets->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,GTK_BUTTONS_NONE,
- _("Unable to apply all markers to \
- '%s' as all being used."),
+_("Unable to apply all markers to '%s' as all being used."),
document_get_current()->file_name);
gtk_dialog_add_button(GTK_DIALOG(dialog),_("_Okay"),GTK_RESPONSE_OK);
gtk_dialog_run(GTK_DIALOG(dialog));
@@ -889,6 +913,7 @@ static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_dat
struct stat sBuf;
GtkWidget *dialog;
gchar *cFoldData=NULL;
+ gchar *pcTemp;
/* keep compiler happy & initialise iBits: will logically be initiated anyway */
gint iBits=0,iFlags,iBitCounter;
@@ -905,10 +930,8 @@ static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_dat
dialog=gtk_message_dialog_new(GTK_WINDOW(geany->main_widgets->window),
GTK_DIALOG_DESTROY_WITH_PARENT,GTK_MESSAGE_ERROR,
GTK_BUTTONS_NONE,
- _("'%s' has been edited since it was last saved by g\
- eany. Marker positions may be unreliable and will \
- not be loaded.\nPress Ignore to try an load marker\
- s anyway."),doc->file_name);
+_("'%s' has been edited since it was last saved by geany. Marker positions may be unreliable and w\
+ill not be loaded.\nPress Ignore to try an load markers anyway."),doc->file_name);
gtk_dialog_add_button(GTK_DIALOG(dialog),_("_Okay"),GTK_RESPONSE_OK);
gtk_dialog_add_button(GTK_DIALOG(dialog),_("_Ignore"),GTK_RESPONSE_REJECT);
l=gtk_dialog_run(GTK_DIALOG(dialog));
@@ -923,38 +946,59 @@ static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_dat
ApplyBookmarks(sci,fd);
/* get fold settings if present and want to use them */
- if(fd->pcFolding==NULL || bRememberFolds==FALSE)
- break;
+ if(fd->pcFolding!=NULL && bRememberFolds==TRUE)
+ {
+ cFoldData=fd->pcFolding;
- cFoldData=fd->pcFolding;
+ /* first ensure fold positions exist */
+ scintilla_send_message(sci,SCI_COLOURISE,0,-1);
- /* first ensure fold positions exist */
- scintilla_send_message(sci,SCI_COLOURISE,0,-1);
+ iLineCount=scintilla_send_message(sci,SCI_GETLINECOUNT,0,0);
- iLineCount=scintilla_send_message(sci,SCI_GETLINECOUNT,0,0);
+ /* go through lines setting fold status */
+ for(i=0,iBitCounter=6;i<iLineCount;i++)
+ {
+ iFlags=scintilla_send_message(sci,SCI_GETFOLDLEVEL,i,0);
+ /* ignore non-folding lines */
+ if((iFlags & SC_FOLDLEVELHEADERFLAG)==0)
+ continue;
+
+ /* get next 6 fold states if needed */
+ if(iBitCounter==6)
+ {
+ iBitCounter=0;
+ iBits=base64_char_to_int[(gint)(*cFoldData)];
+ cFoldData++;
+ }
+
+ /* set fold if needed */
+ if(((iBits>>iBitCounter)&1)==0)
+ scintilla_send_message(sci,SCI_TOGGLEFOLD,i,0);
+
+ /* increment counter */
+ iBitCounter++;
+ }
+ }
- /* go through lines setting fold status */
- for(i=0,iBitCounter=6;i<iLineCount;i++)
+ /* get non-numbered bookmark settings if present and want to use them */
+ if(fd->pcBookmarks!=NULL && bRememberBookmarks==TRUE)
{
- iFlags=scintilla_send_message(sci,SCI_GETFOLDLEVEL,i,0);
- /* ignore non-folding lines */
- if((iFlags & SC_FOLDLEVELHEADERFLAG)==0)
- continue;
-
- /* get next 6 fold states if needed */
- if(iBitCounter==6)
+ pcTemp=fd->pcBookmarks;
+ while(pcTemp[0]!=0)
{
- iBitCounter=0;
- iBits=base64_char_to_int[(gint)(*cFoldData)];
- cFoldData++;
- }
+ /* get next linenumber */
+ i=strtoll(pcTemp,NULL,16);
+ /* set bookmark */
+ scintilla_send_message(sci,SCI_MARKERADD,i,1);
+ /* move to next linenumber */
+ while(pcTemp[0]!=0 && pcTemp[0]!=',')
+ pcTemp++;
- /* set fold if needed */
- if(((iBits>>iBitCounter)&1)==0)
- scintilla_send_message(sci,SCI_TOGGLEFOLD,i,0);
+ if(pcTemp[0]==',')
+ pcTemp++;
+
+ }
- /* increment counter */
- iBitCounter++;
}
break;
@@ -977,9 +1021,10 @@ static void on_document_save(GObject *obj, GeanyDocument *doc, gpointer user_dat
gint i,iLineCount,iFlags,iBitCounter=0;
ScintillaObject* sci=doc->editor->sci;
struct stat sBuf;
- GByteArray *gbaFoldData=g_byte_array_sized_new(1000);
+ GByteArray *gbaFoldData=NULL;
guint8 guiFold=0;
- gboolean bHasClosedFold=FALSE;
+ gboolean bHasClosedFold=FALSE,bHasBookmark=FALSE;
+ gchar szLine[20];
/* update markerpos */
fd=GetFileData(doc->file_name);
@@ -987,45 +1032,79 @@ static void on_document_save(GObject *obj, GeanyDocument *doc, gpointer user_dat
fd->iBookmark[i]=scintilla_send_message(sci,SCI_MARKERNEXT,0,
1<<(fd->iBookmarkMarkerUsed[i]));
- /* update fold state */
- iLineCount=scintilla_send_message(sci,SCI_GETLINECOUNT,0,0);
- /* go through each line */
- for(i=0;i<iLineCount;i++)
+ /* save fold state */
+ if(bRememberFolds==TRUE)
{
- iFlags=scintilla_send_message(sci,SCI_GETFOLDLEVEL,i,0);
- /* ignore line if not a folding point */
- if((iFlags & SC_FOLDLEVELHEADERFLAG)==0)
- continue;
+ gbaFoldData=g_byte_array_sized_new(1000);
- iFlags=scintilla_send_message(sci,SCI_GETFOLDEXPANDED,i,0);
- /* make note of if any folds closed or not */
- bHasClosedFold|=((iFlags&1)==0);
- /* remember if folded or not */
- guiFold|=(iFlags&1)<<iBitCounter;
- iBitCounter++;
- if(iBitCounter<6)
- continue;
+ iLineCount=scintilla_send_message(sci,SCI_GETLINECOUNT,0,0);
+ /* go through each line */
+ for(i=0;i<iLineCount;i++)
+ {
+ iFlags=scintilla_send_message(sci,SCI_GETFOLDLEVEL,i,0);
+ /* ignore line if not a folding point */
+ if((iFlags & SC_FOLDLEVELHEADERFLAG)==0)
+ continue;
+
+ iFlags=scintilla_send_message(sci,SCI_GETFOLDEXPANDED,i,0);
+ /* make note of if any folds closed or not */
+ bHasClosedFold|=((iFlags&1)==0);
+ /* remember if folded or not */
+ guiFold|=(iFlags&1)<<iBitCounter;
+ iBitCounter++;
+ if(iBitCounter<6)
+ continue;
+
+ /* if have 6 bits then store these */
+ iBitCounter=0;
+ guiFold=(guint8)base64_int_to_char[guiFold];
+ g_byte_array_append(gbaFoldData,&guiFold,1);
+ guiFold=0;
+ }
+
+ /* flush buffer */
+ if(iBitCounter!=0)
+ {
+ guiFold=(guint8)base64_int_to_char[guiFold];
+ g_byte_array_append(gbaFoldData,&guiFold,1);
+ }
- /* if have 6 bits then store these */
- iBitCounter=0;
- guiFold=(guint8)base64_int_to_char[guiFold];
- g_byte_array_append(gbaFoldData,&guiFold,1);
- guiFold=0;
+ /* transfer data to text string if have closed fold. Default will leave them open*/
+ fd->pcFolding=(!bHasClosedFold)?NULL:g_strndup((gchar*)(gbaFoldData->data),
+ gbaFoldData->len);
+
+ /* free byte array space */
+ g_byte_array_free(gbaFoldData,TRUE);
}
+ else
+ fd->pcFolding=NULL;
- /* flush buffer */
- if(iBitCounter!=0)
+ /* now save off bookmarks */
+ if(bRememberBookmarks==TRUE)
{
- guiFold=(guint8)base64_int_to_char[guiFold];
- g_byte_array_append(gbaFoldData,&guiFold,1);
+ gbaFoldData=g_byte_array_sized_new(1000);
+
+ i=0;
+ while((i=scintilla_send_message(sci,SCI_MARKERNEXT,i+1,2))!=-1)
+ {
+ g_sprintf(szLine,"%s%X",bHasBookmark?",":"",i);
+ g_byte_array_append(gbaFoldData,(guint8*)szLine,strlen(szLine));
+
+ /* will be data in byte array to save */
+ bHasBookmark=TRUE;
+ }
+
+ /* transfer data to text string */
+ fd->pcBookmarks=(!bHasBookmark)?NULL:g_strndup((gchar*)(gbaFoldData->data),
+ gbaFoldData->len);
+
+ /* free byte array space */
+ g_byte_array_free(gbaFoldData,TRUE);
}
+ else
+ fd->pcBookmarks=NULL;
- /* transfer data to text string if have closed fold. Default will leave them open*/
- fd->pcFolding=(!bHasClosedFold)?NULL:g_strndup((gchar*)(gbaFoldData->data),
- gbaFoldData->len);
- /* free byte array space */
- g_byte_array_free(gbaFoldData,TRUE);
/* make note of time last saved */
if(stat(doc->file_name,&sBuf)==0)
@@ -1056,7 +1135,7 @@ static gint GetLine(ScintillaObject* sci)
static void on_configure_response(GtkDialog *dialog, gint response, gpointer user_data)
{
gboolean bSettingsHaveChanged;
- GtkCheckButton *cb1,*cb2;
+ GtkCheckButton *cb1,*cb2,*cb3;
GtkComboBox *gtkcb1,*gtkcb2;
if(response!=GTK_RESPONSE_OK && response!=GTK_RESPONSE_APPLY)
@@ -1067,6 +1146,7 @@ static void on_configure_response(GtkDialog *dialog, gint response, gpointer use
cb2=(GtkCheckButton*)(g_object_get_data(G_OBJECT(dialog),"Geany_Numbered_Bookmarks_cb2"));
gtkcb1=(GtkComboBox*)(g_object_get_data(G_OBJECT(dialog),"Geany_Numbered_Bookmarks_cb3"));
gtkcb2=(GtkComboBox*)(g_object_get_data(G_OBJECT(dialog),"Geany_Numbered_Bookmarks_cb4"));
+ cb3=(GtkCheckButton*)(g_object_get_data(G_OBJECT(dialog),"Geany_Numbered_Bookmarks_cb5"));
/* first see if settings are going to change */
bSettingsHaveChanged=(bRememberFolds!=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb1)));
@@ -1074,12 +1154,15 @@ static void on_configure_response(GtkDialog *dialog, gint response, gpointer use
GTK_TOGGLE_BUTTON(cb2)));
bSettingsHaveChanged|=(gtk_combo_box_get_active(gtkcb1)!=PositionInLine);
bSettingsHaveChanged|=(gtk_combo_box_get_active(gtkcb2)!=WhereToSaveFileDetails);
+ bSettingsHaveChanged|=(bRememberBookmarks!=gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(cb3)));
/* set new settings settings */
bRememberFolds=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb1));
bCenterWhenGotoBookmark=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb2));
PositionInLine=gtk_combo_box_get_active(gtkcb1);
WhereToSaveFileDetails=gtk_combo_box_get_active(gtkcb2);
+ bRememberBookmarks=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb3));
/* now save new settings if they have changed */
if(bSettingsHaveChanged)
@@ -1123,6 +1206,12 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
gtk_box_pack_start(GTK_BOX(vbox),gtkw,FALSE,FALSE,2);
g_object_set_data(G_OBJECT(dialog),"Geany_Numbered_Bookmarks_cb4",gtkw);
+ gtkw=gtk_check_button_new_with_label(_("remember normal Bookmarks"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkw),bRememberBookmarks);
+ gtk_box_pack_start(GTK_BOX(vbox),gtkw,FALSE,FALSE,2);
+ /* save pointer to check_button */
+ g_object_set_data(G_OBJECT(dialog),"Geany_Numbered_Bookmarks_cb5",gtkw);
+
gtk_widget_show_all(vbox);
g_signal_connect(dialog,"response",G_CALLBACK(on_configure_response),NULL);
@@ -1144,23 +1233,14 @@ void plugin_help(void)
/* create label */
label=gtk_label_new(
- _("This Plugin implements Numbered Bookmarks in Geany.\n\n"
- "It allows you to use 10 numbered bookmarks. Normaly if you had more than one \
-bookmark, you would have to cycle through them until you reached the one you wanted. With this \
-plugin you can go straight to the bookmark that you want with a single key combination. To set a \
-numbered bookmark press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to the \
-line number. If you press Ctrl+Shift+a number on a line that already has that bookmark number then\
- it removes the bookmark, otherwise it will move the bookmark there if it was set on a different \
-line, or create it if it had not already been set. Only the bookmark with the highest number on a \
-line will be shown, but you can have more than one bookmark per line. This plugin does not \
-interfer with regular bookmarks. When a file is saved, Geany will remember the numbered bookmarks \
-and make sure that they are set the next time you open the file.\n\n"
- "You can alter the default behaviour of this plugin by selecting Plugin Manager under the \
-Tools menu, selecting this plugin, and cliking Preferences. You can change:\nRemember fold state -\
- if this is set then this plugin will remember the state of any folds along with the numbered \
-bookmarks and set them when the file is next loaded.\nCenter view when goto bookmark - If this is \
-set it will try to make sure that the numbered bookmark that you are going to is in the center of \
-the screen, otherwise it will simply be on the screen somewhere."));
+_("This Plugin implements Numbered Bookmarks in Geany, as well as remembering the state of folds, \
+and positions of standard non-numbered bookmarks when a file is saved.\n\n"
+"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark press Ctrl+Shift+a n\
+umber from 0 to 9. You will see a marker apear next to the line number. If you press Ctrl+Shift+a \
+number on a line that already has that bookmark number then it removes the bookmark, otherwise it \
+will move the bookmark there if it was set on a different line, or create it if it had not already\
+ been set. Only the most recently set bookmark on a line will be shown, but you can have more than\
+ one bookmark per line. To move to a previously set bookmark, press Ctrl+a number from 0 to 9."));
gtk_label_set_line_wrap(GTK_LABEL(label),TRUE);
gtk_widget_show(label);
@@ -1274,8 +1354,7 @@ static void SetBookMark(gint iBookMark)
dialog=gtk_message_dialog_new(GTK_WINDOW(geany->main_widgets->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,GTK_BUTTONS_NONE,
- _("Unable to apply markers as all being used\
- ."));
+ _("Unable to apply markers as all being used."));
gtk_dialog_add_button(GTK_DIALOG(dialog),_("_Okay"),GTK_RESPONSE_OK);
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
@@ -1446,9 +1525,9 @@ void plugin_cleanup(void)
{
/* free filename */
g_free(fdTemp->pcFileName);
- /* free folding information if present */
- if(fdTemp->pcFolding!=NULL)
- g_free(fdTemp->pcFolding);
+ /* free folding & bookmark information if present */
+ g_free(fdTemp->pcFolding);
+ g_free(fdTemp->pcBookmarks);
fdTemp2=fdTemp->NextNode;
/* free memory block */
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/master
Author: William Fraser <william.fraser(a)virgin.net>
Committer: William Fraser <william.fraser(a)virgin.net>
Date: Wed, 18 Apr 2012 15:29:41
Commit: cf11e635d2f94fea73e973eada789f29d573a960
https://github.com/geany/geany-plugins/commit/cf11e635d2f94fea73e973eada789…
Log Message:
-----------
reworked so use variable markers for better compatibility with other plugins.
Modified Paths:
--------------
geanynumberedbookmarks/src/geanynumberedbookmarks.c
Modified: geanynumberedbookmarks/src/geanynumberedbookmarks.c
325 files changed, 227 insertions(+), 98 deletions(-)
===================================================================
@@ -34,26 +34,18 @@
static const gchar base64_int_to_char[]=
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-/* offset for marker numbers used - to bypass markers used by normal bookmarksetc */
-#define BOOKMARK_BASE 10
-
/* define structures used in this plugin */
typedef struct FileData
{
gchar *pcFileName; /* holds filename */
gint iBookmark[10]; /* holds bookmark lines or -1 for not set */
+ gint iBookmarkMarkerUsed[10]; /*holds which marker (2-24) is used for this bookmark */
gint iBookmarkLinePos[10]; /* holds position of cursor in line */
gchar *pcFolding; /* holds which folds are open and which not */
gint LastChangedTime; /* time file was last changed by this editor */
struct FileData * NextNode;
} FileData;
-/* structure to hold list of Scintilla objects that have had icons set for bookmarks */
-typedef struct SCIPOINTERHOLDER
-{
- ScintillaObject* sci;
- struct SCIPOINTERHOLDER * NextNode;
-} SCIPOINTERHOLDER;
GeanyPlugin *geany_plugin;
GeanyData *geany_data;
@@ -71,7 +63,6 @@
/* internal variables */
static gint iShiftNumbers[]={41,33,34,163,36,37,94,38,42,40};
-static SCIPOINTERHOLDER *sciList=NULL;
static FileData *fdKnownFilesSettings=NULL;
static gulong key_release_signal_id;
@@ -584,61 +575,192 @@ static void LoadSettings(void)
}
-/* Define Markers for an editor */
-static void DefineMarkers(ScintillaObject* sci)
-{
- gint i;
- for(i=0;i<10;i++)
- scintilla_send_message(sci,SCI_MARKERDEFINEPIXMAP,i+BOOKMARK_BASE,
- (glong)(aszMarkerImages[i]));
-}
-
+/* get next free marker number */
+static gint NextFreeMarker(ScintillaObject* sci) {
+ gint i,l,m,k;
+ guint32 markers;
+ FileData *fd;
-/* Make sure that have setup markers if not come across this particular editor
- * Keep track of editors we've encountered and set markers for
-*/
-static void CheckEditorSetup(void)
-{
- SCIPOINTERHOLDER *sciTemp;
- ScintillaObject* sci=document_get_current()->editor->sci;
+ markers=(guint32)(g_object_get_data(G_OBJECT(sci),"Geany_Numbered_Bookmarks_Used"));
- /* no recorded editors so make note of editor */
- if(sciList==NULL)
+ /* markers 0 and 1 reserved for bookmarks & errors, 25 onwards for folds */
+ /* find first free marker after last defined marker. Will ensure that new marker */
+ /* is displayed over any previously set markers */
+ for(i=24,m=-1;i>1;i--)
{
- if((sciList=(SCIPOINTERHOLDER *)(g_malloc(sizeof *sciTemp)))!=NULL)
+ l=scintilla_send_message(sci,SCI_MARKERSYMBOLDEFINED,i,0);
+
+ if(l==SC_MARK_CIRCLE || l==SC_MARK_AVAILABLE)
{
- sciList->sci=sci;
- sciList->NextNode=NULL;
- DefineMarkers(sci);
+ /* if reached start of user-defined markers then return this */
+ if(i==2)
+ return 2;
+
+ /* found empty marker so make note of it */
+ m=i;
+ /* keep looking for 1st unused marker after last used marker */
+ continue;
}
- return;
+ /* found marker */
+
+ /* if not a numbered bookmark then ignore it */
+ if((markers&(1<<i))==0)
+ continue;
+
+ /* if have found an empty marker higher then return this */
+ if(m!=-1)
+ return m;
+
+ /* no empty markers above last used */
+
+ /* first see if there are any unused markers */
+ while(i>1)
+ {
+ l=scintilla_send_message(sci,SCI_MARKERSYMBOLDEFINED,i,0);
+ if(l==SC_MARK_CIRCLE || l==SC_MARK_AVAILABLE)
+ break;
+
+ i--;
+ }
+
+ /* no empty markers available so return -1 */
+ if(i==1)
+ return -1;
+
+ /* there are empty markers available. Break out of for loop & make them available */
+ break;
}
- sciTemp=sciList;
- while(sciTemp->NextNode!=NULL)
+ /* compact used numbered markers */
+ /* move through markers moving numbered bookmarks ones from i to m */
+ for(m=2,i=2;i<25;i++)
{
- /* if have come across this editor before, then it will have had it's markers set and we
- * don't need to do any more
- */
- if(sciTemp->sci==sci)
- return;
+ /* don't move marker unless it's a numbered bookmark marker */
+ if((markers&(1<<i))==0)
+ continue;
- sciTemp=sciTemp->NextNode;
+ /* find unused marker */
+ l=scintilla_send_message(sci,SCI_MARKERSYMBOLDEFINED,m,0);
+ while((l!=SC_MARK_CIRCLE && l!=SC_MARK_AVAILABLE) && m<i)
+ {
+ m++;
+ l=scintilla_send_message(sci,SCI_MARKERSYMBOLDEFINED,m,0);
+ }
+
+ /* if can't move marker forward then don't */
+ if(m==i)
+ continue;
+
+ /* move marker from i to m */
+ /* first make note of line number of marker */
+ l=scintilla_send_message(sci,SCI_MARKERNEXT,0,1<<i);
+ /* remove old marker */
+ scintilla_send_message(sci,SCI_MARKERDELETEALL,i,0);
+ scintilla_send_message(sci,SCI_MARKERDEFINE,i,SC_MARK_AVAILABLE);
+
+ /* find bookmark number, put in k */
+ fd=GetFileData(document_get_current()->file_name);
+ for(k=0;k<10;k++)
+ if(fd->iBookmarkMarkerUsed[k]==i)
+ break;
+
+ /* insert new marker */
+ scintilla_send_message(sci,SCI_MARKERDEFINEPIXMAP,m,(glong)(aszMarkerImages[k]));
+ scintilla_send_message(sci,SCI_MARKERADD,l,m);
+
+ /* update markers record */
+ markers-=1<<i;
+ markers|=1<<m;
+
+ /* update record of which bookmark uses which marker */
+ fd->iBookmarkMarkerUsed[k]=m;
}
- /* if have come across this editor before, then it will have had it's markers set and we don't
- * need to do any more
- */
- if(sciTemp->sci==sci)
- return;
- /* not come across this editor */
- if((sciTemp->NextNode=g_malloc(sizeof *sciTemp->NextNode))!=NULL)
+ /* save record of which markers are being used */
+ g_object_set_data(G_OBJECT(sci),"Geany_Numbered_Bookmarks_Used",(gpointer)markers);
+
+
+ /* m should point to last used marker. Next free marker should lie after this */
+ /* find free marker & return it */
+ for(;m<25;m++)
{
- sciTemp->NextNode->sci=sci;
- sciTemp->NextNode->NextNode=NULL;
- DefineMarkers(sci);
- }
+ l=scintilla_send_message(sci,SCI_MARKERSYMBOLDEFINED,m,0);
+ if(l==SC_MARK_CIRCLE || l==SC_MARK_AVAILABLE)
+ return m;
+ }
+
+ /* no empty markers available so return -1 */
+ /* in theory shouldn't get here but leave just in case my logic is flawed */
+ return -1;
+}
+
+
+static void SetMarker(ScintillaObject* sci,gint bookmarkNumber,gint markerNumber,gint line)
+{
+ guint32 markers;
+ FileData *fd;
+
+ /* insert new marker */
+ scintilla_send_message(sci,SCI_MARKERDEFINEPIXMAP,markerNumber,
+ (glong)(aszMarkerImages[bookmarkNumber]));
+ scintilla_send_message(sci,SCI_MARKERADD,line,markerNumber);
+
+ /* update record of which bookmark uses which marker */
+ fd=GetFileData(document_get_current()->file_name);
+ fd->iBookmarkMarkerUsed[bookmarkNumber]=markerNumber;
+
+ /* update record of which markers are being used */
+ markers=(guint32)(g_object_get_data(G_OBJECT(sci),"Geany_Numbered_Bookmarks_Used"));
+ markers|=1<<markerNumber;
+ g_object_set_data(G_OBJECT(sci),"Geany_Numbered_Bookmarks_Used",(gpointer)markers);
+}
+
+
+static void DeleteMarker(ScintillaObject* sci,gint bookmarkNumber,gint markerNumber)
+{
+ guint32 markers;
+
+ /* remove marker */
+ scintilla_send_message(sci,SCI_MARKERDELETEALL,markerNumber,0);
+ scintilla_send_message(sci,SCI_MARKERDEFINE,markerNumber,SC_MARK_AVAILABLE);
+
+ /* update record of which markers are being used */
+ markers=(guint32)(g_object_get_data(G_OBJECT(sci),"Geany_Numbered_Bookmarks_Used"));
+ markers-=1<<markerNumber;
+ g_object_set_data(G_OBJECT(sci),"Geany_Numbered_Bookmarks_Used",(gpointer)markers);
+}
+
+
+static void ApplyBookmarks(ScintillaObject* sci,FileData *fd)
+{
+ gint i,iLineCount,m;
+ GtkWidget *dialog;
+
+ iLineCount=scintilla_send_message(sci,SCI_GETLINECOUNT,0,0);
+
+ for(i=0;i<10;i++)
+ if(fd->iBookmark[i]!=-1 && fd->iBookmark[i]<iLineCount)
+ {
+ m=NextFreeMarker(sci);
+ /* if run out of markers report this */
+ if(m==-1)
+ {
+ dialog=gtk_message_dialog_new(GTK_WINDOW(geany->main_widgets->window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,GTK_BUTTONS_NONE,
+ _("Unable to apply all markers to \
+ '%s' as all being used."),
+ document_get_current()->file_name);
+ gtk_dialog_add_button(GTK_DIALOG(dialog),_("_Okay"),GTK_RESPONSE_OK);
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+ return;
+ }
+
+ /* otherwise ok to set marker */
+ SetMarker(sci,i,m,fd->iBookmark[i]);
+ }
}
@@ -658,10 +780,6 @@ static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_dat
/* keep compiler happy & initialise iBits: will logically be initiated anyway */
gint iBits=0,iFlags,iBitCounter;
- /* ensure have markers set */
- CheckEditorSetup();
- DefineMarkers(sci);
-
/* check to see if file has changed since geany last saved it */
fd=GetFileData(doc->file_name);
if(stat(doc->file_name,&sBuf)==0 && fd!=NULL && fd->LastChangedTime!=-1 &&
@@ -686,9 +804,7 @@ static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_dat
/* file not changed since Geany last saved it so saved settings should be fine */
case GTK_RESPONSE_ACCEPT:
/* now set markers */
- for(i=0;i<10;i++)
- if(fd->iBookmark[i]!=-1)
- scintilla_send_message(sci,SCI_MARKERADD,fd->iBookmark[i],i+BOOKMARK_BASE);
+ ApplyBookmarks(sci,fd);
/* get fold settings if present and want to use them */
if(fd->pcFolding==NULL || bRememberFolds==FALSE)
@@ -728,11 +844,7 @@ static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_dat
break;
/* file has changed since Geany last saved but, try to load bookmarks anyway */
case GTK_RESPONSE_REJECT:
- iLineCount=scintilla_send_message(sci,SCI_GETLINECOUNT,0,0);
- for(i=0;i<10;i++)
- if(fd->iBookmark[i]!=-1 && fd->iBookmark[i]<iLineCount)
- scintilla_send_message(sci,SCI_MARKERADD,fd->iBookmark[i],i);
-
+ ApplyBookmarks(sci,fd);
break;
default: /* default - don't try to set markers */
break;
@@ -745,7 +857,7 @@ static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_dat
*/
static void on_document_save(GObject *obj, GeanyDocument *doc, gpointer user_data)
{
- FileData *fdTemp;
+ FileData *fd;
gint i,iLineCount,iFlags,iBitCounter=0;
ScintillaObject* sci=doc->editor->sci;
struct stat sBuf;
@@ -754,9 +866,10 @@ static void on_document_save(GObject *obj, GeanyDocument *doc, gpointer user_dat
gboolean bHasClosedFold=FALSE;
/* update markerpos */
- fdTemp=GetFileData(doc->file_name);
+ fd=GetFileData(doc->file_name);
for(i=0;i<10;i++)
- fdTemp->iBookmark[i]=scintilla_send_message(sci,SCI_MARKERNEXT,0,1<<(i+BOOKMARK_BASE));
+ fd->iBookmark[i]=scintilla_send_message(sci,SCI_MARKERNEXT,0,
+ 1<<(fd->iBookmarkMarkerUsed[i]));
/* update fold state */
iLineCount=scintilla_send_message(sci,SCI_GETLINECOUNT,0,0);
@@ -792,14 +905,15 @@ static void on_document_save(GObject *obj, GeanyDocument *doc, gpointer user_dat
}
/* transfer data to text string if have closed fold. Default will leave them open*/
- fdTemp->pcFolding=(!bHasClosedFold)?NULL:g_strndup((gchar*)(gbaFoldData->data),gbaFoldData->len);
+ fd->pcFolding=(!bHasClosedFold)?NULL:g_strndup((gchar*)(gbaFoldData->data),
+ gbaFoldData->len);
/* free byte array space */
g_byte_array_free(gbaFoldData,TRUE);
/* make note of time last saved */
if(stat(doc->file_name,&sBuf)==0)
- fdTemp->LastChangedTime=sBuf.st_mtime;
+ fd->LastChangedTime=sBuf.st_mtime;
/* save settings */
SaveSettings();
@@ -949,7 +1063,9 @@ static void GotoBookMark(gint iBookMark)
ScintillaObject* sci=document_get_current()->editor->sci;
FileData *fd;
- iLine=scintilla_send_message(sci,SCI_MARKERNEXT,0,1<<(iBookMark+BOOKMARK_BASE));
+ fd=GetFileData(document_get_current()->file_name);
+
+ iLine=scintilla_send_message(sci,SCI_MARKERNEXT,0,1<<(fd->iBookmarkMarkerUsed[iBookMark]));
/* ignore if no marker placed for requested bookmark */
if(iLine==-1)
@@ -967,7 +1083,6 @@ static void GotoBookMark(gint iBookMark)
break;
/* remembered line position */
case 1:
- fd=GetFileData(document_get_current()->file_name);
iPosition+=fd->iBookmarkLinePos[iBookMark];
if(iPosition>iEndOfLine)
iPosition=iEndOfLine;
@@ -1012,12 +1127,13 @@ static void GotoBookMark(gint iBookMark)
/* set (or remove) numbered bookmark */
static void SetBookMark(gint iBookMark)
{
- gint iNewLine,iOldLine,iPosInLine;
+ gint iNewLine,iOldLine,iPosInLine,m;
ScintillaObject* sci=document_get_current()->editor->sci;
- FileData *fd;
+ FileData *fd=GetFileData(document_get_current()->file_name);;
+ GtkWidget *dialog;
/* see if already such a bookmark present */
- iOldLine=scintilla_send_message(sci,SCI_MARKERNEXT,0,1<<(iBookMark+BOOKMARK_BASE));
+ iOldLine=scintilla_send_message(sci,SCI_MARKERNEXT,0,1<<(fd->iBookmarkMarkerUsed[iBookMark]));
iNewLine=GetLine(sci);
iPosInLine=scintilla_send_message(sci,SCI_GETCURRENTPOS,0,0)-
scintilla_send_message(sci,SCI_POSITIONFROMLINE,iNewLine,0);
@@ -1025,23 +1141,43 @@ static void SetBookMark(gint iBookMark)
/* if no marker then simply add one to current line */
if(iOldLine==-1)
{
- CheckEditorSetup();
- scintilla_send_message(sci,SCI_MARKERADD,iNewLine,iBookMark+BOOKMARK_BASE);
- fd=GetFileData(document_get_current()->file_name);
+ m=NextFreeMarker(sci);
+ /* if run out of markers report this */
+ if(m==-1)
+ {
+ dialog=gtk_message_dialog_new(GTK_WINDOW(geany->main_widgets->window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,GTK_BUTTONS_NONE,
+ _("Unable to apply markers as all being used\
+ ."));
+ gtk_dialog_add_button(GTK_DIALOG(dialog),_("_Okay"),GTK_RESPONSE_OK);
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+ return;
+ }
+ /* otherwise ok to set marker */
+ SetMarker(sci,iBookMark,m,iNewLine);
fd->iBookmarkLinePos[iBookMark]=iPosInLine;
}
- /* else either have to remove marker from current line, or move it to current line */
+ /* else if have to remove marker from current line */
+ else if(iOldLine==iNewLine)
+ {
+ DeleteMarker(sci,iBookMark,fd->iBookmarkMarkerUsed[iBookMark]);
+ }
+ /* else have to move it to current line */
else
{
+ /* go through the process of removing and adding the marker so the marker will */
+ /* have the highest value and be on top */
+
/* remove old marker */
- scintilla_send_message(sci,SCI_MARKERDELETEALL,iBookMark+BOOKMARK_BASE,0);
+ DeleteMarker(sci,iBookMark,fd->iBookmarkMarkerUsed[iBookMark]);
/* add new marker if moving marker */
- if(iOldLine!=iNewLine)
- {
- scintilla_send_message(sci,SCI_MARKERADD,iNewLine,iBookMark+BOOKMARK_BASE);
- fd=GetFileData(document_get_current()->file_name);
- fd->iBookmarkLinePos[iBookMark]=iPosInLine;
- }
+ m=NextFreeMarker(sci);
+ /* don't bother checking for failure to find marker as have just released one so */
+ /* there should be one free */
+ SetMarker(sci,iBookMark,m,iNewLine);
+ fd->iBookmarkLinePos[iBookMark]=iPosInLine;
}
}
@@ -1160,10 +1296,9 @@ void plugin_cleanup(void)
gint k;
guint i;
ScintillaObject* sci;
- SCIPOINTERHOLDER *sciTemp;
- SCIPOINTERHOLDER *sciNext;
FileData *fdTemp=fdKnownFilesSettings;
FileData *fdTemp2;
+ guint32 markers;
/* uncouple keypress monitor */
g_signal_handler_disconnect(geany->main_widgets->window,key_release_signal_id);
@@ -1172,20 +1307,14 @@ void plugin_cleanup(void)
for(i=0;i<GEANY(documents_array)->len;i++)
if(documents[i]->is_valid) {
sci=documents[i]->editor->sci;
- for(k=0;k<9;k++)
- scintilla_send_message(sci,SCI_MARKERDELETEALL,BOOKMARK_BASE+k,0);
+ markers=(guint32)(g_object_get_data(G_OBJECT(sci),
+ "Geany_Numbered_Bookmarks_Used"));
+ for(k=2;k<25;k++)
+ if((markers&(1<<k))!=0)
+ scintilla_send_message(sci,SCI_MARKERDELETEALL,k,0);
}
- /* Clear memory used for list of editors */
- sciTemp=sciList;
- while(sciTemp!=NULL)
- {
- sciNext=sciTemp->NextNode;
- free(sciTemp);
- sciTemp=sciNext;
- }
-
/* Clear memory used to hold file details */
while(fdTemp!=NULL)
{
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Thu, 12 Apr 2012 20:45:13
Commit: 866573ab2ed28a27a019daf4086905c7db0886a6
https://github.com/geany/geany-plugins/commit/866573ab2ed28a27a019daf408690…
Log Message:
-----------
Fix Help button URL
Until we found a final definition of what the Help button should do, keep it as before but at least
with a working URL.
Modified Paths:
--------------
spellcheck/src/scplugin.c
Modified: spellcheck/src/scplugin.c
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -340,7 +340,7 @@ void plugin_help(void)
}
g_free(readme);
*/
- utils_open_browser("http://plugins.geany.org/spellcheck/");
+ utils_open_browser("http://plugins.geany.org/spellcheck.html");
}
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).