Commits February 2010

commits@lists.geany.org

7 participants
84 discussions

SF.net SVN: geany:[4715] trunk
by eht16＠users.sourceforge.net 28 Feb '10

28 Feb '10

Revision: 4715 http://geany.svn.sourceforge.net/geany/?rev=4715&view=rev Author: eht16 Date: 2010-02-28 15:05:47 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Fix wrongly auto-detected multiline comments (patch by Eugene Arshinov, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-02-28 14:59:52 UTC (rev 4714) +++ trunk/ChangeLog 2010-02-28 15:05:47 UTC (rev 4715) @@ -19,6 +19,9 @@ * src/msgwindow.c, src/msgwindow.h, src/ui_utils.c, src/ui_utils.h: Make Space on the compiler and messages widgets not focus the editor widget while Enter does (patch by Can Koy, thanks). + * src/editor.c: + Fix wrongly auto-detected multiline comments + (patch by Eugene Arshinov, thanks). 2010-02-28 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2010-02-28 14:59:52 UTC (rev 4714) +++ trunk/src/editor.c 2010-02-28 15:05:47 UTC (rev 4715) @@ -3182,8 +3182,12 @@ /* Use the start of the line enter was pressed on, to avoid any doc keyword styles */ indent_pos = sci_get_line_indent_position(sci, cur_line - 1); style = sci_get_style_at(sci, indent_pos); + if (!in_block_comment(lexer, style)) + return; - if (in_block_comment(lexer, style)) + /* Check whether the comment block continues on this line */ + indent_pos = sci_get_line_indent_position(sci, cur_line); + if (sci_get_style_at(sci, indent_pos) == style) { gchar *previous_line = sci_get_line(sci, cur_line - 1); /* the type of comment, '*' (C/C++/Java), '+' and the others (D) */ @@ -4949,5 +4953,3 @@ sci_set_current_line(sci, lstart); } } - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4714] trunk/plugins/genapi.py
by eht16＠users.sourceforge.net 28 Feb '10

28 Feb '10

Revision: 4714 http://geany.svn.sourceforge.net/geany/?rev=4714&view=rev Author: eht16 Date: 2010-02-28 14:59:52 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Re-add a wanted tab in the comment Modified Paths: -------------- trunk/plugins/genapi.py Modified: trunk/plugins/genapi.py =================================================================== --- trunk/plugins/genapi.py 2010-02-28 14:57:06 UTC (rev 4713) +++ trunk/plugins/genapi.py 2010-02-28 14:59:52 UTC (rev 4714) @@ -60,7 +60,7 @@ * * E.g.:@code * #define plugin_add_toolbar_item \ - * geany_functions->p_plugin->plugin_add_toolbar_item @endcode + * geany_functions->p_plugin->plugin_add_toolbar_item @endcode * * You need to declare the @ref geany_functions symbol yourself. * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4713] trunk
by eht16＠users.sourceforge.net 28 Feb '10

28 Feb '10

Revision: 4713 http://geany.svn.sourceforge.net/geany/?rev=4713&view=rev Author: eht16 Date: 2010-02-28 14:57:06 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Make Space on the compiler and messages widgets not focus the editor widget while Enter does (patch by Can Koy, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/msgwindow.c trunk/src/msgwindow.h trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-02-28 14:32:38 UTC (rev 4712) +++ trunk/ChangeLog 2010-02-28 14:57:06 UTC (rev 4713) @@ -16,6 +16,9 @@ * src/document.c, src/document.h: Fix document_try_focus() to make it work with the sidebar document list as well. + * src/msgwindow.c, src/msgwindow.h, src/ui_utils.c, src/ui_utils.h: + Make Space on the compiler and messages widgets not focus the editor + widget while Enter does (patch by Can Koy, thanks). 2010-02-28 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2010-02-28 14:32:38 UTC (rev 4712) +++ trunk/src/msgwindow.c 2010-02-28 14:57:06 UTC (rev 4713) @@ -111,18 +111,29 @@ } +static gboolean is_keyval_enter_or_return(guint keyval) +{ + return (keyval == GDK_Return || keyval == GDK_ISO_Enter || keyval == GDK_KP_Enter); +} + + static gboolean on_msgwin_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) { - if (event->keyval == GDK_Return || - event->keyval == GDK_ISO_Enter || - event->keyval == GDK_KP_Enter || - event->keyval == GDK_space) + if (is_keyval_enter_or_return(event->keyval) || event->keyval == GDK_space) { - GdkEventButton button_event; - - button_event.button = 1; - button_event.time = event->time; - on_msgwin_button_press_event(NULL, &button_event, data); + switch (GPOINTER_TO_INT(data)) + { + case MSG_COMPILER: + { /* single click in the compiler treeview */ + msgwin_goto_compiler_file_line(event->keyval); + break; + } + case MSG_MESSAGE: + { /* single click in the message treeview (results of 'Find usage') */ + msgwin_goto_messages_file_line(event->keyval); + break; + } + } } return FALSE; } @@ -582,7 +593,7 @@ } -static gboolean goto_compiler_file_line(const gchar *filename, gint line) +static gboolean goto_compiler_file_line(const gchar *filename, gint line, guint keyval) { if (!filename || line <= -1) return FALSE; @@ -626,17 +637,23 @@ if (doc != NULL) { + gboolean ret; + if (! doc->changed) /* if modified, line may be wrong */ editor_indicator_set_on_line(doc->editor, GEANY_INDICATOR_ERROR, line - 1); - return navqueue_goto_line(old_doc, doc, line); + ret = navqueue_goto_line(old_doc, doc, line); + if (ret && is_keyval_enter_or_return(keyval)) + gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); + + return ret; } } return FALSE; } -gboolean msgwin_goto_compiler_file_line(void) +gboolean msgwin_goto_compiler_file_line(guint keyval) { GtkTreeIter iter; GtkTreeModel *model; @@ -672,7 +689,7 @@ g_free(string); g_free(dir); - ret = goto_compiler_file_line(filename, line); + ret = goto_compiler_file_line(filename, line, keyval); g_free(filename); return ret; } @@ -949,7 +966,7 @@ } -gboolean msgwin_goto_messages_file_line(void) +gboolean msgwin_goto_messages_file_line(guint keyval) { GtkTreeIter iter; GtkTreeModel *model; @@ -969,6 +986,8 @@ if (line >= 0 && DOC_VALID(doc)) { ret = navqueue_goto_line(old_doc, doc, line); + if (ret && is_keyval_enter_or_return(keyval)) + gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); } else if (line < 0 && string != NULL) { @@ -979,7 +998,11 @@ /* use document_open_file to find an already open file, or open it in place */ doc = document_open_file(filename, FALSE, NULL, NULL); if (doc != NULL) + { ret = navqueue_goto_line(old_doc, doc, line); + if (ret && is_keyval_enter_or_return(keyval)) + gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); + } } g_free(filename); } @@ -1027,12 +1050,12 @@ { case MSG_COMPILER: { /* single click in the compiler treeview */ - msgwin_goto_compiler_file_line(); + msgwin_goto_compiler_file_line(0); break; } case MSG_MESSAGE: { /* single click in the message treeview (results of 'Find usage') */ - msgwin_goto_messages_file_line(); + msgwin_goto_messages_file_line(0); break; } } Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2010-02-28 14:32:38 UTC (rev 4712) +++ trunk/src/msgwindow.h 2010-02-28 14:57:06 UTC (rev 4713) @@ -101,11 +101,11 @@ void msgwin_menu_add_common_items(GtkMenu *menu); -gboolean msgwin_goto_compiler_file_line(void); +gboolean msgwin_goto_compiler_file_line(guint keyval); void msgwin_parse_compiler_error_line(const gchar *string, const gchar *dir, gchar **filename, gint *line); -gboolean msgwin_goto_messages_file_line(void); +gboolean msgwin_goto_messages_file_line(guint keyval); #endif Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2010-02-28 14:32:38 UTC (rev 4712) +++ trunk/src/ui_utils.c 2010-02-28 14:57:06 UTC (rev 4713) @@ -1492,7 +1492,7 @@ while (TRUE) { gtk_tree_selection_select_iter(treesel, &iter); - if (cb()) + if (cb(0)) break; /* found next message */ if (! tree_model_iter_get_next(model, &iter, down)) Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2010-02-28 14:32:38 UTC (rev 4712) +++ trunk/src/ui_utils.h 2010-02-28 14:57:06 UTC (rev 4713) @@ -283,7 +283,7 @@ void ui_update_tab_status(GeanyDocument *doc); -typedef gboolean TVMatchCallback(void); +typedef gboolean TVMatchCallback(guint); gboolean ui_tree_view_find_next(GtkTreeView *treeview, TVMatchCallback cb); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4712] trunk/src
by eht16＠users.sourceforge.net 28 Feb '10

28 Feb '10

Revision: 4712 http://geany.svn.sourceforge.net/geany/?rev=4712&view=rev Author: eht16 Date: 2010-02-28 14:32:38 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Fix document_try_focus() to make it work with the sidebar document list as well. Modified Paths: -------------- trunk/src/document.c trunk/src/document.h trunk/src/sidebar.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2010-02-28 14:30:27 UTC (rev 4711) +++ trunk/src/document.c 2010-02-28 14:32:38 UTC (rev 4712) @@ -516,7 +516,7 @@ } -void document_try_focus(GeanyDocument *doc) +void document_try_focus(GeanyDocument *doc, GtkWidget *source_widget) { /* doc might not be valid e.g. if user closed a tab whilst Geany is opening files */ if (DOC_VALID(doc)) @@ -524,7 +524,10 @@ GtkWidget *sci = GTK_WIDGET(doc->editor->sci); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); - if (focusw == doc->priv->tag_tree) + if (source_widget == NULL) + source_widget = doc->priv->tag_tree; + + if (focusw == source_widget) gtk_widget_grab_focus(sci); } } @@ -532,7 +535,7 @@ static gboolean on_idle_focus(gpointer doc) { - document_try_focus(doc); + document_try_focus(doc, NULL); return FALSE; } @@ -752,7 +755,7 @@ sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); /* bring it in front, jump to the start and grab the focus */ editor_goto_pos(doc->editor, 0, FALSE); - document_try_focus(doc); + document_try_focus(doc, NULL); #if USE_GIO_FILEMON monitor_file_setup(doc); Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2010-02-28 14:30:27 UTC (rev 4711) +++ trunk/src/document.h 2010-02-28 14:32:38 UTC (rev 4712) @@ -192,7 +192,7 @@ gboolean document_remove_page(guint page_num); -void document_try_focus(GeanyDocument *doc); +void document_try_focus(GeanyDocument *doc, GtkWidget *source_widget); gboolean document_close(GeanyDocument *doc); Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2010-02-28 14:30:27 UTC (rev 4711) +++ trunk/src/sidebar.c 2010-02-28 14:32:38 UTC (rev 4712) @@ -710,10 +710,10 @@ } -static void change_focus_to_editor(GeanyDocument *doc) +static void change_focus_to_editor(GeanyDocument *doc, GtkWidget *source_widget) { if (may_steal_focus) - document_try_focus(doc); + document_try_focus(doc, source_widget); may_steal_focus = FALSE; } @@ -736,7 +736,7 @@ gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), (GtkWidget*) doc->editor->sci)); if (selection_change.keyval != GDK_space) - change_focus_to_editor(doc); + change_focus_to_editor(doc, tv.tree_openfiles); } return FALSE; } @@ -765,7 +765,7 @@ { navqueue_goto_line(doc, doc, line); if (selection_change.keyval != GDK_space) - change_focus_to_editor(doc); + change_focus_to_editor(doc, 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:[4711] trunk
by eht16＠users.sourceforge.net 28 Feb '10

28 Feb '10

Revision: 4711 http://geany.svn.sourceforge.net/geany/?rev=4711&view=rev Author: eht16 Date: 2010-02-28 14:30:27 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Make Space on the symbol and document list not focus the editor widget while Enter does (closes #2919444, patch by Can Koy, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/src/about.c trunk/src/sidebar.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-02-28 13:12:48 UTC (rev 4710) +++ trunk/ChangeLog 2010-02-28 14:30:27 UTC (rev 4711) @@ -10,6 +10,12 @@ * scintilla/LexR.cxx: Backport R lexer from Scintilla CVS to fix case sensitive keywords (Scintilla bug #2956543). + * src/sidebar.c, src/about.c, THANKS: + Make Space on the symbol and document list not focus the editor + widget while Enter does (closes #2919444, patch by Can Koy, thanks). + * src/document.c, src/document.h: + Fix document_try_focus() to make it work with the sidebar document + list as well. 2010-02-28 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2010-02-28 13:12:48 UTC (rev 4710) +++ trunk/THANKS 2010-02-28 14:30:27 UTC (rev 4711) @@ -74,6 +74,7 @@ Jörn Reder <joern(at)zyn(dot)de> - --socket-file command line option patch Kelvin Gardiner <kelvin(at)mbmn(dot)net> - VHDL symbol list patch, Verilog filetype Jon Senior <jon(at)restlesslemon(dot)co(dot)uk> - R tagmanager parser patch +Can Koy <cankoy(at)ymail(dot)com> - Multiple changes/improvements Translators: ------------ Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2010-02-28 13:12:48 UTC (rev 4710) +++ trunk/src/about.c 2010-02-28 14:30:27 UTC (rev 4711) @@ -82,7 +82,7 @@ static const gchar *contributors = "Alexander Rodin, Alexey Antipov, Andrew Rowland, Anh Phạm, blackdog, Bo Lorentsen, Bob Doan, " -"Bronisław Białek, Catalin Marinas, " +"Bronisław Białek, Can Koy, Catalin Marinas, " "Chris Macksey, Christoph Berg, Colomban Wendling, Conrad Steenberg, Daniel Richard G., Dave Moore, " "Dirk Weber, Elias Pschernig, Eric Forgeot, Eugene Arshinov, Felipe Pena, François Cami, " "Giuseppe Torelli, Guillaume de Rorthais, Guillaume Hoffmann, Herbert Voss, Jason Oster, " Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2010-02-28 13:12:48 UTC (rev 4710) +++ trunk/src/sidebar.c 2010-02-28 14:30:27 UTC (rev 4711) @@ -46,6 +46,7 @@ #include <gdk/gdkkeysyms.h> + SidebarTreeviews tv = {NULL, NULL, NULL}; /* while typeahead searching, editor should not get focus */ static gboolean may_steal_focus = FALSE; @@ -59,6 +60,12 @@ } doc_items = {NULL, NULL, NULL, NULL}; +static struct +{ + GtkTreeSelection *selection; + guint keyval; +} selection_change = {NULL, 0}; + enum { TREEVIEW_SYMBOL = 0, @@ -88,9 +95,9 @@ static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ /* callback prototypes */ -static gboolean on_openfiles_tree_selection_changed(GtkTreeSelection *selection); +static gboolean on_openfiles_tree_selection_changed(gpointer data); static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data); -static gboolean on_taglist_tree_selection_changed(GtkTreeSelection *selection); +static gboolean on_taglist_tree_selection_changed(gpointer data); static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event, gpointer user_data); static gboolean sidebar_key_press_cb(GtkWidget *widget, GdkEventKey *event, @@ -667,7 +674,6 @@ break; } } - } @@ -712,14 +718,14 @@ } -static gboolean on_openfiles_tree_selection_changed(GtkTreeSelection *selection) +static gboolean on_openfiles_tree_selection_changed(gpointer data) { GtkTreeIter iter; GtkTreeModel *model; GeanyDocument *doc = NULL; /* use switch_notebook_page to ignore changing the notebook page because it is already done */ - if (gtk_tree_selection_get_selected(selection, &model, &iter) && ! ignore_callback) + if (gtk_tree_selection_get_selected(selection_change.selection, &model, &iter) && ! ignore_callback) { gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, -1); if (! doc) @@ -729,19 +735,20 @@ gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), (GtkWidget*) doc->editor->sci)); - change_focus_to_editor(doc); + if (selection_change.keyval != GDK_space) + change_focus_to_editor(doc); } return FALSE; } -static gboolean on_taglist_tree_selection_changed(GtkTreeSelection *selection) +static gboolean on_taglist_tree_selection_changed(gpointer data) { GtkTreeIter iter; GtkTreeModel *model; gint line = 0; - if (gtk_tree_selection_get_selected(selection, &model, &iter)) + if (gtk_tree_selection_get_selected(selection_change.selection, &model, &iter)) { const TMTag *tag; @@ -757,7 +764,8 @@ if (doc != NULL) { navqueue_goto_line(doc, doc, line); - change_focus_to_editor(doc); + if (selection_change.keyval != GDK_space) + change_focus_to_editor(doc); } } } @@ -765,6 +773,13 @@ } +static void update_selection_change(GtkTreeSelection *selection, guint keyval) +{ + selection_change.selection = selection; + selection_change.keyval = keyval; +} + + static gboolean sidebar_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data) { @@ -778,10 +793,12 @@ may_steal_focus = TRUE; /* delay the query of selection state because this callback is executed before GTK * changes the selection (g_signal_connect_after would be better but it doesn't work) */ + update_selection_change(selection, event->keyval); + if (widget == tv.tree_openfiles) /* tag and doc list have separate handlers */ - g_idle_add((GSourceFunc) on_openfiles_tree_selection_changed, selection); + g_idle_add(on_openfiles_tree_selection_changed, NULL); else - g_idle_add((GSourceFunc) on_taglist_tree_selection_changed, selection); + g_idle_add(on_taglist_tree_selection_changed, NULL); } return FALSE; } @@ -820,10 +837,12 @@ { /* allow reclicking of taglist treeview item */ /* delay the query of selection state because this callback is executed before GTK * changes the selection (g_signal_connect_after would be better but it doesn't work) */ + update_selection_change(selection, 0); + if (widget == tv.tree_openfiles) - g_idle_add((GSourceFunc) on_openfiles_tree_selection_changed, selection); + g_idle_add(on_openfiles_tree_selection_changed, NULL); else - g_idle_add((GSourceFunc) on_taglist_tree_selection_changed, selection); + g_idle_add(on_taglist_tree_selection_changed, NULL); } else if (event->button == 3) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4710] trunk/ChangeLog
by dmaphy＠users.sourceforge.net 28 Feb '10

28 Feb '10

Revision: 4710 http://geany.svn.sourceforge.net/geany/?rev=4710&view=rev Author: dmaphy Date: 2010-02-28 13:12:48 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Fix the ChangeLog (sorry, again :( ) Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-02-28 13:06:05 UTC (rev 4709) +++ trunk/ChangeLog 2010-02-28 13:12:48 UTC (rev 4710) @@ -1,8 +1,8 @@ -2010-02-26 Dominic Hopf <dmaphy(at)googlemail(dot)com> +2010-02-28 Dominic Hopf <dmaphy(at)googlemail(dot)com> * src/log.c: - fix keyboard accelerators in debug messages window - (Thanks Can Koy!) + Fix keyboard accelerators in debug messages window + (Thanks Can Koy). 2010-02-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4709] trunk
by dmaphy＠users.sourceforge.net 28 Feb '10

28 Feb '10

Revision: 4709 http://geany.svn.sourceforge.net/geany/?rev=4709&view=rev Author: dmaphy Date: 2010-02-28 13:06:05 +0000 (Sun, 28 Feb 2010) Log Message: ----------- fix keyboard accelerators in debug messages window (Thanks Can Koy!) Modified Paths: -------------- trunk/ChangeLog trunk/src/log.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-02-28 12:56:19 UTC (rev 4708) +++ trunk/ChangeLog 2010-02-28 13:06:05 UTC (rev 4709) @@ -1,3 +1,10 @@ +2010-02-26 Dominic Hopf <dmaphy(at)googlemail(dot)com> + + * src/log.c: + fix keyboard accelerators in debug messages window + (Thanks Can Koy!) + + 2010-02-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * scintilla/LexR.cxx: Modified: trunk/src/log.c =================================================================== --- trunk/src/log.c 2010-02-28 12:56:19 UTC (rev 4708) +++ trunk/src/log.c 2010-02-28 13:06:05 UTC (rev 4709) @@ -180,7 +180,7 @@ dialog = gtk_dialog_new_with_buttons(_("Debug Messages"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CLEAR, DIALOG_RESPONSE_CLEAR, + _("Cl_ear"), DIALOG_RESPONSE_CLEAR, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 6); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4708] trunk
by eht16＠users.sourceforge.net 28 Feb '10

28 Feb '10

Revision: 4708 http://geany.svn.sourceforge.net/geany/?rev=4708&view=rev Author: eht16 Date: 2010-02-28 12:56:19 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Backport R lexer from Scintilla CVS to fix case sensitive keywords (Scintilla bug #2956543). Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/LexR.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-02-28 01:04:19 UTC (rev 4707) +++ trunk/ChangeLog 2010-02-28 12:56:19 UTC (rev 4708) @@ -1,3 +1,10 @@ +2010-02-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * scintilla/LexR.cxx: + Backport R lexer from Scintilla CVS to fix case sensitive keywords + (Scintilla bug #2956543). + + 2010-02-28 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * src/ui_utils.c: Modified: trunk/scintilla/LexR.cxx =================================================================== --- trunk/scintilla/LexR.cxx 2010-02-28 01:04:19 UTC (rev 4707) +++ trunk/scintilla/LexR.cxx 2010-02-28 12:56:19 UTC (rev 4708) @@ -77,9 +77,9 @@ sc.SetState(SCE_R_DEFAULT); } } else if (sc.state == SCE_R_IDENTIFIER) { - if (!IsAWordChar(sc.ch) || (sc.ch == '.')) { + if (!IsAWordChar(sc.ch)) { char s[100]; - sc.GetCurrentLowered(s, sizeof(s)); + sc.GetCurrent(s, sizeof(s)); if (keywords.InList(s)) { sc.ChangeState(SCE_R_KWORD); } else if (keywords2.InList(s)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4707] trunk
by frlan＠users.sourceforge.net 28 Feb '10

28 Feb '10

Revision: 4707 http://geany.svn.sourceforge.net/geany/?rev=4707&view=rev Author: frlan Date: 2010-02-28 01:04:19 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Show number of lines of current document inside statusbar. Thanks to Can Koy for providing the patch. Modified Paths: -------------- trunk/ChangeLog trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-02-26 16:08:34 UTC (rev 4706) +++ trunk/ChangeLog 2010-02-28 01:04:19 UTC (rev 4707) @@ -1,3 +1,10 @@ +2010-02-28 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * src/ui_utils.c: + Show number of lines of current document inside statusbar. Thanks to + Can Koy for providing the patch. + + 2010-02-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/keybindings.c, doc/geany.txt, doc/geany.html: Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2010-02-26 16:08:34 UTC (rev 4706) +++ trunk/src/ui_utils.c 2010-02-28 01:04:19 UTC (rev 4707) @@ -187,8 +187,8 @@ col = 0; /* Status bar statistics: col = column, sel = selection. */ - g_string_printf(stats_str, _("line: %d\t col: %d\t sel: %d\t "), - (line + 1), col, + g_string_printf(stats_str, _("line: %d / %d\t col: %d\t sel: %d\t "), + (line + 1), sci_get_line_count(doc->editor->sci), col, sci_get_selected_text_length(doc->editor->sci) - 1); g_string_append(stats_str, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4706] branches/gnu-regex
by ntrel＠users.sourceforge.net 26 Feb '10

26 Feb '10

Revision: 4706 http://geany.svn.sourceforge.net/geany/?rev=4706&view=rev Author: ntrel Date: 2010-02-26 16:08:34 +0000 (Fri, 26 Feb 2010) Log Message: ----------- Implement regex backreference replacement for \0 (whole match) and groups \1 to \9. Modified Paths: -------------- branches/gnu-regex/ChangeLog branches/gnu-regex/src/document.c Modified: branches/gnu-regex/ChangeLog =================================================================== --- branches/gnu-regex/ChangeLog 2010-02-25 18:30:43 UTC (rev 4705) +++ branches/gnu-regex/ChangeLog 2010-02-26 16:08:34 UTC (rev 4706) @@ -1,3 +1,10 @@ +2010-02-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/document.c: + Implement regex backreference replacement for \0 (whole match) and + groups \1 to \9. + + 2010-02-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/utils.c, src/document.c: Modified: branches/gnu-regex/src/document.c =================================================================== --- branches/gnu-regex/src/document.c 2010-02-25 18:30:43 UTC (rev 4705) +++ branches/gnu-regex/src/document.c 2010-02-26 16:08:34 UTC (rev 4706) @@ -1952,24 +1952,38 @@ } -static gint find_regex(ScintillaObject *sci, guint pos, regex_t *regex, regmatch_t *match) +/* groups that don't exist are handled OK as len = end - start = (-1) - (-1) = 0 */ +static gchar *get_regex_match_string(const gchar *text, regmatch_t *pmatch, gint match_idx) { + return g_strndup(&text[pmatch[match_idx].rm_so], + pmatch[match_idx].rm_eo - pmatch[match_idx].rm_so); +} + + +static regmatch_t regex_matches[10]; +/* All matching text from regex_matches[0].rm_so to regex_matches[0].rm_eo */ +static gchar *regex_match_text = NULL; + +static gint find_regex(ScintillaObject *sci, guint pos, regex_t *regex) +{ const gchar *text; g_return_val_if_fail(pos <= (guint)sci_get_length(sci), FALSE); text = (void*)scintilla_send_message(sci, SCI_GETCHARACTERPOINTER, 0, 0); text += pos; - if (regexec(regex, text, 1, match, 0) == 0) - return match->rm_so + pos; - + if (regexec(regex, text, G_N_ELEMENTS(regex_matches), regex_matches, 0) == 0) + { + setptr(regex_match_text, get_regex_match_string(text, regex_matches, 0)); + return regex_matches[0].rm_so + pos; + } + setptr(regex_match_text, NULL); return -1; } static gint geany_search_next(ScintillaObject *sci, const gchar *str, gint flags) { - regmatch_t match; regex_t regex; gint ret = -1; gint pos; @@ -1981,9 +1995,9 @@ return -1; pos = sci_get_current_position(sci); - ret = find_regex(sci, pos, &regex, &match); + ret = find_regex(sci, pos, &regex); if (ret >= 0) - sci_set_selection(sci, ret, match.rm_eo + pos); + sci_set_selection(sci, ret, regex_matches[0].rm_eo + pos); regfree(&regex); return ret; @@ -2100,9 +2114,12 @@ } /* digit escape */ g_string_erase(str, i, 2); - grp = "{group}"; + /* fix match offsets by subtracting index of whole match start from the string */ + grp = get_regex_match_string(regex_match_text - regex_matches[0].rm_so, + regex_matches, c - '0'); g_string_insert(str, i, grp); i += strlen(grp); + g_free(grp); } /* now fix backslash, tabs, etc */ if (!utils_str_replace_escape(str->str)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2010