Commits March 2008

commits@lists.geany.org

3 participants
133 discussions

SF.net SVN: geany: [2391] trunk
by eht16＠users.sourceforge.net 23 Mar '08

23 Mar '08

Revision: 2391 http://geany.svn.sourceforge.net/geany/?rev=2391&view=rev Author: eht16 Date: 2008-03-23 09:43:01 -0700 (Sun, 23 Mar 2008) Log Message: ----------- Small improvement in counting changed documents for Save All update. Modified Paths: -------------- trunk/ChangeLog trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-23 16:32:36 UTC (rev 2390) +++ trunk/ChangeLog 2008-03-23 16:43:01 UTC (rev 2391) @@ -14,6 +14,8 @@ opening Find dialogs. * src/keybindings.c, src/keybindings.h, src/plugindata.h: Add shortcut to switch to the sidebar. + * src/ui_utils.c: + Small improvement in counting changed documents for Save All update. 2008-03-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2008-03-23 16:32:36 UTC (rev 2390) +++ trunk/src/ui_utils.c 2008-03-23 16:43:01 UTC (rev 2391) @@ -536,14 +536,17 @@ /* save all menu item and tool button */ for (i = 0; i < (guint) gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); i++) { - /* count the amount of files where changes were made and if there are some, + /* check whether there are files where changes were made and if there are some, * we need the save all button / item */ - if (! dirty_tabs && doc_list[i].is_valid && doc_list[i].changed) + if (DOC_IDX_VALID(i) && doc_list[i].changed) + { dirty_tabs = TRUE; + break; + } } - gtk_widget_set_sensitive(ui_widgets.save_buttons[2], (dirty_tabs > 0) ? TRUE : FALSE); - gtk_widget_set_sensitive(ui_widgets.save_buttons[3], (dirty_tabs > 0) ? TRUE : FALSE); + gtk_widget_set_sensitive(ui_widgets.save_buttons[2], dirty_tabs); + gtk_widget_set_sensitive(ui_widgets.save_buttons[3], dirty_tabs); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2390] trunk
by eht16＠users.sourceforge.net 23 Mar '08

23 Mar '08

Revision: 2390 http://geany.svn.sourceforge.net/geany/?rev=2390&view=rev Author: eht16 Date: 2008-03-23 09:32:36 -0700 (Sun, 23 Mar 2008) Log Message: ----------- Add shortcut to switch to the sidebar. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/plugindata.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-23 16:29:43 UTC (rev 2389) +++ trunk/ChangeLog 2008-03-23 16:32:36 UTC (rev 2390) @@ -12,6 +12,8 @@ geany.glade: Add preference for not using the current word under the cursor when opening Find dialogs. + * src/keybindings.c, src/keybindings.h, src/plugindata.h: + Add shortcut to switch to the sidebar. 2008-03-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2008-03-23 16:29:43 UTC (rev 2389) +++ trunk/src/keybindings.c 2008-03-23 16:32:36 UTC (rev 2390) @@ -89,6 +89,7 @@ static void cb_func_switch_scribble(guint key_id); static void cb_func_switch_vte(guint key_id); static void cb_func_switch_search_bar(guint key_id); +static void cb_func_switch_sidebar(guint key_id); static void cb_func_switch_tableft(guint key_id); static void cb_func_switch_tabright(guint key_id); static void cb_func_switch_tablastused(guint key_id); @@ -379,6 +380,8 @@ GDK_F4, 0, "switch_vte", _("Switch to VTE"), NULL); keybindings_set_item(group, GEANY_KEYS_FOCUS_SEARCHBAR, cb_func_switch_search_bar, GDK_F7, 0, "switch_search_bar", _("Switch to Search Bar"), NULL); + keybindings_set_item(group, GEANY_KEYS_FOCUS_SIDEBAR, cb_func_switch_sidebar, + 0, 0, "switch_sidebar", _("Switch to Sidebar"), NULL); group = ADD_KB_GROUP(NOTEBOOK, _("Notebook tab")); @@ -1157,6 +1160,17 @@ gtk_widget_grab_focus(lookup_widget(app->window, "entry1")); } +static void cb_func_switch_sidebar(G_GNUC_UNUSED guint key_id) +{ + if (ui_prefs.sidebar_visible) + { + gint page_num = gtk_notebook_get_current_page(GTK_NOTEBOOK(app->treeview_notebook)); + GtkWidget *swin = gtk_notebook_get_nth_page(GTK_NOTEBOOK(app->treeview_notebook), page_num); + + gtk_widget_grab_focus(gtk_bin_get_child(GTK_BIN(swin))); + } +} + static void cb_func_switch_vte(G_GNUC_UNUSED guint key_id) { msgwin_switch_tab(MSG_VTE, TRUE); Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2008-03-23 16:29:43 UTC (rev 2389) +++ trunk/src/keybindings.h 2008-03-23 16:32:36 UTC (rev 2390) @@ -241,6 +241,7 @@ GEANY_KEYS_FOCUS_SCRIBBLE, GEANY_KEYS_FOCUS_VTE, GEANY_KEYS_FOCUS_SEARCHBAR, + GEANY_KEYS_FOCUS_SIDEBAR, GEANY_KEYS_FOCUS_COUNT }; Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-03-23 16:29:43 UTC (rev 2389) +++ trunk/src/plugindata.h 2008-03-23 16:32:36 UTC (rev 2390) @@ -35,12 +35,12 @@ /* The API version should be incremented whenever any plugin data types below are * modified or appended to. */ -static const gint api_version = 49; +static const gint api_version = 50; /* The ABI version should be incremented whenever existing fields in the plugin * data types below have to be changed or reordered. It should stay the same if fields * are only appended, as this doesn't affect existing fields. */ -static const gint abi_version = 22; +static const gint abi_version = 23; /** This performs runtime checks that try to ensure: * 1. Geany ABI data types are compatible with this plugin. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2389] trunk
by eht16＠users.sourceforge.net 23 Mar '08

23 Mar '08

Revision: 2389 http://geany.svn.sourceforge.net/geany/?rev=2389&view=rev Author: eht16 Date: 2008-03-23 09:29:43 -0700 (Sun, 23 Mar 2008) Log Message: ----------- Add preference for not using the current word under the cursor when opening Find dialogs. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/editor.c trunk/src/editor.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/prefs.c trunk/src/prefs.h trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-23 15:25:42 UTC (rev 2388) +++ trunk/ChangeLog 2008-03-23 16:29:43 UTC (rev 2389) @@ -7,6 +7,11 @@ * tagmanager/make.c, src/symbols.c: Update Makefile parser from CTags SVN and improve it to detect targets in Makefiles. + * geany.glade, src/interface.c, src/prefs.c, src/prefs.h, src/keyfile.c + src/callbacks.c, src/search.c, src/editor.c, src/editor.h, + geany.glade: + Add preference for not using the current word under the cursor when + opening Find dialogs. 2008-03-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-03-23 15:25:42 UTC (rev 2388) +++ trunk/geany.glade 2008-03-23 16:29:43 UTC (rev 2389) @@ -3553,6 +3553,25 @@ <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkCheckButton" id="check_search_use_current_word"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection.</property> + <property name="label" translatable="yes">Use the current word under the cursor for Find dialogs</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> </child> </widget> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-03-23 15:25:42 UTC (rev 2388) +++ trunk/src/callbacks.c 2008-03-23 16:29:43 UTC (rev 2389) @@ -1921,7 +1921,7 @@ if (! DOC_IDX_VALID(idx)) return; - sel = editor_get_default_selection(idx, GEANY_WORDCHARS"./"); + sel = editor_get_default_selection(idx, TRUE, GEANY_WORDCHARS"./"); if (sel != NULL) { Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-03-23 15:25:42 UTC (rev 2388) +++ trunk/src/editor.c 2008-03-23 16:29:43 UTC (rev 2389) @@ -2626,7 +2626,7 @@ /* wordchars: NULL or a string containing characters to match a word. * Returns: the current selection or the current word. */ -gchar *editor_get_default_selection(gint idx, const gchar *wordchars) +gchar *editor_get_default_selection(gint idx, gboolean use_current_word, const gchar *wordchars) { gchar *s = NULL; @@ -2640,7 +2640,7 @@ s = g_malloc(len + 1); sci_get_selected_text(doc_list[idx].sci, s); } - else if (sci_get_lines_selected(doc_list[idx].sci) == 0) + else if (sci_get_lines_selected(doc_list[idx].sci) == 0 && use_current_word) { /* use the word at current cursor position */ gchar word[GEANY_MAX_WORD_LENGTH]; Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2008-03-23 15:25:42 UTC (rev 2388) +++ trunk/src/editor.h 2008-03-23 16:29:43 UTC (rev 2389) @@ -145,7 +145,7 @@ void editor_find_current_word(ScintillaObject *sci, gint pos, gchar *word, size_t wordlen, const gchar *wc); -gchar *editor_get_default_selection(gint idx, const gchar *wordchars); +gchar *editor_get_default_selection(gint idx, gboolean use_current_word, const gchar *wordchars); void editor_select_word(ScintillaObject *sci); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-03-23 15:25:42 UTC (rev 2388) +++ trunk/src/interface.c 2008-03-23 16:29:43 UTC (rev 2389) @@ -2499,6 +2499,7 @@ GtkWidget *check_suppress_status_msgs; GtkWidget *check_auto_focus; GtkWidget *check_ask_suppress_search_dialogs; + GtkWidget *check_search_use_current_word; GtkWidget *label199; GtkWidget *frame25; GtkWidget *alignment28; @@ -2937,6 +2938,13 @@ gtk_tooltips_set_tip (tooltips, check_ask_suppress_search_dialogs, _("Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous"), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_ask_suppress_search_dialogs), FALSE); + check_search_use_current_word = gtk_check_button_new_with_mnemonic (_("Use the current word under the cursor for Find dialogs")); + gtk_widget_show (check_search_use_current_word); + gtk_box_pack_start (GTK_BOX (vbox21), check_search_use_current_word, FALSE, FALSE, 0); + GTK_WIDGET_UNSET_FLAGS (check_search_use_current_word, GTK_CAN_FOCUS); + gtk_tooltips_set_tip (tooltips, check_search_use_current_word, _("Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection."), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_search_use_current_word), FALSE); + label199 = gtk_label_new (_("Miscellaneous")); gtk_widget_show (label199); gtk_frame_set_label_widget (GTK_FRAME (frame19), label199); @@ -4492,6 +4500,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, check_suppress_status_msgs, "check_suppress_status_msgs"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_auto_focus, "check_auto_focus"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_ask_suppress_search_dialogs, "check_ask_suppress_search_dialogs"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_search_use_current_word, "check_search_use_current_word"); GLADE_HOOKUP_OBJECT (prefs_dialog, label199, "label199"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame25, "frame25"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment28, "alignment28"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-03-23 15:25:42 UTC (rev 2388) +++ trunk/src/keyfile.c 2008-03-23 16:29:43 UTC (rev 2389) @@ -179,6 +179,7 @@ g_key_file_set_boolean(config, PACKAGE, "pref_main_save_winpos", prefs.save_winpos); g_key_file_set_boolean(config, PACKAGE, "pref_main_confirm_exit", prefs.confirm_exit); g_key_file_set_boolean(config, PACKAGE, "pref_main_suppress_search_dialogs", prefs.suppress_search_dialogs); + g_key_file_set_boolean(config, PACKAGE, "pref_main_search_use_current_word", prefs.search_use_current_word); g_key_file_set_boolean(config, PACKAGE, "pref_main_suppress_status_messages", prefs.suppress_status_messages); g_key_file_set_boolean(config, PACKAGE, "switch_msgwin_pages", prefs.switch_msgwin_pages); g_key_file_set_boolean(config, PACKAGE, "beep_on_errors", prefs.beep_on_errors); @@ -472,6 +473,7 @@ /* general */ prefs.confirm_exit = utils_get_setting_boolean(config, PACKAGE, "pref_main_confirm_exit", FALSE); prefs.suppress_search_dialogs = utils_get_setting_boolean(config, PACKAGE, "pref_main_suppress_search_dialogs", FALSE); + prefs.search_use_current_word = utils_get_setting_boolean(config, PACKAGE, "pref_main_search_use_current_word", TRUE); prefs.suppress_status_messages = utils_get_setting_boolean(config, PACKAGE, "pref_main_suppress_status_messages", FALSE); prefs.load_session = utils_get_setting_boolean(config, PACKAGE, "pref_main_load_session", TRUE); project_prefs.project_session = utils_get_setting_boolean(config, PACKAGE, "pref_main_project_session", TRUE); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-03-23 15:25:42 UTC (rev 2388) +++ trunk/src/prefs.c 2008-03-23 16:29:43 UTC (rev 2389) @@ -198,6 +198,9 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_ask_suppress_search_dialogs"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), prefs.suppress_search_dialogs); + widget = lookup_widget(ui_widgets.prefs_dialog, "check_search_use_current_word"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), prefs.search_use_current_word); + widget = lookup_widget(ui_widgets.prefs_dialog, "entry_contextaction"); gtk_entry_set_text(GTK_ENTRY(widget), prefs.context_action_cmd); @@ -597,6 +600,9 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_suppress_status_msgs"); prefs.suppress_status_messages = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(ui_widgets.prefs_dialog, "check_search_use_current_word"); + prefs.search_use_current_word = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(ui_widgets.prefs_dialog, "check_auto_focus"); prefs.auto_focus = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); Modified: trunk/src/prefs.h =================================================================== --- trunk/src/prefs.h 2008-03-23 15:25:42 UTC (rev 2388) +++ trunk/src/prefs.h 2008-03-23 16:29:43 UTC (rev 2389) @@ -36,6 +36,7 @@ gboolean confirm_exit; gboolean beep_on_errors; gboolean suppress_search_dialogs; + gboolean search_use_current_word; gboolean suppress_status_messages; gboolean switch_msgwin_pages; gboolean auto_focus; Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-03-23 15:25:42 UTC (rev 2388) +++ trunk/src/search.c 2008-03-23 16:29:43 UTC (rev 2389) @@ -247,7 +247,9 @@ } #endif - if (!s) { s=editor_get_default_selection(idx, NULL); } + if (!s) + s=editor_get_default_selection(idx, TRUE, NULL); + if (s) { setup_find_next(s); /* allow find next/prev */ @@ -288,7 +290,7 @@ g_return_if_fail(DOC_IDX_VALID(idx)); - sel = editor_get_default_selection(idx, NULL); + sel = editor_get_default_selection(idx, prefs.search_use_current_word, NULL); if (widgets.find_dialog == NULL) { @@ -409,7 +411,7 @@ if (idx == -1 || ! doc_list[idx].is_valid) return; - sel = editor_get_default_selection(idx, NULL); + sel = editor_get_default_selection(idx, prefs.search_use_current_word, NULL); if (widgets.replace_dialog == NULL) { @@ -708,13 +710,13 @@ G_CALLBACK(gtk_widget_hide_on_delete), NULL); gtk_widget_show_all(widgets.find_in_files_dialog); - sel = editor_get_default_selection(idx, NULL); + sel = editor_get_default_selection(idx, prefs.search_use_current_word, NULL); } entry = GTK_BIN(combo)->child; /* only set selection if the dialog is not already visible, or has just been created */ if (! sel && ! GTK_WIDGET_VISIBLE(widgets.find_in_files_dialog)) - sel = editor_get_default_selection(idx, NULL); + sel = editor_get_default_selection(idx, prefs.search_use_current_word, NULL); if (sel) gtk_entry_set_text(GTK_ENTRY(entry), sel); g_free(sel); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2388] trunk
by eht16＠users.sourceforge.net 23 Mar '08

23 Mar '08

Revision: 2388 http://geany.svn.sourceforge.net/geany/?rev=2388&view=rev Author: eht16 Date: 2008-03-23 08:25:42 -0700 (Sun, 23 Mar 2008) Log Message: ----------- Update Makefile parser from CTags SVN and improve it to detect targets in Makefiles. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c trunk/tagmanager/make.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-23 14:57:53 UTC (rev 2387) +++ trunk/ChangeLog 2008-03-23 15:25:42 UTC (rev 2388) @@ -4,6 +4,9 @@ src/highlighting.c: Add styles to customize line and search marker and add translucency setting. + * tagmanager/make.c, src/symbols.c: + Update Makefile parser from CTags SVN and improve it to detect + targets in Makefiles. 2008-03-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-03-23 14:57:53 UTC (rev 2387) +++ trunk/src/symbols.c 2008-03-23 15:25:42 UTC (rev 2388) @@ -740,6 +740,12 @@ NULL); break; } + case GEANY_FILETYPES_MAKE: + tag_list_add_groups(tag_store, + &tv_iters.tag_function, _("Targets"), "classviewer-method", + &tv_iters.tag_macro, _("Macros"), "classviewer-macro", + NULL); + break; case GEANY_FILETYPES_D: default: { Modified: trunk/tagmanager/make.c =================================================================== --- trunk/tagmanager/make.c 2008-03-23 14:57:53 UTC (rev 2387) +++ trunk/tagmanager/make.c 2008-03-23 15:25:42 UTC (rev 2388) @@ -1,6 +1,7 @@ /* +* $Id$ * -* Copyright (c) 2000-2001, Darren Hiebert +* Copyright (c) 2000-2005, Darren Hiebert * * This source code is released for free distribution under the terms of the * GNU General Public License. @@ -11,10 +12,13 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ +#include <stdio.h> +#include <string.h> #include <ctype.h> +#include "options.h" #include "parse.h" #include "read.h" #include "vstring.h" @@ -23,80 +27,192 @@ * DATA DEFINITIONS */ typedef enum { - K_MACRO + K_MACRO, K_TARGET } shKind; static kindOption MakeKinds [] = { - { TRUE, 'm', "macro", "macros"} + { TRUE, 'm', "macro", "macros"}, + { TRUE, 'f', "function", "targets"} }; /* * FUNCTION DEFINITIONS */ +static int nextChar (void) +{ + int c = fileGetc (); + if (c == '\\') + { + c = fileGetc (); + if (c == '\n') + c = fileGetc (); + } + return c; +} + +static void skipLine (void) +{ + int c; + do + c = nextChar (); + while (c != EOF && c != '\n'); + if (c == '\n') + fileUngetc (c); +} + +static int skipToNonWhite (void) +{ + int c; + do + c = nextChar (); + while (c != '\n' && isspace (c)); + return c; +} + static boolean isIdentifier (int c) { - return (boolean)(isalnum (c) || c == '_'); + return (boolean)(c != '\0' && (isalnum (c) || strchr (".-_", c) != NULL)); } -static void findMakeTags (void) +static void readIdentifier (const int first, vString *const id) { - vString *name = vStringNew (); - const unsigned char *line; + int c = first; + vStringClear (id); + while (isIdentifier (c)) + { + vStringPut (id, c); + c = nextChar (); + } + fileUngetc (c); + vStringTerminate (id); +} - while ((line = fileReadLine ()) != NULL) - { - const unsigned char* cp = line; - boolean possible = TRUE; +static void skipToMatch (const char *const pair) +{ + const int begin = pair [0], end = pair [1]; + const unsigned long inputLineNumber = getInputLineNumber (); + int matchLevel = 1; + int c = '\0'; - while (isspace ((int) *cp)) - ++cp; - if (*cp == '#') - continue; + while (matchLevel > 0) + { + c = nextChar (); + if (c == begin) + ++matchLevel; + else if (c == end) + --matchLevel; + else if (c == '\n') + break; + } + if (c == EOF) + verbose ("%s: failed to find match for '%c' at line %lu\n", + getInputFileName (), begin, inputLineNumber); +} - while (*cp != '\0') +static void findMakeTags (void) +{ + vString *name = vStringNew (); + boolean newline = TRUE; + boolean in_define = FALSE; + boolean in_rule = FALSE; + boolean variable_possible = TRUE; + int c; + + while ((c = nextChar ()) != EOF) { - /* We look for any sequence of identifier characters following - * either a white space or a colon and followed by either = or := - */ - if (possible && isIdentifier ((int) *cp)) - { - while (isIdentifier ((int) *cp)) + if (newline) { - vStringPut (name, (int) *cp); - ++cp; + if (in_rule) + { + if (c == '\t') + { + skipLine (); /* skip rule */ + continue; + } + else + in_rule = FALSE; + } + + variable_possible = (boolean)(!in_rule); + newline = FALSE; } - vStringTerminate (name); - while (isspace ((int) *cp)) - ++cp; - if ( *cp == ':') - ++cp; - if ( *cp == '=') - makeSimpleTag (name, MakeKinds, K_MACRO); - vStringClear (name); - } - else if (isspace ((int) *cp) || *cp == ':') - possible = TRUE; - else - possible = FALSE; - if (*cp != '\0') - ++cp; + if (c == '\n') + newline = TRUE; + else if (isspace (c)) + continue; + else if (c == '#') + skipLine (); + else if (c == '(') + skipToMatch ("()"); + else if (c == '{') + skipToMatch ("{}"); + else if (c == ':') + { + variable_possible = TRUE; + in_rule = TRUE; + } + else if (variable_possible && isIdentifier (c)) + { + readIdentifier (c, name); + + if (strcmp (vStringValue (name), "endef") == 0) + in_define = FALSE; + else if (in_define) + skipLine (); + else if (strcmp (vStringValue (name), "define") == 0 && + isIdentifier (c)) + { + in_define = TRUE; + c = skipToNonWhite (); + readIdentifier (c, name); + makeSimpleTag (name, MakeKinds, K_MACRO); + skipLine (); + } + else { + c = skipToNonWhite (); + if (strchr (":?+", c) != NULL) + { + boolean append = (boolean)(c == '+'); + if (c == ':') + { + in_rule = TRUE; + makeSimpleTag (name, MakeKinds, K_TARGET); + } + c = nextChar (); + if (c != '=') + fileUngetc (c); + else if (append) + { + skipLine (); + continue; + } + } + if (c == '=') + { + makeSimpleTag (name, MakeKinds, K_MACRO); + in_rule = FALSE; + skipLine (); + } + } + } + else + variable_possible = FALSE; } - } - vStringDelete (name); + vStringDelete (name); } extern parserDefinition* MakefileParser (void) { - static const char *const patterns [] = { "[Mm]akefile", NULL }; - static const char *const extensions [] = { "mak", "mk", NULL }; - parserDefinition* const def = parserNew ("Make"); - def->kinds = MakeKinds; - def->kindCount = KIND_COUNT (MakeKinds); - def->patterns = patterns; - def->extensions = extensions; - def->parser = findMakeTags; - return def; + static const char *const patterns [] = { "[Mm]akefile", NULL }; + static const char *const extensions [] = { "mak", "mk", NULL }; + parserDefinition* const def = parserNew ("Make"); + def->kinds = MakeKinds; + def->kindCount = KIND_COUNT (MakeKinds); + def->patterns = patterns; + def->extensions = extensions; + def->parser = findMakeTags; + return def; } -/* vi:set tabstop=8 shiftwidth=4: */ +/* vi:set tabstop=4 shiftwidth=4: */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2387] trunk
by eht16＠users.sourceforge.net 23 Mar '08

23 Mar '08

Revision: 2387 http://geany.svn.sourceforge.net/geany/?rev=2387&view=rev Author: eht16 Date: 2008-03-23 07:57:53 -0700 (Sun, 23 Mar 2008) Log Message: ----------- Add styles to customize line and search marker and add translucency setting. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.common trunk/doc/geany.html trunk/doc/geany.txt trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 18:44:12 UTC (rev 2386) +++ trunk/ChangeLog 2008-03-23 14:57:53 UTC (rev 2387) @@ -1,3 +1,11 @@ +2008-03-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/filetypes.common, doc/geany.txt, doc/geany.html, + src/highlighting.c: + Add styles to customize line and search marker and add + translucency setting. + + 2008-03-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/callbacks.c: Modified: trunk/data/filetypes.common =================================================================== --- trunk/data/filetypes.common 2008-03-21 18:44:12 UTC (rev 2386) +++ trunk/data/filetypes.common 2008-03-23 14:57:53 UTC (rev 2387) @@ -26,6 +26,18 @@ # only the first and second argument is interpreted translucency=256;256;false;false +# style for a highlighted line (e.g when using Goto line or goto tag) +# only the first and second argument is interpreted +marker_line=0x000000;0xffff00;false;false + +# style for a highlighted search result (e.g when using "Mark" in Search dialogs) +# only the first and second argument is interpreted +marker_search=0x000000;0xB8F4B8;false;false + +# translucency for the line marker(first argument) and the search marker (second argument) +# only the first and second argument is interpreted +marker_translucency=256;256;false;false + # colour of the caret(the blinking cursor), only first and third argument is interpreted # set the third argument to true to change the caret into a block caret caret=0x000000;0x0;false;false Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-03-21 18:44:12 UTC (rev 2386) +++ trunk/doc/geany.html 2008-03-23 14:57:53 UTC (rev 2387) @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> <meta name="date" content="2008-03-20" /> @@ -2588,13 +2588,35 @@ Example: <tt class="docutils literal">line_wrap_indent=0;0;false;false</tt> </dd> <dt>translucency</dt> -<dd>Translucency for the current line(first argument) and the selection +<dd>Translucency for the current line (first argument) and the selection (second argument). Values between 0 and 256 are accepted. Note for Windows 95, 98 and ME users: keep this value at 256 to disable translucency otherwise Geany might crash. Only the first and second argument is interpreted. Example: <tt class="docutils literal">translucency=256;256;false;false</tt> </dd> +<dt>marker_line</dt> +<dd>The style for a highlighted line (e.g when using Goto line or goto tag). +The forground colour (first argument) is only used when the Markers margin +is enabled (see View menu). +Only the first and second argument is interpreted. +Example: <tt class="docutils literal">marker_line=0x000000;0xffff00;false;false</tt> +</dd> +<dt>marker_search</dt> +<dd>The style for a highlighted search result (e.g when using "Mark" in +Search dialogs). The foreground colour (first argument) is only used +when the Markers margin is enabled (see View menu). +Only the first and second argument is interpreted. +Example: <tt class="docutils literal">marker_search=0x000000;0xB8F4B8;false;false</tt> +</dd> +<dt>marker_translucency</dt> +<dd>Translucency for the line marker (first argument) and the search marker +(second argument). Values between 0 and 256 are accepted. +Note for Windows 95, 98 and ME users: +keep this value at 256 to disable translucency otherwise Geany might crash. +Only the first and second argument is interpreted. +Example: <tt class="docutils literal">marker_translucency=256;256;false;false</tt> +</dd> <dt>whitespace_chars</dt> <dd>Characters to treat as whitespace. These characters are ignored when moving, selecting and deleting across word boundaries @@ -3513,7 +3535,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-03-20 17:07 UTC. +Generated on: 2008-03-23 14:56 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-03-21 18:44:12 UTC (rev 2386) +++ trunk/doc/geany.txt 2008-03-23 14:57:53 UTC (rev 2387) @@ -2311,7 +2311,7 @@ *Example:* ``line_wrap_indent=0;0;false;false`` translucency - Translucency for the current line(first argument) and the selection + Translucency for the current line (first argument) and the selection (second argument). Values between 0 and 256 are accepted. Note for Windows 95, 98 and ME users: @@ -2321,6 +2321,35 @@ *Example:* ``translucency=256;256;false;false`` +marker_line + The style for a highlighted line (e.g when using Goto line or goto tag). + The forground colour (first argument) is only used when the Markers margin + is enabled (see View menu). + + Only the first and second argument is interpreted. + + *Example:* ``marker_line=0x000000;0xffff00;false;false`` + +marker_search + The style for a highlighted search result (e.g when using "Mark" in + Search dialogs). The foreground colour (first argument) is only used + when the Markers margin is enabled (see View menu). + + Only the first and second argument is interpreted. + + *Example:* ``marker_search=0x000000;0xB8F4B8;false;false`` + +marker_translucency + Translucency for the line marker (first argument) and the search marker + (second argument). Values between 0 and 256 are accepted. + + Note for Windows 95, 98 and ME users: + keep this value at 256 to disable translucency otherwise Geany might crash. + + Only the first and second argument is interpreted. + + *Example:* ``marker_translucency=256;256;false;false`` + whitespace_chars Characters to treat as whitespace. These characters are ignored when moving, selecting and deleting across word boundaries Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-03-21 18:44:12 UTC (rev 2386) +++ trunk/src/highlighting.c 2008-03-23 14:57:53 UTC (rev 2387) @@ -70,6 +70,9 @@ GCS_LINE_WRAP_VISUALS, GCS_LINE_WRAP_INDENT, GCS_TRANSLUCENCY, + GCS_MARKER_LINE, + GCS_MARKER_SEARCH, + GCS_MARKER_TRANSLUCENCY, GCS_MAX }; @@ -364,6 +367,10 @@ "0xc0c0c0", "0xffffff", "false", &common_style_set.styling[GCS_INDENT_GUIDE]); get_keyfile_hex(config, config_home, "styling", "white_space", "0xc0c0c0", "0xffffff", "true", &common_style_set.styling[GCS_WHITE_SPACE]); + get_keyfile_hex(config, config_home, "styling", "marker_line", + "0x000000", "0xffff00", "false", &common_style_set.styling[GCS_MARKER_LINE]); + get_keyfile_hex(config, config_home, "styling", "marker_search", + "0x000000", "0xB8F4B8", "false", &common_style_set.styling[GCS_MARKER_SEARCH]); { /* hack because get_keyfile_int uses a Style struct */ HighlightingStyle tmp_style; @@ -391,6 +398,10 @@ 256, 256, &tmp_style); common_style_set.styling[GCS_TRANSLUCENCY].foreground = tmp_style.foreground; common_style_set.styling[GCS_TRANSLUCENCY].background = tmp_style.background; + get_keyfile_int(config, config_home, "styling", "marker_translucency", + 256, 256, &tmp_style); + common_style_set.styling[GCS_MARKER_TRANSLUCENCY].foreground = tmp_style.foreground; + common_style_set.styling[GCS_MARKER_TRANSLUCENCY].background = tmp_style.background; } get_keyfile_wordchars(config, config_home, &common_style_set.wordchars); @@ -436,13 +447,15 @@ /* define marker symbols * 0 -> line marker */ SSM(sci, SCI_MARKERDEFINE, 0, SC_MARK_SHORTARROW); - SSM(sci, SCI_MARKERSETFORE, 0, invert(0x00007f)); - SSM(sci, SCI_MARKERSETBACK, 0, invert(0x00ffff)); + SSM(sci, SCI_MARKERSETFORE, 0, invert(common_style_set.styling[GCS_MARKER_LINE].foreground)); + SSM(sci, SCI_MARKERSETBACK, 0, invert(common_style_set.styling[GCS_MARKER_LINE].background)); + SSM(sci, SCI_MARKERSETALPHA, 0, common_style_set.styling[GCS_MARKER_TRANSLUCENCY].foreground); /* 1 -> user marker */ SSM(sci, SCI_MARKERDEFINE, 1, SC_MARK_PLUS); - SSM(sci, SCI_MARKERSETFORE, 1, invert(0x000000)); - SSM(sci, SCI_MARKERSETBACK, 1, invert(0xB8F4B8)); + SSM(sci, SCI_MARKERSETFORE, 1, invert(common_style_set.styling[GCS_MARKER_SEARCH].foreground)); + SSM(sci, SCI_MARKERSETBACK, 1, invert(common_style_set.styling[GCS_MARKER_SEARCH].background)); + SSM(sci, SCI_MARKERSETALPHA, 1, common_style_set.styling[GCS_MARKER_TRANSLUCENCY].background); /* 2 -> folding marker, other folding settings */ SSM(sci, SCI_SETMARGINTYPEN, 2, SC_MARGIN_SYMBOL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2386] trunk
by eht16＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2386 http://geany.svn.sourceforge.net/geany/?rev=2386&view=rev Author: eht16 Date: 2008-03-21 11:44:12 -0700 (Fri, 21 Mar 2008) Log Message: ----------- Allow selecting items in the symbol list by pressing Enter or Space. Modified Paths: -------------- trunk/ChangeLog trunk/src/treeviews.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 18:29:25 UTC (rev 2385) +++ trunk/ChangeLog 2008-03-21 18:44:12 UTC (rev 2386) @@ -17,6 +17,8 @@ * src/win32.c: Fix crash on Windows due to missing error message when a process spawning fails. + * src/treeviews.c: + Allow selecting items in the symbol list by pressing Enter or Space. 2008-03-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2008-03-21 18:29:25 UTC (rev 2385) +++ trunk/src/treeviews.c 2008-03-21 18:44:12 UTC (rev 2386) @@ -39,6 +39,7 @@ #include "symbols.h" #include "navqueue.h" +#include <gdk/gdkkeysyms.h> SidebarTreeviews tv; @@ -82,6 +83,8 @@ static gboolean on_taglist_tree_selection_changed(GtkTreeSelection *selection); static gboolean on_treeviews_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer user_data); +static gboolean on_treeviews_key_press_event(GtkWidget *widget, GdkEventKey *event, + gpointer user_data); static void on_list_document_activate(GtkCheckMenuItem *item, gpointer user_data); static void on_list_symbol_activate(GtkCheckMenuItem *item, gpointer user_data); @@ -117,6 +120,8 @@ gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store)); g_signal_connect(G_OBJECT(tree), "button-press-event", G_CALLBACK(on_treeviews_button_press_event), GINT_TO_POINTER(TREEVIEW_SYMBOL)); + g_signal_connect(G_OBJECT(tree), "key-press-event", + G_CALLBACK(on_treeviews_key_press_event), GINT_TO_POINTER(TREEVIEW_SYMBOL)); gtk_tree_view_set_enable_search(GTK_TREE_VIEW(tree), FALSE); @@ -648,6 +653,23 @@ } +static gboolean on_treeviews_key_press_event(GtkWidget *widget, GdkEventKey *event, + gpointer user_data) +{ + if (event->keyval == GDK_Return || + event->keyval == GDK_ISO_Enter || + event->keyval == GDK_KP_Enter || + event->keyval == GDK_space) + { + GtkTreeSelection *select = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + /* 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) */ + g_idle_add((GSourceFunc) on_taglist_tree_selection_changed, select); + } + return FALSE; +} + + static gboolean on_treeviews_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer user_data) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2385] trunk
by eht16＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2385 http://geany.svn.sourceforge.net/geany/?rev=2385&view=rev Author: eht16 Date: 2008-03-21 11:29:25 -0700 (Fri, 21 Mar 2008) Log Message: ----------- Fix crash on Windows due to missing error message when a process spawning fails. Modified Paths: -------------- trunk/ChangeLog trunk/src/win32.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 18:24:21 UTC (rev 2384) +++ trunk/ChangeLog 2008-03-21 18:29:25 UTC (rev 2385) @@ -14,6 +14,9 @@ * data/snippets.conf: Add missing colon to "for" snippet for Python and set cursor position (thanks mamaar on IRC). + * src/win32.c: + Fix crash on Windows due to missing error message when a process + spawning fails. 2008-03-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2008-03-21 18:24:21 UTC (rev 2384) +++ trunk/src/win32.c 2008-03-21 18:29:25 UTC (rev 2385) @@ -902,6 +902,8 @@ if (!fSuccess) { geany_debug("win32_spawn: Create process failed"); + if (error != NULL) + *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, "Create process failed"); return FALSE; } @@ -1014,7 +1016,7 @@ if (bFuncRetn == 0) { gchar *msg = g_win32_error_message(GetLastError()); - geany_debug("CreateChildProcess: CreateProcess failed"); + geany_debug("CreateChildProcess: CreateProcess failed (%s)", msg); if (*error != NULL) *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, msg); g_free(msg); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2384] trunk
by eht16＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2384 http://geany.svn.sourceforge.net/geany/?rev=2384&view=rev Author: eht16 Date: 2008-03-21 11:24:21 -0700 (Fri, 21 Mar 2008) Log Message: ----------- Add missing colon to "for" snippet for Python and set cursor position (thanks mamaar on IRC). Modified Paths: -------------- trunk/ChangeLog trunk/data/snippets.conf Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 17:12:19 UTC (rev 2383) +++ trunk/ChangeLog 2008-03-21 18:24:21 UTC (rev 2384) @@ -11,6 +11,9 @@ * tagmanager/tcl.c, src/symbols.c: Update TCL parser from CTags SVN which adds new symbol types for classes and methods (closes #1918748). + * data/snippets.conf: + Add missing colon to "for" snippet for Python and set cursor position + (thanks mamaar on IRC). 2008-03-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/data/snippets.conf =================================================================== --- trunk/data/snippets.conf 2008-03-21 17:12:19 UTC (rev 2383) +++ trunk/data/snippets.conf 2008-03-21 18:24:21 UTC (rev 2384) @@ -43,7 +43,7 @@ for=for ($i = 0; $i < %cursor%; $i++)%brace_open%\n%brace_close% [Python] -for=for i in range()\n\t +for=for i in xrange(%cursor%):\n\t [Ferite] iferr=iferr%block_cursor%fix%block% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2383] trunk/plugins/classbuilder.c
by ntrel＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2383 http://geany.svn.sourceforge.net/geany/?rev=2383&view=rev Author: ntrel Date: 2008-03-21 10:12:19 -0700 (Fri, 21 Mar 2008) Log Message: ----------- Change author to Alexander Rodin, as he did all the design work. Modified Paths: -------------- trunk/plugins/classbuilder.c Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2008-03-21 17:10:08 UTC (rev 2382) +++ trunk/plugins/classbuilder.c 2008-03-21 17:12:19 UTC (rev 2383) @@ -40,7 +40,7 @@ VERSION_CHECK(7) PLUGIN_INFO(_("Class Builder"), _("Creates source files for new class types."), VERSION, - _("The Geany developer team")) + "Alexander Rodin") enum This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2382] trunk
by ntrel＠users.sourceforge.net 21 Mar '08

21 Mar '08

Revision: 2382 http://geany.svn.sourceforge.net/geany/?rev=2382&view=rev Author: ntrel Date: 2008-03-21 10:10:08 -0700 (Fri, 21 Mar 2008) Log Message: ----------- Fix asking detect reload question again if the user doesn't respond within 10 seconds (oops). Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-21 16:59:30 UTC (rev 2381) +++ trunk/ChangeLog 2008-03-21 17:10:08 UTC (rev 2382) @@ -25,6 +25,9 @@ * src/dialogs.c, src/document.c: Replace untitled file header filename after Save As and add to recent files on Windows too. + * src/utils.c: + Fix asking detect reload question again if the user doesn't respond + within 10 seconds (oops). 2008-03-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-03-21 16:59:30 UTC (rev 2381) +++ trunk/src/utils.c 2008-03-21 17:10:08 UTC (rev 2382) @@ -377,7 +377,10 @@ else if (doc_list[idx].mtime < st.st_mtime) { if (check_reload(idx)) - doc_list[idx].last_check = t + delay_time; /* Disable checking until after reload */ + { + /* Disable checking until after reload */ + doc_list[idx].last_check = time(NULL) + delay_time; + } else doc_list[idx].mtime = st.st_mtime; /* Ignore this change on disk completely */ 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
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2008