Commits October 2006

commits@lists.geany.org

2 participants
93 discussions

SF.net SVN: geany: [939] trunk/src/sci_cb.c
by ntrel＠users.sourceforge.net 27 Oct '06

27 Oct '06

Revision: 939 http://svn.sourceforge.net/geany/?rev=939&view=rev Author: ntrel Date: 2006-10-27 07:23:46 -0700 (Fri, 27 Oct 2006) Log Message: ----------- Find last unmatched open bracket for Show Calltip so nested matched brackets are ignored (except LaTeX). Modified Paths: -------------- trunk/src/sci_cb.c Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-10-27 14:22:39 UTC (rev 938) +++ trunk/src/sci_cb.c 2006-10-27 14:23:46 UTC (rev 939) @@ -209,8 +209,11 @@ case '[': case '{': { // Tex auto-closing - sci_cb_auto_close_bracket(sci, pos, nt->ch); // Tex auto-closing - sci_cb_show_calltip(idx, pos); + if (sci_get_lexer(sci) == SCLEX_LATEX) + { + sci_cb_auto_close_bracket(sci, pos, nt->ch); // Tex auto-closing + sci_cb_show_calltip(idx, pos); + } break; } case '}': @@ -483,6 +486,42 @@ } +static gint find_previous_brace(ScintillaObject *sci, gint pos) +{ + gchar c; + gint orig_pos = pos; + // we need something more intelligent than only check for '(' because LaTeX + // uses {, [ or ( + c = SSM(sci, SCI_GETCHARAT, pos, 0); + while (pos >= 0 && pos > orig_pos - 300) + { + c = SSM(sci, SCI_GETCHARAT, pos, 0); + pos--; + if (utils_is_opening_brace(c)) return pos; + } + return -1; +} + + +static gint find_start_bracket(ScintillaObject *sci, gint pos) +{ + gchar c; + gint brackets = 0; + gint orig_pos = pos; + + c = SSM(sci, SCI_GETCHARAT, pos, 0); + while (pos > 0 && pos > orig_pos - 300) + { + c = SSM(sci, SCI_GETCHARAT, pos, 0); + if (c == ')') brackets++; + else if (c == '(') brackets--; + pos--; + if (brackets < 0) return pos; // found start bracket + } + return -1; +} + + gboolean sci_cb_show_calltip(gint idx, gint pos) { gint orig_pos = pos; // the position for the calltip @@ -498,28 +537,22 @@ lexer = SSM(sci, SCI_GETLEXER, 0, 0); - word[0] = '\0'; if (pos == -1) { - gchar c; - // position of '(' is unknown, so go backwards to find it + // position of '(' is unknown, so go backwards from current position to find it pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); + pos--; orig_pos = pos; - // I'm not sure if utils_is_opening_brace() is a good idea, but it is the simplest way, - // but we need something more intelligent than only check for '(' because e.g. LaTeX - // uses {, [ or ( - c = SSM(sci, SCI_GETCHARAT, pos, 0); - while (pos > 0 && ! utils_is_opening_brace(c) && c != ';') - { - c = SSM(sci, SCI_GETCHARAT, pos, 0); - pos--; - } + pos = (lexer == SCLEX_LATEX) ? find_previous_brace(sci, pos) : + find_start_bracket(sci, pos); + if (pos == -1) return FALSE; } style = SSM(sci, SCI_GETSTYLEAT, pos, 0); if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT || style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC)) return FALSE; + word[0] = '\0'; sci_cb_find_current_word(sci, pos - 1, word, sizeof word); if (word[0] == '\0') return FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [938] trunk/ChangeLog
by ntrel＠users.sourceforge.net 27 Oct '06

27 Oct '06

Revision: 938 http://svn.sourceforge.net/geany/?rev=938&view=rev Author: ntrel Date: 2006-10-27 07:22:39 -0700 (Fri, 27 Oct 2006) Log Message: ----------- Find last unmatched open bracket for Show Calltip so nested matched brackets are ignored (except LaTeX). Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-27 14:21:48 UTC (rev 937) +++ trunk/ChangeLog 2006-10-27 14:22:39 UTC (rev 938) @@ -9,6 +9,11 @@ Make C-like comment colour darker; make globalclass brighter to distinguish it from word colour. Make Java use same default syntax highlighting colours as C. + * src/utils.c: + Limit parse depth to 500 chars when parsing C-like function name. + * src/sci_cb.c: + Find last unmatched open bracket for Show Calltip so nested matched + brackets are ignored (except LaTeX). 2006-10-26 Nick Treleaven <nick.treleaven(a)btinternet.com> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [937] trunk/src/utils.c
by ntrel＠users.sourceforge.net 27 Oct '06

27 Oct '06

Revision: 937 http://svn.sourceforge.net/geany/?rev=937&view=rev Author: ntrel Date: 2006-10-27 07:21:48 -0700 (Fri, 27 Oct 2006) Log Message: ----------- Limit parse depth to 500 chars when parsing C-like function name. Modified Paths: -------------- trunk/src/utils.c Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-10-27 11:30:23 UTC (rev 936) +++ trunk/src/utils.c 2006-10-27 14:21:48 UTC (rev 937) @@ -517,7 +517,7 @@ if (tmp == 0) end --; // go back to the end of function identifier - while (end > 0 && end > first_pos - 1000 && + while (end > 0 && end > first_pos - 500 && (tmp = sci_get_char_at(sci, end)) != '(' && tmp != 0) end--; end--; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [936] trunk
by ntrel＠users.sourceforge.net 27 Oct '06

27 Oct '06

Revision: 936 http://svn.sourceforge.net/geany/?rev=936&view=rev Author: ntrel Date: 2006-10-27 04:30:23 -0700 (Fri, 27 Oct 2006) Log Message: ----------- Add filetypes_get_conf_extension() and use in highlighting.c. Fix a memory leak in load_keyfiles(). Group C-like default syntax in init_c_like_styleset(). Make C-like comment colour darker; make globalclass brighter to distinguish it from word colour. Make Java use same default syntax highlighting colours as C. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.c trunk/data/filetypes.cpp trunk/data/filetypes.d trunk/data/filetypes.ferite trunk/data/filetypes.java trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-26 15:22:27 UTC (rev 935) +++ trunk/ChangeLog 2006-10-27 11:30:23 UTC (rev 936) @@ -1,3 +1,16 @@ +2006-10-27 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/highlighting.c, src/filetypes.c, src/filetypes.h, + data/filetypes.java, data/filetypes.cpp, data/filetypes.ferite, + data/filetypes.c, data/filetypes.d: + Add filetypes_get_conf_extension() and use in highlighting.c. + Fix a memory leak in load_keyfiles(). + Group C-like default syntax in init_c_like_styleset(). + Make C-like comment colour darker; make globalclass brighter to + distinguish it from word colour. + Make Java use same default syntax highlighting colours as C. + + 2006-10-26 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/keybindings.c, src/keybindings.h: Modified: trunk/data/filetypes.c =================================================================== --- trunk/data/filetypes.c 2006-10-26 15:22:27 UTC (rev 935) +++ trunk/data/filetypes.c 2006-10-27 11:30:23 UTC (rev 936) @@ -2,9 +2,9 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -comment=0xff0000;0xffffff;false;false -commentline=0xff0000;0xffffff;false;false -commentdoc=0xff0000;0xffffff;false;false +comment=0xd00000;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +commentdoc=0xd00000;0xffffff;false;false number=0x007f00;0xffffff;false;false word=0x00007f;0xffffff;true;false word2=0x991111;0xffffff;true;false @@ -17,9 +17,9 @@ stringeol=0x000000;0xe0c0e0;false;false verbatim=0x101030;0xffffff;false;false regex=0x105090;0xffffff;false;false -commentlinedoc=0xff0000;0xffffff;true;false -commentdockeyword=0xff0000;0xffffff;true;true -globalclass=0x1111bb;0xffffff;true;false +commentlinedoc=0xd00000;0xffffff;true;false +commentdockeyword=0xd00000;0xffffff;true;true +globalclass=0x0000d0;0xffffff;true;false # whether arguments of preprocessor commands should be styled (only first argument is used) # 1 to enable, 0 to disable styling_within_preprocessor=1;0;false;false Modified: trunk/data/filetypes.cpp =================================================================== --- trunk/data/filetypes.cpp 2006-10-26 15:22:27 UTC (rev 935) +++ trunk/data/filetypes.cpp 2006-10-27 11:30:23 UTC (rev 936) @@ -2,9 +2,9 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -comment=0xff0000;0xffffff;false;false -commentline=0xff0000;0xffffff;false;false -commentdoc=0xff0000;0xffffff;false;false +comment=0xd00000;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +commentdoc=0xd00000;0xffffff;false;false number=0x007f00;0xffffff;false;false word=0x00007f;0xffffff;true;false word2=0x991111;0xffffff;true;false @@ -17,9 +17,9 @@ stringeol=0x000000;0xe0c0e0;false;false verbatim=0x101030;0xffffff;false;false regex=0x105090;0xffffff;false;false -commentlinedoc=0xff0000;0xffffff;true;false -commentdockeyword=0xff0000;0xffffff;true;true -globalclass=0x1111bb;0xffffff;true;false +commentlinedoc=0xd00000;0xffffff;true;false +commentdockeyword=0xd00000;0xffffff;true;true +globalclass=0x0000d0;0xffffff;true;false # whether arguments of preprocessor commands should be styled (only first argument is used) # 1 to enable, 0 to disable styling_within_preprocessor=1;0;false;false Modified: trunk/data/filetypes.d =================================================================== --- trunk/data/filetypes.d 2006-10-26 15:22:27 UTC (rev 935) +++ trunk/data/filetypes.d 2006-10-27 11:30:23 UTC (rev 936) @@ -2,9 +2,9 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -comment=0xff0000;0xffffff;false;false -commentline=0xff0000;0xffffff;false;false -commentdoc=0xff0000;0xffffff;false;false +comment=0xd00000;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +commentdoc=0xd00000;0xffffff;false;false number=0x007f00;0xffffff;false;false word=0x111199;0xffffff;true;false word2=0x7f0000;0xffffff;true;false @@ -17,9 +17,9 @@ stringeol=0x000000;0xe0c0e0;false;false verbatim=0x301010;0xffffff;false;false regex=0x105090;0xffffff;false;false -commentlinedoc=0xff0000;0xffffff;true;false -commentdockeyword=0xff0000;0xffffff;true;true -globalclass=0x1111bb;0xffffff;true;false +commentlinedoc=0xd00000;0xffffff;true;false +commentdockeyword=0xd00000;0xffffff;true;true +globalclass=0x0000d0;0xffffff;true;false # whether arguments of preprocessor commands should be styled (only first argument is used) # 1 to enable, 0 to disable styling_within_preprocessor=1;0;false;false Modified: trunk/data/filetypes.ferite =================================================================== --- trunk/data/filetypes.ferite 2006-10-26 15:22:27 UTC (rev 935) +++ trunk/data/filetypes.ferite 2006-10-27 11:30:23 UTC (rev 936) @@ -2,9 +2,9 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -comment=0xff0000;0xffffff;false;false -commentline=0xff0000;0xffffff;false;false -commentdoc=0xff0000;0xffffff;false;false +comment=0xd00000;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +commentdoc=0xd00000;0xffffff;false;false number=0x007f00;0xffffff;false;false word=0x00007f;0xffffff;true;false word2=0x991111;0xffffff;true;false @@ -17,9 +17,9 @@ stringeol=0x000000;0xe0c0e0;false;false verbatim=0x101030;0xffffff;false;false regex=0x105090;0xffffff;false;false -commentlinedoc=0xff0000;0xffffff;true;false -commentdockeyword=0xff0000;0xffffff;true;true -globalclass=0x1111bb;0xffffff;true;false +commentlinedoc=0xd00000;0xffffff;true;false +commentdockeyword=0xd00000;0xffffff;true;true +globalclass=0x0000d0;0xffffff;true;false [keywords] # all items must be in one line Modified: trunk/data/filetypes.java =================================================================== --- trunk/data/filetypes.java 2006-10-26 15:22:27 UTC (rev 935) +++ trunk/data/filetypes.java 2006-10-27 11:30:23 UTC (rev 936) @@ -2,24 +2,24 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -comment=0xff0000;0xffffff;false;false -commentline=0xff0000;0xffffff;false;false -commentdoc=0xff0000;0xffffff;false;false +comment=0xd00000;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +commentdoc=0xd00000;0xffffff;false;false number=0x007f00;0xffffff;false;false -word=0x111199;0xffffff;true;false -word2=0x7f0000;0xffffff;true;false +word=0x00007f;0xffffff;true;false +word2=0x991111;0xffffff;true;false string=0xff901e;0xffffff;false;false character=0xff901e;0xffffff;false;false uuid=0x404080;0xffffff;false;false -preprocessor=0x007f7f;0xffffff;false;false +preprocessor=0x007F7F;0xffffff;false;false operator=0x301010;0xffffff;false;false -identifier=0x404000;0xffffff;false;false +identifier=0x000000;0xffffff;false;false stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x406090;0x0000ff;false;false -regex=0x905010;0xffffff;false;false -commentlinedoc=0xff0000;0xffffff;true;true -commentdockeyword=0xff0000;0xffffff;true;true -globalclass=0x409010;0xffffff;true;false +verbatim=0x101030;0xffffff;false;false +regex=0x105090;0xffffff;false;false +commentlinedoc=0xd00000;0xffffff;true;false +commentdockeyword=0xd00000;0xffffff;true;true +globalclass=0x0000d0;0xffffff;true;false [keywords] primary=abstract assert break case catch class const continue default do else extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static super switch synchronized this throw throws transient try var volatile while Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-10-26 15:22:27 UTC (rev 935) +++ trunk/src/filetypes.c 2006-10-27 11:30:23 UTC (rev 936) @@ -968,12 +968,13 @@ } -static gchar *get_conf_extension(gint filetype_idx) +gchar *filetypes_get_conf_extension(gint filetype_idx) { gchar *result, *tmp = g_strdup(filetypes[filetype_idx]->name); switch (filetype_idx) { + case GEANY_FILETYPES_ALL: result = g_strdup("common"); break; case GEANY_FILETYPES_CPP: result = g_strdup("cpp"); break; case GEANY_FILETYPES_MAKE: result = g_strdup("makefile"); break; case GEANY_FILETYPES_OMS: result = g_strdup("oms"); break; @@ -998,7 +999,7 @@ if (! bp->modified) continue; - ext = get_conf_extension(i); + ext = filetypes_get_conf_extension(i); fname = g_strconcat(conf_prefix, ext, NULL); g_free(ext); Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2006-10-26 15:22:27 UTC (rev 935) +++ trunk/src/filetypes.h 2006-10-27 11:30:23 UTC (rev 936) @@ -133,4 +133,6 @@ GtkFileFilter *filetypes_create_file_filter(filetype *ft); +gchar *filetypes_get_conf_extension(gint filetype_idx); + #endif Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-10-26 15:22:27 UTC (rev 935) +++ trunk/src/highlighting.c 2006-10-27 11:30:23 UTC (rev 936) @@ -81,6 +81,14 @@ } common_style_set; +// used for default styles +typedef struct +{ + gchar *name; + Style style; +} StyleEntry; + + static void new_style_array(gint file_type_id, gint styling_count) { style_sets[file_type_id].styling = g_new0(Style, styling_count); @@ -110,15 +118,19 @@ } -static void load_keyfiles(GKeyFile *config, GKeyFile *config_home, const gchar *filename) +static void load_keyfiles(GKeyFile *config, GKeyFile *config_home, gint filetype_idx) { - gchar *f0 = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, filename, NULL); + gchar *ext = filetypes_get_conf_extension(filetype_idx); + gchar *f0 = g_strconcat(app->datadir, G_DIR_SEPARATOR_S "filetypes.", ext, NULL); gchar *f = g_strconcat(app->configdir, - G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S, filename, NULL); + G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.", ext, NULL); load_system_keyfile(config, f0, G_KEY_FILE_KEEP_COMMENTS, NULL); g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL); + g_free(ext); + g_free(f); + g_free(f0); } @@ -170,6 +182,45 @@ } +static gint rotate_rgb(gint color) +{ + return ((color & 0xFF0000) >> 16) + + (color & 0x00FF00) + + ((color & 0x0000FF) << 16); +} + + +static void get_keyfile_style(GKeyFile *config, GKeyFile *configh, + StyleEntry *entry, Style *style) +{ + gchar **list; + gsize len; + + g_return_if_fail(config && configh && entry && style); + + list = g_key_file_get_string_list(configh, "styling", entry->name, &len, NULL); + if (list == NULL) list = g_key_file_get_string_list(config, "styling", entry->name, &len, NULL); + + if (list != NULL && list[0] != NULL) + style->foreground = (gint) utils_strtod(list[0], NULL, FALSE); + else + style->foreground = rotate_rgb(entry->style.foreground); + + if (list != NULL && list[1] != NULL) + style->background = (gint) utils_strtod(list[1], NULL, FALSE); + else + style->background = rotate_rgb(entry->style.background); + + if (list != NULL && list[2] != NULL) style->bold = utils_atob(list[2]); + else style->bold = entry->style.bold; + + if (list != NULL && list[3] != NULL) style->italic = utils_atob(list[3]); + else style->italic = entry->style.italic; + + g_strfreev(list); +} + + static void get_keyfile_hex(GKeyFile *config, GKeyFile *configh, const gchar *section, const gchar *key, const gchar *foreground, const gchar *background, const gchar *bold, @@ -295,7 +346,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.common"); + load_keyfiles(config, config_home, GEANY_FILETYPES_ALL); get_keyfile_hex(config, config_home, "styling", "selection", "0xc0c0c0", "0x7f0000", "false", &common_style_set.styling[GCS_SELECTION]); @@ -468,35 +519,51 @@ } +static void init_c_like_styleset(GKeyFile *config, GKeyFile *config_home, gint filetype_idx) +{ + StyleEntry entries[] = + { + {"default", {0x000000, 0xffffff, FALSE, FALSE}}, + {"comment", {0xd00000, 0xffffff, FALSE, FALSE}}, + {"commentline", {0xd00000, 0xffffff, FALSE, FALSE}}, + {"commentdoc", {0xd00000, 0xffffff, FALSE, FALSE}}, + {"number", {0x007f00, 0xffffff, FALSE, FALSE}}, + {"word", {0x111199, 0xffffff, TRUE, FALSE}}, + {"word2", {0x7f0000, 0xffffff, TRUE, FALSE}}, + {"string", {0xff901e, 0xffffff, FALSE, FALSE}}, + {"character", {0xff901e, 0xffffff, FALSE, FALSE}}, + {"uuid", {0x404080, 0xffffff, FALSE, FALSE}}, + {"preprocessor",{0x007f7f, 0xffffff, FALSE, FALSE}}, + {"operator", {0x301010, 0xffffff, FALSE, FALSE}}, + {"identifier", {0x000000, 0xffffff, FALSE, FALSE}}, + {"stringeol", {0x000000, 0xe0c0e0, FALSE, FALSE}}, + {"verbatim", {0x301010, 0xffffff, FALSE, FALSE}}, + {"regex", {0x105090, 0xffffff, FALSE, FALSE}}, + {"commentlinedoc", {0xd00000, 0xffffff, TRUE, FALSE}}, + {"commentdockeyword", {0xd00000, 0xffffff, TRUE, FALSE}}, + {"globalclass", {0x0000d0, 0xffffff, TRUE, FALSE}} + }; + gint i; + + new_style_array(filetype_idx, 20); + + for (i = 0; i < 19; i++) + get_keyfile_style(config, config_home, &entries[i], + &style_sets[filetype_idx].styling[i]); + + get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", + 1, 0, &style_sets[filetype_idx].styling[19]); +} + + static void styleset_c_init(void) { GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.c"); + load_keyfiles(config, config_home, GEANY_FILETYPES_C); + init_c_like_styleset(config, config_home, GEANY_FILETYPES_C); - new_style_array(GEANY_FILETYPES_C, 20); - get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[0]); - get_keyfile_hex(config, config_home, "styling", "comment", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[1]); - get_keyfile_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[2]); - get_keyfile_hex(config, config_home, "styling", "commentdoc", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[3]); - get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[4]); - get_keyfile_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", &style_sets[GEANY_FILETYPES_C].styling[5]); - get_keyfile_hex(config, config_home, "styling", "word2", "0x7f0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_C].styling[6]); - get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[7]); - get_keyfile_hex(config, config_home, "styling", "character", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[8]); - get_keyfile_hex(config, config_home, "styling", "uuid", "0x404080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[9]); - get_keyfile_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[10]); - get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[11]); - get_keyfile_hex(config, config_home, "styling", "identifier", "0x,00000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[12]); - get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_C].styling[13]); - get_keyfile_hex(config, config_home, "styling", "verbatim", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[14]); - get_keyfile_hex(config, config_home, "styling", "regex", "0x105090", "0xffffff", "false", &style_sets[GEANY_FILETYPES_C].styling[15]); - get_keyfile_hex(config, config_home, "styling", "commentlinedoc", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_C].styling[16]); - get_keyfile_hex(config, config_home, "styling", "commentdockeyword", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_C].styling[17]); - get_keyfile_hex(config, config_home, "styling", "globalclass", "0x1111bb", "0xffffff", "true", &style_sets[GEANY_FILETYPES_C].styling[18]); - get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, &style_sets[GEANY_FILETYPES_C].styling[19]); - style_sets[GEANY_FILETYPES_C].keywords = g_new(gchar*, 3); get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_C, 0, "if const struct char int float double void long for while do case switch return"); get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_C, 1, "TODO FIXME"); @@ -582,30 +649,9 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.cpp"); + load_keyfiles(config, config_home, GEANY_FILETYPES_CPP); + init_c_like_styleset(config, config_home, GEANY_FILETYPES_CPP); - new_style_array(GEANY_FILETYPES_CPP, 20); - get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[0]); - get_keyfile_hex(config, config_home, "styling", "comment", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[1]); - get_keyfile_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[2]); - get_keyfile_hex(config, config_home, "styling", "commentdoc", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[3]); - get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[4]); - get_keyfile_hex(config, config_home, "styling", "word", "0x00007f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CPP].styling[5]); - get_keyfile_hex(config, config_home, "styling", "word2", "0x991111", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CPP].styling[6]); - get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[7]); - get_keyfile_hex(config, config_home, "styling", "character", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[8]); - get_keyfile_hex(config, config_home, "styling", "uuid", "0x404080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[9]); - get_keyfile_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[10]); - get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[11]); - get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[12]); - get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_CPP].styling[13]); - get_keyfile_hex(config, config_home, "styling", "verbatim", "0x101030", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[14]); - get_keyfile_hex(config, config_home, "styling", "regex", "0x105090", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CPP].styling[15]); - get_keyfile_hex(config, config_home, "styling", "commentlinedoc", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CPP].styling[16]); - get_keyfile_hex(config, config_home, "styling", "commentdockeyword", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CPP].styling[17]); - get_keyfile_hex(config, config_home, "styling", "globalclass", "0x1111bb", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CPP].styling[18]); - get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, &style_sets[GEANY_FILETYPES_CPP].styling[19]); - style_sets[GEANY_FILETYPES_CPP].keywords = g_new(gchar*, 3); get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_CPP, 0, "and and_eq asm auto bitand bitor bool break case catch char class compl const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new not not_eq operator or or_eq private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq"); get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_CPP, 1, "TODO FIXME"); @@ -689,7 +735,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.pascal"); + load_keyfiles(config, config_home, GEANY_FILETYPES_PASCAL); new_style_array(GEANY_FILETYPES_PASCAL, 12); get_keyfile_hex(config, config_home, "styling", "default", "0x0000ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[0]); @@ -758,7 +804,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.makefile"); + load_keyfiles(config, config_home, GEANY_FILETYPES_MAKE); new_style_array(GEANY_FILETYPES_MAKE, 7); get_keyfile_hex(config, config_home, "styling", "default", "0x00002f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_MAKE].styling[0]); @@ -804,7 +850,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.diff"); + load_keyfiles(config, config_home, GEANY_FILETYPES_DIFF); new_style_array(GEANY_FILETYPES_DIFF, 7); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_DIFF].styling[0]); @@ -851,7 +897,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.latex"); + load_keyfiles(config, config_home, GEANY_FILETYPES_LATEX); new_style_array(GEANY_FILETYPES_LATEX, 5); get_keyfile_hex(config, config_home, "styling", "default", "0x00002f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LATEX].styling[0]); @@ -900,7 +946,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.php"); + load_keyfiles(config, config_home, GEANY_FILETYPES_PHP); style_sets[GEANY_FILETYPES_PHP].styling = NULL; style_sets[GEANY_FILETYPES_PHP].keywords = NULL; @@ -940,7 +986,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.html"); + load_keyfiles(config, config_home, GEANY_FILETYPES_HTML); style_sets[GEANY_FILETYPES_HTML].styling = NULL; style_sets[GEANY_FILETYPES_HTML].keywords = NULL; @@ -979,7 +1025,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.xml"); + load_keyfiles(config, config_home, GEANY_FILETYPES_XML); new_style_array(GEANY_FILETYPES_XML, 55); get_keyfile_hex(config, config_home, "styling", "html_default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[0]); @@ -1284,29 +1330,10 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.java"); + load_keyfiles(config, config_home, GEANY_FILETYPES_JAVA); + init_c_like_styleset(config, config_home, GEANY_FILETYPES_JAVA); + style_sets[GEANY_FILETYPES_JAVA].styling[19].foreground = 0; // disable styling_within_preprocessor - new_style_array(GEANY_FILETYPES_JAVA, 19); - get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[0]); - get_keyfile_hex(config, config_home, "styling", "comment", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[1]); - get_keyfile_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[2]); - get_keyfile_hex(config, config_home, "styling", "commentdoc", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[3]); - get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[4]); - get_keyfile_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", &style_sets[GEANY_FILETYPES_JAVA].styling[5]); - get_keyfile_hex(config, config_home, "styling", "word2", "0x7f0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_JAVA].styling[6]); - get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[7]); - get_keyfile_hex(config, config_home, "styling", "character", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[8]); - get_keyfile_hex(config, config_home, "styling", "uuid", "0x404080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[9]); - get_keyfile_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[10]); - get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[11]); - get_keyfile_hex(config, config_home, "styling", "identifier", "0x404000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[12]); - get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[13]); - get_keyfile_hex(config, config_home, "styling", "verbatim", "0x406090", "0x0000ff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[14]); - get_keyfile_hex(config, config_home, "styling", "regex", "0x905010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_JAVA].styling[15]); - get_keyfile_hex(config, config_home, "styling", "commentlinedoc", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_JAVA].styling[16]); - get_keyfile_hex(config, config_home, "styling", "commentdockeyword", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_JAVA].styling[17]); - get_keyfile_hex(config, config_home, "styling", "globalclass", "0x409010", "0xffffff", "true", &style_sets[GEANY_FILETYPES_JAVA].styling[18]); - style_sets[GEANY_FILETYPES_JAVA].keywords = g_new(gchar*, 5); get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_JAVA, 0, "\ abstract assert break case catch class \ @@ -1379,7 +1406,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.perl"); + load_keyfiles(config, config_home, GEANY_FILETYPES_PERL); new_style_array(GEANY_FILETYPES_PERL, 17); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PERL].styling[0]); @@ -1480,7 +1507,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.python"); + load_keyfiles(config, config_home, GEANY_FILETYPES_PYTHON); new_style_array(GEANY_FILETYPES_PYTHON, 14); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PYTHON].styling[0]); @@ -1547,7 +1574,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.ruby"); + load_keyfiles(config, config_home, GEANY_FILETYPES_RUBY); new_style_array(GEANY_FILETYPES_RUBY, 19); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_RUBY].styling[0]); @@ -1621,7 +1648,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.sh"); + load_keyfiles(config, config_home, GEANY_FILETYPES_SH); new_style_array(GEANY_FILETYPES_SH, 11); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_SH].styling[0]); @@ -1696,7 +1723,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.docbook"); + load_keyfiles(config, config_home, GEANY_FILETYPES_DOCBOOK); new_style_array(GEANY_FILETYPES_DOCBOOK, 29); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[0]); @@ -1865,7 +1892,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.css"); + load_keyfiles(config, config_home, GEANY_FILETYPES_CSS); new_style_array(GEANY_FILETYPES_CSS, 16); get_keyfile_hex(config, config_home, "styling", "default", "0x003399", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[0]); @@ -1962,7 +1989,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.conf"); + load_keyfiles(config, config_home, GEANY_FILETYPES_CONF); new_style_array(GEANY_FILETYPES_CONF, 6); get_keyfile_hex(config, config_home, "styling", "default", "0x7f0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CONF].styling[0]); @@ -2010,7 +2037,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.asm"); + load_keyfiles(config, config_home, GEANY_FILETYPES_ASM); new_style_array(GEANY_FILETYPES_ASM, 15); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_ASM].styling[0]); @@ -2084,7 +2111,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.fortran"); + load_keyfiles(config, config_home, GEANY_FILETYPES_FORTRAN); new_style_array(GEANY_FILETYPES_FORTRAN, 15); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FORTRAN].styling[0]); @@ -2157,7 +2184,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.sql"); + load_keyfiles(config, config_home, GEANY_FILETYPES_SQL); new_style_array(GEANY_FILETYPES_SQL, 15); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_SQL].styling[0]); @@ -2252,7 +2279,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.caml"); + load_keyfiles(config, config_home, GEANY_FILETYPES_CAML); new_style_array(GEANY_FILETYPES_CAML, 14); @@ -2325,7 +2352,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.oms"); + load_keyfiles(config, config_home, GEANY_FILETYPES_OMS); new_style_array(GEANY_FILETYPES_OMS, 11); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_OMS].styling[0]); @@ -2391,7 +2418,7 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.tcl"); + load_keyfiles(config, config_home, GEANY_FILETYPES_TCL); new_style_array(GEANY_FILETYPES_TCL, 16); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_TCL].styling[0]); @@ -2468,30 +2495,9 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.d"); + load_keyfiles(config, config_home, GEANY_FILETYPES_D); + init_c_like_styleset(config, config_home, GEANY_FILETYPES_D); - new_style_array(GEANY_FILETYPES_D, 20); - get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[0]); - get_keyfile_hex(config, config_home, "styling", "comment", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[1]); - get_keyfile_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[2]); - get_keyfile_hex(config, config_home, "styling", "commentdoc", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[3]); - get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[4]); - get_keyfile_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", &style_sets[GEANY_FILETYPES_D].styling[5]); - get_keyfile_hex(config, config_home, "styling", "word2", "0x7f0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_D].styling[6]); - get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[7]); - get_keyfile_hex(config, config_home, "styling", "character", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[8]); - get_keyfile_hex(config, config_home, "styling", "uuid", "0x404080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[9]); - get_keyfile_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[10]); - get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[11]); - get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[12]); - get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_D].styling[13]); - get_keyfile_hex(config, config_home, "styling", "verbatim", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[14]); - get_keyfile_hex(config, config_home, "styling", "regex", "0x105090", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[15]); - get_keyfile_hex(config, config_home, "styling", "commentlinedoc", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_D].styling[16]); - get_keyfile_hex(config, config_home, "styling", "commentdockeyword", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_D].styling[17]); - get_keyfile_hex(config, config_home, "styling", "globalclass", "0x1111bb", "0xffffff", "true", &style_sets[GEANY_FILETYPES_D].styling[18]); - get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, &style_sets[GEANY_FILETYPES_D].styling[19]); - style_sets[GEANY_FILETYPES_D].keywords = g_new(gchar*, 3); get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_D, 0, "__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate delete deprecated do double else enum export extern false final finally float for foreach function goto idouble if ifloat import in inout int interface invariant ireal is long mixin module new null out override package pragma private protected public real return scope short static struct super switch synchronized template this throw true try typedef typeof ubyte ucent uint ulong union unittest ushort version void volatile wchar while with"); get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_D, 1, "TODO FIXME"); @@ -2569,30 +2575,9 @@ GKeyFile *config = g_key_file_new(); GKeyFile *config_home = g_key_file_new(); - load_keyfiles(config, config_home, "filetypes.ferite"); + load_keyfiles(config, config_home, GEANY_FILETYPES_FERITE); + init_c_like_styleset(config, config_home, GEANY_FILETYPES_FERITE); - new_style_array(GEANY_FILETYPES_FERITE, 20); - get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[0]); - get_keyfile_hex(config, config_home, "styling", "comment", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[1]); - get_keyfile_hex(config, config_home, "styling", "commentline", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[2]); - get_keyfile_hex(config, config_home, "styling", "commentdoc", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[3]); - get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[4]); - get_keyfile_hex(config, config_home, "styling", "word", "0x00007f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_FERITE].styling[5]); - get_keyfile_hex(config, config_home, "styling", "word2", "0x991111", "0xffffff", "true", &style_sets[GEANY_FILETYPES_FERITE].styling[6]); - get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[7]); - get_keyfile_hex(config, config_home, "styling", "character", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[8]); - get_keyfile_hex(config, config_home, "styling", "uuid", "0x404080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[9]); - get_keyfile_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[10]); - get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[11]); - get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[12]); - get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[13]); - get_keyfile_hex(config, config_home, "styling", "verbatim", "0x101030", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[14]); - get_keyfile_hex(config, config_home, "styling", "regex", "0x105090", "0xffffff", "false", &style_sets[GEANY_FILETYPES_FERITE].styling[15]); - get_keyfile_hex(config, config_home, "styling", "commentlinedoc", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_FERITE].styling[16]); - get_keyfile_hex(config, config_home, "styling", "commentdockeyword", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_FERITE].styling[17]); - get_keyfile_hex(config, config_home, "styling", "globalclass", "0x1111bb", "0xffffff", "true", &style_sets[GEANY_FILETYPES_FERITE].styling[18]); - get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, &style_sets[GEANY_FILETYPES_FERITE].styling[19]); - style_sets[GEANY_FILETYPES_FERITE].keywords = g_new(gchar*, 4); get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_FERITE, 0, "false null self super true abstract alias and arguments attribute_missing break case class closure conformsToProtocol constructor continue default deliver destructor diliver directive do else extends eval final fix for function global handle if iferr implements include instanceof isa method_missing modifies monitor namespace new or private protected protocol public raise recipient rename return static switch uses using while"); get_keyfile_keywords(config, config_home, "keywords", "types", GEANY_FILETYPES_FERITE, 1, "boolean string number array object void"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [935] trunk
by ntrel＠users.sourceforge.net 26 Oct '06

26 Oct '06

Revision: 935 http://svn.sourceforge.net/geany/?rev=935&view=rev Author: ntrel Date: 2006-10-26 08:22:27 -0700 (Thu, 26 Oct 2006) Log Message: ----------- Only accept editing keybindings when the current Scintilla widget has focus. Group editing keybindings together in cb_func_edit. Change keybinding callbacks to pass keybinding index as an argument. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c trunk/src/keybindings.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-25 19:25:35 UTC (rev 934) +++ trunk/ChangeLog 2006-10-26 15:22:27 UTC (rev 935) @@ -1,3 +1,12 @@ +2006-10-26 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/keybindings.c, src/keybindings.h: + Only accept editing keybindings when the current Scintilla widget + has focus. + Group editing keybindings together in cb_func_edit. + Change keybinding callbacks to pass keybinding index as an argument. + + 2006-10-25 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/document.c: Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-10-25 19:25:35 UTC (rev 934) +++ trunk/src/keybindings.c 2006-10-26 15:22:27 UTC (rev 935) @@ -43,67 +43,57 @@ /* simple convenience function to allocate and fill the struct */ -static binding *fill(void (*func) (void), guint key, GdkModifierType mod, const gchar *name, const gchar *label); +static binding *fill(KBCallback func, guint key, GdkModifierType mod, const gchar *name, + const gchar *label); -static void cb_func_menu_new(void); -static void cb_func_menu_open(void); -static void cb_func_menu_save(void); -static void cb_func_menu_saveall(void); -static void cb_func_menu_print(void); -static void cb_func_menu_close(void); -static void cb_func_menu_closeall(void); -static void cb_func_menu_reloadfile(void); -static void cb_func_menu_undo(void); -static void cb_func_menu_redo(void); -static void cb_func_menu_selectall(void); -static void cb_func_menu_preferences(void); -static void cb_func_menu_insert_date(void); -static void cb_func_menu_findnext(void); -static void cb_func_menu_findprevious(void); -static void cb_func_menu_replace(void); -static void cb_func_menu_findinfiles(void); -static void cb_func_menu_gotoline(void); -static void cb_func_menu_opencolorchooser(void); -static void cb_func_menu_fullscreen(void); -static void cb_func_menu_messagewindow(void); -static void cb_func_menu_zoomin(void); -static void cb_func_menu_zoomout(void); -static void cb_func_menu_replacetabs(void); -static void cb_func_menu_foldall(void); -static void cb_func_menu_unfoldall(void); -static void cb_func_build_compile(void); -static void cb_func_build_link(void); -static void cb_func_build_make(void); -static void cb_func_build_makeowntarget(void); -static void cb_func_build_makeobject(void); -static void cb_func_build_run(void); -static void cb_func_build_run2(void); -static void cb_func_build_options(void); -static void cb_func_reloadtaglist(void); -static void cb_func_switch_editor(void); -static void cb_func_switch_scribble(void); -static void cb_func_switch_vte(void); -static void cb_func_switch_tableft(void); -static void cb_func_switch_tabright(void); -static void cb_func_toggle_sidebar(void); -static void cb_func_edit_duplicateline(void); -static void cb_func_edit_tolowercase(void); -static void cb_func_edit_touppercase(void); -static void cb_func_edit_commentline(void); -static void cb_func_edit_commentlinetoggle(void); -static void cb_func_edit_uncommentline(void); -static void cb_func_edit_increaseindent(void); -static void cb_func_edit_gotomatchingbrace(void); -static void cb_func_edit_decreaseindent(void); -static void cb_func_edit_autocomplete(void); -static void cb_func_edit_calltip(void); -static void cb_func_edit_macrolist(void); -static void cb_func_edit_suppresscompletion(void); -static void cb_func_popup_findusage(void); -static void cb_func_popup_gototagdefinition(void); -static void cb_func_popup_gototagdeclaration(void); +static void cb_func_menu_new(guint key_id); +static void cb_func_menu_open(guint key_id); +static void cb_func_menu_save(guint key_id); +static void cb_func_menu_saveall(guint key_id); +static void cb_func_menu_print(guint key_id); +static void cb_func_menu_close(guint key_id); +static void cb_func_menu_closeall(guint key_id); +static void cb_func_menu_reloadfile(guint key_id); +static void cb_func_menu_undo(guint key_id); +static void cb_func_menu_redo(guint key_id); +static void cb_func_menu_selectall(guint key_id); +static void cb_func_menu_preferences(guint key_id); +static void cb_func_menu_insert_date(guint key_id); +static void cb_func_menu_findnext(guint key_id); +static void cb_func_menu_findprevious(guint key_id); +static void cb_func_menu_replace(guint key_id); +static void cb_func_menu_findinfiles(guint key_id); +static void cb_func_menu_gotoline(guint key_id); +static void cb_func_menu_opencolorchooser(guint key_id); +static void cb_func_menu_fullscreen(guint key_id); +static void cb_func_menu_messagewindow(guint key_id); +static void cb_func_menu_zoomin(guint key_id); +static void cb_func_menu_zoomout(guint key_id); +static void cb_func_menu_replacetabs(guint key_id); +static void cb_func_menu_foldall(guint key_id); +static void cb_func_menu_unfoldall(guint key_id); +static void cb_func_build_compile(guint key_id); +static void cb_func_build_link(guint key_id); +static void cb_func_build_make(guint key_id); +static void cb_func_build_makeowntarget(guint key_id); +static void cb_func_build_makeobject(guint key_id); +static void cb_func_build_run(guint key_id); +static void cb_func_build_run2(guint key_id); +static void cb_func_build_options(guint key_id); +static void cb_func_reloadtaglist(guint key_id); +static void cb_func_switch_editor(guint key_id); +static void cb_func_switch_scribble(guint key_id); +static void cb_func_switch_vte(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_toggle_sidebar(guint key_id); -static void keybindings_call_popup_item(int menuitemkey); +// common function for editing keybindings, only valid when scintilla has focus. +static void cb_func_edit(guint key_id); + +// common function for keybindings using current word +static void cb_func_current_word(guint key_id); + static void keybindings_add_accels(); @@ -200,44 +190,46 @@ GDK_Page_Up, GDK_CONTROL_MASK, "switch_tableft", _("Switch to left document")); keys[GEANY_KEYS_SWITCH_TABRIGHT] = fill(cb_func_switch_tabright, GDK_Page_Down, GDK_CONTROL_MASK, "switch_tabright", _("Switch to right document")); - keys[GEANY_KEYS_EDIT_DUPLICATELINE] = fill(cb_func_edit_duplicateline, + + keys[GEANY_KEYS_EDIT_DUPLICATELINE] = fill(cb_func_edit, GDK_g, GDK_CONTROL_MASK, "edit_duplicateline", _("Duplicate line or selection")); - keys[GEANY_KEYS_EDIT_TOLOWERCASE] = fill(cb_func_edit_tolowercase, + keys[GEANY_KEYS_EDIT_TOLOWERCASE] = fill(cb_func_edit, GDK_u, GDK_CONTROL_MASK, "edit_tolowercase", _("Convert Selection to lower-case")); - keys[GEANY_KEYS_EDIT_TOUPPERCASE] = fill(cb_func_edit_touppercase, + keys[GEANY_KEYS_EDIT_TOUPPERCASE] = fill(cb_func_edit, GDK_u, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_touppercase", _("Convert Selection to upper-case")); - keys[GEANY_KEYS_EDIT_COMMENTLINETOGGLE] = fill(cb_func_edit_commentlinetoggle, + keys[GEANY_KEYS_EDIT_COMMENTLINETOGGLE] = fill(cb_func_edit, GDK_b, GDK_CONTROL_MASK, "edit_commentlinetoggle", _("Toggle line commentation")); - keys[GEANY_KEYS_EDIT_COMMENTLINE] = fill(cb_func_edit_commentline, + keys[GEANY_KEYS_EDIT_COMMENTLINE] = fill(cb_func_edit, GDK_d, GDK_CONTROL_MASK, "edit_commentline", _("Comment line")); - keys[GEANY_KEYS_EDIT_UNCOMMENTLINE] = fill(cb_func_edit_uncommentline, + keys[GEANY_KEYS_EDIT_UNCOMMENTLINE] = fill(cb_func_edit, GDK_d, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_uncommentline", _("Uncomment line")); - keys[GEANY_KEYS_EDIT_INCREASEINDENT] = fill(cb_func_edit_increaseindent, + 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_decreaseindent, + keys[GEANY_KEYS_EDIT_DECREASEINDENT] = fill(cb_func_edit, GDK_i, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_decreaseindent", _("Decrease indent")); - keys[GEANY_KEYS_EDIT_GOTOMATCHINGBRACE] = fill(cb_func_edit_gotomatchingbrace, + keys[GEANY_KEYS_EDIT_GOTOMATCHINGBRACE] = fill(cb_func_edit, GDK_less, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_gotomatchingbrace", _("Goto matching brace")); - keys[GEANY_KEYS_EDIT_AUTOCOMPLETE] = fill(cb_func_edit_autocomplete, + keys[GEANY_KEYS_EDIT_AUTOCOMPLETE] = fill(cb_func_edit, GDK_space, GDK_CONTROL_MASK, "edit_autocomplete", _("Complete word")); #ifdef G_OS_WIN32 // on windows alt-space is taken by the window manager - keys[GEANY_KEYS_EDIT_CALLTIP] = fill(cb_func_edit_calltip, + keys[GEANY_KEYS_EDIT_CALLTIP] = fill(cb_func_edit, GDK_space, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_calltip", _("Show calltip")); #else - keys[GEANY_KEYS_EDIT_CALLTIP] = fill(cb_func_edit_calltip, + keys[GEANY_KEYS_EDIT_CALLTIP] = fill(cb_func_edit, GDK_space, GDK_MOD1_MASK, "edit_calltip", _("Show calltip")); #endif - keys[GEANY_KEYS_EDIT_MACROLIST] = fill(cb_func_edit_macrolist, + keys[GEANY_KEYS_EDIT_MACROLIST] = fill(cb_func_edit, GDK_Return, GDK_CONTROL_MASK, "edit_macrolist", _("Show macro list")); - keys[GEANY_KEYS_EDIT_SUPPRESSCOMPLETION] = fill(cb_func_edit_suppresscompletion, + keys[GEANY_KEYS_EDIT_SUPPRESSCOMPLETION] = fill(cb_func_edit, GDK_space, GDK_SHIFT_MASK, "edit_suppresscompletion", _("Suppress auto completion")); - keys[GEANY_KEYS_POPUP_FINDUSAGE] = fill(cb_func_popup_findusage, + + keys[GEANY_KEYS_POPUP_FINDUSAGE] = fill(cb_func_current_word, 0, 0, "popup_findusage", _("Find Usage")); - keys[GEANY_KEYS_POPUP_GOTOTAGDEFINITION] = fill(cb_func_popup_gototagdefinition, + keys[GEANY_KEYS_POPUP_GOTOTAGDEFINITION] = fill(cb_func_current_word, 0, 0, "popup_gototagdefinition", _("Go to tag definition")); - keys[GEANY_KEYS_POPUP_GOTOTAGDECLARATION] = fill(cb_func_popup_gototagdeclaration, + keys[GEANY_KEYS_POPUP_GOTOTAGDECLARATION] = fill(cb_func_current_word, 0, 0, "popup_gototagdeclaration", _("Go to tag declaration")); // now load user defined keys @@ -404,7 +396,7 @@ if (event->keyval == k && event->state == keys[i]->mods) { // call the corresponding callback function for this shortcut - if (keys[i]->cb_func != NULL) keys[i]->cb_func(); + if (keys[i]->cb_func != NULL) keys[i]->cb_func(i); return TRUE; } } @@ -413,7 +405,8 @@ /* simple convenience function to allocate and fill the struct */ -static binding *fill(void (*func) (void), guint key, GdkModifierType mod, const gchar *name, const gchar *label) +static binding *fill(KBCallback func, guint key, GdkModifierType mod, const gchar *name, + const gchar *label) { binding *result; @@ -429,130 +422,130 @@ /* these are the callback functions, each shortcut has its own function, this is only for clear code */ -static void cb_func_menu_new(void) +static void cb_func_menu_new(G_GNUC_UNUSED guint key_id) { document_new_file(NULL); } -static void cb_func_menu_open(void) +static void cb_func_menu_open(G_GNUC_UNUSED guint key_id) { on_open1_activate(NULL, NULL); } -static void cb_func_menu_save(void) +static void cb_func_menu_save(G_GNUC_UNUSED guint key_id) { on_save1_activate(NULL, NULL); } -static void cb_func_menu_saveall(void) +static void cb_func_menu_saveall(G_GNUC_UNUSED guint key_id) { on_save_all1_activate(NULL, NULL); } -static void cb_func_menu_close(void) +static void cb_func_menu_close(G_GNUC_UNUSED guint key_id) { on_close1_activate(NULL, NULL); } -static void cb_func_menu_closeall(void) +static void cb_func_menu_closeall(G_GNUC_UNUSED guint key_id) { on_close_all1_activate(NULL, NULL); } -static void cb_func_menu_reloadfile(void) +static void cb_func_menu_reloadfile(G_GNUC_UNUSED guint key_id) { on_toolbutton23_clicked(NULL, NULL); } -static void cb_func_menu_undo(void) +static void cb_func_menu_undo(G_GNUC_UNUSED guint key_id) { on_undo1_activate(NULL, NULL); } -static void cb_func_menu_redo(void) +static void cb_func_menu_redo(G_GNUC_UNUSED guint key_id) { on_redo1_activate(NULL, NULL); } -static void cb_func_menu_selectall(void) +static void cb_func_menu_selectall(G_GNUC_UNUSED guint key_id) { on_menu_select_all1_activate(NULL, NULL); } -static void cb_func_menu_preferences(void) +static void cb_func_menu_preferences(G_GNUC_UNUSED guint key_id) { on_preferences1_activate(NULL, NULL); } -static void cb_func_menu_findnext(void) +static void cb_func_menu_findnext(G_GNUC_UNUSED guint key_id) { on_find_next1_activate(NULL, NULL); } -static void cb_func_menu_findprevious(void) +static void cb_func_menu_findprevious(G_GNUC_UNUSED guint key_id) { on_find_previous1_activate(NULL, NULL); } -static void cb_func_menu_replace(void) +static void cb_func_menu_replace(G_GNUC_UNUSED guint key_id) { on_replace1_activate(NULL, NULL); } -static void cb_func_menu_findinfiles(void) +static void cb_func_menu_findinfiles(G_GNUC_UNUSED guint key_id) { on_find_in_files1_activate(NULL, NULL); } -static void cb_func_menu_gotoline(void) +static void cb_func_menu_gotoline(G_GNUC_UNUSED guint key_id) { on_go_to_line1_activate(NULL, NULL); } -static void cb_func_menu_opencolorchooser(void) +static void cb_func_menu_opencolorchooser(G_GNUC_UNUSED guint key_id) { on_show_color_chooser1_activate(NULL, NULL); } -static void cb_func_menu_fullscreen(void) +static void cb_func_menu_fullscreen(G_GNUC_UNUSED guint key_id) { GtkCheckMenuItem *c = GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_fullscreen1")); gtk_check_menu_item_set_active(c, ! gtk_check_menu_item_get_active(c)); } -static void cb_func_menu_messagewindow(void) +static void cb_func_menu_messagewindow(G_GNUC_UNUSED guint key_id) { GtkCheckMenuItem *c = GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_show_messages_window1")); gtk_check_menu_item_set_active(c, ! gtk_check_menu_item_get_active(c)); } -static void cb_func_menu_zoomin(void) +static void cb_func_menu_zoomin(G_GNUC_UNUSED guint key_id) { on_zoom_in1_activate(NULL, NULL); } -static void cb_func_menu_zoomout(void) +static void cb_func_menu_zoomout(G_GNUC_UNUSED guint key_id) { on_zoom_out1_activate(NULL, NULL); } -static void cb_func_menu_foldall(void) +static void cb_func_menu_foldall(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; document_fold_all(idx); } -static void cb_func_menu_unfoldall(void) +static void cb_func_menu_unfoldall(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; document_unfold_all(idx); } -static void cb_func_build_compile(void) +static void cb_func_build_compile(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; @@ -560,7 +553,7 @@ on_build_compile_activate(NULL, NULL); } -static void cb_func_build_link(void) +static void cb_func_build_link(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; @@ -568,7 +561,7 @@ on_build_build_activate(NULL, NULL); } -static void cb_func_build_make(void) +static void cb_func_build_make(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; @@ -576,7 +569,7 @@ on_build_make_activate(NULL, GINT_TO_POINTER(GBO_MAKE_ALL)); } -static void cb_func_build_makeowntarget(void) +static void cb_func_build_makeowntarget(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; @@ -584,7 +577,7 @@ on_build_make_activate(NULL, GINT_TO_POINTER(GBO_MAKE_CUSTOM)); } -static void cb_func_build_makeobject(void) +static void cb_func_build_makeobject(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; @@ -592,7 +585,7 @@ on_build_make_activate(NULL, GINT_TO_POINTER(GBO_MAKE_OBJECT)); } -static void cb_func_build_run(void) +static void cb_func_build_run(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; @@ -600,7 +593,7 @@ on_build_execute_activate(NULL, GINT_TO_POINTER(0)); } -static void cb_func_build_run2(void) +static void cb_func_build_run2(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; @@ -608,7 +601,7 @@ on_build_execute_activate(NULL, GINT_TO_POINTER(1)); } -static void cb_func_build_options(void) +static void cb_func_build_options(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; @@ -619,7 +612,7 @@ on_build_arguments_activate(NULL, NULL); } -static void cb_func_reloadtaglist(void) +static void cb_func_reloadtaglist(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; @@ -627,26 +620,9 @@ } -static void cb_func_popup_findusage(void) +// common function for keybindings using current word +static void cb_func_current_word(guint key_id) { - keybindings_call_popup_item(GEANY_KEYS_POPUP_FINDUSAGE); -} - - -static void cb_func_popup_gototagdefinition(void) -{ - keybindings_call_popup_item(GEANY_KEYS_POPUP_GOTOTAGDEFINITION); -} - - -static void cb_func_popup_gototagdeclaration(void) -{ - keybindings_call_popup_item(GEANY_KEYS_POPUP_GOTOTAGDECLARATION); -} - - -static void keybindings_call_popup_item(int menuitemkey) -{ gint idx = document_get_cur_idx(); gint pos; @@ -660,7 +636,7 @@ if (*editor_info.current_word == 0) utils_beep(); else - switch (menuitemkey) + switch (key_id) { case GEANY_KEYS_POPUP_FINDUSAGE: on_find_usage1_activate(NULL, NULL); @@ -677,20 +653,20 @@ } -static void cb_func_switch_editor(void) +static void cb_func_switch_editor(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; gtk_widget_grab_focus(GTK_WIDGET(doc_list[idx].sci)); } -static void cb_func_switch_scribble(void) +static void cb_func_switch_scribble(G_GNUC_UNUSED guint key_id) { gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_SCRATCH); gtk_widget_grab_focus(lookup_widget(app->window, "textview_scribble")); } -static void cb_func_switch_vte(void) +static void cb_func_switch_vte(G_GNUC_UNUSED guint key_id) { #ifdef HAVE_VTE gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_VTE); @@ -698,17 +674,17 @@ #endif } -static void cb_func_switch_tableft(void) +static void cb_func_switch_tableft(G_GNUC_UNUSED guint key_id) { utils_switch_document(LEFT); } -static void cb_func_switch_tabright(void) +static void cb_func_switch_tabright(G_GNUC_UNUSED guint key_id) { utils_switch_document(RIGHT); } -static void cb_func_toggle_sidebar(void) +static void cb_func_toggle_sidebar(G_GNUC_UNUSED guint key_id) { static gint active_page = -1; @@ -731,80 +707,10 @@ gtk_notebook_set_current_page(GTK_NOTEBOOK(app->treeview_notebook), active_page); } -static void cb_func_edit_duplicateline(void) -{ - on_menu_duplicate_line1_activate(NULL, NULL); -} -static void cb_func_edit_commentlinetoggle(void) +static void goto_matching_brace(gint idx) { - on_menu_toggle_line_commentation1_activate(NULL, NULL); -} - -static void cb_func_edit_commentline(void) -{ - on_menu_comment_line1_activate(NULL, NULL); -} - -static void cb_func_edit_uncommentline(void) -{ - on_menu_uncomment_line1_activate(NULL, NULL); -} - -static void cb_func_edit_autocomplete(void) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_start_auto_complete(idx, sci_get_current_position(doc_list[idx].sci), TRUE); -} - -static void cb_func_edit_calltip(void) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_show_calltip(idx, -1); -} - -static void cb_func_edit_macrolist(void) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_show_macro_list(doc_list[idx].sci); -} - -static void cb_func_edit_suppresscompletion(void) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_add_text(doc_list[idx].sci, " "); -} - -static void cb_func_menu_replacetabs(void) -{ - on_replace_tabs_activate(NULL, NULL); -} - -static void cb_func_menu_print(void) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - document_print(idx); -} - -static void cb_func_edit_increaseindent(void) -{ - on_menu_increase_indent1_activate(NULL, NULL); -} - -static void cb_func_edit_decreaseindent(void) -{ - on_menu_decrease_indent1_activate(NULL, NULL); -} - -static void cb_func_edit_gotomatchingbrace(void) -{ gint pos, new_pos; - gint idx = document_get_cur_idx(); if (! DOC_IDX_VALID(idx)) return; @@ -821,17 +727,74 @@ } } -static void cb_func_edit_tolowercase(void) + +// common function for editing keybindings, only valid when scintilla has focus. +static void cb_func_edit(guint key_id) { - on_to_lower_case1_activate(NULL, NULL); + gint idx = document_get_cur_idx(); + GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(app->window)); + + // edit keybindings only valid when scintilla widget has focus + if (! DOC_IDX_VALID(idx) || focusw != GTK_WIDGET(doc_list[idx].sci)) return; + + switch (key_id) + { + case GEANY_KEYS_EDIT_DUPLICATELINE: + on_menu_duplicate_line1_activate(NULL, NULL); + break; + case GEANY_KEYS_EDIT_COMMENTLINETOGGLE: + on_menu_toggle_line_commentation1_activate(NULL, NULL); + break; + case GEANY_KEYS_EDIT_COMMENTLINE: + on_menu_comment_line1_activate(NULL, NULL); + break; + case GEANY_KEYS_EDIT_UNCOMMENTLINE: + on_menu_uncomment_line1_activate(NULL, NULL); + break; + case GEANY_KEYS_EDIT_AUTOCOMPLETE: + sci_cb_start_auto_complete(idx, sci_get_current_position(doc_list[idx].sci), TRUE); + break; + case GEANY_KEYS_EDIT_CALLTIP: + sci_cb_show_calltip(idx, -1); + break; + case GEANY_KEYS_EDIT_MACROLIST: + sci_cb_show_macro_list(doc_list[idx].sci); + break; + case GEANY_KEYS_EDIT_SUPPRESSCOMPLETION: + sci_add_text(doc_list[idx].sci, " "); + break; + case GEANY_KEYS_EDIT_INCREASEINDENT: + on_menu_increase_indent1_activate(NULL, NULL); + break; + case GEANY_KEYS_EDIT_DECREASEINDENT: + on_menu_decrease_indent1_activate(NULL, NULL); + break; + case GEANY_KEYS_EDIT_GOTOMATCHINGBRACE: + goto_matching_brace(idx); + break; + case GEANY_KEYS_EDIT_TOLOWERCASE: + on_to_lower_case1_activate(NULL, NULL); + break; + case GEANY_KEYS_EDIT_TOUPPERCASE: + on_to_upper_case1_activate(NULL, NULL); + break; + } } -static void cb_func_edit_touppercase(void) + +static void cb_func_menu_replacetabs(G_GNUC_UNUSED guint key_id) { - on_to_upper_case1_activate(NULL, NULL); + on_replace_tabs_activate(NULL, NULL); } -static void cb_func_menu_insert_date(void) +static void cb_func_menu_print(G_GNUC_UNUSED guint key_id) { + gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; + document_print(idx); +} + +static void cb_func_menu_insert_date(G_GNUC_UNUSED guint key_id) +{ gtk_menu_item_activate(GTK_MENU_ITEM(lookup_widget(app->popup_menu, "insert_date_custom2"))); } Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2006-10-25 19:25:35 UTC (rev 934) +++ trunk/src/keybindings.h 2006-10-26 15:22:27 UTC (rev 935) @@ -24,6 +24,8 @@ #ifndef GEANY_KEYBINDINGS_H #define GEANY_KEYBINDINGS_H 1 +typedef void (*KBCallback) (guint key_id); + // holds all user-definable key bindings typedef struct binding { @@ -35,7 +37,7 @@ const gchar *label; // function pointer to a callback function, just to keep the code in keypress event // callback function clear - void (*cb_func) (void); + KBCallback cb_func; } binding; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [934] trunk/src/document.c
by eht16＠users.sourceforge.net 26 Oct '06

26 Oct '06

Revision: 934 http://svn.sourceforge.net/geany/?rev=934&view=rev Author: eht16 Date: 2006-10-25 12:25:35 -0700 (Wed, 25 Oct 2006) Log Message: ----------- Fixed typo. Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-25 19:23:19 UTC (rev 933) +++ trunk/src/document.c 2006-10-25 19:25:35 UTC (rev 934) @@ -637,7 +637,7 @@ if (size != st.st_size) { gchar *warn_msg = _("The file \"%s\" could not opened properly and probably was truncated. " - "Be aware that saving it can cause data lost.\nThe file was set to read-only."); + "Be aware that saving it can cause data loss.\nThe file was set to read-only."); if (app->main_window_realized) dialogs_show_msgbox(GTK_MESSAGE_WARNING, warn_msg, utf8_filename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [933] trunk/src/document.c
by eht16＠users.sourceforge.net 26 Oct '06

26 Oct '06

Revision: 933 http://svn.sourceforge.net/geany/?rev=933&view=rev Author: eht16 Date: 2006-10-25 12:23:19 -0700 (Wed, 25 Oct 2006) Log Message: ----------- Fixed access before check ;-). Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-25 17:03:24 UTC (rev 932) +++ trunk/src/document.c 2006-10-25 19:23:19 UTC (rev 933) @@ -1478,13 +1478,14 @@ void document_replace_tabs(gint idx) { gint search_pos; - gint tab_len = sci_get_tab_width(doc_list[idx].sci); + gint tab_len; gchar *tab_str; struct TextToFind ttf; if (! DOC_IDX_VALID(idx)) return; sci_start_undo_action(doc_list[idx].sci); + tab_len = sci_get_tab_width(doc_list[idx].sci); ttf.chrg.cpMin = 0; ttf.chrg.cpMax = sci_get_length(doc_list[idx].sci); ttf.lpstrText = (gchar*)"\t"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [932] trunk
by ntrel＠users.sourceforge.net 25 Oct '06

25 Oct '06

Revision: 932 http://svn.sourceforge.net/geany/?rev=932&view=rev Author: ntrel Date: 2006-10-25 10:03:24 -0700 (Wed, 25 Oct 2006) Log Message: ----------- When replacing tabs by space, prevent the scroll position changing, and fix a possible change of cursor position. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-25 14:48:07 UTC (rev 931) +++ trunk/ChangeLog 2006-10-25 17:03:24 UTC (rev 932) @@ -1,3 +1,10 @@ +2006-10-25 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/document.c: + When replacing tabs by space, prevent the scroll position changing, + and fix a possible change of cursor position. + + 2006-10-25 Enrico Tröger <enrico.troeger(a)uvena.de> * src/dialogs.c, src/dialogs.h, src/build.c, src/prefs.c, src/win32.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-25 14:48:07 UTC (rev 931) +++ trunk/src/document.c 2006-10-25 17:03:24 UTC (rev 932) @@ -1477,52 +1477,32 @@ void document_replace_tabs(gint idx) { - gint i, len, j = 0, k, tabs_amount = 0, tab_w, pos; - gchar *data, *text; + gint search_pos; + gint tab_len = sci_get_tab_width(doc_list[idx].sci); + gchar *tab_str; + struct TextToFind ttf; - if (idx < 0 || ! doc_list[idx].is_valid) return; + if (! DOC_IDX_VALID(idx)) return; - pos = sci_get_current_position(doc_list[idx].sci); - tab_w = sci_get_tab_width(doc_list[idx].sci); + sci_start_undo_action(doc_list[idx].sci); + ttf.chrg.cpMin = 0; + ttf.chrg.cpMax = sci_get_length(doc_list[idx].sci); + ttf.lpstrText = (gchar*)"\t"; + tab_str = g_strnfill(tab_len, ' '); - // get the text - len = sci_get_length(doc_list[idx].sci) + 1; - data = g_malloc(len); - sci_get_text(doc_list[idx].sci, len, data); - - for (i = 0; i < len; i++) if (data[i] == 9) tabs_amount++; - - // if there are no tabs, just return and leave the content untouched - if (tabs_amount == 0) + while (TRUE) { - g_free(data); - return; - } + search_pos = sci_find_text(doc_list[idx].sci, SCFIND_MATCHCASE, &ttf); + if (search_pos == -1) break; - text = g_malloc(len + (tabs_amount * (tab_w - 1)) + 1); - - for (i = 0; i < len; i++) - { - if (data[i] == 9) - { - // increase cursor position to keep it at same position - if (pos > i) pos += 3; - - for (k = 0; k < tab_w; k++) text[j++] = 32; - } - else - { - text[j++] = data[i]; - } + sci_target_start(doc_list[idx].sci, search_pos); + sci_target_end(doc_list[idx].sci, search_pos + 1); + sci_target_replace(doc_list[idx].sci, tab_str, FALSE); + ttf.chrg.cpMin = search_pos + tab_len - 1; // next search starts after replacement + ttf.chrg.cpMax += tab_len - 1; // update end of range now text has changed } - text[j] = '\0'; - - geany_debug("Replacing Tabs: tabs_amount: %d, text len: %d, j: %d", tabs_amount, len, j); - sci_set_text(doc_list[idx].sci, text); - sci_set_current_position(doc_list[idx].sci, pos); - - g_free(data); - g_free(text); + sci_end_undo_action(doc_list[idx].sci); + g_free(tab_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: [931] trunk
by eht16＠users.sourceforge.net 25 Oct '06

25 Oct '06

Revision: 931 http://svn.sourceforge.net/geany/?rev=931&view=rev Author: eht16 Date: 2006-10-25 07:48:07 -0700 (Wed, 25 Oct 2006) Log Message: ----------- Moved utils_convert_to_utf8() and utils_convert_to_utf8_from_charset() to encodings.c. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/encodings.c trunk/src/encodings.h trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-25 14:38:48 UTC (rev 930) +++ trunk/ChangeLog 2006-10-25 14:48:07 UTC (rev 931) @@ -6,6 +6,9 @@ dialogs_show_error() to dialogs_show_msgbox(). * src/document.c: Added warning message when opening files that cannot be handled correctly and set them to read-only mode. + * src/document.c, src/encodings.c, src/encodings.h, src/utils.c, + src/utils.h: Moved utils_convert_to_utf8() and + utils_convert_to_utf8_from_charset() to encodings.c. 2006-10-24 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-25 14:38:48 UTC (rev 930) +++ trunk/src/document.c 2006-10-25 14:48:07 UTC (rev 931) @@ -462,7 +462,8 @@ } else { - gchar *converted_text = utils_convert_to_utf8_from_charset(*data, *size, forced_enc, FALSE); + gchar *converted_text = encodings_convert_to_utf8_from_charset( + *data, *size, forced_enc, FALSE); if (converted_text == NULL) { return FALSE; @@ -494,7 +495,8 @@ *bom = TRUE; if ((*enc)[4] != '8') // the BOM indicated something else than UTF-8 { - gchar *converted_text = utils_convert_to_utf8_from_charset(*data, *size, *enc, FALSE); + gchar *converted_text = encodings_convert_to_utf8_from_charset( + *data, *size, *enc, FALSE); if (converted_text == NULL) { g_free(*enc); @@ -518,7 +520,7 @@ } else { - gchar *converted_text = utils_convert_to_utf8(*data, *size, enc); + gchar *converted_text = encodings_convert_to_utf8(*data, *size, enc); if (converted_text == NULL) { Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2006-10-25 14:38:48 UTC (rev 930) +++ trunk/src/encodings.c 2006-10-25 14:48:07 UTC (rev 931) @@ -286,3 +286,94 @@ } } } + + +/* Converts a string from the given charset to UTF-8. + * If fast is set, no further checks are performed. */ +gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gsize size, + const gchar *charset, gboolean fast) +{ + gchar *utf8_content = NULL; + GError *conv_error = NULL; + gchar* converted_contents = NULL; + gsize bytes_written; + + g_return_val_if_fail(buffer != NULL, NULL); + g_return_val_if_fail(charset != NULL, NULL); + + converted_contents = g_convert(buffer, size, "UTF-8", charset, NULL, + &bytes_written, &conv_error); + + if (fast) + { + utf8_content = converted_contents; + if (conv_error != NULL) g_error_free(conv_error); + } + else if (conv_error != NULL || ! g_utf8_validate(converted_contents, bytes_written, NULL)) + { + if (conv_error != NULL) + { + geany_debug("Couldn't convert from %s to UTF-8 (%s).", charset, conv_error->message); + g_error_free(conv_error); + conv_error = NULL; + } + else + geany_debug("Couldn't convert from %s to UTF-8.", charset); + + utf8_content = NULL; + if (converted_contents != NULL) g_free(converted_contents); + } + else + { + geany_debug("Converted from %s to UTF-8.", charset); + utf8_content = converted_contents; + } + + return utf8_content; +} + + +gchar *encodings_convert_to_utf8(const gchar *buffer, gsize size, gchar **used_encoding) +{ + gchar *locale_charset = NULL; + gchar *utf8_content; + gchar *charset; + gboolean check_current = FALSE; + guint i; + + // current locale is not UTF-8, we have to check this charset + check_current = ! g_get_charset((const gchar**)&locale_charset); + + for (i = 0; i < GEANY_ENCODINGS_MAX; i++) + { + if (i == encodings[GEANY_ENCODING_NONE].idx) continue; + + if (check_current) + { + check_current = FALSE; + charset = locale_charset; + i = -1; + } + else + charset = encodings[i].charset; + + geany_debug("Trying to convert %d bytes of data from %s into UTF-8.", size, charset); + utf8_content = encodings_convert_to_utf8_from_charset(buffer, size, charset, FALSE); + + if (utf8_content != NULL) + { + if (used_encoding != NULL) + { + if (*used_encoding != NULL) + { + g_free(*used_encoding); + geany_debug("%s:%d", __FILE__, __LINE__); + } + *used_encoding = g_strdup(charset); + } + return utf8_content; + } + } + + return NULL; +} Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2006-10-25 14:38:48 UTC (rev 930) +++ trunk/src/encodings.h 2006-10-25 14:48:07 UTC (rev 931) @@ -67,7 +67,14 @@ void encodings_init(void); +gchar *encodings_convert_to_utf8(const gchar *buffer, gsize size, gchar **used_encoding); +/* Converts a string from the given charset to UTF-8. + * If fast is set, no further checks are performed. */ +gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gsize size, + const gchar *charset, gboolean fast); + + /* * The original versions of the following tables are taken from profterm * Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-10-25 14:38:48 UTC (rev 930) +++ trunk/src/utils.c 2006-10-25 14:48:07 UTC (rev 931) @@ -226,8 +226,8 @@ if (tag->type & tag_types) { - if (! doc_is_utf8) utf8_name = utils_convert_to_utf8_from_charset(tag->name, -1, - doc_list[idx].encoding, TRUE); + if (! doc_is_utf8) utf8_name = encodings_convert_to_utf8_from_charset(tag->name, + -1, doc_list[idx].encoding, TRUE); else utf8_name = tag->name; if ((tag->atts.entry.scope != NULL) && isalpha(tag->atts.entry.scope[0])) { @@ -347,95 +347,6 @@ } -/* Converts a string from the given charset to UTF-8. - * If fast is set, no further checks are performed. */ -gchar *utils_convert_to_utf8_from_charset(const gchar *buffer, gsize size, const gchar *charset, - gboolean fast) -{ - gchar *utf8_content = NULL; - GError *conv_error = NULL; - gchar* converted_contents = NULL; - gsize bytes_written; - - g_return_val_if_fail(buffer != NULL, NULL); - g_return_val_if_fail(charset != NULL, NULL); - - converted_contents = g_convert(buffer, size, "UTF-8", charset, NULL, - &bytes_written, &conv_error); - - if (fast) - { - utf8_content = converted_contents; - if (conv_error != NULL) g_error_free(conv_error); - } - else if (conv_error != NULL || ! g_utf8_validate(converted_contents, bytes_written, NULL)) - { - if (conv_error != NULL) - { - geany_debug("Couldn't convert from %s to UTF-8 (%s).", charset, conv_error->message); - g_error_free(conv_error); - conv_error = NULL; - } - else - geany_debug("Couldn't convert from %s to UTF-8.", charset); - - utf8_content = NULL; - if (converted_contents != NULL) g_free(converted_contents); - } - else - { - geany_debug("Converted from %s to UTF-8.", charset); - utf8_content = converted_contents; - } - - return utf8_content; -} - - -gchar *utils_convert_to_utf8(const gchar *buffer, gsize size, gchar **used_encoding) -{ - gchar *locale_charset = NULL; - gchar *utf8_content; - gchar *charset; - gboolean check_current = FALSE; - guint i; - - // current locale is not UTF-8, we have to check this charset - check_current = ! g_get_charset((const gchar**)&locale_charset); - - for (i = 0; i < GEANY_ENCODINGS_MAX; i++) - { - if (check_current) - { - check_current = FALSE; - charset = locale_charset; - i = -1; - } - else - charset = encodings[i].charset; - - geany_debug("Trying to convert %d bytes of data from %s into UTF-8.", size, charset); - utf8_content = utils_convert_to_utf8_from_charset(buffer, size, charset, FALSE); - - if (utf8_content != NULL) - { - if (used_encoding != NULL) - { - if (*used_encoding != NULL) - { - g_free(*used_encoding); - geany_debug("%s:%d", __FILE__, __LINE__); - } - *used_encoding = g_strdup(charset); - } - return utf8_content; - } - } - - return NULL; -} - - /** * (stolen from anjuta and modified) * Search backward through size bytes looking for a '<', then return the tag if any Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-10-25 14:38:48 UTC (rev 930) +++ trunk/src/utils.h 2006-10-25 14:48:07 UTC (rev 931) @@ -44,13 +44,6 @@ gint utils_write_file(const gchar *filename, const gchar *text); -gchar *utils_convert_to_utf8(const gchar *buffer, gsize size, gchar **used_encoding); - -/* Converts a string from the given charset to UTF-8. - * If fast is set, no further checks are performed. */ -gchar *utils_convert_to_utf8_from_charset(const gchar *buffer, gsize size, const gchar *charset, - gboolean fast); - /** * (stolen from anjuta and modified) * Search backward through size bytes looking for a '<', then return the tag if any This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [930] trunk
by eht16＠users.sourceforge.net 25 Oct '06

25 Oct '06

Revision: 930 http://svn.sourceforge.net/geany/?rev=930&view=rev Author: eht16 Date: 2006-10-25 07:38:48 -0700 (Wed, 25 Oct 2006) Log Message: ----------- Added warning message dialog, united dialogs_show_info() and dialogs_show_error() to dialogs_show_msgbox(). Added warning message when opening files that cannot be handled correctly and set them to read-only mode. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/document.c trunk/src/prefs.c trunk/src/win32.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-24 23:50:50 UTC (rev 929) +++ trunk/ChangeLog 2006-10-25 14:38:48 UTC (rev 930) @@ -1,3 +1,13 @@ +2006-10-25 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/dialogs.c, src/dialogs.h, src/build.c, src/prefs.c, src/win32.c + src/document.c: + Added warning message dialog, united dialogs_show_info() and + dialogs_show_error() to dialogs_show_msgbox(). + * src/document.c: Added warning message when opening files that cannot + be handled correctly and set them to read-only mode. + + 2006-10-24 Enrico Tröger <enrico.troeger(a)uvena.de> * src/build.c, src/socket.c: Fixed compiler warnings under Windows. Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-10-24 23:50:50 UTC (rev 929) +++ trunk/src/build.c 2006-10-25 14:38:48 UTC (rev 930) @@ -258,7 +258,8 @@ } else { - dialogs_show_error("Something very strange is occured, could not stat %s (%s)", + dialogs_show_msgbox(GTK_MESSAGE_ERROR, + _("Something very strange is occured, could not stat %s (%s)"), doc_list[idx].file_name, strerror(errno)); } } Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-10-24 23:50:50 UTC (rev 929) +++ trunk/src/dialogs.c 2006-10-25 14:38:48 UTC (rev 930) @@ -120,7 +120,6 @@ gtk_combo_box_append_text(GTK_COMBO_BOX(encoding_combo), encoding_string); g_free(encoding_string); } - //gtk_combo_box_append_text(GTK_COMBO_BOX(encoding_combo), _("Do not any conversion")); gtk_combo_box_append_text(GTK_COMBO_BOX(encoding_combo), _("Detect from file")); gtk_combo_box_set_active(GTK_COMBO_BOX(encoding_combo), GEANY_ENCODINGS_MAX); @@ -305,7 +304,7 @@ } -void dialogs_show_info(const gchar *text, ...) +void dialogs_show_msgbox(gint type, const gchar *text, ...) { #ifndef G_OS_WIN32 GtkWidget *dialog; @@ -318,11 +317,10 @@ va_end(args); #ifdef G_OS_WIN32 - win32_message_dialog(GTK_MESSAGE_INFO, string); + win32_message_dialog(type, string); #else - dialog = gtk_message_dialog_new(GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", string); + type, GTK_BUTTONS_OK, "%s", string); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); #endif @@ -330,30 +328,6 @@ } -void dialogs_show_error(const gchar *text, ...) -{ -#ifndef G_OS_WIN32 - GtkWidget *dialog; -#endif - gchar *string = g_malloc(512); - va_list args; - - va_start(args, text); - g_vsnprintf(string, 511, text, args); - va_end(args); - -#ifdef G_OS_WIN32 - win32_message_dialog(GTK_MESSAGE_ERROR, string); -#else - dialog = gtk_message_dialog_new(GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", string); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); -#endif - g_free(string); -} - - gboolean dialogs_show_unsaved_file(gint idx) { #ifndef G_OS_WIN32 @@ -860,8 +834,8 @@ if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_name == NULL) { - dialogs_show_error( - _("An error occurred or file information could not be retrieved (e.g. from a new file).")); + dialogs_show_msgbox(GTK_MESSAGE_ERROR, + _("An error occurred or file information could not be retrieved (e.g. from a new file).")); return; } Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2006-10-24 23:50:50 UTC (rev 929) +++ trunk/src/dialogs.h 2006-10-25 14:38:48 UTC (rev 930) @@ -30,10 +30,6 @@ /* This shows the file selection dialog to save a file. */ void dialogs_show_save_as(); -void dialogs_show_info(const gchar *text, ...) G_GNUC_PRINTF (1, 2); - -void dialogs_show_error(const gchar *text, ...) G_GNUC_PRINTF (1, 2); - gboolean dialogs_show_unsaved_file(gint idx); /* This shows the font selection dialog to choose a font. */ @@ -62,4 +58,6 @@ void dialogs_show_keyboard_shortcuts(); +void dialogs_show_msgbox(gint type, const gchar *text, ...); + #endif Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-24 23:50:50 UTC (rev 929) +++ trunk/src/document.c 2006-10-25 14:38:48 UTC (rev 930) @@ -617,9 +617,9 @@ } #ifdef G_OS_WIN32 - if (! g_file_get_contents(utf8_filename, &data, &size, &err)) + if (! g_file_get_contents(utf8_filename, &data, NULL, &err)) #else - if (! g_file_get_contents(locale_filename, &data, &size, &err)) + if (! g_file_get_contents(locale_filename, &data, NULL, &err)) #endif { msgwin_status_add(err->message); @@ -629,6 +629,23 @@ return -1; } + /* check whether the size of the loaded data is equal to the size of the file in the filesystem */ + //size = strlen(data); + size = strlen(data); + if (size != st.st_size) + { + gchar *warn_msg = _("The file \"%s\" could not opened properly and probably was truncated. " + "Be aware that saving it can cause data lost.\nThe file was set to read-only."); + + if (app->main_window_realized) + dialogs_show_msgbox(GTK_MESSAGE_WARNING, warn_msg, utf8_filename); + + msgwin_status_add(warn_msg, utf8_filename); + + // set the file to read-only mode because saving it is probably dangerous + readonly = TRUE; + } + /* Determine character encoding and convert to UTF-8 */ if (forced_enc != NULL) { @@ -810,7 +827,7 @@ if (conv_error != NULL) { - dialogs_show_error( + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." "\nError message: %s\n"), doc_list[idx].encoding, conv_error->message); @@ -1444,7 +1461,7 @@ rc = system(cmdline); if (rc != 0) { - dialogs_show_error(_("Printing of \"%s\" failed (return code: %d)."), + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Printing of \"%s\" failed (return code: %d)."), doc_list[idx].file_name, rc); } else Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-10-24 23:50:50 UTC (rev 929) +++ trunk/src/prefs.c 2006-10-25 14:38:48 UTC (rev 930) @@ -873,7 +873,7 @@ if (keys[i]->key == key && keys[i]->mods == mods && ! (keys[i]->key == keys[idx]->key && keys[i]->mods == keys[idx]->mods)) { - dialogs_show_error( + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("The combination '%s' is already used for \"%s\". Please choose another one."), action, keys[i]->label); return TRUE; Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2006-10-24 23:50:50 UTC (rev 929) +++ trunk/src/win32.c 2006-10-25 14:38:48 UTC (rev 930) @@ -337,6 +337,12 @@ title = _("Question"); break; } + case GTK_MESSAGE_WARNING: + { + t = MB_OK | MB_ICONWARNING; + title = _("Warning"); + break; + } default: { t = MB_OK | MB_ICONINFORMATION; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2006