Commits August 2010

commits@lists.geany.org

4 participants
94 discussions

SF.net SVN: geany:[5193] trunk
by ntrel＠users.sourceforge.net 24 Aug '10

24 Aug '10

Revision: 5193 http://geany.svn.sourceforge.net/geany/?rev=5193&view=rev Author: ntrel Date: 2010-08-24 11:41:56 +0000 (Tue, 24 Aug 2010) Log Message: ----------- Make the Properties dialog filename a label and put it first (patch by Ji?\197?\153?\195?\173 Techet, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/project.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-24 11:21:41 UTC (rev 5192) +++ trunk/ChangeLog 2010-08-24 11:41:56 UTC (rev 5193) @@ -1,3 +1,10 @@ +2010-08-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/project.c: + Make the Properties dialog filename a label and put it first (patch + by Jiří Techet, thanks). + + 2010-08-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * scintilla/LexTxt2tags.cxx, scintilla/makefile.win32, Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2010-08-24 11:21:41 UTC (rev 5192) +++ trunk/src/project.c 2010-08-24 11:41:56 UTC (rev 5193) @@ -412,29 +412,29 @@ gtk_table_set_row_spacings(GTK_TABLE(table), 5); gtk_table_set_col_spacings(GTK_TABLE(table), 10); - label = gtk_label_new(_("Name:")); + label = gtk_label_new(_("Filename:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - e->name = gtk_entry_new(); - ui_entry_add_clear_icon(GTK_ENTRY(e->name)); - gtk_entry_set_max_length(GTK_ENTRY(e->name), MAX_NAME_LEN); - gtk_table_attach(GTK_TABLE(table), e->name, 1, 2, 0, 1, + e->file_name = gtk_label_new(""); + gtk_label_set_selectable(GTK_LABEL(e->file_name), TRUE); + gtk_table_attach(GTK_TABLE(table), e->file_name, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(e->file_name), 0, 0); - label = gtk_label_new(_("Filename:")); + label = gtk_label_new(_("Name:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - e->file_name = gtk_entry_new(); - ui_entry_add_clear_icon(GTK_ENTRY(e->file_name)); - gtk_editable_set_editable(GTK_EDITABLE(e->file_name), FALSE); /* read-only */ - gtk_table_attach(GTK_TABLE(table), e->file_name, 1, 2, 1, 2, + e->name = gtk_entry_new(); + ui_entry_add_clear_icon(GTK_ENTRY(e->name)); + gtk_entry_set_max_length(GTK_ENTRY(e->name), MAX_NAME_LEN); + gtk_table_attach(GTK_TABLE(table), e->name, 1, 2, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -542,7 +542,7 @@ /* fill the elements with the appropriate data */ gtk_entry_set_text(GTK_ENTRY(e->name), p->name); - gtk_entry_set_text(GTK_ENTRY(e->file_name), p->file_name); + gtk_label_set_text(GTK_LABEL(e->file_name), p->file_name); gtk_entry_set_text(GTK_ENTRY(e->base_path), p->base_path); radio_long_line_custom = ui_lookup_widget(e->dialog, "radio_long_line_custom"); @@ -686,7 +686,11 @@ return FALSE; } - file_name = gtk_entry_get_text(GTK_ENTRY(e->file_name)); + if (app->project == NULL) + file_name = gtk_entry_get_text(GTK_ENTRY(e->file_name)); + else + file_name = gtk_label_get_text(GTK_LABEL(e->file_name)); + if (! NZV(file_name)) { SHOW_ERR(_("You have specified an invalid project filename.")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5192] trunk/m4/
by ntrel＠users.sourceforge.net 24 Aug '10

24 Aug '10

Revision: 5192 http://geany.svn.sourceforge.net/geany/?rev=5192&view=rev Author: ntrel Date: 2010-08-24 11:21:41 +0000 (Tue, 24 Aug 2010) Log Message: ----------- Ignore contents of m4 dir. Property Changed: ---------------- trunk/m4/ Property changes on: trunk/m4 ___________________________________________________________________ Added: svn:ignore + *.m4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5191] trunk
by ntrel＠users.sourceforge.net 24 Aug '10

24 Aug '10

Revision: 5191 http://geany.svn.sourceforge.net/geany/?rev=5191&view=rev Author: ntrel Date: 2010-08-24 11:17:55 +0000 (Tue, 24 Aug 2010) Log Message: ----------- Remove generated file m4/intltool.m4. Modified Paths: -------------- trunk/ChangeLog Removed Paths: ------------- trunk/m4/intltool.m4 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-23 15:16:39 UTC (rev 5190) +++ trunk/ChangeLog 2010-08-24 11:17:55 UTC (rev 5191) @@ -5,7 +5,7 @@ scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, data/filetypes.txt2tags, wscript: Add lexer for Txt2Tags (patch by Forgeot Eric, thanks - #3020632). - * m4, m4/intltool.m4, configure.ac, Makefile.am: + * m4, configure.ac, Makefile.am: Use AC_CONFIG_MACRO_DIR (patch by Erik de Castro Lopo, thanks). * src/callbacks.c: Only prompt for reloading if the document has unsaved changes Deleted: trunk/m4/intltool.m4 =================================================================== --- trunk/m4/intltool.m4 2010-08-23 15:16:39 UTC (rev 5190) +++ trunk/m4/intltool.m4 2010-08-24 11:17:55 UTC (rev 5191) @@ -1,220 +0,0 @@ -## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- -## Copyright (C) 2001 Eazel, Inc. -## Author: Maciej Stachowiak <mjs(a)noisehavoc.org> -## Kenneth Christiansen <kenneth(a)gnu.org> -## -## 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## -## As a special exception to the GNU General Public License, if you -## distribute this file as part of a program that contains a -## configuration script generated by Autoconf, you may include it under -## the same distribution terms that you use for the rest of that program. - -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 36 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], -[AC_PREREQ([2.50])dnl - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` - [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` - ] - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -AC_SUBST(INTLTOOL_DESKTOP_RULE) -AC_SUBST(INTLTOOL_DIRECTORY_RULE) -AC_SUBST(INTLTOOL_KEYS_RULE) -AC_SUBST(INTLTOOL_PROP_RULE) -AC_SUBST(INTLTOOL_OAF_RULE) -AC_SUBST(INTLTOOL_PONG_RULE) -AC_SUBST(INTLTOOL_SERVER_RULE) -AC_SUBST(INTLTOOL_SHEET_RULE) -AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -AC_SUBST(INTLTOOL_UI_RULE) -AC_SUBST(INTLTOOL_XAM_RULE) -AC_SUBST(INTLTOOL_KBD_RULE) -AC_SUBST(INTLTOOL_XML_RULE) -AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) -AC_SUBST(INTLTOOL_CAVES_RULE) -AC_SUBST(INTLTOOL_SCHEMAS_RULE) -AC_SUBST(INTLTOOL_THEME_RULE) -AC_SUBST(INTLTOOL_SERVICE_RULE) -AC_SUBST(INTLTOOL_POLICY_RULE) - -# Use the tools built into the package, not the ones that are installed. -AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') -AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') -AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found; required for intltool]) -fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - AC_MSG_ERROR([perl 5.x required for intltool]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - -IT_PO_SUBDIR([po]) - -dnl The following is very similar to -dnl -dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) -dnl -dnl with the following slight differences: -dnl - the *.in files are in ac_aux_dir, -dnl - if the file haven't changed upon reconfigure, it's not touched, -dnl - the evaluation of the third parameter enables a hack which computes -dnl the actual value of $libdir, -dnl - the user sees "executing intltool commands", instead of -dnl "creating intltool-extract" and such. -dnl -dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were -dnl a reason for it. - -AC_CONFIG_COMMANDS([intltool], [ - -for file in intltool-extract intltool-merge intltool-update; do - sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ - -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ - -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ - < ${ac_aux_dir}/${file}.in > ${file}.out - if cmp -s ${file} ${file}.out 2>/dev/null; then - rm -f ${file}.out - else - mv -f ${file}.out ${file} - fi - chmod ugo+x ${file} - chmod u+w ${file} -done - -], -[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' -prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) - -]) - - -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - if test ! -f "$1/Makefile"; then - AC_MSG_ERROR([$1/Makefile is not ready.]) - fi - mv "$1/Makefile" "$1/Makefile.tmp" - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.tmp" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - - -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5190] trunk
by ntrel＠users.sourceforge.net 23 Aug '10

23 Aug '10

Revision: 5190 http://geany.svn.sourceforge.net/geany/?rev=5190&view=rev Author: ntrel Date: 2010-08-23 15:16:39 +0000 (Mon, 23 Aug 2010) Log Message: ----------- Only prompt for reloading if the document has unsaved changes (patch by Ji?\197?\153?\195?\173 Techet, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-23 12:37:17 UTC (rev 5189) +++ trunk/ChangeLog 2010-08-23 15:16:39 UTC (rev 5190) @@ -4,9 +4,12 @@ scintilla/include/SciLexer.h, scintilla/include/Scintilla.iface, scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, data/filetypes.txt2tags, wscript: - Add lexer for Txt2Tags (patch by Forgeot Eric, #3020632). + Add lexer for Txt2Tags (patch by Forgeot Eric, thanks - #3020632). * m4, m4/intltool.m4, configure.ac, Makefile.am: Use AC_CONFIG_MACRO_DIR (patch by Erik de Castro Lopo, thanks). + * src/callbacks.c: + Only prompt for reloading if the document has unsaved changes + (patch by Jiří Techet, thanks). 2010-08-21 Frank Lanitz <frank(a)frank.uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2010-08-23 12:37:17 UTC (rev 5189) +++ trunk/src/callbacks.c 2010-08-23 15:16:39 UTC (rev 5190) @@ -485,7 +485,8 @@ charset = doc->encoding; base_name = g_path_get_basename(doc->file_name); - if (dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, + if (!doc->changed || + dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, _("Any unsaved changes will be lost."), _("Are you sure you want to reload '%s'?"), base_name)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5189] trunk
by ntrel＠users.sourceforge.net 23 Aug '10

23 Aug '10

Revision: 5189 http://geany.svn.sourceforge.net/geany/?rev=5189&view=rev Author: ntrel Date: 2010-08-23 12:37:17 +0000 (Mon, 23 Aug 2010) Log Message: ----------- Use AC_CONFIG_MACRO_DIR (patch by Erik de Castro Lopo, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/Makefile.am trunk/configure.ac Added Paths: ----------- trunk/m4/ trunk/m4/intltool.m4 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-23 12:14:58 UTC (rev 5188) +++ trunk/ChangeLog 2010-08-23 12:37:17 UTC (rev 5189) @@ -5,6 +5,8 @@ scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, data/filetypes.txt2tags, wscript: Add lexer for Txt2Tags (patch by Forgeot Eric, #3020632). + * m4, m4/intltool.m4, configure.ac, Makefile.am: + Use AC_CONFIG_MACRO_DIR (patch by Erik de Castro Lopo, thanks). 2010-08-21 Frank Lanitz <frank(a)frank.uvena.de> Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2010-08-23 12:14:58 UTC (rev 5188) +++ trunk/Makefile.am 2010-08-23 12:37:17 UTC (rev 5189) @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = 1.7 +ACLOCAL_AMFLAGS = -I m4 + WIN32_BUILD_FILES = \ geany_private.rc \ win32-config.h \ Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2010-08-23 12:14:58 UTC (rev 5188) +++ trunk/configure.ac 2010-08-23 12:37:17 UTC (rev 5189) @@ -3,6 +3,7 @@ AC_INIT(configure.ac) AM_INIT_AUTOMAKE(geany, 0.20) +AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -22,7 +23,6 @@ AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.]) fi -#AC_PROG_RANLIB AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_INTLTOOL Added: trunk/m4/intltool.m4 =================================================================== --- trunk/m4/intltool.m4 (rev 0) +++ trunk/m4/intltool.m4 2010-08-23 12:37:17 UTC (rev 5189) @@ -0,0 +1,220 @@ +## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- +## Copyright (C) 2001 Eazel, Inc. +## Author: Maciej Stachowiak <mjs(a)noisehavoc.org> +## Kenneth Christiansen <kenneth(a)gnu.org> +## +## 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## As a special exception to the GNU General Public License, if you +## distribute this file as part of a program that contains a +## configuration script generated by Autoconf, you may include it under +## the same distribution terms that you use for the rest of that program. + +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 36 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], +[AC_PREREQ([2.50])dnl + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac + +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` + [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` + ] + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + +AC_SUBST(INTLTOOL_DESKTOP_RULE) +AC_SUBST(INTLTOOL_DIRECTORY_RULE) +AC_SUBST(INTLTOOL_KEYS_RULE) +AC_SUBST(INTLTOOL_PROP_RULE) +AC_SUBST(INTLTOOL_OAF_RULE) +AC_SUBST(INTLTOOL_PONG_RULE) +AC_SUBST(INTLTOOL_SERVER_RULE) +AC_SUBST(INTLTOOL_SHEET_RULE) +AC_SUBST(INTLTOOL_SOUNDLIST_RULE) +AC_SUBST(INTLTOOL_UI_RULE) +AC_SUBST(INTLTOOL_XAM_RULE) +AC_SUBST(INTLTOOL_KBD_RULE) +AC_SUBST(INTLTOOL_XML_RULE) +AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) +AC_SUBST(INTLTOOL_CAVES_RULE) +AC_SUBST(INTLTOOL_SCHEMAS_RULE) +AC_SUBST(INTLTOOL_THEME_RULE) +AC_SUBST(INTLTOOL_SERVICE_RULE) +AC_SUBST(INTLTOOL_POLICY_RULE) + +# Use the tools built into the package, not the ones that are installed. +AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') +AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') +AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') + +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found; required for intltool]) +fi +if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then + AC_MSG_ERROR([perl 5.x required for intltool]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi + +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) + +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], + [[extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr]])], + [DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share + dnl in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) + ;; + *) + [DATADIRNAME=lib] + ;; + esac]) +fi +AC_SUBST(DATADIRNAME) + +IT_PO_SUBDIR([po]) + +dnl The following is very similar to +dnl +dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) +dnl +dnl with the following slight differences: +dnl - the *.in files are in ac_aux_dir, +dnl - if the file haven't changed upon reconfigure, it's not touched, +dnl - the evaluation of the third parameter enables a hack which computes +dnl the actual value of $libdir, +dnl - the user sees "executing intltool commands", instead of +dnl "creating intltool-extract" and such. +dnl +dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were +dnl a reason for it. + +AC_CONFIG_COMMANDS([intltool], [ + +for file in intltool-extract intltool-merge intltool-update; do + sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ + -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ + -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ + < ${ac_aux_dir}/${file}.in > ${file}.out + if cmp -s ${file} ${file}.out 2>/dev/null; then + rm -f ${file}.out + else + mv -f ${file}.out ${file} + fi + chmod ugo+x ${file} + chmod u+w ${file} +done + +], +[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' +prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" +INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) + +]) + + +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + if test ! -f "$1/Makefile"; then + AC_MSG_ERROR([$1/Makefile is not ready.]) + fi + mv "$1/Makefile" "$1/Makefile.tmp" + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.tmp" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) + + +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5188] trunk
by ntrel＠users.sourceforge.net 23 Aug '10

23 Aug '10

Revision: 5188 http://geany.svn.sourceforge.net/geany/?rev=5188&view=rev Author: ntrel Date: 2010-08-23 12:14:58 +0000 (Mon, 23 Aug 2010) Log Message: ----------- Add lexer for Txt2Tags (patch by Forgeot Eric, #3020632). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.txt2tags trunk/scintilla/KeyWords.cxx trunk/scintilla/Makefile.am trunk/scintilla/include/SciLexer.h trunk/scintilla/include/Scintilla.iface trunk/scintilla/makefile.win32 trunk/src/highlighting.c trunk/wscript Added Paths: ----------- trunk/scintilla/LexTxt2tags.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-21 09:07:46 UTC (rev 5187) +++ trunk/ChangeLog 2010-08-23 12:14:58 UTC (rev 5188) @@ -1,3 +1,12 @@ +2010-08-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * scintilla/LexTxt2tags.cxx, scintilla/makefile.win32, + scintilla/include/SciLexer.h, scintilla/include/Scintilla.iface, + scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, + data/filetypes.txt2tags, wscript: + Add lexer for Txt2Tags (patch by Forgeot Eric, #3020632). + + 2010-08-21 Frank Lanitz <frank(a)frank.uvena.de> * src/plugindata.h: @@ -2,3 +11,3 @@ Apply a patch by Jiří Techet which is preventing warnings when using - -Wmissing-prototypes on compiling. Thanks. + -Wmissing-prototypes on compiling. Thanks. Modified: trunk/data/filetypes.txt2tags =================================================================== --- trunk/data/filetypes.txt2tags 2010-08-21 09:07:46 UTC (rev 5187) +++ trunk/data/filetypes.txt2tags 2010-08-23 12:14:58 UTC (rev 5188) @@ -1,9 +1,34 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# no syntax highlighting yet +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +strong=0x445675;0xffffff;true;false +emphasis=0x653A39;0xffffff;false;true +underlined=0x386742;0xffffff;false;false +header1=0xE20700;0xffffff;true;false +header2=0xE20700;0xffffff;true;false +header3=0xA81D05;0xffffff;true;false +header4=0x871704;0xffffff;true;false +header5=0x871704;0xffffff;true;false +header6=0x871704;0xffffff;true;false +ulist_item=0xE300EE;0xffffff;false;false +olist_item=0xE300EE;0xffffff;false;false +blockquote=0x015F52;0xffffff;false;false +strikeout=0x644A9B;0xffffff;false;false +hrule=0xff901e;0xffffff;false;false +link=0x0930DE;0xffffff;false;true +code=0x009f00;0xffffff;false;false +codebk=0x005f00;0xffffff;false;false +comment=0x777777;0xffffff;false;false +option=0xC0036E;0xffffff;false;true +preproc=0x848B00;0xffffff;false;true +postproc=0xC05600;0xffffff;false;true [settings] # default extension used when saving files extension=txt2tags +[keywords] +primary=includeconf options toc + Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2010-08-21 09:07:46 UTC (rev 5187) +++ trunk/scintilla/KeyWords.cxx 2010-08-23 12:14:58 UTC (rev 5188) @@ -359,6 +359,7 @@ LINK_LEXER(lmRuby); LINK_LEXER(lmSQL); LINK_LEXER(lmTCL); + LINK_LEXER(lmTxt2tags); LINK_LEXER(lmVerilog); LINK_LEXER(lmVHDL); LINK_LEXER(lmXML); Added: trunk/scintilla/LexTxt2tags.cxx =================================================================== --- trunk/scintilla/LexTxt2tags.cxx (rev 0) +++ trunk/scintilla/LexTxt2tags.cxx 2010-08-23 12:14:58 UTC (rev 5188) @@ -0,0 +1,498 @@ +/****************************************************************** + * LexTxt2tags.cxx + * + * A simple Txt2tags lexer for scintilla. + * + * + * Adapted by Eric Forgeot + * Based on the LexMarkdown.cxx by Jon Strait - jstrait(a)moonloop.net + * + * What could be improved: + * - Verbatim lines could be like for raw lines : when there is no space between the ``` and the following text, the first letter should be colored so the user would understand there must be a space for a valid tag. + * - marks such as bold, italic, strikeout, underline should begin to be highlighted only when they are closed and valid. + * - verbatim and raw area should be highlighted too. + * + * The License.txt file describes the conditions under which this + * software may be distributed. + * + *****************************************************************/ + +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <stdio.h> +#include <stdarg.h> + +#include "Platform.h" + +#include "PropSet.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "KeyWords.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + + + +static inline bool IsNewline(const int ch) { + return (ch == '\n' || ch == '\r'); +} + +// True if can follow ch down to the end with possibly trailing whitespace +static bool FollowToLineEnd(const int ch, const int state, const unsigned int endPos, StyleContext &sc) { + unsigned int i = 0; + while (sc.GetRelative(++i) == ch) + ; + // Skip over whitespace + while (IsASpaceOrTab(sc.GetRelative(i)) && sc.currentPos + i < endPos) + ++i; + if (IsNewline(sc.GetRelative(i)) || sc.currentPos + i == endPos) { + sc.Forward(i); + sc.ChangeState(state); + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + return true; + } + else return false; +} + +// Set the state on text section from current to length characters, +// then set the rest until the newline to default, except for any characters matching token +static void SetStateAndZoom(const int state, const int length, const int token, StyleContext &sc) { + sc.SetState(state); + sc.Forward(length); + sc.SetState(SCE_TXT2TAGS_DEFAULT); + sc.Forward(); + bool started = false; + while (sc.More() && !IsNewline(sc.ch)) { + if (sc.ch == token && !started) { + sc.SetState(state); + started = true; + } + else if (sc.ch != token) { + sc.SetState(SCE_TXT2TAGS_DEFAULT); + started = false; + } + sc.Forward(); + } + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); +} + +// Does the previous line have more than spaces and tabs? +static bool HasPrevLineContent(StyleContext &sc) { + int i = 0; + // Go back to the previous newline + while ((--i + sc.currentPos) && !IsNewline(sc.GetRelative(i))) + ; + while (--i + sc.currentPos) { + if (IsNewline(sc.GetRelative(i))) + break; + if (!IsASpaceOrTab(sc.GetRelative(i))) + return true; + } + return false; +} + +// Separator line +static bool IsValidHrule(const unsigned int endPos, StyleContext &sc) { + int c, count = 1; + unsigned int i = 0; + while (++i) { + c = sc.GetRelative(i); + if (c == sc.ch) + ++count; + // hit a terminating character + else if (!IsASpaceOrTab(c) || sc.currentPos + i == endPos) { + // Are we a valid HRULE + if ((IsNewline(c) || sc.currentPos + i == endPos) && + count >= 20 && !HasPrevLineContent(sc)) { + sc.SetState(SCE_TXT2TAGS_HRULE); + sc.Forward(i); + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + return true; + } + else { + sc.SetState(SCE_TXT2TAGS_DEFAULT); + return false; + } + } + } + return false; +} + +static void ColorizeTxt2tagsDoc(unsigned int startPos, int length, int initStyle, + WordList **, Accessor &styler) { + unsigned int endPos = startPos + length; + int precharCount = 0; + // Don't advance on a new loop iteration and retry at the same position. + // Useful in the corner case of having to start at the beginning file position + // in the default state. + bool freezeCursor = false; + + StyleContext sc(startPos, length, initStyle, styler); + + while (sc.More()) { + // Skip past escaped characters + if (sc.ch == '\\') { + sc.Forward(); + continue; + } + + // A blockquotes resets the line semantics + if (sc.state == SCE_TXT2TAGS_BLOCKQUOTE){ + sc.Forward(2); + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + } + // An option colors the whole line + if (sc.state == SCE_TXT2TAGS_OPTION){ + FollowToLineEnd('%', SCE_TXT2TAGS_OPTION, endPos, sc); + } + if (sc.state == SCE_TXT2TAGS_POSTPROC){ + FollowToLineEnd('%', SCE_TXT2TAGS_POSTPROC, endPos, sc); + } + if (sc.state == SCE_TXT2TAGS_PREPROC){ + FollowToLineEnd('%', SCE_TXT2TAGS_PREPROC, endPos, sc); + } + // A comment colors the whole line + if (sc.state == SCE_TXT2TAGS_COMMENT){ + FollowToLineEnd('%', SCE_TXT2TAGS_COMMENT, endPos, sc); + } + // Conditional state-based actions + if (sc.state == SCE_TXT2TAGS_CODE2) { + if (IsNewline(sc.ch)) + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + if (sc.Match("``") && sc.GetRelative(-2) != ' ') { + sc.Forward(2); + sc.SetState(SCE_TXT2TAGS_DEFAULT); + } + } + // Table + else if (sc.state == SCE_TXT2TAGS_CODE) { + if (IsNewline(sc.ch)) + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + if (sc.ch == '|' && sc.chPrev != ' ') + sc.ForwardSetState(SCE_TXT2TAGS_DEFAULT); + } + // Strong + else if (sc.state == SCE_TXT2TAGS_STRONG1) { + if (IsNewline(sc.ch)) + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + if (sc.Match("**") && sc.chPrev != ' ') { + sc.Forward(2); + sc.SetState(SCE_TXT2TAGS_DEFAULT); + } + } + // Emphasis + else if (sc.state == SCE_TXT2TAGS_EM1) { + if (IsNewline(sc.ch)) + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + if (sc.Match("//") && sc.chPrev != ' ') { + sc.Forward(2); + sc.ForwardSetState(SCE_TXT2TAGS_DEFAULT); + } + } + // Underline + else if (sc.state == SCE_TXT2TAGS_EM2) { + if (IsNewline(sc.ch)) + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + if (sc.Match("__") && sc.chPrev != ' ') { + sc.Forward(2); + sc.ForwardSetState(SCE_TXT2TAGS_DEFAULT); + } + } + // codeblock + else if (sc.state == SCE_TXT2TAGS_CODEBK) { + if (IsNewline(sc.ch)) + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + if (sc.atLineStart && sc.Match("```")) { + int i = 1; + while (!IsNewline(sc.GetRelative(i)) && sc.currentPos + i < endPos) + i++; + sc.Forward(i); + sc.SetState(SCE_TXT2TAGS_DEFAULT); + } + } + // strikeout + else if (sc.state == SCE_TXT2TAGS_STRIKEOUT) { + if (IsNewline(sc.ch)) + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + if (sc.Match("--") && sc.chPrev != ' ') { + sc.Forward(2); + sc.SetState(SCE_TXT2TAGS_DEFAULT); + } + } + // Headers + else if (sc.state == SCE_TXT2TAGS_LINE_BEGIN) { + if (sc.Match("======")) + { + sc.SetState(SCE_TXT2TAGS_HEADER6); + sc.Forward(); + } + else if (sc.Match("=====")) + { + sc.SetState(SCE_TXT2TAGS_HEADER5); + sc.Forward(); + } + else if (sc.Match("====")) + { + sc.SetState(SCE_TXT2TAGS_HEADER4); + sc.Forward(); + } + else if (sc.Match("===")) + { + sc.SetState(SCE_TXT2TAGS_HEADER3); + sc.Forward(); + } + //SetStateAndZoom(SCE_TXT2TAGS_HEADER3, 3, '=', sc); + else if (sc.Match("==")) { + sc.SetState(SCE_TXT2TAGS_HEADER2); + sc.Forward(); + } + //SetStateAndZoom(SCE_TXT2TAGS_HEADER2, 2, '=', sc); + else if (sc.Match("=")) { + // Catch the special case of an unordered list + if (sc.chNext == '.' && IsASpaceOrTab(sc.GetRelative(2))) { + precharCount = 0; + sc.SetState(SCE_TXT2TAGS_PRECHAR); + } + else + { + sc.SetState(SCE_TXT2TAGS_HEADER1); + sc.Forward(); + } + //SetStateAndZoom(SCE_TXT2TAGS_HEADER1, 1, '=', sc); + } + + // Numbered title + else if (sc.Match("++++++")) + { + sc.SetState(SCE_TXT2TAGS_HEADER6); + sc.Forward(); + } + else if (sc.Match("+++++")) + { + sc.SetState(SCE_TXT2TAGS_HEADER5); + sc.Forward(); + } + else if (sc.Match("++++")) + { + sc.SetState(SCE_TXT2TAGS_HEADER4); + sc.Forward(); + } + else if (sc.Match("+++")) + { + sc.SetState(SCE_TXT2TAGS_HEADER3); + sc.Forward(); + } + //SetStateAndZoom(SCE_TXT2TAGS_HEADER3, 3, '+', sc); + else if (sc.Match("++")) { + sc.SetState(SCE_TXT2TAGS_HEADER2); + sc.Forward(); + } + //SetStateAndZoom(SCE_TXT2TAGS_HEADER2, 2, '+', sc); + else if (sc.Match("+")) { + // Catch the special case of an unordered list + if (sc.chNext == ' ' && IsASpaceOrTab(sc.GetRelative(1))) { + // if (IsNewline(sc.ch)) { + //precharCount = 0; + // sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + //sc.SetState(SCE_TXT2TAGS_PRECHAR); + // } + // else { + // precharCount = 0; + sc.SetState(SCE_TXT2TAGS_OLIST_ITEM); + sc.Forward(2); + sc.SetState(SCE_TXT2TAGS_DEFAULT); + // sc.SetState(SCE_TXT2TAGS_PRECHAR); + // } + } + else + { + sc.SetState(SCE_TXT2TAGS_HEADER1); + sc.Forward(); + } + } + + + // Codeblock + else if (sc.Match("```")) { + if (!HasPrevLineContent(sc)) + // if (!FollowToLineEnd(sc)) + sc.SetState(SCE_TXT2TAGS_CODEBK); + else + sc.SetState(SCE_TXT2TAGS_DEFAULT); + } + + // Preproc + else if (sc.Match("%!preproc")) { + sc.SetState(SCE_TXT2TAGS_PREPROC); + } + // Postproc + else if (sc.Match("%!postproc")) { + sc.SetState(SCE_TXT2TAGS_POSTPROC); + } + // Option + else if (sc.Match("%!")) { + sc.SetState(SCE_TXT2TAGS_OPTION); + } + + // Comment + else if (sc.ch == '%') { + sc.SetState(SCE_TXT2TAGS_COMMENT); + } + // list + else if (sc.ch == '-') { + precharCount = 0; + sc.SetState(SCE_TXT2TAGS_PRECHAR); + } + // def list + else if (sc.ch == ':') { + precharCount = 0; + sc.SetState(SCE_TXT2TAGS_OLIST_ITEM); + sc.Forward(1); + sc.SetState(SCE_TXT2TAGS_PRECHAR); + } + else if (IsNewline(sc.ch)) + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + else { + precharCount = 0; + sc.SetState(SCE_TXT2TAGS_PRECHAR); + } + } + + // The header lasts until the newline + else if (sc.state == SCE_TXT2TAGS_HEADER1 || sc.state == SCE_TXT2TAGS_HEADER2 || + sc.state == SCE_TXT2TAGS_HEADER3 || sc.state == SCE_TXT2TAGS_HEADER4 || + sc.state == SCE_TXT2TAGS_HEADER5 || sc.state == SCE_TXT2TAGS_HEADER6) { + if (IsNewline(sc.ch)) + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + } + + // New state only within the initial whitespace + if (sc.state == SCE_TXT2TAGS_PRECHAR) { + // Blockquote + if (sc.Match("\"\"\"") && precharCount < 5){ + + sc.SetState(SCE_TXT2TAGS_BLOCKQUOTE); + sc.Forward(1); + } + /* + // Begin of code block + else if (!HasPrevLineContent(sc) && (sc.chPrev == '\t' || precharCount >= 4)) + sc.SetState(SCE_TXT2TAGS_CODEBK); + */ + // HRule - Total of 20 or more hyphens, asterisks, or underscores + // on a line by themselves + else if ((sc.ch == '-' ) && IsValidHrule(endPos, sc)) + ; + // Unordered list + else if ((sc.ch == '-') && IsASpaceOrTab(sc.chNext)) { + sc.SetState(SCE_TXT2TAGS_ULIST_ITEM); + sc.ForwardSetState(SCE_TXT2TAGS_DEFAULT); + } + // Ordered list + else if (IsADigit(sc.ch)) { + int digitCount = 0; + while (IsADigit(sc.GetRelative(++digitCount))) + ; + if (sc.GetRelative(digitCount) == '.' && + IsASpaceOrTab(sc.GetRelative(digitCount + 1))) { + sc.SetState(SCE_TXT2TAGS_OLIST_ITEM); + sc.Forward(digitCount + 1); + sc.SetState(SCE_TXT2TAGS_DEFAULT); + } + } + // Alternate Ordered list + else if (sc.ch == '+' && sc.chNext == ' ' && IsASpaceOrTab(sc.GetRelative(2))) { + // sc.SetState(SCE_TXT2TAGS_OLIST_ITEM); + // sc.Forward(2); + // sc.SetState(SCE_TXT2TAGS_DEFAULT); + } + else if (sc.ch != ' ' || precharCount > 2) + sc.SetState(SCE_TXT2TAGS_DEFAULT); + else + ++precharCount; + } + + // New state anywhere in doc + if (sc.state == SCE_TXT2TAGS_DEFAULT) { + // if (sc.atLineStart && sc.ch == '#') { + // sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + // freezeCursor = true; + // } + // Links and Images + if (sc.Match("![") || sc.ch == '[') { + int i = 0, j = 0, k = 0; + int len = endPos - sc.currentPos; + while (i < len && (sc.GetRelative(++i) != ']' || sc.GetRelative(i - 1) == '\\')) + ; + if (sc.GetRelative(i) == ']') { + j = i; + if (sc.GetRelative(++i) == '(') { + while (i < len && (sc.GetRelative(++i) != '(' || sc.GetRelative(i - 1) == '\\')) + ; + if (sc.GetRelative(i) == '(') + k = i; + } + + else if (sc.GetRelative(i) == '[' || sc.GetRelative(++i) == '[') { + while (i < len && (sc.GetRelative(++i) != ']' || sc.GetRelative(i - 1) == '\\')) + ; + if (sc.GetRelative(i) == ']') + k = i; + } + } + // At least a link text + if (j) { + sc.SetState(SCE_TXT2TAGS_LINK); + sc.Forward(j); + // Also has a URL or reference portion + if (k) + sc.Forward(k - j); + sc.ForwardSetState(SCE_TXT2TAGS_DEFAULT); + } + } + // Code - also a special case for alternate inside spacing + if (sc.Match("``") && sc.GetRelative(3) != ' ') { + sc.SetState(SCE_TXT2TAGS_CODE2); + sc.Forward(); + } + else if (sc.ch == '|' && sc.GetRelative(3) != ' ') { + sc.SetState(SCE_TXT2TAGS_CODE); + } + // Strong + else if (sc.Match("**") && sc.GetRelative(2) != ' ') { + sc.SetState(SCE_TXT2TAGS_STRONG1); + sc.Forward(); + } + // Emphasis + else if (sc.Match("//") && sc.GetRelative(2) != ' ') { + sc.SetState(SCE_TXT2TAGS_EM1); + sc.Forward(); + } + else if (sc.Match("__") && sc.GetRelative(2) != ' ') { + sc.SetState(SCE_TXT2TAGS_EM2); + sc.Forward(); + } + // Strikeout + else if (sc.Match("--") && sc.GetRelative(2) != ' ') { + sc.SetState(SCE_TXT2TAGS_STRIKEOUT); + sc.Forward(); + } + + // Beginning of line + else if (IsNewline(sc.ch)) + sc.SetState(SCE_TXT2TAGS_LINE_BEGIN); + } + // Advance if not holding back the cursor for this iteration. + if (!freezeCursor) + sc.Forward(); + freezeCursor = false; + } + sc.Complete(); +} + +LexerModule lmTxt2tags(SCLEX_TXT2TAGS, ColorizeTxt2tagsDoc, "txt2tags"); Property changes on: trunk/scintilla/LexTxt2tags.cxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2010-08-21 09:07:46 UTC (rev 5187) +++ trunk/scintilla/Makefile.am 2010-08-23 12:14:58 UTC (rev 5188) @@ -29,6 +29,7 @@ LexR.cxx \ LexRuby.cxx \ LexSQL.cxx \ +LexTxt2tags.cxx \ LexTCL.cxx \ LexVHDL.cxx \ LexVerilog.cxx \ Modified: trunk/scintilla/include/SciLexer.h =================================================================== --- trunk/scintilla/include/SciLexer.h 2010-08-21 09:07:46 UTC (rev 5187) +++ trunk/scintilla/include/SciLexer.h 2010-08-23 12:14:58 UTC (rev 5188) @@ -111,6 +111,7 @@ #define SCLEX_NIMROD 96 #define SCLEX_SML 97 #define SCLEX_MARKDOWN 98 +#define SCLEX_TXT2TAGS 99 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -1385,6 +1386,32 @@ #define SCE_MARKDOWN_CODE 19 #define SCE_MARKDOWN_CODE2 20 #define SCE_MARKDOWN_CODEBK 21 +#define SCE_TXT2TAGS_DEFAULT 0 +#define SCE_TXT2TAGS_LINE_BEGIN 1 +#define SCE_TXT2TAGS_STRONG1 2 +#define SCE_TXT2TAGS_STRONG2 3 +#define SCE_TXT2TAGS_EM1 4 +#define SCE_TXT2TAGS_EM2 5 +#define SCE_TXT2TAGS_HEADER1 6 +#define SCE_TXT2TAGS_HEADER2 7 +#define SCE_TXT2TAGS_HEADER3 8 +#define SCE_TXT2TAGS_HEADER4 9 +#define SCE_TXT2TAGS_HEADER5 10 +#define SCE_TXT2TAGS_HEADER6 11 +#define SCE_TXT2TAGS_PRECHAR 12 +#define SCE_TXT2TAGS_ULIST_ITEM 13 +#define SCE_TXT2TAGS_OLIST_ITEM 14 +#define SCE_TXT2TAGS_BLOCKQUOTE 15 +#define SCE_TXT2TAGS_STRIKEOUT 16 +#define SCE_TXT2TAGS_HRULE 17 +#define SCE_TXT2TAGS_LINK 18 +#define SCE_TXT2TAGS_CODE 19 +#define SCE_TXT2TAGS_CODE2 20 +#define SCE_TXT2TAGS_CODEBK 21 +#define SCE_TXT2TAGS_COMMENT 22 +#define SCE_TXT2TAGS_OPTION 23 +#define SCE_TXT2TAGS_PREPROC 24 +#define SCE_TXT2TAGS_POSTPROC 25 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ #endif Modified: trunk/scintilla/include/Scintilla.iface =================================================================== --- trunk/scintilla/include/Scintilla.iface 2010-08-21 09:07:46 UTC (rev 5187) +++ trunk/scintilla/include/Scintilla.iface 2010-08-23 12:14:58 UTC (rev 5188) @@ -2299,6 +2299,7 @@ val SCLEX_NIMROD=96 val SCLEX_SML=97 val SCLEX_MARKDOWN=98 +val SCLEX_TXT2TAGS=99 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -3752,6 +3753,34 @@ val SCE_MARKDOWN_CODE=19 val SCE_MARKDOWN_CODE2=20 val SCE_MARKDOWN_CODEBK=21 +# Lexical state for SCLEX_TXT2TAGS +lex Txt2tags=SCLEX_TXT2TAGS SCE_TXT2TAGS_ +val SCE_TXT2TAGS_DEFAULT=0 +val SCE_TXT2TAGS_LINE_BEGIN=1 +val SCE_TXT2TAGS_STRONG1=2 +val SCE_TXT2TAGS_STRONG2=3 +val SCE_TXT2TAGS_EM1=4 +val SCE_TXT2TAGS_EM2=5 +val SCE_TXT2TAGS_HEADER1=6 +val SCE_TXT2TAGS_HEADER2=7 +val SCE_TXT2TAGS_HEADER3=8 +val SCE_TXT2TAGS_HEADER4=9 +val SCE_TXT2TAGS_HEADER5=10 +val SCE_TXT2TAGS_HEADER6=11 +val SCE_TXT2TAGS_PRECHAR=12 +val SCE_TXT2TAGS_ULIST_ITEM=13 +val SCE_TXT2TAGS_OLIST_ITEM=14 +val SCE_TXT2TAGS_BLOCKQUOTE=15 +val SCE_TXT2TAGS_STRIKEOUT=16 +val SCE_TXT2TAGS_HRULE=17 +val SCE_TXT2TAGS_LINK=18 +val SCE_TXT2TAGS_CODE=19 +val SCE_TXT2TAGS_CODE2=20 +val SCE_TXT2TAGS_CODEBK=21 +val SCE_TXT2TAGS_COMMENT=22 +val SCE_TXT2TAGS_OPTION=23 +val SCE_TXT2TAGS_PREPROC=24 +val SCE_TXT2TAGS_POSTPROC=25 # Events Modified: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 2010-08-21 09:07:46 UTC (rev 5187) +++ trunk/scintilla/makefile.win32 2010-08-23 12:14:58 UTC (rev 5188) @@ -61,7 +61,7 @@ #**LEXOBJS=\\\n$\*.o $ LEXOBJS=\ LexAda.o LexBash.o LexAsm.o LexCSS.o LexCPP.o LexHTML.o LexOthers.o LexPascal.o \ -LexPerl.o LexPython.o LexSQL.o LexCaml.o LexTCL.o LexRuby.o LexFortran.o LexVHDL.o LexVerilog.o\ +LexPerl.o LexPython.o LexSQL.o LexCaml.o LexTCL.o LexTxt2tags.o LexRuby.o LexFortran.o LexVHDL.o LexVerilog.o\ LexMarkdown.o LexMatlab.o \ LexD.o LexLua.o LexHaskell.o LexBasic.o LexR.o LexYAML.o LexCmake.o LexNsis.o #--Autogenerated -- end of automatically generated section Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2010-08-21 09:07:46 UTC (rev 5187) +++ trunk/src/highlighting.c 2010-08-23 12:14:58 UTC (rev 5188) @@ -2528,7 +2528,71 @@ set_sci_style(sci, SCE_TCL_WORD5, ft_id, 15); } +static void styleset_txt2tags_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +{ + new_styleset(ft_id, 22); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "strong", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "emphasis", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "header1", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "header2", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "header3", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "header4", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "header5", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "header6", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "ulist_item", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "olist_item", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "blockquote", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "strikeout", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "hrule", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "link", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "code", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "codebk", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "underlined", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "option", &style_sets[ft_id].styling[19]); + get_keyfile_style(config, config_home, "preproc", &style_sets[ft_id].styling[20]); + get_keyfile_style(config, config_home, "postproc", &style_sets[ft_id].styling[21]); + + style_sets[ft_id].keywords = NULL; +} + + +static void styleset_txt2tags(ScintillaObject *sci, gint ft_id) +{ + apply_filetype_properties(sci, SCLEX_TXT2TAGS, ft_id); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_TXT2TAGS_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_TXT2TAGS_LINE_BEGIN, ft_id, 0); + set_sci_style(sci, SCE_TXT2TAGS_PRECHAR, ft_id, 0); + set_sci_style(sci, SCE_TXT2TAGS_STRONG1, ft_id, 1); + set_sci_style(sci, SCE_TXT2TAGS_STRONG2, ft_id, 1); + set_sci_style(sci, SCE_TXT2TAGS_EM1, ft_id, 2); + set_sci_style(sci, SCE_TXT2TAGS_EM2, ft_id, 17); + set_sci_style(sci, SCE_TXT2TAGS_HEADER1, ft_id, 3); + set_sci_style(sci, SCE_TXT2TAGS_HEADER2, ft_id, 4); + set_sci_style(sci, SCE_TXT2TAGS_HEADER3, ft_id, 5); + set_sci_style(sci, SCE_TXT2TAGS_HEADER4, ft_id, 6); + set_sci_style(sci, SCE_TXT2TAGS_HEADER5, ft_id, 7); + set_sci_style(sci, SCE_TXT2TAGS_HEADER6, ft_id, 8); + set_sci_style(sci, SCE_TXT2TAGS_ULIST_ITEM, ft_id, 9); + set_sci_style(sci, SCE_TXT2TAGS_OLIST_ITEM, ft_id, 10); + set_sci_style(sci, SCE_TXT2TAGS_BLOCKQUOTE, ft_id, 11); + set_sci_style(sci, SCE_TXT2TAGS_STRIKEOUT, ft_id, 12); + set_sci_style(sci, SCE_TXT2TAGS_HRULE, ft_id, 13); + set_sci_style(sci, SCE_TXT2TAGS_LINK, ft_id, 14); + set_sci_style(sci, SCE_TXT2TAGS_CODE, ft_id, 15); + set_sci_style(sci, SCE_TXT2TAGS_CODE2, ft_id, 15); + set_sci_style(sci, SCE_TXT2TAGS_CODEBK, ft_id, 16); + set_sci_style(sci, SCE_TXT2TAGS_COMMENT, ft_id, 18); + set_sci_style(sci, SCE_TXT2TAGS_OPTION, ft_id, 19); + set_sci_style(sci, SCE_TXT2TAGS_PREPROC, ft_id, 20); + set_sci_style(sci, SCE_TXT2TAGS_POSTPROC, ft_id, 21); +} + + static void styleset_matlab_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { new_styleset(ft_id, 9); @@ -3193,6 +3257,7 @@ init_styleset_case(GEANY_FILETYPES_SH, styleset_sh_init); init_styleset_case(GEANY_FILETYPES_SQL, styleset_sql_init); init_styleset_case(GEANY_FILETYPES_TCL, styleset_tcl_init); + init_styleset_case(GEANY_FILETYPES_TXT2TAGS, styleset_txt2tags_init); init_styleset_case(GEANY_FILETYPES_VHDL, styleset_vhdl_init); init_styleset_case(GEANY_FILETYPES_VERILOG, styleset_verilog_init); init_styleset_case(GEANY_FILETYPES_XML, styleset_markup_init); @@ -3261,6 +3326,7 @@ styleset_case(GEANY_FILETYPES_SH, styleset_sh); styleset_case(GEANY_FILETYPES_SQL, styleset_sql); styleset_case(GEANY_FILETYPES_TCL, styleset_tcl); + styleset_case(GEANY_FILETYPES_TXT2TAGS, styleset_txt2tags); styleset_case(GEANY_FILETYPES_VHDL, styleset_vhdl); styleset_case(GEANY_FILETYPES_VERILOG, styleset_verilog); styleset_case(GEANY_FILETYPES_XML, styleset_xml); Modified: trunk/wscript =================================================================== --- trunk/wscript 2010-08-21 09:07:46 UTC (rev 5187) +++ trunk/wscript 2010-08-23 12:14:58 UTC (rev 5188) @@ -92,8 +92,8 @@ 'scintilla/LexLua.cxx', 'scintilla/LexMarkdown.cxx', 'scintilla/LexMatlab.cxx', 'scintilla/LexNsis.cxx', 'scintilla/LexOthers.cxx', 'scintilla/LexPascal.cxx', 'scintilla/LexPerl.cxx', 'scintilla/LexPython.cxx', - 'scintilla/LexR.cxx', - 'scintilla/LexRuby.cxx', 'scintilla/LexSQL.cxx', 'scintilla/LexTCL.cxx', + 'scintilla/LexR.cxx', 'scintilla/LexRuby.cxx', 'scintilla/LexSQL.cxx', + 'scintilla/LexTCL.cxx', 'scintilla/LexTxt2tags.cxx', 'scintilla/LexVHDL.cxx', 'scintilla/LexVerilog.cxx', 'scintilla/LexYAML.cxx', 'scintilla/LineMarker.cxx', 'scintilla/PerLine.cxx', 'scintilla/PlatGTK.cxx', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5187] trunk
by frlan＠users.sourceforge.net 21 Aug '10

21 Aug '10

Revision: 5187 http://geany.svn.sourceforge.net/geany/?rev=5187&view=rev Author: frlan Date: 2010-08-21 09:07:46 +0000 (Sat, 21 Aug 2010) Log Message: ----------- Apply a patch by Ji?\197?\153?\195?\173 Techet which is preventing warnings when using -Wmissing-prototypes on compiling. Thanks. Modified Paths: -------------- trunk/ChangeLog trunk/src/plugindata.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-20 16:04:45 UTC (rev 5186) +++ trunk/ChangeLog 2010-08-21 09:07:46 UTC (rev 5187) @@ -1,3 +1,10 @@ +2010-08-21 Frank Lanitz <frank(a)frank.uvena.de> + + * src/plugindata.h: + Apply a patch by Jiří Techet which is preventing warnings when using + -Wmissing-prototypes on compiling. Thanks. + + 2010-08-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * scintilla/KeyWords.cxx: Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2010-08-20 16:04:45 UTC (rev 5186) +++ trunk/src/plugindata.h 2010-08-21 09:07:46 UTC (rev 5187) @@ -68,6 +68,7 @@ * want your plugin to require the current Geany version on your machine. * You should update this value when using any new API features. */ #define PLUGIN_VERSION_CHECK(api_required) \ + gint plugin_version_check(gint abi_ver);\ gint plugin_version_check(gint abi_ver) \ { \ if (abi_ver != GEANY_ABI_VERSION) \ @@ -113,6 +114,7 @@ * extra PluginInfo features (such as an icon), so we don't need to break API * compatibility. Alternatively just add a new macro, PLUGIN_SET_INFO_FULL(). -ntrel */ #define PLUGIN_SET_INFO(p_name, p_description, p_version, p_author) \ + void plugin_set_info(PluginInfo* info);\ void plugin_set_info(PluginInfo* info) \ { \ info->name = (p_name); \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5186] trunk
by ntrel＠users.sourceforge.net 20 Aug '10

20 Aug '10

Revision: 5186 http://geany.svn.sourceforge.net/geany/?rev=5186&view=rev Author: ntrel Date: 2010-08-20 16:04:45 +0000 (Fri, 20 Aug 2010) Log Message: ----------- Remove buildcmd_* accessor functions. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-20 15:56:39 UTC (rev 5185) +++ trunk/ChangeLog 2010-08-20 16:04:45 UTC (rev 5186) @@ -7,6 +7,8 @@ * src/build.c, src/build.h: Replace GeanyBuildCommand::entries array with separate fields. Similar to r5077 in the bs2 branch, but with less loop unrolling. + * src/build.c: + Remove buildcmd_* accessor functions. 2010-08-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2010-08-20 15:56:39 UTC (rev 5185) +++ trunk/src/build.c 2010-08-20 16:04:45 UTC (rev 5186) @@ -189,24 +189,6 @@ } -static gchar *buildcmd_label(GeanyBuildCommand *bc) -{ - return id_to_str(bc, GEANY_BC_LABEL); -} - - -static gchar *buildcmd_cmd(GeanyBuildCommand *bc) -{ - return id_to_str(bc, GEANY_BC_COMMAND); -} - - -static gchar *buildcmd_working_dir(GeanyBuildCommand *bc) -{ - return id_to_str(bc, GEANY_BC_WORKING_DIR); -} - - static const gchar *config_keys[] = { [GEANY_BC_LABEL] = "LB", [GEANY_BC_COMMAND] = "CM", @@ -813,8 +795,8 @@ have_project = project != NULL; cmd = get_build_cmd(doc, GEANY_GBG_EXEC, cmdindex, NULL); - cmd_string = build_replace_placeholder(doc, buildcmd_cmd(cmd)); - cmd_working_dir = buildcmd_working_dir(cmd); + cmd_string = build_replace_placeholder(doc, cmd->command); + cmd_working_dir = cmd->working_dir; if (! NZV(cmd_working_dir)) cmd_working_dir = "%d"; working_dir = build_replace_placeholder(doc, cmd_working_dir); /* in utf-8 */ @@ -1231,7 +1213,7 @@ if (buildcmd == NULL) return; - cmdstr = buildcmd_cmd(buildcmd); + cmdstr = buildcmd->command; if (cmd_cat != NULL) { @@ -1243,7 +1225,7 @@ else full_command = cmdstr; - dir = build_replace_placeholder(doc, buildcmd_working_dir(buildcmd)); + dir = build_replace_placeholder(doc, buildcmd->working_dir); subs_command = build_replace_placeholder(doc, full_command); build_info.grp = grp; build_info.cmd = cmd; @@ -1307,7 +1289,7 @@ return; } bc = get_build_cmd(doc, grp, cmd, NULL); - if (bc != NULL && strcmp(buildcmd_cmd(bc), "builtin") == 0) + if (bc != NULL && strcmp(bc->command, "builtin") == 0) { gchar *uri; if (doc == NULL) @@ -1442,14 +1424,14 @@ for (j = bs->build_cmd; j < build_groups_count[grp]; ++j) { GeanyBuildCommand *bc = get_build_cmd(NULL, grp, j, NULL); - const gchar *lbl = (bc == NULL) ? "" : buildcmd_label(bc); + const gchar *lbl = (bc == NULL) ? "" : bc->label; create_build_menu_item(menu, keygroup, accel_group, bs, lbl, grp, j); } } else { GeanyBuildCommand *bc = get_build_cmd(NULL, bs->build_grp, bs->build_cmd, NULL); - const gchar *lbl = (bc == NULL) ? "" : buildcmd_label(bc); + const gchar *lbl = (bc == NULL) ? "" : bc->label; create_build_menu_item(menu, keygroup, accel_group, bs, lbl, bs->build_grp, bs->build_cmd); } } @@ -1538,7 +1520,7 @@ const gchar *label; bc = get_build_cmd(doc, grp, cmd, NULL); if (bc) - label = buildcmd_label(bc); + label = bc->label; else label = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5185] trunk/src/build.c
by ntrel＠users.sourceforge.net 20 Aug '10

20 Aug '10

Revision: 5185 http://geany.svn.sourceforge.net/geany/?rev=5185&view=rev Author: ntrel Date: 2010-08-20 15:56:39 +0000 (Fri, 20 Aug 2010) Log Message: ----------- Add TODO items to tidy code for easier understanding. Modified Paths: -------------- trunk/src/build.c Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2010-08-20 15:55:30 UTC (rev 5184) +++ trunk/src/build.c 2010-08-20 15:56:39 UTC (rev 5185) @@ -25,6 +25,11 @@ /* * Build commands and menu items. */ +/* TODO: tidy code: + * De-uglify expressions with too much pointer indirection/array indexing by + * adding intermediate variables. + * Replace defines with enums. + * Other TODOs in code. */ #include "geany.h" #include "build.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5184] trunk
by ntrel＠users.sourceforge.net 20 Aug '10

20 Aug '10

Revision: 5184 http://geany.svn.sourceforge.net/geany/?rev=5184&view=rev Author: ntrel Date: 2010-08-20 15:55:30 +0000 (Fri, 20 Aug 2010) Log Message: ----------- Replace GeanyBuildCommand::entries array with separate fields. Similar to r5077 in the bs2 branch, but with less loop unrolling. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/build.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-20 11:28:40 UTC (rev 5183) +++ trunk/ChangeLog 2010-08-20 15:55:30 UTC (rev 5184) @@ -4,6 +4,9 @@ Link Octave instead of Matlab. Add comment about not being autogenerated. Minor changes to fit Scintilla order. + * src/build.c, src/build.h: + Replace GeanyBuildCommand::entries array with separate fields. + Similar to r5077 in the bs2 branch, but with less loop unrolling. 2010-08-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2010-08-20 11:28:40 UTC (rev 5183) +++ trunk/src/build.c 2010-08-20 15:55:30 UTC (rev 5184) @@ -152,10 +152,38 @@ /* convenience routines to access parts of GeanyBuildCommand */ static gchar *id_to_str(GeanyBuildCommand *bc, gint id) { - return bc->entries[id]; + switch (id) + { + case GEANY_BC_LABEL: + return bc->label; + case GEANY_BC_COMMAND: + return bc->command; + case GEANY_BC_WORKING_DIR: + return bc->working_dir; + } + g_assert(0); + return NULL; } +static void set_command(GeanyBuildCommand *bc, gint id, gchar *str) +{ + switch (id) + { + case GEANY_BC_LABEL: + setptr(bc->label, str); + break; + case GEANY_BC_COMMAND: + setptr(bc->command, str); + break; + case GEANY_BC_WORKING_DIR: + setptr(bc->working_dir, str); + break; + } + g_assert(0); +} + + static gchar *buildcmd_label(GeanyBuildCommand *bc) { return id_to_str(bc, GEANY_BC_LABEL); @@ -209,6 +237,7 @@ /* for debug only, print the commands structures in priority order */ static void printfcmds(void) { +#if 0 GeanyBuildCommand **cl[GEANY_GBG_COUNT][GEANY_BCS_COUNT] = { /* GEANY_BCS_DEF, GEANY_BCS_FT, GEANY_BCS_HOME_FT, GEANY_BCS_PREF, * GEANY_BCS_FT_PROJ, GEANY_BCS_PROJ */ @@ -285,6 +314,7 @@ } printf("\n"); } +#endif } @@ -1891,7 +1921,7 @@ if (bc != NULL ) { - if ((str = bc->entries[i]) == NULL) + if ((str = id_to_str(bc, i)) == NULL) str = ""; else if ((gint)dst == src) roww->used_dst = TRUE; @@ -2112,7 +2142,7 @@ if (*(dst->dst[grp]) == NULL) *(dst->dst[grp]) = g_new0(GeanyBuildCommand, build_groups_count[grp]); for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) - setptr((*(dst->dst[grp]))[cmd].entries[i], entries[i]); + set_command(&(*(dst->dst[grp]))[cmd], i, entries[i]); (*(dst->dst[grp]))[cmd].exists = TRUE; (*(dst->dst[grp]))[cmd].changed = TRUE; changed = TRUE; @@ -2307,12 +2337,12 @@ if (label != NULL) { dstcmd[cmd].exists = TRUE; - setptr(dstcmd[cmd].entries[GEANY_BC_LABEL], label); + setptr(dstcmd[cmd].label, label); set_key_fld(key,"CM"); - setptr(dstcmd[cmd].entries[GEANY_BC_COMMAND], + setptr(dstcmd[cmd].command, g_key_file_get_string(config, build_grp_name, key, NULL)); set_key_fld(key,"WD"); - setptr(dstcmd[cmd].entries[GEANY_BC_WORKING_DIR], + setptr(dstcmd[cmd].working_dir, g_key_file_get_string(config, build_grp_name, key, NULL)); } else dstcmd[cmd].exists = FALSE; @@ -2398,12 +2428,13 @@ /* load old [build_settings] values if there is no value defined by [build-menu] */ /* set GeanyBuildCommand if it doesn't already exist and there is a command */ +/* TODO: rewrite as function */ #define ASSIGNIF(type, id, string, value) \ if (NZV(value) && ! type[GBO_TO_CMD(id)].exists) { \ type[GBO_TO_CMD(id)].exists = TRUE; \ - setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_LABEL], g_strdup(string)); \ - setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_COMMAND], (value)); \ - setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_WORKING_DIR], NULL); \ + setptr(type[GBO_TO_CMD(id)].label, g_strdup(string)); \ + setptr(type[GBO_TO_CMD(id)].command, (value)); \ + setptr(type[GBO_TO_CMD(id)].working_dir, NULL); \ type[GBO_TO_CMD(id)].old = TRUE; \ } else \ g_free(value); @@ -2448,11 +2479,11 @@ else makebasedir = g_strdup("%d"); if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_ALL)].old) - setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_ALL)].entries[GEANY_BC_WORKING_DIR], g_strdup(makebasedir)); + setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_ALL)].working_dir, g_strdup(makebasedir)); if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_CUSTOM)].old) - setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_CUSTOM)].entries[GEANY_BC_WORKING_DIR], g_strdup(makebasedir)); + setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_CUSTOM)].working_dir, g_strdup(makebasedir)); if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].old) - setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].entries[GEANY_BC_WORKING_DIR], g_strdup("%d")); + setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].working_dir, g_strdup("%d")); value = g_key_file_get_string(config, "project", "run_cmd", NULL); if (NZV(value)) { @@ -2461,9 +2492,9 @@ if (! exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists) { exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists = TRUE; - setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].entries[GEANY_BC_LABEL], g_strdup(_("_Execute"))); - setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].entries[GEANY_BC_COMMAND], value); - setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].entries[GEANY_BC_WORKING_DIR], g_strdup(basedir)); + setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].label, g_strdup(_("_Execute"))); + setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].command, value); + setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].working_dir, g_strdup(basedir)); exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].old = TRUE; } } @@ -2516,7 +2547,7 @@ for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { set_key_fld(key, config_keys[i]); - g_key_file_set_string(config, build_grp_name, key, src[cmd].entries[i]); + g_key_file_set_string(config, build_grp_name, key, id_to_str(&src[cmd], i)); } } else @@ -2645,15 +2676,17 @@ static struct { - const gchar *entries[GEANY_BC_CMDENTRIES_COUNT]; + const gchar *label; + const gchar *command; + const gchar *working_dir; GeanyBuildCommand **ptr; gint index; } default_cmds[] = { - { {N_("_Make"), "make", NULL}, &non_ft_def, GBO_TO_CMD(GEANY_GBO_MAKE_ALL)}, - { {N_("Make Custom _Target"), "make ", NULL}, &non_ft_def, GBO_TO_CMD(GEANY_GBO_CUSTOM)}, - { {N_("Make _Object"), "make %e.o", NULL }, &non_ft_def, GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)}, - { {N_("_Execute"), "./%e", NULL }, &exec_def, GBO_TO_CMD(GEANY_GBO_EXEC)}, - { {NULL, NULL, NULL}, NULL, 0 } + { N_("_Make"), "make", NULL, &non_ft_def, GBO_TO_CMD(GEANY_GBO_MAKE_ALL)}, + { N_("Make Custom _Target"), "make ", NULL, &non_ft_def, GBO_TO_CMD(GEANY_GBO_CUSTOM)}, + { N_("Make _Object"), "make %e.o", NULL, &non_ft_def, GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)}, + { N_("_Execute"), "./%e", NULL, &exec_def, GBO_TO_CMD(GEANY_GBO_EXEC)}, + { NULL, NULL, NULL, NULL, 0 } }; @@ -2669,18 +2702,14 @@ non_ft_def = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); exec_def = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); run_info = g_new0(RunInfo, build_groups_count[GEANY_GBG_EXEC]); - for (cmdindex = 0; default_cmds[cmdindex].entries[GEANY_BC_COMMAND] != NULL; ++cmdindex) + + for (cmdindex = 0; default_cmds[cmdindex].command != NULL; ++cmdindex) { - enum GeanyBuildCmdEntries k; GeanyBuildCommand *cmd = &((*(default_cmds[cmdindex].ptr))[ default_cmds[cmdindex].index ]); cmd->exists = TRUE; - for (k = 0; k < GEANY_BC_CMDENTRIES_COUNT; k++) - { - if (k == GEANY_BC_LABEL) - cmd->entries[k] = g_strdup(_(default_cmds[cmdindex].entries[k])); - else - cmd->entries[k] = g_strdup(default_cmds[cmdindex].entries[k]); - } + cmd->label = g_strdup(_(default_cmds[cmdindex].label)); + cmd->command = g_strdup(default_cmds[cmdindex].command); + cmd->working_dir = g_strdup(default_cmds[cmdindex].working_dir); } /* create the toolbar Build item sub menu */ Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2010-08-20 11:28:40 UTC (rev 5183) +++ trunk/src/build.h 2010-08-20 15:55:30 UTC (rev 5184) @@ -120,20 +120,22 @@ extern GeanyBuildInfo build_info; /** The entries of a command for a menu item */ -typedef enum GeanyBuildCmdEntries +typedef enum GeanyBuildCmdEntries { - GEANY_BC_LABEL, /**< The menu item label, _ marks mnemonic */ - GEANY_BC_COMMAND, /**< The command to run. */ - GEANY_BC_WORKING_DIR, /**< The directory to run in */ - GEANY_BC_CMDENTRIES_COUNT /**< Count of entries */ + GEANY_BC_LABEL, /**< The menu item label, _ marks mnemonic */ + GEANY_BC_COMMAND, /**< The command to run. */ + GEANY_BC_WORKING_DIR, /**< The directory to run in */ + GEANY_BC_CMDENTRIES_COUNT /**< Count of entries */ } GeanyBuildCmdEntries; /** The command for a menu item. */ typedef struct GeanyBuildCommand { - /** Pointers to g_string values of the command entries. + /** Pointers to g_string values of the command entries. * Must be freed if the pointer is changed. */ - gchar *entries[GEANY_BC_CMDENTRIES_COUNT]; + gchar *label; /**< Menu item label */ + gchar *command; /**< Command to run */ + gchar *working_dir; /**< working directory */ gboolean exists; /**< If the entries have valid values. */ gboolean changed; /**< Save on exit if @c changed, remove if not @c exist. */ gboolean old; /**< Converted from old format. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2010