Commits August 2006

commits@lists.geany.org

3 participants
123 discussions

SF.net SVN: geany: [716] trunk
by eht16＠users.sourceforge.net 15 Aug '06

15 Aug '06

Revision: 716 Author: eht16 Date: 2006-08-15 02:01:47 -0700 (Tue, 15 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=716&view=rev Log Message: ----------- Fixed "while" and "switch" autocompletion. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-15 08:51:48 UTC (rev 715) +++ trunk/ChangeLog 2006-08-15 09:01:47 UTC (rev 716) @@ -4,6 +4,7 @@ Made increase/decrease indentation working with selections. Keep the old cursor position when working on a single line (do not jump to line start). + * src/sci_cb.c: Fixed "while" and "switch" autocompletion. 2006-08-14 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-08-15 08:51:48 UTC (rev 715) +++ trunk/src/sci_cb.c 2006-08-15 09:01:47 UTC (rev 716) @@ -670,7 +670,7 @@ } else if (! strncmp("while", buf + 10, 5)) { - if (! isspace(*buf + 9)) goto free_and_return; + if (! isspace(*(buf + 9))) goto free_and_return; construct = g_strdup_printf("()%s{%s\t%s}%s", eol, eol, eol, eol); @@ -701,7 +701,7 @@ } else if (! strncmp("switch", buf + 9, 6)) { - if (! isspace(*buf + 8)) goto free_and_return; + if (! isspace(*(buf + 8))) goto free_and_return; construct = g_strdup_printf("()%s{%s\tcase : break;%s\tdefault: %s}%s", eol, eol, eol, eol, eol); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [715] trunk
by eht16＠users.sourceforge.net 15 Aug '06

15 Aug '06

Revision: 715 Author: eht16 Date: 2006-08-15 01:51:48 -0700 (Tue, 15 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=715&view=rev Log Message: ----------- Made increase/decrease indentation working with selections. Keep the old cursor position when working on a single line (do not jump to line start). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-14 15:02:52 UTC (rev 714) +++ trunk/ChangeLog 2006-08-15 08:51:48 UTC (rev 715) @@ -1,3 +1,11 @@ +2006-08-15 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/callbacks.c: + Made increase/decrease indentation working with selections. + Keep the old cursor position when working on a single line + (do not jump to line start). + + 2006-08-14 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/sci_cb.c: Applied patch from Jens Granseuer to fix build with @@ -8,7 +16,7 @@ Assume C-like warning messages when running make when the current file is a Makefile. Moved some msgwin setup and cleanup code to msgwindow.c. - * src/utils.c, src/utils.h + * src/utils.c, src/utils.h: Moved utils_parse_compiler_error_line to msgwindow.c. Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-08-14 15:02:52 UTC (rev 714) +++ trunk/src/callbacks.c 2006-08-15 08:51:48 UTC (rev 715) @@ -2474,14 +2474,24 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - gint line, pos; if (idx == -1 || ! doc_list[idx].is_valid) return; - line = sci_get_current_line(doc_list[idx].sci, -1); - pos = sci_get_line_indent_position(doc_list[idx].sci, line); + if (sci_can_copy(doc_list[idx].sci)) + { + sci_cmd(doc_list[idx].sci, SCI_TAB); + } + else + { + gint line, pos, old_pos; - sci_set_current_position(doc_list[idx].sci, pos); - sci_cmd(doc_list[idx].sci, SCI_TAB); + old_pos = sci_get_current_position(doc_list[idx].sci); + line = sci_get_current_line(doc_list[idx].sci, old_pos); + pos = sci_get_line_indent_position(doc_list[idx].sci, line); + + sci_set_current_position(doc_list[idx].sci, pos); + sci_cmd(doc_list[idx].sci, SCI_TAB); + sci_set_current_position(doc_list[idx].sci, old_pos + 1); + } } @@ -2490,13 +2500,23 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - gint line, pos; if (idx == -1 || ! doc_list[idx].is_valid) return; - line = sci_get_current_line(doc_list[idx].sci, -1); - pos = sci_get_line_indent_position(doc_list[idx].sci, line); + if (sci_can_copy(doc_list[idx].sci)) + { + sci_cmd(doc_list[idx].sci, SCI_BACKTAB); + } + else + { + gint line, pos, old_pos; - sci_set_current_position(doc_list[idx].sci, pos); - sci_cmd(doc_list[idx].sci, SCI_BACKTAB); + old_pos = sci_get_current_position(doc_list[idx].sci); + line = sci_get_current_line(doc_list[idx].sci, old_pos); + pos = sci_get_line_indent_position(doc_list[idx].sci, line); + + sci_set_current_position(doc_list[idx].sci, pos); + sci_cmd(doc_list[idx].sci, SCI_BACKTAB); + sci_set_current_position(doc_list[idx].sci, old_pos - 1); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [714] trunk
by ntrel＠users.sourceforge.net 14 Aug '06

14 Aug '06

Revision: 714 Author: ntrel Date: 2006-08-14 08:02:52 -0700 (Mon, 14 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=714&view=rev Log Message: ----------- Store build information instead of using app->cur_idx; Assume C-like warning messages when running make when the current file is a Makefile; Moved some msgwin setup and cleanup code to msgwindow.c; Moved utils_parse_compiler_error_line to msgwindow.c Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/callbacks.c trunk/src/geany.h trunk/src/main.c trunk/src/msgwindow.c trunk/src/msgwindow.h trunk/src/search.c trunk/src/search.h trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/ChangeLog 2006-08-14 15:02:52 UTC (rev 714) @@ -1,3 +1,17 @@ +2006-08-14 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/sci_cb.c: Applied patch from Jens Granseuer to fix build with + gcc 2.95 (closes #1539502). + * src/build.c, src/geany.h, src/msgwindow.c, src/msgwindow.h, + src/callbacks.c, src/search.c, src/search.h, src/main.c: + Store build information instead of using app->cur_idx. + Assume C-like warning messages when running make when the current + file is a Makefile. + Moved some msgwin setup and cleanup code to msgwindow.c. + * src/utils.c, src/utils.h + Moved utils_parse_compiler_error_line to msgwindow.c. + + 2006-08-13 Enrico Tröger <enrico.troeger(a)uvena.de> * src/document.c: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/src/build.c 2006-08-14 15:02:52 UTC (rev 714) @@ -249,7 +249,8 @@ gint stdout_fd; gint stderr_fd; - app->cur_idx = idx; + g_return_val_if_fail(idx >= 0 && doc_list[idx].is_valid, (GPid) 1); + document_clear_indicators(idx); cmd_string = g_strjoinv(" ", cmd); @@ -282,6 +283,13 @@ msgwin_compiler_add(COLOR_BLUE, FALSE, _("%s (in directory: %s)"), utf8_cmd_string, utf8_working_dir); gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); + // set the build info for the message window + { + filetype *ft = doc_list[idx].file_type; + guint ft_id = (ft == NULL) ? filetypes[GEANY_FILETYPES_ALL]->id : ft->id; + msgwin_set_build_info(working_dir, ft_id); + } + if (! g_spawn_async_with_pipes(working_dir, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &child_pid, NULL, &stdout_fd, &stderr_fd, &error)) { @@ -473,7 +481,7 @@ { gchar *filename; gint line; - utils_parse_compiler_error_line(g_strstrip(msg), &filename, &line); + msgwin_parse_compiler_error_line(g_strstrip(msg), &filename, &line); if (line != -1) { gint idx = document_find_by_filename(filename, FALSE); Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/src/callbacks.c 2006-08-14 15:02:52 UTC (rev 714) @@ -135,6 +135,9 @@ } g_queue_free(app->recent_queue); + msgwin_finalize(); + search_finalize(); + if (app->prefs_dialog && GTK_IS_WIDGET(app->prefs_dialog)) gtk_widget_destroy(app->prefs_dialog); if (app->save_filesel && GTK_IS_WIDGET(app->save_filesel)) gtk_widget_destroy(app->save_filesel); if (app->open_filesel && GTK_IS_WIDGET(app->open_filesel)) gtk_widget_destroy(app->open_filesel); @@ -145,7 +148,6 @@ g_object_unref(app->default_tag_tree); gtk_widget_destroy(app->default_tag_tree); } - search_finalise(); scintilla_release_resources(); #ifdef HAVE_VTE if (app->have_vte) vte_close(); Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/src/geany.h 2006-08-14 15:02:52 UTC (rev 714) @@ -164,7 +164,6 @@ gint tab_pos_editor; gint tab_pos_msgwin; gint tab_pos_sidebar; - gint cur_idx; // currently only used by the build system (build_spawn_cmd) guint mru_length; gint autocompletion_max_height; gint long_line_type; Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/src/main.c 2006-08-14 15:02:52 UTC (rev 714) @@ -253,7 +253,6 @@ app->tagbar = lookup_widget(app->window, "scrolledwindow2"); app->treeview_notebook = lookup_widget(app->window, "notebook3"); app->notebook = lookup_widget(app->window, "notebook1"); - msgwindow.notebook = lookup_widget(app->window, "notebook_info"); app->statusbar = lookup_widget(app->window, "statusbar"); app->popup_menu = create_edit_menu1(); app->toolbar_menu = create_toolbar_popup_menu1(); @@ -317,10 +316,8 @@ app->undo_items[0] = lookup_widget(app->popup_menu, "undo1"); app->undo_items[1] = lookup_widget(app->window, "menu_undo2"); app->undo_items[2] = lookup_widget(app->window, "toolbutton_undo"); - msgwindow.tree_status = lookup_widget(app->window, "treeview3"); - msgwindow.tree_msg = lookup_widget(app->window, "treeview4"); - msgwindow.tree_compiler = lookup_widget(app->window, "treeview5"); + msgwin_init(); search_init(); } Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/src/msgwindow.c 2006-08-14 15:02:52 UTC (rev 714) @@ -35,15 +35,47 @@ #include <stdlib.h> +static struct +{ + gchar *dir; + guint file_type_id; +} build_info = {NULL, GEANY_FILETYPES_ALL}; + + static GdkColor dark = {0, 58832, 58832, 58832}; static GdkColor white = {0, 65535, 65535, 65535}; -gchar *find_in_files_dir = NULL; +MessageWindow msgwindow; static void msgwin_parse_grep_line(const gchar *string, gchar **filename, gint *line); +void msgwin_init() +{ + msgwindow.tree_status = lookup_widget(app->window, "treeview3"); + msgwindow.tree_msg = lookup_widget(app->window, "treeview4"); + msgwindow.tree_compiler = lookup_widget(app->window, "treeview5"); + msgwindow.notebook = lookup_widget(app->window, "notebook_info"); + msgwindow.find_in_files_dir = NULL; +} + + +void msgwin_finalize() +{ + g_free(msgwindow.find_in_files_dir); + g_free(build_info.dir); +} + + +void msgwin_set_build_info(const gchar *dir, guint file_type_id) +{ + g_free(build_info.dir); + build_info.dir = g_strdup(dir); + build_info.file_type_id = file_type_id; +} + + /* does some preparing things to the status message list widget */ void msgwin_prepare_status_tree_view(void) { @@ -263,15 +295,21 @@ gint line; gint idx; gchar *filename; - utils_parse_compiler_error_line(string, &filename, &line); + msgwin_parse_compiler_error_line(string, &filename, &line); if (filename != NULL && line > -1) { - // use document_open_file to find an already open file, or open it in place - idx = document_open_file(-1, filename, 0, FALSE, NULL, NULL); - // document_set_indicator will check valid idx - document_set_indicator(idx, line - 1); - // utils_goto_file_line will check valid filename. - ret = utils_goto_file_line(filename, FALSE, line); + gchar *utf8_filename = utils_get_utf8_from_locale(filename); + idx = document_find_by_filename(utf8_filename, FALSE); + g_free(utf8_filename); + + if (idx < 0) // file not already open + idx = document_open_file(-1, filename, 0, FALSE, NULL, NULL); + + if (idx >= 0 && doc_list[idx].is_valid) + { + document_set_indicator(idx, line - 1); + ret = utils_goto_line(idx, line); + } } g_free(filename); } @@ -281,6 +319,134 @@ } +/* try to parse the file and line number where the error occured described in line + * and when something useful is found, it stores the line number in *line and the + * relevant file with the error in *filename. + * *line will be -1 if no error was found in string. + * *filename must be freed unless it is NULL. */ +void msgwin_parse_compiler_error_line(const gchar *string, gchar **filename, gint *line) +{ + gchar *end = NULL; + gchar **fields; + gchar *pattern; // pattern to split the error message into some fields + guint field_min_len; // used to detect errors after parsing + guint field_idx_line; // idx of the field where the line is + guint field_idx_file; // idx of the field where the filename is + guint skip_dot_slash = 0; // number of characters to skip at the beginning of the filename + + *filename = NULL; + *line = -1; + + g_return_if_fail(build_info.dir != NULL); + if (string == NULL) return; + + switch (build_info.file_type_id) + { + // only gcc is supported, I don't know any other C(++) compilers and their error messages + case GEANY_FILETYPES_C: + case GEANY_FILETYPES_CPP: + case GEANY_FILETYPES_RUBY: + case GEANY_FILETYPES_JAVA: + case GEANY_FILETYPES_MAKE: // Assume makefile is building C-like code + { + // empty.h:4: Warnung: type defaults to `int' in declaration of `foo' + // empty.c:21: error: conflicting types for `foo' + pattern = ":"; + field_min_len = 4; + field_idx_line = 1; + field_idx_file = 0; + break; + } + case GEANY_FILETYPES_LATEX: + { + // ./kommtechnik_2b.tex:18: Emergency stop. + pattern = ":"; + field_min_len = 3; + field_idx_line = 1; + field_idx_file = 0; + break; + } + case GEANY_FILETYPES_PHP: + { + // Parse error: parse error, unexpected T_CASE in brace_bug.php on line 3 + pattern = " "; + field_min_len = 11; + field_idx_line = 10; + field_idx_file = 7; + break; + } + case GEANY_FILETYPES_PERL: + { + // syntax error at test.pl line 7, near "{ + pattern = " "; + field_min_len = 6; + field_idx_line = 5; + field_idx_file = 3; + break; + } + // the error output of python and tcl equals + case GEANY_FILETYPES_TCL: + case GEANY_FILETYPES_PYTHON: + { + // File "HyperArch.py", line 37, in ? + // (file "clrdial.tcl" line 12) + pattern = " \""; + field_min_len = 6; + field_idx_line = 5; + field_idx_file = 2; + break; + } + case GEANY_FILETYPES_PASCAL: + { + // bandit.pas(149,3) Fatal: Syntax error, ";" expected but "ELSE" found + pattern = "("; + field_min_len = 2; + field_idx_line = 1; + field_idx_file = 0; + break; + } + case GEANY_FILETYPES_D: + { + // warning - pi.d(118): implicit conversion of expression (digit) of type int ... + pattern = " ("; + field_min_len = 4; + field_idx_line = 3; + field_idx_file = 2; + break; + } + default: return; + } + + fields = g_strsplit_set(string, pattern, field_min_len); + + // parse the line + if (g_strv_length(fields) < field_min_len) + { + g_strfreev(fields); + return; + } + + *line = strtol(fields[field_idx_line], &end, 10); + + // if the line could not be read, line is 0 and an error occurred, so we leave + if (fields[field_idx_line] == end) + { + g_strfreev(fields); + return; + } + + // skip some characters at the beginning of the filename, at the moment only "./" + // can be extended if other "trash" is known + if (strncmp(fields[field_idx_file], "./", 2) == 0) skip_dot_slash = 2; + + // get the build directory to get the path to look for other files + *filename = g_strconcat(build_info.dir, G_DIR_SEPARATOR_S, + fields[field_idx_file] + skip_dot_slash, NULL); + + g_strfreev(fields); +} + + gboolean msgwin_goto_messages_file_line() { GtkTreeIter iter; @@ -370,7 +536,7 @@ cur_idx = document_get_cur_idx(); if (cur_idx >= 0 && doc_list[cur_idx].is_valid) { - *filename = g_strconcat(find_in_files_dir, G_DIR_SEPARATOR_S, + *filename = g_strconcat(msgwindow.find_in_files_dir, G_DIR_SEPARATOR_S, fields[field_idx_file] + skip_dot_slash, NULL); } Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/src/msgwindow.h 2006-08-14 15:02:52 UTC (rev 714) @@ -42,7 +42,7 @@ }; -typedef struct msgwin +typedef struct { GtkListStore *store_status; GtkListStore *store_msg; @@ -54,13 +54,16 @@ GtkWidget *popup_msg_menu; GtkWidget *popup_compiler_menu; GtkWidget *notebook; -} msgwin; + gchar *find_in_files_dir; +} MessageWindow; -msgwin msgwindow; +extern MessageWindow msgwindow; -extern gchar *find_in_files_dir; +void msgwin_init(); +void msgwin_finalize(); + void msgwin_prepare_msg_tree_view(void); void msgwin_prepare_status_tree_view(void); @@ -73,10 +76,19 @@ void msgwin_status_add(gchar const *format, ...); +void msgwin_set_build_info(const gchar *dir, guint file_type_id); + GtkWidget *msgwin_create_message_popup_menu(gint type); gboolean msgwin_goto_compiler_file_line(); +/* try to parse the file and line number where the error occured described in line + * and when something useful is found, it stores the line number in *line and the + * relevant file with the error in filename. + * *line will be -1 if no error was found in string. + * filename must be freed unless it is NULL. */ +void msgwin_parse_compiler_error_line(const gchar *string, gchar **filename, gint *line); + gboolean msgwin_goto_messages_file_line(); #endif Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/src/search.c 2006-08-14 15:02:52 UTC (rev 714) @@ -100,7 +100,7 @@ #define FREE_WIDGET(wid) \ if (wid && GTK_IS_WIDGET(wid)) gtk_widget_destroy(wid); -void search_finalise() +void search_finalize() { FREE_WIDGET(widgets.find_dialog); FREE_WIDGET(widgets.replace_dialog); @@ -812,8 +812,8 @@ } else { - g_free(find_in_files_dir); - find_in_files_dir = g_strdup(dir); + g_free(msgwindow.find_in_files_dir); + msgwindow.find_in_files_dir = g_strdup(dir); utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, search_read_io, NULL); g_child_watch_add(child_pid, search_close_pid, NULL); Modified: trunk/src/search.h =================================================================== --- trunk/src/search.h 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/src/search.h 2006-08-14 15:02:52 UTC (rev 714) @@ -41,7 +41,7 @@ void search_init(); -void search_finalise(); +void search_finalize(); void search_show_find_dialog(); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/src/utils.c 2006-08-14 15:02:52 UTC (rev 714) @@ -2128,136 +2128,6 @@ } -/* try to parse the file and line number where the error occured described in line - * and when something useful is found, it stores the line number in *line and the - * relevant file with the error in *filename. - * *line will be -1 if no error was found in string. - * *filename must be freed unless it is NULL. */ -void utils_parse_compiler_error_line(const gchar *string, gchar **filename, gint *line) -{ - gchar *end = NULL; - gchar *path; - gchar **fields; - gchar *pattern; // pattern to split the error message into some fields - guint field_min_len; // used to detect errors after parsing - guint field_idx_line; // idx of the field where the line is - guint field_idx_file; // idx of the field where the filename is - guint skip_dot_slash = 0; // number of characters to skip at the beginning of the filename - - *filename = NULL; - *line = -1; - - if (string == NULL || ! doc_list[app->cur_idx].is_valid || - doc_list[app->cur_idx].file_type == NULL) - return; - - switch (doc_list[app->cur_idx].file_type->id) - { - // only gcc is supported, I don't know any other C(++) compilers and their error messages - case GEANY_FILETYPES_C: - case GEANY_FILETYPES_CPP: - case GEANY_FILETYPES_RUBY: - case GEANY_FILETYPES_JAVA: - { - // empty.h:4: Warnung: type defaults to `int' in declaration of `foo' - // empty.c:21: error: conflicting types for `foo' - pattern = ":"; - field_min_len = 4; - field_idx_line = 1; - field_idx_file = 0; - break; - } - case GEANY_FILETYPES_LATEX: - { - // ./kommtechnik_2b.tex:18: Emergency stop. - pattern = ":"; - field_min_len = 3; - field_idx_line = 1; - field_idx_file = 0; - break; - } - case GEANY_FILETYPES_PHP: - { - // Parse error: parse error, unexpected T_CASE in brace_bug.php on line 3 - pattern = " "; - field_min_len = 11; - field_idx_line = 10; - field_idx_file = 7; - break; - } - case GEANY_FILETYPES_PERL: - { - // syntax error at test.pl line 7, near "{ - pattern = " "; - field_min_len = 6; - field_idx_line = 5; - field_idx_file = 3; - break; - } - // the error output of python and tcl equals - case GEANY_FILETYPES_TCL: - case GEANY_FILETYPES_PYTHON: - { - // File "HyperArch.py", line 37, in ? - // (file "clrdial.tcl" line 12) - pattern = " \""; - field_min_len = 6; - field_idx_line = 5; - field_idx_file = 2; - break; - } - case GEANY_FILETYPES_PASCAL: - { - // bandit.pas(149,3) Fatal: Syntax error, ";" expected but "ELSE" found - pattern = "("; - field_min_len = 2; - field_idx_line = 1; - field_idx_file = 0; - break; - } - case GEANY_FILETYPES_D: - { - // warning - pi.d(118): implicit conversion of expression (digit) of type int ... - pattern = " ("; - field_min_len = 4; - field_idx_line = 3; - field_idx_file = 2; - break; - } - default: return; - } - - fields = g_strsplit_set(string, pattern, field_min_len); - - // parse the line - if (g_strv_length(fields) < field_min_len) - { - g_strfreev(fields); - return; - } - - *line = strtol(fields[field_idx_line], &end, 10); - - // if the line could not be read, line is 0 and an error occurred, so we leave - if (fields[field_idx_line] == end) - { - g_strfreev(fields); - return; - } - - // skip some characters at the beginning of the filename, at the moment only "./" - // can be extended if other "trash" is known - if (strncmp(fields[field_idx_file], "./", 2) == 0) skip_dot_slash = 2; - - // get the basename of the built file to get the path to look for other files - path = g_path_get_dirname(doc_list[app->cur_idx].file_name); - *filename = g_strconcat(path, G_DIR_SEPARATOR_S, fields[field_idx_file] + skip_dot_slash, NULL); - g_free(path); - - g_strfreev(fields); -} - - // returned string must be freed. gchar *utils_get_current_time_string() { Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-08-14 10:35:57 UTC (rev 713) +++ trunk/src/utils.h 2006-08-14 15:02:52 UTC (rev 714) @@ -201,13 +201,6 @@ * before ANSI-C99. With with_route set, it takes strings of the format "#00ff00". */ gint utils_strtod(const gchar *source, gchar **end, gboolean with_route); -/* try to parse the file and line number where the error occured described in line - * and when something useful is found, it stores the line number in *line and the - * relevant file with the error in filename. - * *line will be -1 if no error was found in string. - * filename must be freed unless it is NULL. */ -void utils_parse_compiler_error_line(const gchar *string, gchar **filename, gint *line); - // returned string must be freed. gchar *utils_get_current_time_string(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [713] trunk/src/sci_cb.c
by ntrel＠users.sourceforge.net 14 Aug '06

14 Aug '06

Revision: 713 Author: ntrel Date: 2006-08-14 03:35:57 -0700 (Mon, 14 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=713&view=rev Log Message: ----------- Applied patch from Jens Granseuer to fix build with gcc 2.95 (closes #1539502) Modified Paths: -------------- trunk/src/sci_cb.c Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-08-13 15:04:30 UTC (rev 712) +++ trunk/src/sci_cb.c 2006-08-14 10:35:57 UTC (rev 713) @@ -393,8 +393,8 @@ tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE, doc_list[idx].file_type->lang); if (tags->len == 1 && TM_TAG(tags->pdata[0])->atts.entry.arglist) { + gchar *calltip; tag = TM_TAG(tags->pdata[0]); - gchar *calltip; if (tag->atts.entry.var_type) calltip = g_strconcat(tag->atts.entry.var_type, " ", tag->name, " ", tag->atts.entry.arglist, NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [712] trunk
by eht16＠users.sourceforge.net 13 Aug '06

13 Aug '06

Revision: 712 Author: eht16 Date: 2006-08-13 08:04:30 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=712&view=rev Log Message: ----------- Added colour values for indentation guides and white space. Made hard coded SCI_AUTOCSETMAXHEIGHT changeable and added an option in the preferences dialog. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.common trunk/doc/geany.docbook trunk/geany.glade trunk/src/document.c trunk/src/geany.h trunk/src/highlighting.c trunk/src/interface.c trunk/src/keyfile.c trunk/src/prefs.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/ChangeLog 2006-08-13 15:04:30 UTC (rev 712) @@ -6,6 +6,13 @@ * src/vte.c: Added the GTK IM menu items to the VTE popup menu. * src/utils.c, src/dialogs.c, src/build.c, src/callbacks.c, src/search.c, src/keyfile.c: Use utf8/locale encoding wrappers. + * data/filetypes.common, src/highlighting.c, src/geany.h, + src/keyfile.c, src/prefs.c, src/document.c, src/interface.c, + geany.glade, doc/geany.docbook: + Added colour values for indentation guides and white space. + Made hard coded SCI_AUTOCSETMAXHEIGHT changeable and added an option + in the preferences dialog. + * src/sciwrappers.c: Added sci_set_autoc_max_height(). 2006-08-12 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/data/filetypes.common =================================================================== --- trunk/data/filetypes.common 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/data/filetypes.common 2006-08-13 15:04:30 UTC (rev 712) @@ -14,6 +14,9 @@ current_line=0x0;0xe5e5e5;true;false # colour of the caret(the blinking cursor), only first argument is interpreted caret=0x000000;0x0;false;false +indent_guide=0xc0c0c0;0xffffff;false;false +# the third argument defines whether to use these values or use the default values defined by the filetypes +white_space=0xc0c0c0;0xffffff;true;false # style of folding icons, only first and second arguments are used, valid values are: # first argument: 1 for boxes, 2 for circles # second argument: 1 for straight lines, 2 for curved lines Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/doc/geany.docbook 2006-08-13 15:04:30 UTC (rev 712) @@ -1498,9 +1498,26 @@ <entry>The style for colouring the background of the current line. Only the second argument is interpreted. </entry> - <entry>current_line=0x0;0xE5E5E5;false;false</entry> + <entry>current_line=0x0;0xe5e5e5;false;false</entry> </row> <row> + <entry>indent_guide</entry> + <entry>The style for colouring the indentation guides. + Only the first and second arguments are interpreted. + </entry> + <entry>indent_guide=0xc0c0c0;0xffffff;false;false</entry> + </row> + <row> + <entry>white_space</entry> + <entry>The style for colouring the white space if it is shown. + The first both arguments define the foreground and + background colours, the third argument sets whether to use + the defined colours or to use the colours defined by each + filetype for the white space. + </entry> + <entry>white_space=0xc0c0c0;0xffffff;true;false</entry> + </row> + <row> <entry>folding_style</entry> <entry>The style of folding icons. Only first and second arguments are used. Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/geany.glade 2006-08-13 15:04:30 UTC (rev 712) @@ -2766,7 +2766,7 @@ <widget class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">19</property> + <property name="spacing">20</property> <child> <widget class="GtkLabel" id="label147"> @@ -4364,7 +4364,7 @@ <child> <widget class="GtkLabel" id="label116"> <property name="visible">True</property> - <property name="label" translatable="yes">Tab Width</property> + <property name="label" translatable="yes">Tab Width:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -4885,6 +4885,64 @@ <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">20</property> + + <child> + <widget class="GtkLabel" id="label173"> + <property name="visible">True</property> + <property name="label" translatable="yes">Rows of auto completion list:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="spin_autocheight"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Number of rows to display when the auto completion list is shown.</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">10 1 99 1 10 10</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> </child> </widget> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/src/document.c 2006-08-13 15:04:30 UTC (rev 712) @@ -205,6 +205,7 @@ sci_set_mark_long_lines(sci, app->long_line_type, app->long_line_column, app->long_line_color); sci_set_tab_width(sci, app->pref_editor_tab_width); + sci_set_autoc_max_height(sci, app->autocompletion_max_height); sci_set_indentionguides(sci, app->pref_editor_show_indent_guide); sci_set_visible_white_spaces(sci, app->pref_editor_show_white_space); @@ -790,8 +791,7 @@ } -#define SEARCH_NOT_FOUND_TXT _("The document has been searched completely but the match \"%s\" \ - was not found. Wrap search around the document?") +#define SEARCH_NOT_FOUND_TXT _("The document has been searched completely but the match \"%s\" was not found. Wrap search around the document?") /* special search function, used from the find entry in the toolbar */ void document_find_next(gint idx, const gchar *text, gint flags, gboolean find_button, gboolean inc) Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/src/geany.h 2006-08-13 15:04:30 UTC (rev 712) @@ -57,6 +57,7 @@ #define GEANY_WORDCHARS "_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\" #define GEANY_MAX_WORD_LENGTH 192 #define GEANY_MAX_AUTOCOMPLETE_WORDS 30 +#define GEANY_MAX_AUTOCOMPLETE_HEIGHT 10 #define GEANY_STRING_UNTITLED _("untitled") #define GEANY_MSGWIN_HEIGHT 208 #define GEANY_WINDOW_MINIMAL_WIDTH 620 @@ -165,6 +166,7 @@ gint tab_pos_sidebar; gint cur_idx; // currently only used by the build system (build_spawn_cmd) guint mru_length; + gint autocompletion_max_height; gint long_line_type; gint long_line_column; #ifdef HAVE_FIFO Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/src/highlighting.c 2006-08-13 15:04:30 UTC (rev 712) @@ -147,7 +147,7 @@ static guint invert(guint icolour) { - if (types[GEANY_FILETYPES_ALL]->styling[9][0]) + if (types[GEANY_FILETYPES_ALL]->styling[11][0]) { guint r, g, b; @@ -204,8 +204,10 @@ styleset_get_hex(config, config_home, "styling", "margin_folding", "0x000000", "0xdfdfdf", "false", types[GEANY_FILETYPES_ALL]->styling[5]); styleset_get_hex(config, config_home, "styling", "current_line", "0x000000", "0xe5e5e5", "true", types[GEANY_FILETYPES_ALL]->styling[6]); styleset_get_hex(config, config_home, "styling", "caret", "0x000000", "0x000000", "false", types[GEANY_FILETYPES_ALL]->styling[7]); - styleset_get_int(config, config_home, "styling", "folding_style", 1, 1, types[GEANY_FILETYPES_ALL]->styling[8]); - styleset_get_int(config, config_home, "styling", "invert_all", 0, 0, types[GEANY_FILETYPES_ALL]->styling[9]); + styleset_get_hex(config, config_home, "styling", "indent_guide", "0xc0c0c0", "0xffffff", "false", types[GEANY_FILETYPES_ALL]->styling[8]); + styleset_get_hex(config, config_home, "styling", "white_space", "0xc0c0c0", "0xffffff", "true", types[GEANY_FILETYPES_ALL]->styling[9]); + styleset_get_int(config, config_home, "styling", "folding_style", 1, 1, types[GEANY_FILETYPES_ALL]->styling[10]); + styleset_get_int(config, config_home, "styling", "invert_all", 0, 0, types[GEANY_FILETYPES_ALL]->styling[11]); types[GEANY_FILETYPES_ALL]->keywords = NULL; styleset_get_wordchars(config, config_home, GEANY_FILETYPES_ALL, GEANY_WORDCHARS); @@ -260,7 +262,7 @@ SSM(sci, SCI_SETFOLDFLAGS, 0, 0); // choose the folding style - boxes or circles, I prefer boxes, so it is default ;-) - switch (types[GEANY_FILETYPES_ALL]->styling[8][0]) + switch (types[GEANY_FILETYPES_ALL]->styling[10][0]) { case 2: { @@ -281,7 +283,7 @@ } // choose the folding style - straight or curved, I prefer straight, so it is default ;-) - switch (types[GEANY_FILETYPES_ALL]->styling[8][1]) + switch (types[GEANY_FILETYPES_ALL]->styling[10][1]) { case 2: { @@ -332,6 +334,12 @@ styleset_set_style(sci, STYLE_LINENUMBER, GEANY_FILETYPES_ALL, 4); styleset_set_style(sci, STYLE_BRACELIGHT, GEANY_FILETYPES_ALL, 2); styleset_set_style(sci, STYLE_BRACEBAD, GEANY_FILETYPES_ALL, 3); + styleset_set_style(sci, STYLE_INDENTGUIDE, GEANY_FILETYPES_ALL, 8); + + SSM(sci, SCI_SETWHITESPACEFORE, types[GEANY_FILETYPES_ALL]->styling[9][2], + invert(types[GEANY_FILETYPES_ALL]->styling[9][0])); + SSM(sci, SCI_SETWHITESPACEBACK, types[GEANY_FILETYPES_ALL]->styling[9][2], + invert(types[GEANY_FILETYPES_ALL]->styling[9][1])); } @@ -422,7 +430,7 @@ } SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_C]->wordchars); - SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM(sci, SCI_SETLEXER, SCLEX_CPP, 0); @@ -459,8 +467,6 @@ // is used for local structs and typedefs styleset_set_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_C, 18); - SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); - if (types[GEANY_FILETYPES_C]->styling[19][0] == 1) SSM(sci, SCI_SETPROPERTY, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); SSM(sci, SCI_SETPROPERTY, (sptr_t) "preprocessor.symbol.$(file.patterns.cpp)", (sptr_t) "#"); @@ -557,7 +563,7 @@ } SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_CPP]->wordchars); - SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM(sci, SCI_SETLEXER, SCLEX_CPP, 0); @@ -592,8 +598,6 @@ // is used for local structs and typedefs styleset_set_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_CPP, 18); - SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); - if (types[GEANY_FILETYPES_CPP]->styling[19][0] == 1) SSM(sci, SCI_SETPROPERTY, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); SSM(sci, SCI_SETPROPERTY, (sptr_t) "preprocessor.symbol.$(file.patterns.cpp)", (sptr_t) "#"); @@ -650,7 +654,7 @@ styleset_common(sci, 5); SSM (sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_PASCAL]->wordchars); - SSM (sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM (sci, SCI_SETLEXER, SCLEX_PASCAL, 0); @@ -669,10 +673,7 @@ styleset_set_style(sci, SCE_C_COMMENTLINE, GEANY_FILETYPES_PASCAL, 10); styleset_set_style(sci, SCE_C_COMMENTDOC, GEANY_FILETYPES_PASCAL, 11); - SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); - //SSM(sci, SCI_SETPROPERTY, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); - } @@ -836,6 +837,8 @@ SSM (sci, SCI_SETPROPERTY, (sptr_t) "phpscript.mode", (sptr_t) "1"); SSM (sci, SCI_SETLEXER, SCLEX_HTML, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); + // use the same colouring for HTML; XML and so on styleset_markup(sci); @@ -944,8 +947,6 @@ SSM(sci, SCI_SETKEYWORDS, 4, (sptr_t) types[GEANY_FILETYPES_XML]->keywords[4]); SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) types[GEANY_FILETYPES_XML]->keywords[5]); - SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); - // hotspotting, nice thing SSM(sci, SCI_SETHOTSPOTACTIVEFORE, 1, invert(0xff0000)); SSM(sci, SCI_SETHOTSPOTACTIVEUNDERLINE, 1, 0); @@ -1215,7 +1216,7 @@ SSM (sci, SCI_SETLEXER, SCLEX_CPP, 0); SSM (sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_JAVA]->wordchars); - SSM (sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM (sci, SCI_SETCONTROLCHARSYMBOL, 32, 0); @@ -1248,8 +1249,6 @@ SSM(sci, SCI_STYLESETITALIC, SCE_C_COMMENTDOCKEYWORDERROR, TRUE); styleset_set_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_JAVA, 18); - - SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } @@ -1333,7 +1332,7 @@ SSM(sci, SCI_SETPROPERTY, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_PERL]->wordchars); - SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) types[GEANY_FILETYPES_PERL]->keywords[0]); @@ -1354,8 +1353,6 @@ styleset_set_style(sci, SCE_PL_BACKTICKS, GEANY_FILETYPES_PERL, 14); styleset_set_style(sci, SCE_PL_HASH, GEANY_FILETYPES_PERL, 15); styleset_set_style(sci, SCE_PL_SYMBOLTABLE, GEANY_FILETYPES_PERL, 16); - - SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } @@ -1407,6 +1404,7 @@ SSM (sci, SCI_SETLEXER, SCLEX_PYTHON, 0); SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) types[GEANY_FILETYPES_PYTHON]->keywords[0]); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); styleset_set_style(sci, SCE_P_DEFAULT, GEANY_FILETYPES_PYTHON, 0); styleset_set_style(sci, SCE_P_COMMENTLINE, GEANY_FILETYPES_PYTHON, 1); @@ -1481,6 +1479,7 @@ SSM (sci, SCI_SETLEXER, SCLEX_RUBY, 0); SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) types[GEANY_FILETYPES_RUBY]->keywords[0]); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); styleset_set_style(sci, SCE_RB_DEFAULT, GEANY_FILETYPES_RUBY, 0); styleset_set_style(sci, SCE_RB_COMMENTLINE, GEANY_FILETYPES_RUBY, 1); @@ -1549,7 +1548,7 @@ SSM (sci, SCI_SETLEXER, SCLEX_BASH, 0); SSM (sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_SH]->wordchars); - SSM (sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM (sci, SCI_SETCONTROLCHARSYMBOL, 32, 0); @@ -1566,8 +1565,6 @@ styleset_set_style(sci, SCE_SH_BACKTICKS, GEANY_FILETYPES_SH, 8); styleset_set_style(sci, SCE_SH_PARAM, GEANY_FILETYPES_SH, 9); styleset_set_style(sci, SCE_SH_SCALAR, GEANY_FILETYPES_SH, 10); - - SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } @@ -1706,7 +1703,7 @@ SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) types[GEANY_FILETYPES_DOCBOOK]->keywords[1]); SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_DOCBOOK]->wordchars); - SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); // Unknown tags and attributes are highlighed in red. // If a tag is actually OK, it should be added in lower case to the htmlKeyWords string. @@ -1827,7 +1824,7 @@ styleset_common(sci, 5); SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_CSS]->wordchars); - SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM(sci, SCI_SETLEXER, SCLEX_CSS, 0); @@ -1885,7 +1882,7 @@ SSM (sci, SCI_SETLEXER, SCLEX_PROPERTIES, 0); SSM (sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_CONF]->wordchars); - SSM (sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM (sci, SCI_SETCONTROLCHARSYMBOL, 32, 0); @@ -1948,7 +1945,7 @@ styleset_common(sci, 5); SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_ASM]->wordchars); - SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM(sci, SCI_SETLEXER, SCLEX_ASM, 0); @@ -2051,7 +2048,7 @@ styleset_common(sci, 5); SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_SQL]->wordchars); - SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM(sci, SCI_SETLEXER, SCLEX_SQL, 0); @@ -2128,7 +2125,7 @@ styleset_common(sci, 5); SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_CAML]->wordchars); - SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM(sci, SCI_SETLEXER, SCLEX_CAML, 0); @@ -2201,7 +2198,7 @@ SSM (sci, SCI_SETLEXER, SCLEX_OMS, 0); SSM (sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_OMS]->wordchars); - SSM (sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM (sci, SCI_SETCONTROLCHARSYMBOL, 32, 0); @@ -2218,8 +2215,6 @@ styleset_set_style(sci, SCE_SH_BACKTICKS, GEANY_FILETYPES_OMS, 8); styleset_set_style(sci, SCE_SH_PARAM, GEANY_FILETYPES_OMS, 9); styleset_set_style(sci, SCE_SH_SCALAR, GEANY_FILETYPES_OMS, 10); - - SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } @@ -2278,7 +2273,7 @@ SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_TCL]->wordchars); - SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM(sci, SCI_SETLEXER, SCLEX_TCL, 0); @@ -2304,8 +2299,6 @@ styleset_set_style(sci, SCE_TCL_WORD3, GEANY_FILETYPES_TCL, 13); styleset_set_style(sci, SCE_TCL_WORD4, GEANY_FILETYPES_TCL, 14); styleset_set_style(sci, SCE_TCL_WORD5, GEANY_FILETYPES_TCL, 15); - - SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } static void styleset_d_init(void) @@ -2395,7 +2388,7 @@ } SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_D]->wordchars); - SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); SSM(sci, SCI_SETLEXER, SCLEX_CPP, 0); @@ -2429,7 +2422,5 @@ // is used for local structs and typedefs styleset_set_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_D, 18); - - SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/src/interface.c 2006-08-13 15:04:30 UTC (rev 712) @@ -2173,6 +2173,10 @@ GtkWidget *check_xmltag; GtkWidget *check_folding; GtkWidget *check_indicators; + GtkWidget *hbox6; + GtkWidget *label173; + GtkObject *spin_autocheight_adj; + GtkWidget *spin_autocheight; GtkWidget *label172; GtkWidget *label95; GtkWidget *vbox2; @@ -2300,7 +2304,7 @@ gtk_widget_show (label163); gtk_box_pack_start (GTK_BOX (vbox4), label163, FALSE, FALSE, 0); - hbox2 = gtk_hbox_new (FALSE, 19); + hbox2 = gtk_hbox_new (FALSE, 20); gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (vbox4), hbox2, FALSE, TRUE, 0); @@ -2811,7 +2815,7 @@ gtk_table_set_row_spacings (GTK_TABLE (table5), 3); gtk_table_set_col_spacings (GTK_TABLE (table5), 25); - label116 = gtk_label_new (_("Tab Width")); + label116 = gtk_label_new (_("Tab Width:")); gtk_widget_show (label116); gtk_table_attach (GTK_TABLE (table5), label116, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2976,6 +2980,21 @@ gtk_tooltips_set_tip (tooltips, check_indicators, _("Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error."), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_indicators), FALSE); + hbox6 = gtk_hbox_new (FALSE, 20); + gtk_widget_show (hbox6); + gtk_box_pack_start (GTK_BOX (vbox17), hbox6, TRUE, TRUE, 0); + + label173 = gtk_label_new (_("Rows of auto completion list:")); + gtk_widget_show (label173); + gtk_box_pack_start (GTK_BOX (hbox6), label173, FALSE, FALSE, 0); + + spin_autocheight_adj = gtk_adjustment_new (10, 1, 99, 1, 10, 10); + spin_autocheight = gtk_spin_button_new (GTK_ADJUSTMENT (spin_autocheight_adj), 1, 0); + gtk_widget_show (spin_autocheight); + gtk_box_pack_start (GTK_BOX (hbox6), spin_autocheight, FALSE, TRUE, 0); + gtk_tooltips_set_tip (tooltips, spin_autocheight, _("Number of rows to display when the auto completion list is shown."), NULL); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_autocheight), TRUE); + label172 = gtk_label_new (_("<b>Features</b>")); gtk_widget_show (label172); gtk_frame_set_label_widget (GTK_FRAME (frame14), label172); @@ -3392,6 +3411,9 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, check_xmltag, "check_xmltag"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_folding, "check_folding"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_indicators, "check_indicators"); + GLADE_HOOKUP_OBJECT (prefs_dialog, hbox6, "hbox6"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label173, "label173"); + GLADE_HOOKUP_OBJECT (prefs_dialog, spin_autocheight, "spin_autocheight"); GLADE_HOOKUP_OBJECT (prefs_dialog, label172, "label172"); GLADE_HOOKUP_OBJECT (prefs_dialog, label95, "label95"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox2, "vbox2"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/src/keyfile.c 2006-08-13 15:04:30 UTC (rev 712) @@ -84,6 +84,7 @@ g_key_file_set_integer(config, PACKAGE, "tab_pos_editor", app->tab_pos_editor); g_key_file_set_integer(config, PACKAGE, "tab_pos_msgwin", app->tab_pos_msgwin); g_key_file_set_integer(config, PACKAGE, "tab_pos_sidebar", app->tab_pos_sidebar); + g_key_file_set_integer(config, PACKAGE, "autocompletion_max_height", app->autocompletion_max_height); g_key_file_set_integer(config, PACKAGE, "long_line_column", app->long_line_column); g_key_file_set_string(config, PACKAGE, "long_line_color", app->long_line_color); g_key_file_set_boolean(config, PACKAGE, "beep_on_errors", app->beep_on_errors); @@ -245,6 +246,7 @@ app->long_line_type = utils_get_setting_integer(config, PACKAGE, "long_line_type", 0); app->long_line_color = utils_get_setting_string(config, PACKAGE, "long_line_color", "#C2EBC2"); app->long_line_column = utils_get_setting_integer(config, PACKAGE, "long_line_column", 72); + app->autocompletion_max_height = utils_get_setting_integer(config, PACKAGE, "autocompletion_max_height", GEANY_MAX_AUTOCOMPLETE_HEIGHT); app->tab_pos_editor = utils_get_setting_integer(config, PACKAGE, "tab_pos_editor", GTK_POS_TOP); app->tab_pos_msgwin = utils_get_setting_integer(config, PACKAGE, "tab_pos_msgwin",GTK_POS_LEFT); app->tab_pos_sidebar = utils_get_setting_integer(config, PACKAGE, "tab_pos_sidebar", GTK_POS_TOP); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/src/prefs.c 2006-08-13 15:04:30 UTC (rev 712) @@ -44,9 +44,6 @@ #endif -gint old_tab_width; -gint old_long_line_column; -gchar *old_long_line_color; gchar *dialog_key_name; static GtkListStore *store = NULL; static GtkTreeView *tree = NULL; @@ -113,7 +110,6 @@ widget = lookup_widget(app->prefs_dialog, "spin_long_line"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), app->long_line_column); - old_long_line_column = app->long_line_column; switch (app->long_line_type) { @@ -123,8 +119,6 @@ } gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); - old_long_line_color = g_strdup(app->long_line_color); - color = g_new0(GdkColor, 1); gdk_color_parse(app->long_line_color, color); widget = lookup_widget(app->prefs_dialog, "long_line_color"); @@ -191,7 +185,6 @@ // Editor settings widget = lookup_widget(app->prefs_dialog, "spin_tab_width"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), app->pref_editor_tab_width); - old_tab_width = app->pref_editor_tab_width; widget = lookup_widget(app->prefs_dialog, "combo_encoding"); // luckily the index of the combo box items match the index of the encodings array @@ -233,7 +226,10 @@ widget = lookup_widget(app->prefs_dialog, "check_indicators"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_use_indicators); + widget = lookup_widget(app->prefs_dialog, "spin_autocheight"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), app->autocompletion_max_height); + // Tools Settings #ifdef G_OS_WIN32 // hide related Make path setting @@ -519,7 +515,10 @@ widget = lookup_widget(app->prefs_dialog, "check_indicators"); app->pref_editor_use_indicators = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(app->prefs_dialog, "spin_autocheight"); + app->autocompletion_max_height = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); + // Tools Settings widget = lookup_widget(app->prefs_dialog, "entry_com_make"); g_free(app->tools_make_cmd); @@ -626,10 +625,6 @@ if (! app->pref_editor_folding) document_unfold_all(i); } } - old_tab_width = app->pref_editor_tab_width; - old_long_line_column = app->long_line_column; - g_free(old_long_line_color); - old_long_line_color = g_strdup(app->long_line_color); // store all settings configuration_save(); Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/src/sciwrappers.c 2006-08-13 15:04:30 UTC (rev 712) @@ -847,3 +847,8 @@ { return SSM(sci, SCI_GETLINEINDENTPOSITION, line, 0); } + +void sci_set_autoc_max_height(ScintillaObject *sci, gint val) +{ + SSM(sci, SCI_AUTOCSETMAXHEIGHT, val, 0); +} Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2006-08-13 09:07:10 UTC (rev 711) +++ trunk/src/sciwrappers.h 2006-08-13 15:04:30 UTC (rev 712) @@ -156,5 +156,6 @@ void sci_start_styling (ScintillaObject * sci, gint pos, gint mask); void sci_select_all (ScintillaObject * sci); gint sci_get_line_indent_position(ScintillaObject * sci, gint line); +void sci_set_autoc_max_height (ScintillaObject * sci, gint val); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [711] trunk
by eht16＠users.sourceforge.net 13 Aug '06

13 Aug '06

Revision: 711 Author: eht16 Date: 2006-08-13 02:07:10 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=711&view=rev Log Message: ----------- Use utf8/locale encoding wrappers. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/keyfile.c trunk/src/search.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-13 08:45:59 UTC (rev 710) +++ trunk/ChangeLog 2006-08-13 09:07:10 UTC (rev 711) @@ -4,6 +4,8 @@ Use wrappers for converting between utf8 and locale encoding. Fixed small memory leak. * src/vte.c: Added the GTK IM menu items to the VTE popup menu. + * src/utils.c, src/dialogs.c, src/build.c, src/callbacks.c, + src/search.c, src/keyfile.c: Use utf8/locale encoding wrappers. 2006-08-12 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-08-13 08:45:59 UTC (rev 710) +++ trunk/src/build.c 2006-08-13 09:07:10 UTC (rev 711) @@ -81,8 +81,7 @@ view_file = g_strconcat(executable, (mode == 0) ? ".dvi" : ".pdf", NULL); // try convert in locale for stat() - locale_filename = g_locale_from_utf8(view_file, -1, NULL, NULL, NULL); - if (locale_filename == NULL) locale_filename = g_strdup(view_file); + locale_filename = utils_get_locale_from_utf8(view_file); // check wether view_file exists if (stat(locale_filename, &st) != 0) @@ -101,8 +100,7 @@ cmd_string = utils_str_replace(cmd_string, "%e", executable); // try convert in locale - locale_cmd_string = g_locale_from_utf8(cmd_string, -1, NULL, NULL, NULL); - if (locale_cmd_string == NULL) locale_cmd_string = g_strdup(view_file); + locale_cmd_string = utils_get_locale_from_utf8(cmd_string); argv = g_new0(gchar *, 4); argv[0] = g_strdup("/bin/sh"); @@ -183,8 +181,7 @@ if (idx < 0 || doc_list[idx].file_name == NULL) return (GPid) 1; - locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); - if (locale_filename == NULL) locale_filename = g_strdup(doc_list[idx].file_name); + locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); executable = utils_remove_ext_from_filename(locale_filename); object_file = g_strdup_printf("%s.o", executable); @@ -258,8 +255,7 @@ cmd_string = g_strjoinv(" ", cmd); g_strfreev(cmd); - locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); - if (locale_filename == NULL) locale_filename = g_strdup(doc_list[idx].file_name); + locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); executable = utils_remove_ext_from_filename(locale_filename); @@ -272,8 +268,7 @@ g_free(tmp); g_free(executable); - utf8_cmd_string = g_locale_to_utf8(cmd_string, -1, NULL, NULL, NULL); - if (utf8_cmd_string == NULL) utf8_cmd_string = g_strdup(cmd_string); + utf8_cmd_string = utils_get_utf8_from_locale(cmd_string); argv = g_new0(gchar *, 4); argv[0] = g_strdup("/bin/sh"); @@ -342,11 +337,9 @@ script_name = g_strdup("./geany_run_script.sh"); - locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); - if (locale_filename == NULL) locale_filename = g_strdup(doc_list[idx].file_name); + locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); - locale_term_cmd = g_locale_from_utf8(app->tools_term_cmd, -1, NULL, NULL, NULL); - if (locale_term_cmd == NULL) locale_term_cmd = g_strdup(app->tools_term_cmd); + locale_term_cmd = utils_get_locale_from_utf8(app->tools_term_cmd); // split the term_cmd, so arguments will work too term_argv = g_strsplit(locale_term_cmd, " ", -1); term_argv_len = g_strv_length(term_argv); @@ -393,8 +386,7 @@ if (chdir(working_dir) != 0) { gchar *utf8_working_dir = NULL; - utf8_working_dir = g_locale_to_utf8(working_dir, -1, NULL, NULL, NULL); - if (utf8_working_dir == NULL) utf8_working_dir = g_strdup(working_dir); + utf8_working_dir = utils_get_utf8_from_locale(working_dir); msgwin_status_add(_("Failed to change the working directory to %s"), working_dir); result_id = (GPid) 1; // return 1, to prevent error handling of the caller Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-08-13 08:45:59 UTC (rev 710) +++ trunk/src/callbacks.c 2006-08-13 09:07:10 UTC (rev 711) @@ -847,8 +847,7 @@ on_file_open_entry_activate (GtkEntry *entry, gpointer user_data) { - gchar *locale_filename = g_locale_from_utf8(gtk_entry_get_text(entry), -1, NULL, NULL, NULL); - if (locale_filename == NULL) locale_filename = g_strdup(gtk_entry_get_text(entry)); + gchar *locale_filename = utils_get_locale_from_utf8(gtk_entry_get_text(entry)); if (g_file_test(locale_filename, G_FILE_TEST_IS_DIR)) { @@ -874,8 +873,7 @@ if (filename) { // try to get the UTF-8 equivalent for the filename, fallback to filename if error - gchar *utf8_filename = g_locale_to_utf8(filename, -1, NULL, NULL, NULL); - if (utf8_filename == NULL) utf8_filename = g_strdup(filename); + gchar *utf8_filename = utils_get_utf8_from_locale(filename); gtk_entry_set_text(GTK_ENTRY(lookup_widget( GTK_WIDGET(filechooser), "file_entry")), utf8_filename); @@ -1672,10 +1670,7 @@ case 2: //make object { gchar *locale_filename, *short_file, *noext, *object_file; //temp - locale_filename = g_locale_from_utf8(doc_list[idx].file_name, - -1, NULL, NULL, NULL); - if (locale_filename == NULL) - locale_filename = g_strdup(doc_list[idx].file_name); + locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); short_file = g_path_get_basename(locale_filename); g_free(locale_filename); @@ -2265,10 +2260,8 @@ on_recent_file_activate (GtkMenuItem *menuitem, gpointer user_data) { - gchar *locale_filename = g_locale_from_utf8((gchar*) user_data, -1, NULL, NULL, NULL); + gchar *locale_filename = utils_get_locale_from_utf8((gchar*) user_data); - if (locale_filename == NULL) locale_filename = g_strdup((gchar*) user_data); - document_open_file(-1, locale_filename, 0, FALSE, NULL, NULL); utils_recent_file_loaded((gchar*) user_data); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-08-13 08:45:59 UTC (rev 710) +++ trunk/src/dialogs.c 2006-08-13 09:07:10 UTC (rev 711) @@ -125,8 +125,7 @@ { gchar *locale_filename; - locale_filename = g_locale_from_utf8(initdir, -1, NULL, NULL, NULL); - if (locale_filename == NULL) locale_filename = g_strdup(initdir); + locale_filename = utils_get_locale_from_utf8(initdir); if (g_path_is_absolute(locale_filename)) gtk_file_chooser_set_current_folder( @@ -178,8 +177,7 @@ // If the current document has a filename we use that as the default. if (doc_list[idx].file_name != NULL) { - gchar *locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); - if (locale_filename == NULL) locale_filename = g_strdup(doc_list[idx].file_name); + gchar *locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); if (g_path_is_absolute(locale_filename)) gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(app->save_filesel), locale_filename); @@ -1061,8 +1059,7 @@ #if defined(HAVE_SYS_STAT_H) && defined(TIME_WITH_SYS_TIME) && defined(HAVE_SYS_TYPES_H) - locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); - if (locale_filename == NULL) locale_filename = g_strdup(doc_list[idx].file_name); + locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); if (stat(locale_filename, &st) == 0) { // first copy the returned string and the trim it, to not modify the static glibc string Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-08-13 08:45:59 UTC (rev 710) +++ trunk/src/keyfile.c 2006-08-13 09:07:10 UTC (rev 711) @@ -424,8 +424,7 @@ else file = array[1]; // try to get the locale equivalent for the filename, fallback to filename if error - locale_filename = g_locale_from_utf8(file, -1, NULL, NULL, NULL); - if (locale_filename == NULL) locale_filename = g_strdup(file); + locale_filename = utils_get_locale_from_utf8(file); if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR || G_FILE_TEST_IS_SYMLINK)) { Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-08-13 08:45:59 UTC (rev 710) +++ trunk/src/search.c 2006-08-13 09:07:10 UTC (rev 711) @@ -730,8 +730,7 @@ (invert ? FIF_INVERT_MATCH : 0) | (case_sens ? FIF_CASE_SENSITIVE : 0); - locale_dir = g_locale_from_utf8(utf8_dir, -1, NULL, NULL, NULL); - if (locale_dir == NULL) locale_dir = g_strdup(utf8_dir); + locale_dir = utils_get_locale_from_utf8(utf8_dir); if (search_find_in_files(search_text, locale_dir, opts)) { Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-08-13 08:45:59 UTC (rev 710) +++ trunk/src/utils.c 2006-08-13 09:07:10 UTC (rev 711) @@ -967,7 +967,7 @@ if (doc_list[idx].last_check > (t - GEANY_CHECK_FILE_DELAY)) return FALSE; - locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); + locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); if (stat(locale_filename, &st) != 0) return FALSE; if (doc_list[idx].mtime > t || st.st_mtime > t) @@ -1836,7 +1836,7 @@ void utils_recent_file_loaded(const gchar *filename) { - GList *item = + GList *item = g_queue_find_custom(app->recent_queue, filename, (GCompareFunc) strcmp); gchar *data; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [710] trunk
by eht16＠users.sourceforge.net 13 Aug '06

13 Aug '06

Revision: 710 Author: eht16 Date: 2006-08-13 01:45:59 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=710&view=rev Log Message: ----------- Added the GTK IM menu items to the VTE popup menu. Modified Paths: -------------- trunk/ChangeLog trunk/src/vte.c trunk/src/vte.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-13 08:36:52 UTC (rev 709) +++ trunk/ChangeLog 2006-08-13 08:45:59 UTC (rev 710) @@ -3,6 +3,7 @@ * src/document.c: Use wrappers for converting between utf8 and locale encoding. Fixed small memory leak. + * src/vte.c: Added the GTK IM menu items to the VTE popup menu. 2006-08-12 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2006-08-13 08:36:52 UTC (rev 709) +++ trunk/src/vte.c 2006-08-13 08:45:59 UTC (rev 710) @@ -41,6 +41,7 @@ static pid_t pid; static GModule *module = NULL; static struct vte_funcs *vf; +static gboolean popup_menu_created = FALSE; #define VTE_TERMINAL(obj) (GTK_CHECK_CAST((obj), VTE_TYPE_TERMINAL, VteTerminal)) @@ -135,7 +136,6 @@ vte = vf->vte_terminal_new(); vc->vte = vte; - vc->menu = vte_create_popup_menu(); scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(vte)->adjustment)); GTK_WIDGET_UNSET_FLAGS(scrollbar, GTK_CAN_FOCUS); @@ -181,7 +181,7 @@ * this prevents a segfault on X close window if the message window is hidden * (patch from Nick Treleaven, thanks) */ gtk_widget_destroy(vc->vte); - gtk_widget_destroy(vc->menu); + if (popup_menu_created) gtk_widget_destroy(vc->menu); g_free(vc->font); g_free(vc->emulation); g_free(vc->color_back); @@ -243,6 +243,13 @@ { if (event->button == 3) { + if (! popup_menu_created) + { + vc->menu = vte_create_popup_menu(); + vf->vte_terminal_im_append_menuitems(VTE_TERMINAL(vc->vte), GTK_MENU_SHELL(vc->im_submenu)); + popup_menu_created = TRUE; + } + gtk_menu_popup(GTK_MENU(vc->menu), NULL, NULL, NULL, NULL, event->button, event->time); } @@ -283,6 +290,7 @@ g_module_symbol(mod, "vte_terminal_set_color_foreground", (void*)&vf->vte_terminal_set_color_foreground); g_module_symbol(mod, "vte_terminal_set_color_background", (void*)&vf->vte_terminal_set_color_background); g_module_symbol(mod, "vte_terminal_feed_child", (void*)&vf->vte_terminal_feed_child); + g_module_symbol(mod, "vte_terminal_im_append_menuitems", (void*)&vf->vte_terminal_im_append_menuitems); } @@ -378,6 +386,18 @@ gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect((gpointer)item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(2)); + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + + vc->im_submenu = gtk_menu_new(); + + item = gtk_image_menu_item_new_with_mnemonic(_("_Input Methods")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + + gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu); + return menu; } Modified: trunk/src/vte.h =================================================================== --- trunk/src/vte.h 2006-08-13 08:36:52 UTC (rev 709) +++ trunk/src/vte.h 2006-08-13 08:45:59 UTC (rev 710) @@ -66,8 +66,9 @@ struct vte_conf { - GtkWidget *vte; // small hack, to have always a reference to the widget + GtkWidget *vte; GtkWidget *menu; + GtkWidget *im_submenu; gboolean scroll_on_key; gboolean scroll_on_out; gboolean follow_path; @@ -106,6 +107,7 @@ void (*vte_terminal_set_color_foreground) (VteTerminal *terminal, const GdkColor *foreground); void (*vte_terminal_set_color_background) (VteTerminal *terminal, const GdkColor *background); void (*vte_terminal_feed_child) (VteTerminal *terminal, const char *data, glong length); + void (*vte_terminal_im_append_menuitems) (VteTerminal *terminal, GtkMenuShell *menushell); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [709] trunk
by eht16＠users.sourceforge.net 13 Aug '06

13 Aug '06

Revision: 709 Author: eht16 Date: 2006-08-13 01:36:52 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=709&view=rev Log Message: ----------- Use wrappers for converting between utf8 and locale encoding. Fixed small memory leak. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-12 21:38:36 UTC (rev 708) +++ trunk/ChangeLog 2006-08-13 08:36:52 UTC (rev 709) @@ -1,3 +1,10 @@ +2006-08-13 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/document.c: + Use wrappers for converting between utf8 and locale encoding. + Fixed small memory leak. + + 2006-08-12 Enrico Tröger <enrico.troeger(a)uvena.de> * src/document.c: Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-08-12 21:38:36 UTC (rev 708) +++ trunk/src/document.c 2006-08-13 08:36:52 UTC (rev 709) @@ -429,7 +429,7 @@ if (reload) { utf8_filename = g_strdup(doc_list[idx].file_name); - locale_filename = g_locale_from_utf8(utf8_filename, -1, NULL, NULL, NULL); + locale_filename = utils_get_locale_from_utf8(utf8_filename); } else { @@ -442,15 +442,7 @@ // try to get the UTF-8 equivalent for the filename, fallback to filename if error locale_filename = g_strdup(filename); - utf8_filename = g_locale_to_utf8(locale_filename, -1, NULL, NULL, &err); - if (utf8_filename == NULL) - { - if (err != NULL) msgwin_status_add("%s (%s)", _("Invalid filename"), err->message); - else msgwin_status_add(_("Invalid filename")); - utf8_filename = g_strdup(locale_filename); - g_error_free(err); - err = NULL; // set to NULL for further usage - } + utf8_filename = utils_get_utf8_from_locale(locale_filename); // if file is already open, switch to it and go idx = document_find_by_filename(utf8_filename, FALSE); @@ -751,8 +743,9 @@ { len = strlen(data); } - locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); + locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); fp = fopen(locale_filename, "wb"); // this should fix the windows \n problem + g_free(locale_filename); if (fp == NULL) { msgwin_status_add(_("Error saving file (%s)."), strerror(errno)); @@ -1047,7 +1040,7 @@ if (doc_list[idx].tm_file == NULL) { - gchar *locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); + gchar *locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); doc_list[idx].tm_file = tm_source_file_new(locale_filename, FALSE, doc_list[idx].file_type->name); g_free(locale_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: [708] trunk
by ntrel＠users.sourceforge.net 12 Aug '06

12 Aug '06

Revision: 708 Author: ntrel Date: 2006-08-12 14:38:36 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=708&view=rev Log Message: ----------- Add select directory button for Find in files Modified Paths: -------------- trunk/ChangeLog trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-12 21:36:55 UTC (rev 707) +++ trunk/ChangeLog 2006-08-12 21:38:36 UTC (rev 708) @@ -13,6 +13,9 @@ * src/search.c: Enable case sensitive when regex search enabled. Some label text changes for the dialogs. Use hbox packing in Find and Find in files dialogs. + Add select directory button for Find in files. + * src/utils.c, src/utils.h: + Add wrappers for converting between utf8 and locale encoding. 2006-08-11 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-08-12 21:36:55 UTC (rev 707) +++ trunk/src/search.c 2006-08-12 21:38:36 UTC (rev 708) @@ -85,7 +85,9 @@ static void on_find_in_files_dialog_response(GtkDialog *dialog, gint response, gpointer user_data); +static void on_open_dir_dialog_clicked(GtkButton *button, gpointer user_data); + void search_init() { widgets.find_dialog = NULL; @@ -351,6 +353,7 @@ static GtkWidget *combo = NULL; static GtkWidget *entry1; GtkWidget *entry2; // the child GtkEntry of combo + GtkWidget *dirbtn, *openimg; gint idx = document_get_cur_idx(); gchar *sel = NULL; gchar *cur_dir; @@ -383,9 +386,16 @@ g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "entry_dir", gtk_widget_ref(entry1), (GDestroyNotify)gtk_widget_unref); + dirbtn = gtk_button_new(); + openimg = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(dirbtn), openimg); + g_signal_connect(G_OBJECT(dirbtn), "clicked", G_CALLBACK(on_open_dir_dialog_clicked), + NULL); + dbox = gtk_hbox_new(FALSE, 6); gtk_box_pack_start(GTK_BOX(dbox), label1, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(dbox), entry1, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(dbox), dirbtn, FALSE, FALSE, 0); label = gtk_label_new(_("Search for:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); @@ -469,6 +479,35 @@ } +static void on_open_dir_dialog_clicked(GtkButton *button, gpointer user_data) +{ + GtkWidget *dialog = gtk_file_chooser_dialog_new(_("Select folder"), + GTK_WINDOW(app->window), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); + GtkWidget *entry_dir = lookup_widget(widgets.find_in_files_dialog, "entry_dir"); + gchar *dir_locale; + const gchar *entry_text; + + entry_text = gtk_entry_get_text(GTK_ENTRY(entry_dir)); + dir_locale = utils_get_locale_from_utf8(entry_text); + if (g_file_test(dir_locale, G_FILE_TEST_IS_DIR)) + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), dir_locale); + g_free(dir_locale); + + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) + { + gchar *dir_utf8; + dir_locale = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)); + dir_utf8 = utils_get_utf8_from_locale(dir_locale); + g_free(dir_locale); + gtk_entry_set_text(GTK_ENTRY(entry_dir), dir_utf8); + g_free(dir_utf8); + } + gtk_widget_destroy(dialog); +} + + static void on_find_replace_checkbutton_toggled(GtkToggleButton *togglebutton, gpointer user_data) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [707] trunk/src
by ntrel＠users.sourceforge.net 12 Aug '06

12 Aug '06

Revision: 707 Author: ntrel Date: 2006-08-12 14:36:55 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=707&view=rev Log Message: ----------- Add wrappers for converting between utf8 and locale encoding Modified Paths: -------------- trunk/src/utils.c trunk/src/utils.h Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-08-12 17:27:09 UTC (rev 706) +++ trunk/src/utils.c 2006-08-12 21:36:55 UTC (rev 707) @@ -2623,3 +2623,21 @@ } return ret; } + + +gchar *utils_get_locale_from_utf8(const gchar *utf8_text) +{ + gchar *locale_text = g_locale_from_utf8(utf8_text, -1, NULL, NULL, NULL); + if (locale_text == NULL) locale_text = g_strdup(utf8_text); + return locale_text; +} + + +gchar *utils_get_utf8_from_locale(const gchar *locale_text) +{ + gchar *utf8_text = g_locale_to_utf8(locale_text, -1, NULL, NULL, NULL); + if (utf8_text == NULL) utf8_text = g_strdup(locale_text); + return utf8_text; +} + + Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-08-12 17:27:09 UTC (rev 706) +++ trunk/src/utils.h 2006-08-12 21:36:55 UTC (rev 707) @@ -233,4 +233,10 @@ * wrapstart is the minimum position to start wrapping or -1 for default */ gboolean utils_wrap_string(gchar *string, gint wrapstart); +/* Simple wrapper for g_locale_from_utf8; returns a copy of utf8_text on failure. */ +gchar *utils_get_locale_from_utf8(const gchar *utf8_text); + +/* Simple wrapper for g_locale_to_utf8; returns a copy of locale_text on failure. */ +gchar *utils_get_utf8_from_locale(const gchar *locale_text); + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2006