Commits July 2007

commits@lists.geany.org

3 participants
112 discussions

SF.net SVN: geany: [1687] trunk
by eht16＠users.sourceforge.net 09 Jul '07

09 Jul '07

Revision: 1687 http://svn.sourceforge.net/geany/?rev=1687&view=rev Author: eht16 Date: 2007-07-09 10:33:31 -0700 (Mon, 09 Jul 2007) Log Message: ----------- Change the background colour of the search bar in the toolbar according to the search result. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c trunk/src/document.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-09 16:01:23 UTC (rev 1686) +++ trunk/ChangeLog 2007-07-09 17:33:31 UTC (rev 1687) @@ -13,6 +13,9 @@ Use only supported symbol types in the symbol view for PHP. * src/treeviews.c: Focus the editor widget after switching between files with the open files list. + * src/callbacks.c, src/document.c, src/document.h: + Change the background colour of the search bar in the toolbar + according to the search result. 2007-07-08 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-07-09 16:01:23 UTC (rev 1686) +++ trunk/src/callbacks.c 2007-07-09 17:33:31 UTC (rev 1687) @@ -566,6 +566,23 @@ } +static void set_search_bar_background(GtkWidget *widget, gboolean success) +{ + const GdkColor red = {0, 0xffff, 0x6666, 0x6666}; + const GdkColor white = {0, 0xffff, 0xffff, 0xffff}; + static gboolean old_value = TRUE; + + // only update if really needed + if (old_value != success) + { + gtk_widget_modify_base(widget, GTK_STATE_NORMAL, success ? NULL : &red); + gtk_widget_modify_text(widget, GTK_STATE_NORMAL, success ? NULL : &white); + + old_value = success; + } +} + + // store text, clear search flags so we can use Search->Find Next/Previous static void setup_find_next(GtkEditable *editable) { @@ -582,9 +599,11 @@ gpointer user_data) { gint idx = document_get_cur_idx(); + gboolean result; setup_find_next(GTK_EDITABLE(entry)); - document_search_bar_find(idx, search_data.text, 0, FALSE); + result = document_search_bar_find(idx, search_data.text, 0, FALSE); + set_search_bar_background(GTK_WIDGET(entry), result); } @@ -594,9 +613,11 @@ gpointer user_data) { gint idx = document_get_cur_idx(); + gboolean result; setup_find_next(editable); - document_search_bar_find(idx, search_data.text, 0, TRUE); + result = document_search_bar_find(idx, search_data.text, 0, TRUE); + set_search_bar_background(GTK_WIDGET(editable), result); } @@ -607,10 +628,12 @@ { //on_entry1_changed(NULL, NULL); gint idx = document_get_cur_idx(); + gboolean result; GtkWidget *entry = lookup_widget(GTK_WIDGET(app->window), "entry1"); setup_find_next(GTK_EDITABLE(entry)); - document_search_bar_find(idx, search_data.text, 0, FALSE); + result = document_search_bar_find(idx, search_data.text, 0, FALSE); + set_search_bar_background(entry, result); } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-07-09 16:01:23 UTC (rev 1686) +++ trunk/src/document.c 2007-07-09 17:33:31 UTC (rev 1687) @@ -1113,14 +1113,19 @@ } -/* special search function, used from the find entry in the toolbar */ -void document_search_bar_find(gint idx, const gchar *text, gint flags, gboolean inc) +/* special search function, used from the find entry in the toolbar + * return TRUE if text was found otherwise FALSE + * return also TRUE if text is empty */ +gboolean document_search_bar_find(gint idx, const gchar *text, gint flags, gboolean inc) { gint start_pos, search_pos; struct TextToFind ttf; - g_return_if_fail(text != NULL); - if (! DOC_IDX_VALID(idx) || ! *text) return; + g_return_val_if_fail(text != NULL, FALSE); + if (! DOC_IDX_VALID(idx)) + return FALSE; + if (! *text) + return TRUE; start_pos = (inc) ? sci_get_selection_start(doc_list[idx].sci) : sci_get_selection_end(doc_list[idx].sci); // equal if no selection @@ -1144,6 +1149,7 @@ sci_set_selection_start(doc_list[idx].sci, ttf.chrgText.cpMin); sci_set_selection_end(doc_list[idx].sci, ttf.chrgText.cpMax); doc_list[idx].scroll_percent = 0.3F; + return TRUE; } else { @@ -1153,6 +1159,7 @@ } utils_beep(); sci_goto_pos(doc_list[idx].sci, start_pos, FALSE); // clear selection + return FALSE; } } Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2007-07-09 16:01:23 UTC (rev 1686) +++ trunk/src/document.h 2007-07-09 17:33:31 UTC (rev 1687) @@ -160,8 +160,7 @@ * It returns whether the file could be saved or not. */ gboolean document_save_file(gint idx, gboolean force); -/* special search function, used from the find entry in the toolbar */ -void document_search_bar_find(gint idx, const gchar *text, gint flags, gboolean inc); +gboolean document_search_bar_find(gint idx, const gchar *text, gint flags, gboolean inc); /* General search function, used from the find dialog. * Returns -1 on failure or the start position of the matching text. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1686] trunk
by eht16＠users.sourceforge.net 09 Jul '07

09 Jul '07

Revision: 1686 http://svn.sourceforge.net/geany/?rev=1686&view=rev Author: eht16 Date: 2007-07-09 09:01:23 -0700 (Mon, 09 Jul 2007) Log Message: ----------- Focus the editor widget after switching between files with the open files list. Modified Paths: -------------- trunk/ChangeLog trunk/src/treeviews.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-09 15:35:25 UTC (rev 1685) +++ trunk/ChangeLog 2007-07-09 16:01:23 UTC (rev 1686) @@ -11,6 +11,8 @@ * src/symbols.c, tagmanager/php.c: Use CTags SVN version of PHP parser. Use only supported symbol types in the symbol view for PHP. + * src/treeviews.c: Focus the editor widget after switching between + files with the open files list. 2007-07-08 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2007-07-09 15:35:25 UTC (rev 1685) +++ trunk/src/treeviews.c 2007-07-09 16:01:23 UTC (rev 1686) @@ -414,6 +414,13 @@ } +static gboolean change_focus(GtkWidget *widget) +{ + gtk_widget_grab_focus(widget); + return FALSE; +} + + static void on_openfiles_tree_selection_changed(GtkTreeSelection *selection, gpointer data) { GtkTreeIter iter; @@ -427,6 +434,7 @@ gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), gtk_notebook_page_num(GTK_NOTEBOOK(app->notebook), (GtkWidget*) doc_list[idx].sci)); + g_idle_add((GSourceFunc) change_focus, GTK_WIDGET(doc_list[idx].sci)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1685] trunk/src/keybindings.c
by eht16＠users.sourceforge.net 09 Jul '07

09 Jul '07

Revision: 1685 http://svn.sourceforge.net/geany/?rev=1685&view=rev Author: eht16 Date: 2007-07-09 08:35:25 -0700 (Mon, 09 Jul 2007) Log Message: ----------- Fix wrong default value (thanks John). Modified Paths: -------------- trunk/src/keybindings.c Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-07-09 15:11:18 UTC (rev 1684) +++ trunk/src/keybindings.c 2007-07-09 15:35:25 UTC (rev 1685) @@ -261,7 +261,7 @@ keys[GEANY_KEYS_EDIT_COMMENTLINE] = fill(cb_func_edit, 0, 0, "edit_commentline", _("Comment line(s)")); keys[GEANY_KEYS_EDIT_UNCOMMENTLINE] = fill(cb_func_edit, - 0, 0 | GDK_CONTROL_MASK, "edit_uncommentline", _("Uncomment line(s)")); + 0, 0, "edit_uncommentline", _("Uncomment line(s)")); keys[GEANY_KEYS_EDIT_INCREASEINDENT] = fill(cb_func_edit, GDK_i, GDK_CONTROL_MASK, "edit_increaseindent", _("Increase indent")); keys[GEANY_KEYS_EDIT_DECREASEINDENT] = fill(cb_func_edit, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1684] trunk
by eht16＠users.sourceforge.net 09 Jul '07

09 Jul '07

Revision: 1684 http://svn.sourceforge.net/geany/?rev=1684&view=rev Author: eht16 Date: 2007-07-09 08:11:18 -0700 (Mon, 09 Jul 2007) Log Message: ----------- Use CTags SVN version of PHP parser. Use only supported symbol types in the symbol view for PHP. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c trunk/tagmanager/php.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-09 13:53:27 UTC (rev 1683) +++ trunk/ChangeLog 2007-07-09 15:11:18 UTC (rev 1684) @@ -8,6 +8,9 @@ Use a TreeView for keybinding list in the preferences dialog and add descriptive sections for better usability. * src/keybindings.c: Use Ctrl-B for Goto matching brace. + * src/symbols.c, tagmanager/php.c: + Use CTags SVN version of PHP parser. + Use only supported symbol types in the symbol view for PHP. 2007-07-08 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-07-09 13:53:27 UTC (rev 1683) +++ trunk/src/symbols.c 2007-07-09 15:11:18 UTC (rev 1684) @@ -502,6 +502,18 @@ //&(tv_iters.tag_other), _("Other"), NULL); break; } + case GEANY_FILETYPES_PHP: + { + tag_list_add_groups(tag_store, + &(tv_iters.tag_class), _("Classes"), + &(tv_iters.tag_function), _("Functions"), + &(tv_iters.tag_macro), _("Constants"), + &(tv_iters.tag_variable), _("Variables"), NULL); + //&(tv_iters.tag_struct), _("Label"), + //&(tv_iters.tag_namespace), _("Begin"), + //&(tv_iters.tag_other), _("Other"), NULL); + break; + } case GEANY_FILETYPES_RUBY: { tag_list_add_groups(tag_store, Modified: trunk/tagmanager/php.c =================================================================== --- trunk/tagmanager/php.c 2007-07-09 13:53:27 UTC (rev 1683) +++ trunk/tagmanager/php.c 2007-07-09 15:11:18 UTC (rev 1684) @@ -16,7 +16,7 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <string.h> @@ -28,144 +28,151 @@ * DATA DEFINITIONS */ typedef enum { - K_CLASS, K_DEFINE, K_FUNCTION, K_VARIABLE + K_CLASS, K_DEFINE, K_FUNCTION, K_VARIABLE } phpKind; static kindOption PhpKinds [] = { - { TRUE, 'c', "class", "classes" }, - { TRUE, 'd', "define", "constant definitions" }, - { TRUE, 'f', "function", "functions" }, - { TRUE, 'v', "variable", "variables" } + { TRUE, 'c', "class", "classes" }, + { TRUE, 'd', "macro", "constant definitions" }, + { TRUE, 'f', "function", "functions" }, + { TRUE, 'v', "variable", "variables" } }; /* * FUNCTION DEFINITIONS */ - static boolean isLetter(const int c) { - return (boolean)(isalpha(c) || (c >= 127 && c <= 255)); + return (boolean)(isalpha(c) || (c >= 127 && c <= 255)); } static boolean isVarChar1(const int c) { - return (boolean)(isLetter (c) || c == '_'); + return (boolean)(isLetter (c) || c == '_'); } static boolean isVarChar(const int c) { - return (boolean)(isVarChar1 (c) || isdigit (c)); + return (boolean)(isVarChar1 (c) || isdigit (c)); } static void findPhpTags (void) { - vString *name = vStringNew (); - const unsigned char *line; + vString *name = vStringNew (); + const unsigned char *line; - while ((line = fileReadLine ()) != NULL) - { - const unsigned char *cp = line; + while ((line = fileReadLine ()) != NULL) + { + const unsigned char *cp = line; + const char* f; - while (isspace (*cp)) - cp++; + while (isspace (*cp)) + cp++; - if (*(const char*)cp == '$' && isVarChar1 (*(const char*)(cp+1))) - { - cp += 1; - vStringClear (name); - while (isVarChar ((int) *cp)) - { - vStringPut (name, (int) *cp); - ++cp; - } - while (isspace ((int) *cp)) - ++cp; - if (*(const char*) cp == '=') - { - vStringTerminate (name); - makeSimpleTag (name, PhpKinds, K_VARIABLE); - vStringClear (name); - } - } - else if (strncmp ((const char*) cp, "function", (size_t) 8) == 0 && - isspace ((int) cp [8])) - { - cp += 8; + if (*(const char*)cp == '$' && isVarChar1 (*(const char*)(cp+1))) + { + cp += 1; + vStringClear (name); + while (isVarChar ((int) *cp)) + { + vStringPut (name, (int) *cp); + ++cp; + } + while (isspace ((int) *cp)) + ++cp; + if (*(const char*) cp == '=') + { + vStringTerminate (name); + makeSimpleTag (name, PhpKinds, K_VARIABLE); + vStringClear (name); + } + } + else if ((f = strstr ((const char*) cp, "function")) != NULL && + (f == (const char*) cp || isspace ((int) f [-1])) && + isspace ((int) f [8])) + { + cp = ((const unsigned char *) f) + 8; - while (isspace ((int) *cp)) - ++cp; + while (isspace ((int) *cp)) + ++cp; - if (*cp == '&') /* skip reference character */ - cp++; + if (*cp == '&') /* skip reference character and following whitespace */ + { + cp++; - vStringClear (name); - while (isalnum ((int) *cp) || *cp == '_') - { - vStringPut (name, (int) *cp); - ++cp; - } - vStringTerminate (name); - makeSimpleTag (name, PhpKinds, K_FUNCTION); - vStringClear (name); - } - else if (strncmp ((const char*) cp, "class", (size_t) 5) == 0 && - isspace ((int) cp [5])) - { - cp += 5; + while (isspace ((int) *cp)) + ++cp; + } - while (isspace ((int) *cp)) - ++cp; - vStringClear (name); - while (isalnum ((int) *cp) || *cp == '_') - { - vStringPut (name, (int) *cp); - ++cp; - } - vStringTerminate (name); - makeSimpleTag (name, PhpKinds, K_CLASS); - vStringClear (name); - } - else if (strncmp ((const char*) cp, "define", (size_t) 6) == 0 && - ! isalnum ((int) cp [6])) - { - cp += 6; + vStringClear (name); + while (isalnum ((int) *cp) || *cp == '_') + { + vStringPut (name, (int) *cp); + ++cp; + } + vStringTerminate (name); + makeSimpleTag (name, PhpKinds, K_FUNCTION); + vStringClear (name); + } + else if (strncmp ((const char*) cp, "class", (size_t) 5) == 0 && + isspace ((int) cp [5])) + { + cp += 5; - while (isspace ((int) *cp)) - ++cp; - if (*cp != '(') - continue; - ++cp; + while (isspace ((int) *cp)) + ++cp; + vStringClear (name); + while (isalnum ((int) *cp) || *cp == '_') + { + vStringPut (name, (int) *cp); + ++cp; + } + vStringTerminate (name); + makeSimpleTag (name, PhpKinds, K_CLASS); + vStringClear (name); + } + else if (strncmp ((const char*) cp, "define", (size_t) 6) == 0 && + ! isalnum ((int) cp [6])) + { + cp += 6; - while (isspace ((int) *cp)) - ++cp; - if ((*cp == '\'') || (*cp == '"')) - ++cp; - else if (! ((*cp == '_') || isalnum ((int) *cp))) - continue; - - vStringClear (name); - while (isalnum ((int) *cp) || *cp == '_') - { - vStringPut (name, (int) *cp); - ++cp; - } - vStringTerminate (name); - makeSimpleTag (name, PhpKinds, K_DEFINE); - vStringClear (name); + while (isspace ((int) *cp)) + ++cp; + if (*cp != '(') + continue; + ++cp; + + while (isspace ((int) *cp)) + ++cp; + if ((*cp == '\'') || (*cp == '"')) + ++cp; + else if (! ((*cp == '_') || isalnum ((int) *cp))) + continue; + + vStringClear (name); + while (isalnum ((int) *cp) || *cp == '_') + { + vStringPut (name, (int) *cp); + ++cp; + } + vStringTerminate (name); + makeSimpleTag (name, PhpKinds, K_DEFINE); + vStringClear (name); + } } - } - vStringDelete (name); + vStringDelete (name); } extern parserDefinition* PhpParser (void) { - static const char *const extensions [] = { "php", "php3", "phtml", NULL }; - parserDefinition* def = parserNew ("PHP"); - def->kinds = PhpKinds; - def->kindCount = KIND_COUNT (PhpKinds); - def->extensions = extensions; - def->parser = findPhpTags; - return def; + static const char *const extensions [] = { "php", "php3", "phtml", NULL }; + parserDefinition* def = parserNew ("PHP"); + def->kinds = PhpKinds; + def->kindCount = KIND_COUNT (PhpKinds); + def->extensions = extensions; + def->parser = findPhpTags; + 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: [1683] trunk
by eht16＠users.sourceforge.net 09 Jul '07

09 Jul '07

Revision: 1683 http://svn.sourceforge.net/geany/?rev=1683&view=rev Author: eht16 Date: 2007-07-09 06:53:27 -0700 (Mon, 09 Jul 2007) Log Message: ----------- Use Ctrl-B for Goto matching brace. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-09 13:48:41 UTC (rev 1682) +++ trunk/ChangeLog 2007-07-09 13:53:27 UTC (rev 1683) @@ -7,6 +7,7 @@ * src/keybindings.c, src/keybindings.h, src/prefs.c: Use a TreeView for keybinding list in the preferences dialog and add descriptive sections for better usability. + * src/keybindings.c: Use Ctrl-B for Goto matching brace. 2007-07-08 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-07-09 13:48:41 UTC (rev 1682) +++ trunk/src/keybindings.c 2007-07-09 13:53:27 UTC (rev 1683) @@ -273,7 +273,7 @@ keys[GEANY_KEYS_EDIT_SENDTOCMD3] = fill(cb_func_edit, GDK_3, GDK_CONTROL_MASK, "edit_sendtocmd3", _("Send to Custom Command 3")); keys[GEANY_KEYS_EDIT_GOTOMATCHINGBRACE] = fill(cb_func_edit_global, - 0, 0, "edit_gotomatchingbrace", + GDK_b, GDK_CONTROL_MASK, "edit_gotomatchingbrace", _("Goto matching brace")); keys[GEANY_KEYS_EDIT_TOGGLEMARKER] = fill(cb_func_edit_global, GDK_m, GDK_CONTROL_MASK, "edit_togglemarker", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1682] trunk
by eht16＠users.sourceforge.net 09 Jul '07

09 Jul '07

Revision: 1682 http://svn.sourceforge.net/geany/?rev=1682&view=rev Author: eht16 Date: 2007-07-09 06:48:41 -0700 (Mon, 09 Jul 2007) Log Message: ----------- Use a TreeView for keybinding list in the preferences dialog and add descriptive sections for better usability. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-09 13:16:26 UTC (rev 1681) +++ trunk/ChangeLog 2007-07-09 13:48:41 UTC (rev 1682) @@ -4,6 +4,9 @@ Change name of XML filetype to "XML document". Add sub menus to "Set Filetype" menu. * src/editor.c: Always show calltip for PHP files. + * src/keybindings.c, src/keybindings.h, src/prefs.c: + Use a TreeView for keybinding list in the preferences dialog and add + descriptive sections for better usability. 2007-07-08 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-07-09 13:16:26 UTC (rev 1681) +++ trunk/src/keybindings.c 2007-07-09 13:48:41 UTC (rev 1682) @@ -331,6 +331,19 @@ } } + // set section name + keys[GEANY_KEYS_MENU_NEW]->section = _("File menu"); + keys[GEANY_KEYS_MENU_UNDO]->section = _("Edit menu"); + keys[GEANY_KEYS_MENU_FINDNEXT]->section = _("Search menu"); + keys[GEANY_KEYS_MENU_TOGGLEALL]->section = _("View menu"); + keys[GEANY_KEYS_MENU_REPLACETABS]->section = _("Document menu"); + keys[GEANY_KEYS_BUILD_COMPILE]->section = _("Build menu"); + keys[GEANY_KEYS_MENU_OPENCOLORCHOOSER]->section = _("Tools menu"); + keys[GEANY_KEYS_MENU_HELP]->section = _("Help menu"); + keys[GEANY_KEYS_SWITCH_EDITOR]->section = _("Focus menu"); + keys[GEANY_KEYS_EDIT_TOLOWERCASE]->section = _("Editing menu"); + keys[GEANY_KEYS_EDIT_AUTOCOMPLETE]->section = _("Tag menu"); + g_free(configfile); g_key_file_free(config); @@ -478,52 +491,18 @@ { gchar *shortcut; - switch (i) + if (keys[i]->section != NULL) { - case GEANY_KEYS_MENU_NEW: - g_string_append(text_names, _("File menu\n")); + if (i == GEANY_KEYS_MENU_NEW) + { + g_string_append_printf(text_names, "%s\n", keys[i]->section); g_string_append(text_keys, "\n"); - break; - case GEANY_KEYS_MENU_UNDO: - g_string_append(text_names, _("\nEdit menu\n")); + } + else + { + g_string_append_printf(text_names, "\n%s\n", keys[i]->section); g_string_append(text_keys, "\n\n"); - break; - case GEANY_KEYS_MENU_FINDNEXT: - g_string_append(text_names, _("\nSearch menu\n")); - g_string_append(text_keys, "\n\n"); - break; - case GEANY_KEYS_MENU_TOGGLEALL: - g_string_append(text_names, _("\nView menu\n")); - g_string_append(text_keys, "\n\n"); - break; - case GEANY_KEYS_MENU_REPLACETABS: - g_string_append(text_names, _("\nDocument menu\n")); - g_string_append(text_keys, "\n\n"); - break; - case GEANY_KEYS_BUILD_COMPILE: - g_string_append(text_names, _("\nBuild menu\n")); - g_string_append(text_keys, "\n\n"); - break; - case GEANY_KEYS_MENU_OPENCOLORCHOOSER: - g_string_append(text_names, _("\nTools menu\n")); - g_string_append(text_keys, "\n\n"); - break; - case GEANY_KEYS_MENU_HELP: - g_string_append(text_names, _("\nHelp menu\n")); - g_string_append(text_keys, "\n\n"); - break; - case GEANY_KEYS_SWITCH_EDITOR: - g_string_append(text_names, _("\nFocus commands\n")); - g_string_append(text_keys, "\n\n"); - break; - case GEANY_KEYS_EDIT_TOLOWERCASE: - g_string_append(text_names, _("\nEditing commands\n")); - g_string_append(text_keys, "\n\n"); - break; - case GEANY_KEYS_EDIT_AUTOCOMPLETE: - g_string_append(text_names, _("\nTag commands\n")); - g_string_append(text_keys, "\n\n"); - break; + } } shortcut = gtk_accelerator_get_label(keys[i]->key, keys[i]->mods); @@ -704,6 +683,7 @@ result->key = key; result->mods = mod; result->cb_func = func; + result->section = NULL; return result; } Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2007-07-09 13:16:26 UTC (rev 1681) +++ trunk/src/keybindings.h 2007-07-09 13:48:41 UTC (rev 1682) @@ -39,6 +39,9 @@ // function pointer to a callback function, just to keep the code in keypress event // callback function clear KBCallback cb_func; + // string to use as a section name in the preferences dialog in keybinding treeview as well as + // in the keybinding help dialog, set only for the first binding in the section + gchar *section; } binding; Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-07-09 13:16:26 UTC (rev 1681) +++ trunk/src/prefs.c 2007-07-09 13:48:41 UTC (rev 1682) @@ -55,7 +55,8 @@ gchar *dialog_key_name; -static GtkListStore *store = NULL; +GtkTreeIter g_iter; +static GtkTreeStore *store = NULL; static GtkTreeView *tree = NULL; GtkWidget *dialog_label; static gboolean edited = FALSE; @@ -77,9 +78,6 @@ { GtkWidget *widget; GdkColor *color; - GtkTreeIter iter; - guint i; - gchar *key_string; // General settings widget = lookup_widget(app->prefs_dialog, "spin_mru"); @@ -353,7 +351,7 @@ tree = GTK_TREE_VIEW(lookup_widget(app->prefs_dialog, "treeview7")); //g_object_set(tree, "vertical-separator", 6, NULL); - store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING); + store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_STRING); gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store)); renderer = gtk_cell_renderer_text_new(); @@ -378,15 +376,27 @@ G_CALLBACK(on_tree_view_button_press_event), NULL); } - for (i = 0; i < GEANY_MAX_KEYS; i++) { - key_string = gtk_accelerator_name(keys[i]->key, keys[i]->mods); - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, 0, keys[i]->label, 1, key_string, -1); - g_free(key_string); + GtkTreeIter parent, iter; + gint i; + gchar *key_string; + + for (i = 0; i < GEANY_MAX_KEYS; i++) + { + if (keys[i]->section != NULL) + { + gtk_tree_store_append(store, &parent, NULL); + gtk_tree_store_set(store, &parent, 0, keys[i]->section, -1); + } + + key_string = gtk_accelerator_name(keys[i]->key, keys[i]->mods); + gtk_tree_store_append(store, &iter, &parent); + gtk_tree_store_set(store, &iter, 0, keys[i]->label, 1, key_string, -1); + g_free(key_string); + } } + gtk_tree_view_expand_all(GTK_TREE_VIEW(tree)); - #ifdef HAVE_VTE // make VTE switch visible only when VTE is compiled in, it is hidden by default widget = lookup_widget(app->prefs_dialog, "check_vte"); @@ -757,7 +767,7 @@ if (response != GTK_RESPONSE_APPLY) { - gtk_list_store_clear(store); + gtk_tree_store_clear(store); gtk_widget_hide(GTK_WIDGET(dialog)); } } @@ -852,18 +862,31 @@ static gboolean on_tree_view_button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data) { - GtkTreeIter iter; GtkTreeModel *model; GtkTreeSelection *selection; gchar *name; // discard click events in the tree unless it is a double click - if (widget == (GtkWidget*)tree && event->type != GDK_2BUTTON_PRESS) return FALSE; + if (widget == (GtkWidget*)tree && event->type != GDK_2BUTTON_PRESS) + return FALSE; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); - if (gtk_tree_selection_get_selected(selection, &model, &iter)) + if (gtk_tree_selection_get_selected(selection, &model, &g_iter)) { - gtk_tree_model_get(model, &iter, 0, &name, -1); + if (gtk_tree_model_iter_has_child(model, &g_iter)) + { // double click on a section to expand or collapse it + GtkTreePath *path = gtk_tree_model_get_path(model, &g_iter); + + if (gtk_tree_view_row_expanded(tree, path)) + gtk_tree_view_collapse_row(tree, path); + else + gtk_tree_view_expand_row(tree, path, FALSE); + + gtk_tree_path_free(path); + return TRUE; + } + + gtk_tree_model_get(model, &g_iter, 0, &name, -1); if (name != NULL) { GtkWidget *dialog; @@ -874,7 +897,8 @@ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - str = g_strdup_printf(_("Type the combination of the keys you want to use for \"%s\""), name); + str = g_strdup_printf( + _("Type the combination of the keys you want to use for \"%s\""), name); label = gtk_label_new(str); gtk_misc_set_padding(GTK_MISC(label), 5, 10); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label); @@ -883,7 +907,8 @@ gtk_misc_set_padding(GTK_MISC(dialog_label), 5, 10); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), dialog_label); - g_signal_connect(G_OBJECT(dialog), "key-press-event", G_CALLBACK(on_keytype_dialog_response), NULL); + g_signal_connect(G_OBJECT(dialog), "key-press-event", + G_CALLBACK(on_keytype_dialog_response), NULL); g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(on_dialog_response), NULL); g_signal_connect(G_OBJECT(dialog), "close", G_CALLBACK(gtk_widget_destroy), NULL); @@ -911,19 +936,24 @@ // get the index of the shortcut idx = strtol(path, &test, 10); - if (test == path) return; + if (test == path) + return; + gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(store), &iter, path); + if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) + return; + gtk_accelerator_parse(new_text, &lkey, &lmods); - if (find_duplicate(idx, lkey, lmods, new_text)) return; + if (find_duplicate(idx, lkey, lmods, new_text)) + return; // set the values here, because of the above check, setting it in gtk_accelerator_parse would // return a wrong key combination if it is duplicate keys[idx]->key = lkey; keys[idx]->mods = lmods; - gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(store), &iter, path); - gtk_list_store_set(store, &iter, 1, new_text, -1); + gtk_tree_store_set(store, &iter, 1, new_text, -1); edited = TRUE; } @@ -946,15 +976,13 @@ } -static void on_dialog_response(GtkWidget *dialog, gint response, gpointer user_data) +static void on_dialog_response(GtkWidget *dialog, gint response, gpointer iter) { if (response == GTK_RESPONSE_ACCEPT) { - GtkTreeIter iter; guint idx; guint lkey; GdkModifierType lmods; - gchar path[3]; for (idx = 0; idx < GEANY_MAX_KEYS; idx++) { @@ -963,17 +991,17 @@ gtk_accelerator_parse(gtk_label_get_text(GTK_LABEL(dialog_label)), &lkey, &lmods); - if (find_duplicate(idx, lkey, lmods, gtk_label_get_text(GTK_LABEL(dialog_label)))) return; + if (find_duplicate(idx, lkey, lmods, gtk_label_get_text(GTK_LABEL(dialog_label)))) + return; // set the values here, because of the above check, setting it in gtk_accelerator_parse would // return a wrong key combination if it is duplicate keys[idx]->key = lkey; keys[idx]->mods = lmods; - // generate the path, it is exactly the index - g_snprintf(path, 3, "%d", idx); - gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(store), &iter, path); - gtk_list_store_set(store, &iter, 1, gtk_label_get_text(GTK_LABEL(dialog_label)), -1); + gtk_tree_store_set(store, &g_iter, + 1, gtk_label_get_text(GTK_LABEL(dialog_label)), -1); + g_free(dialog_key_name); dialog_key_name = 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: [1681] trunk
by eht16＠users.sourceforge.net 09 Jul '07

09 Jul '07

Revision: 1681 http://svn.sourceforge.net/geany/?rev=1681&view=rev Author: eht16 Date: 2007-07-09 06:16:26 -0700 (Mon, 09 Jul 2007) Log Message: ----------- Always show calltip for PHP files. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-09 12:46:16 UTC (rev 1680) +++ trunk/ChangeLog 2007-07-09 13:16:26 UTC (rev 1681) @@ -3,6 +3,7 @@ * src/filetypes.c, src/filetypes.h: Change name of XML filetype to "XML document". Add sub menus to "Set Filetype" menu. + * src/editor.c: Always show calltip for PHP files. 2007-07-08 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-07-09 12:46:16 UTC (rev 1680) +++ trunk/src/editor.c 2007-07-09 13:16:26 UTC (rev 1681) @@ -859,9 +859,6 @@ style = SSM(sci, SCI_GETSTYLEAT, pos, 0); if (is_comment(lexer, style)) return FALSE; - // never show a calltip in a PHP file outside of the <? ?> tags - if (lexer == SCLEX_HTML && ! (style >= SCE_HPHP_DEFAULT && style <= SCE_HPHP_OPERATOR)) - return FALSE; word[0] = '\0'; editor_find_current_word(sci, pos - 1, word, sizeof word, 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: [1680] trunk
by eht16＠users.sourceforge.net 09 Jul '07

09 Jul '07

Revision: 1680 http://svn.sourceforge.net/geany/?rev=1680&view=rev Author: eht16 Date: 2007-07-09 05:46:16 -0700 (Mon, 09 Jul 2007) Log Message: ----------- Change name of XML filetype to "XML document". Add sub menus to "Set Filetype" menu. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/filetypes.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-08 14:55:37 UTC (rev 1679) +++ trunk/ChangeLog 2007-07-09 12:46:16 UTC (rev 1680) @@ -1,3 +1,10 @@ +2007-07-09 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/filetypes.c, src/filetypes.h: + Change name of XML filetype to "XML document". + Add sub menus to "Set Filetype" menu. + + 2007-07-08 Enrico Tröger <enrico.troeger(a)uvena.de> * src/dialogs.c: Fix missing descriptive text in message box when Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-07-08 14:55:37 UTC (rev 1679) +++ trunk/src/filetypes.c 2007-07-09 12:46:16 UTC (rev 1680) @@ -400,7 +400,7 @@ filetypes[GEANY_FILETYPES_XML]->uid = FILETYPE_UID_XML; filetypes[GEANY_FILETYPES_XML]->lang = -2; filetypes[GEANY_FILETYPES_XML]->name = g_strdup("XML"); - filetypes[GEANY_FILETYPES_XML]->title = g_strdup(_("XML source file")); + filetypes[GEANY_FILETYPES_XML]->title = g_strdup(_("XML document")); filetypes[GEANY_FILETYPES_XML]->extension = g_strdup("xml"); filetypes[GEANY_FILETYPES_XML]->pattern = utils_strv_new( "*.xml", "*.sgml", "*.xsl", "*.xslt", "*.xsd", NULL); @@ -532,37 +532,69 @@ } +#define create_sub_menu(menu, item, title) \ + (menu) = gtk_menu_new(); \ + (item) = gtk_menu_item_new_with_mnemonic((title)); \ + gtk_menu_item_set_submenu(GTK_MENU_ITEM((item)), (menu)); \ + gtk_container_add(GTK_CONTAINER(filetype_menu), (item)); \ + gtk_widget_show((item)); + + /* Calls filetypes_init_types() and creates the filetype menu. */ void filetypes_init() { filetype_id ft_id; GtkWidget *filetype_menu = lookup_widget(app->window, "set_filetype1_menu"); + GtkWidget *sub_menu; + GtkWidget *sub_menu_programming, *sub_menu_scripts, *sub_menu_markup, *sub_menu_misc; + GtkWidget *sub_item_programming, *sub_item_scripts, *sub_item_markup, *sub_item_misc; filetypes_init_types(); + create_sub_menu(sub_menu_programming, sub_item_programming, _("_Programming Languages")); + create_sub_menu(sub_menu_scripts, sub_item_scripts, _("_Scripting Languages")); + create_sub_menu(sub_menu_markup, sub_item_markup, _("_Markup Languages")); + create_sub_menu(sub_menu_misc, sub_item_misc, _("M_iscellaneous Languages")); + // Append all filetypes to the filetype menu for (ft_id = 0; ft_id < GEANY_MAX_FILE_TYPES; ft_id++) { filetype *ft = filetypes[ft_id]; - const gchar *title = (ft_id == GEANY_FILETYPES_ALL) ? _("None") : ft->title; + const gchar *title = ft->title; // insert separators for different filetype groups switch (ft_id) { + case GEANY_FILETYPES_C: // programming + { + sub_menu = sub_menu_programming; + break; + } case GEANY_FILETYPES_PERL: // scripts - case GEANY_FILETYPES_XML: // text documents + { + sub_menu = sub_menu_scripts; + break; + } + case GEANY_FILETYPES_XML: // markup + { // (include also CSS, not really markup but fit quite well to HTML) + sub_menu = sub_menu_markup; + break; + } + case GEANY_FILETYPES_SQL: // misc + { + sub_menu = sub_menu_misc; + break; + } case GEANY_FILETYPES_ALL: // none { - GtkWidget *sep = gtk_separator_menu_item_new(); - - gtk_widget_show(sep); - gtk_container_add(GTK_CONTAINER(filetype_menu), sep); + sub_menu = filetype_menu; + title = _("None"); + break; } - default: - break; + default: break; } ft->item = NULL; - filetypes_create_menu_item(filetype_menu, title, ft); + filetypes_create_menu_item(sub_menu, title, ft); } } Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2007-07-08 14:55:37 UTC (rev 1679) +++ trunk/src/filetypes.h 2007-07-09 12:46:16 UTC (rev 1680) @@ -62,11 +62,13 @@ GEANY_FILETYPES_MAKE, GEANY_FILETYPES_OMS, - // documents and others + // markup langauges GEANY_FILETYPES_XML, GEANY_FILETYPES_DOCBOOK, GEANY_FILETYPES_HTML, GEANY_FILETYPES_CSS, + + // miscellaneous languages GEANY_FILETYPES_SQL, GEANY_FILETYPES_LATEX, GEANY_FILETYPES_DIFF, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1679] trunk
by eht16＠users.sourceforge.net 08 Jul '07

08 Jul '07

Revision: 1679 http://svn.sourceforge.net/geany/?rev=1679&view=rev Author: eht16 Date: 2007-07-08 07:55:37 -0700 (Sun, 08 Jul 2007) Log Message: ----------- Fix missing descriptive text in message box when closing an unsaved file on Windows. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-07 17:12:50 UTC (rev 1678) +++ trunk/ChangeLog 2007-07-08 14:55:37 UTC (rev 1679) @@ -1,3 +1,9 @@ +2007-07-08 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/dialogs.c: Fix missing descriptive text in message box when + closing an unsaved file on Windows. + + 2007-07-07 Enrico Tröger <enrico.troeger(a)uvena.de> * src/editor.c: Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2007-07-07 17:12:50 UTC (rev 1678) +++ trunk/src/dialogs.c 2007-07-08 14:55:37 UTC (rev 1679) @@ -400,7 +400,7 @@ #ifndef G_OS_WIN32 GtkWidget *dialog, *button; #endif - gchar *msg, *short_fn = NULL; + gchar *msg, *msg2, *short_fn = NULL; gint ret; // display the file tab to remind the user of the document @@ -414,15 +414,16 @@ msg = g_strdup_printf(_("The file '%s' is not saved."), (short_fn != NULL) ? short_fn : GEANY_STRING_UNTITLED); + msg2 = _("Do you want to save it before closing?"); g_free(short_fn); #ifdef G_OS_WIN32 + setptr(msg, g_strconcat(msg, "\n", msg2, NULL)); ret = win32_message_dialog_unsaved(msg); #else dialog = gtk_message_dialog_new(GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", msg); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), - "%s", _("Do you want to save it before closing?")); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", msg2); gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); button = ui_button_new_with_image(GTK_STOCK_CLEAR, _("_Don't save")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1678] trunk
by eht16＠users.sourceforge.net 07 Jul '07

07 Jul '07

Revision: 1678 http://svn.sourceforge.net/geany/?rev=1678&view=rev Author: eht16 Date: 2007-07-07 10:12:50 -0700 (Sat, 07 Jul 2007) Log Message: ----------- Use an extra space after comment toggle mark. Also comment blank lines when using toggle comment. Also comment already commented lines when using toggle comment. Fix some selection issues when using toggle comment. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c trunk/src/geany.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-07 16:30:44 UTC (rev 1677) +++ trunk/ChangeLog 2007-07-07 17:12:50 UTC (rev 1678) @@ -7,6 +7,11 @@ Add keybinding for Select, Transpose, Cut, Copy and Delete line. * src/keybindings.c: Change default shortcut for Find Next/Previous to Ctrl-G and Ctrl-Shift-G. + * src/editor.c, src/geany.h: + Use an extra space after comment toggle mark. + Also comment blank lines when using toggle comment. + Also comment already commented lines when using toggle comment. + Fix some selection issues when using toggle comment. 2007-07-07 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-07-07 16:30:44 UTC (rev 1677) +++ trunk/src/editor.c 2007-07-07 17:12:50 UTC (rev 1678) @@ -1533,36 +1533,22 @@ if (cc == NULL || strlen(cc) == 0) { guint j; + gsize tm_len = strlen(GEANY_TOGGLE_MARK); single_line = TRUE; if (toggle) { - co_len++; - switch (co_len) - { - case 2: if (sel[x] != co[0] || sel[x+1] != GEANY_TOGGLE_MARK) continue; break; - case 3: if (sel[x] != co[0] || sel[x+1] != co[1] || - sel[x+2] != GEANY_TOGGLE_MARK) - continue; break; - case 4: if (sel[x] != co[0] || sel[x+1] != co[1] || sel[x+2] != co[2] || - sel[x+3] != GEANY_TOGGLE_MARK) - continue; break; - default: continue; - } + if (strncmp(sel + x, co, co_len) != 0 || + strncmp(sel + x + co_len, GEANY_TOGGLE_MARK, tm_len) != 0) + continue; + + co_len += tm_len; } else { - switch (co_len) - { - case 1: if (sel[x] != co[0]) - continue; break; - case 2: if (sel[x] != co[0] || sel[x+1] != co[1]) - continue; break; - case 3: if (sel[x] != co[0] || sel[x+1] != co[1] || sel[x+2] != co[2]) - continue; break; - default: continue; - } + if (strncmp(sel + x, co, co_len) != 0) + continue; } SSM(doc_list[idx].sci, SCI_GOTOPOS, line_start + x + co_len, 0); @@ -1631,12 +1617,14 @@ void editor_do_comment_toggle(gint idx) { gint first_line, last_line; - gint x, i, line_start, line_len; - gint sel_start, sel_end, co_len; + gint x, i, line_start, line_len, first_line_start; + gint sel_start, sel_end; gint count_commented = 0, count_uncommented = 0; gchar sel[256], *co, *cc; gboolean break_loop = FALSE, single_line = FALSE; gboolean first_line_was_comment = FALSE; + gsize co_len; + gsize tm_len = strlen(GEANY_TOGGLE_MARK); filetype *ft; if (! DOC_IDX_VALID(idx) || doc_list[idx].file_type == NULL) @@ -1655,11 +1643,11 @@ last_line = MAX(first_line, last_line); // detection of HTML vs PHP code, if non-PHP set filetype to XML - line_start = sci_get_position_from_line(doc_list[idx].sci, first_line); + first_line_start = sci_get_position_from_line(doc_list[idx].sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { - if (sci_get_style_at(doc_list[idx].sci, line_start) < 118 || - sci_get_style_at(doc_list[idx].sci, line_start) > 127) + if (sci_get_style_at(doc_list[idx].sci, first_line_start) < 118 || + sci_get_style_at(doc_list[idx].sci, first_line_start) > 127) ft = filetypes[GEANY_FILETYPES_XML]; } @@ -1683,99 +1671,83 @@ x = 0; buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); - if (buf_len <= 0) + if (buf_len < 0) continue; sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; while (isspace(sel[x])) x++; - // to skip blank lines - if (x < line_len && sel[x] != '\0') + // use single line comment + if (cc == NULL || strlen(cc) == 0) { - // use single line comment - if (cc == NULL || strlen(cc) == 0) + gboolean do_continue = FALSE; + single_line = TRUE; + + if (strncmp(sel + x, co, co_len) == 0 && + strncmp(sel + x + co_len, GEANY_TOGGLE_MARK, tm_len) == 0) { - gboolean do_continue = FALSE; - single_line = TRUE; + do_continue = TRUE; + } - switch (co_len) - { - case 1: - if (sel[x] == co[0]) - { - do_continue = TRUE; - } - break; - case 2: - if (sel[x] == co[0] && sel[x+1] == co[1]) - { - do_continue = TRUE; - } - break; - case 3: - if (sel[x] == co[0] && sel[x+1] == co[1] && sel[x+2] == co[2]) - { - do_continue = TRUE; - } - break; - default: return; - } - if (do_continue && i == first_line) first_line_was_comment = TRUE; - if (do_continue) - { - count_uncommented += editor_do_uncomment(idx, i, TRUE); - continue; - } + if (do_continue && i == first_line) + first_line_was_comment = TRUE; - // we are still here, so the above lines were not already comments, so comment it - editor_do_comment(idx, i, FALSE, TRUE); - count_commented++; - } - // use multi line comment - else + if (do_continue) { - gint style_comment; - gint lexer = SSM(doc_list[idx].sci, SCI_GETLEXER, 0, 0); + count_uncommented += editor_do_uncomment(idx, i, TRUE); + continue; + } - // skip lines which are already comments - switch (lexer) - { // I will list only those lexers which support multi line comments - case SCLEX_XML: - case SCLEX_HTML: - { - if (sci_get_style_at(doc_list[idx].sci, line_start) >= 118 && - sci_get_style_at(doc_list[idx].sci, line_start) <= 127) - style_comment = SCE_HPHP_COMMENT; - else style_comment = SCE_H_COMMENT; - break; - } - case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; - case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; - case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; - case SCLEX_D: style_comment = SCE_D_COMMENT; break; - default: style_comment = SCE_C_COMMENT; - } - if (sci_get_style_at(doc_list[idx].sci, line_start + x) == style_comment) + // we are still here, so the above lines were not already comments, so comment it + editor_do_comment(idx, i, TRUE, TRUE); + count_commented++; + } + // use multi line comment + else + { + gint style_comment; + gint lexer = SSM(doc_list[idx].sci, SCI_GETLEXER, 0, 0); + + // skip lines which are already comments + switch (lexer) + { // I will list only those lexers which support multi line comments + case SCLEX_XML: + case SCLEX_HTML: { - real_uncomment_multiline(idx); - count_uncommented++; + if (sci_get_style_at(doc_list[idx].sci, line_start) >= 118 && + sci_get_style_at(doc_list[idx].sci, line_start) <= 127) + style_comment = SCE_HPHP_COMMENT; + else style_comment = SCE_H_COMMENT; + break; } - else - { - real_comment_multiline(idx, line_start, last_line); - count_commented++; - } - - // break because we are already on the last line - break_loop = TRUE; - break; + case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; + case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; + case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; + case SCLEX_D: style_comment = SCE_D_COMMENT; break; + default: style_comment = SCE_C_COMMENT; } + if (sci_get_style_at(doc_list[idx].sci, line_start + x) == style_comment) + { + real_uncomment_multiline(idx); + count_uncommented++; + } + else + { + real_comment_multiline(idx, line_start, last_line); + count_commented++; + } + + // break because we are already on the last line + break_loop = TRUE; + break; } } SSM(doc_list[idx].sci, SCI_ENDUNDOACTION, 0, 0); + co_len += tm_len; + // restore selection if there is one if (sel_start < sel_end) { @@ -1785,7 +1757,7 @@ // don't modify sel_start when the selection starts within indentation get_indent(doc_list[idx].sci, sel_start, TRUE); - if ((sel_start - line_start) <= (gint) strlen(indent)) + if ((sel_start - first_line_start) <= (gint) strlen(indent)) a = 0; sci_set_selection_start(doc_list[idx].sci, sel_start + a); @@ -1809,8 +1781,7 @@ } else if (count_uncommented > 0) { - gint eol_len = utils_get_eol_char_len(idx); - sci_set_current_position(doc_list[idx].sci, sel_start - co_len - eol_len, TRUE); + sci_set_current_position(doc_list[idx].sci, sel_start - co_len, TRUE); } } @@ -1874,7 +1845,7 @@ x = 0; buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); - if (buf_len <= 0) + if (buf_len < 0) continue; sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; @@ -1895,7 +1866,7 @@ if (toggle) { - gchar *text = g_strdup_printf("%s%c", co, GEANY_TOGGLE_MARK); + gchar *text = g_strconcat(co, GEANY_TOGGLE_MARK, NULL); sci_insert_text(doc_list[idx].sci, start, text); g_free(text); } Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-07-07 16:30:44 UTC (rev 1677) +++ trunk/src/geany.h 2007-07-07 17:12:50 UTC (rev 1678) @@ -44,7 +44,7 @@ #define GEANY_USE_WIN32_DIALOG 0 #define GEANY_CHECK_FILE_DELAY 30 #define GEANY_WORDCHARS "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" -#define GEANY_TOGGLE_MARK '~' +#define GEANY_TOGGLE_MARK "~ " #define GEANY_MAX_WORD_LENGTH 192 #define GEANY_MAX_AUTOCOMPLETE_WORDS 30 #define GEANY_MAX_AUTOCOMPLETE_HEIGHT 10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2007