Commits January 2007

commits@lists.geany.org

3 participants
87 discussions

SF.net SVN: geany: [1178] trunk
by ntrel＠users.sourceforge.net 13 Jan '07

13 Jan '07

Revision: 1178 http://svn.sourceforge.net/geany/?rev=1178&view=rev Author: ntrel Date: 2007-01-13 04:42:12 -0800 (Sat, 13 Jan 2007) Log Message: ----------- Print an error message (instead of debug message) when a command-line file cannot be loaded. Modified Paths: -------------- trunk/ChangeLog trunk/po/POTFILES.in trunk/src/main.c trunk/src/socket.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-12 16:56:23 UTC (rev 1177) +++ trunk/ChangeLog 2007-01-13 12:42:12 UTC (rev 1178) @@ -1,3 +1,10 @@ +2007-01-13 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/main.c, src/socket.c, po/POTFILES.in: + Print an error message (instead of debug message) when a + command-line file cannot be loaded. + + 2007-01-12 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/sci_cb.c, src/symbols.c, src/symbols.h: Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2007-01-12 16:56:23 UTC (rev 1177) +++ trunk/po/POTFILES.in 2007-01-13 12:42:12 UTC (rev 1178) @@ -29,3 +29,4 @@ src/notebook.c src/symbols.c src/tools.c +src/socket.c Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-01-12 16:56:23 UTC (rev 1177) +++ trunk/src/main.c 2007-01-13 12:42:12 UTC (rev 1178) @@ -335,6 +335,7 @@ { //use current dir gchar *cur_dir = g_get_current_dir(); + result = g_strjoin( G_DIR_SEPARATOR_S, cur_dir, filename, NULL); g_free(cur_dir); @@ -466,6 +467,41 @@ } +// open files from command line +gboolean open_cl_files(gint argc, gchar **argv) +{ + gint i; + + if (argc <= 1) return FALSE; + + for(i = 1; i < argc; i++) + { + gchar *filename = get_argv_filename(argv[i]); + + if (filename && + g_file_test(filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + { + gint idx; + + idx = document_open_file(-1, filename, 0, FALSE, NULL, NULL); + // add recent file manually because opening_session_files is set + if (DOC_IDX_VALID(idx)) + ui_add_recent_file(doc_list[idx].file_name); + } + else + { + gchar *msg = _("Could not find file '%s'."); + + g_printerr(msg, filename); // also print to the terminal + g_printerr("\n"); + msgwin_status_add(msg, filename); + } + g_free(filename); + } + return TRUE; +} + + gint main(gint argc, gchar **argv) { gint idx; @@ -580,36 +616,19 @@ // apply all configuration options apply_settings(); - // open files from command line + // load any command line files or session files app->opening_session_files = TRUE; - if (argc > 1) + if (! open_cl_files(argc, argv)) { - gint i; - for(i = 1; i < argc; i++) + if (app->pref_main_load_session && cl_options.load_session) { - if (argv[i] && g_file_test(argv[i], G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + if (! configuration_open_files()) { - gchar *filename = get_argv_filename(argv[i]); - gint idx; - - idx = document_open_file(-1, filename, 0, FALSE, NULL, NULL); - // add recent file manually because opening_session_files is set - if (DOC_IDX_VALID(idx)) - ui_add_recent_file(doc_list[idx].file_name); - g_free(filename); + ui_update_popup_copy_items(-1); + ui_update_popup_reundo_items(-1); } - else - geany_debug("Could not load file '%s'.", argv[i]); } } - else if (app->pref_main_load_session && cl_options.load_session) - { - if (! configuration_open_files()) - { - ui_update_popup_copy_items(-1); - ui_update_popup_reundo_items(-1); - } - } app->opening_session_files = FALSE; // open a new file if no other file was opened Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2007-01-12 16:56:23 UTC (rev 1177) +++ trunk/src/socket.c 2007-01-13 12:42:12 UTC (rev 1178) @@ -42,6 +42,7 @@ #include "main.h" #include "socket.h" #include "document.h" +#include "support.h" @@ -75,6 +76,37 @@ +void send_open_command(gint sock, gint argc, gchar **argv) +{ + gint i; + gchar *filename; + + g_return_if_fail(argc > 1); + geany_debug("using running instance of Geany"); + + socket_fd_write_all(sock, "open\n", 5); + + for(i = 1; i < argc && argv[i] != NULL; i++) + { + filename = get_argv_filename(argv[i]); + + if (filename != NULL && + g_file_test(filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + { + socket_fd_write_all(sock, filename, strlen(filename)); + socket_fd_write_all(sock, "\n", 1); + } + else + { + g_printerr(_("Could not find file '%s'."), filename); + g_printerr("\n"); // keep translation from open_cl_files() in main.c. + } + g_free(filename); + } + socket_fd_write_all(sock, ".\n", 2); +} + + /* (Unix domain) socket support to replace the old FIFO code * (taken from Sylpheed, thanks) */ gint socket_init(gint argc, gchar **argv) @@ -118,25 +150,7 @@ // remote command mode, here we have another running instance and want to use it if (argc > 1) { - gint i; - gchar *filename; - - geany_debug("using running instance of Geany"); - - socket_fd_write_all(sock, "open\n", 5); - - for(i = 1; i < argc && argv[i] != NULL; i++) - { - filename = get_argv_filename(argv[i]); - - if (filename != NULL) - { - socket_fd_write_all(sock, filename, strlen(filename)); - socket_fd_write_all(sock, "\n", 1); - g_free(filename); - } - } - socket_fd_write_all(sock, ".\n", 2); + send_open_command(sock, argc, argv); } socket_fd_close(sock); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1177] trunk/src/notebook.c
by ntrel＠users.sourceforge.net 12 Jan '07

12 Jan '07

Revision: 1177 http://svn.sourceforge.net/geany/?rev=1177&view=rev Author: ntrel Date: 2007-01-12 08:56:23 -0800 (Fri, 12 Jan 2007) Log Message: ----------- Fix some indent formatting. Modified Paths: -------------- trunk/src/notebook.c Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2007-01-12 16:55:05 UTC (rev 1176) +++ trunk/src/notebook.c 2007-01-12 16:56:23 UTC (rev 1177) @@ -198,15 +198,15 @@ // prevent oscillation between non-homogeneous sized tabs switch(gtk_notebook_get_tab_pos(notebook)) { - case GTK_POS_LEFT: - case GTK_POS_RIGHT: - ok = ((ndest > ncurr) && (y > oldy)) || ((ndest < ncurr) && (y < oldy)); - break; + case GTK_POS_LEFT: + case GTK_POS_RIGHT: + ok = ((ndest > ncurr) && (y > oldy)) || ((ndest < ncurr) && (y < oldy)); + break; - case GTK_POS_TOP: - case GTK_POS_BOTTOM: - ok = ((ndest > ncurr) && (x > oldx)) || ((ndest < ncurr) && (x < oldx)); - break; + case GTK_POS_TOP: + case GTK_POS_BOTTOM: + ok = ((ndest > ncurr) && (x > oldx)) || ((ndest < ncurr) && (x < oldx)); + break; } if (ok) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1176] trunk
by ntrel＠users.sourceforge.net 12 Jan '07

12 Jan '07

Revision: 1176 http://svn.sourceforge.net/geany/?rev=1176&view=rev Author: ntrel Date: 2007-01-12 08:55:05 -0800 (Fri, 12 Jan 2007) Log Message: ----------- Fix g_strconcat leaks in utils_make_settings_dir(). Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-12 13:04:39 UTC (rev 1175) +++ trunk/ChangeLog 2007-01-12 16:55:05 UTC (rev 1176) @@ -8,6 +8,8 @@ * src/treeviews.c, src/document.c: Don't select the current document when reordering tabs (fixes #1632708). + * src/utils.c: + Fix g_strconcat leaks in utils_make_settings_dir(). 2007-01-11 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-01-12 13:04:39 UTC (rev 1175) +++ trunk/src/utils.c 2007-01-12 16:55:05 UTC (rev 1176) @@ -820,8 +820,8 @@ "the documentation (in ", doc_dir, "index.html or visit " GEANY_HOMEPAGE ").", NULL); utils_write_file(filedefs_readme, text); g_free(text); - g_free(filedefs_readme); } + g_free(filedefs_readme); } // make subdir for template files @@ -846,8 +846,8 @@ NULL); utils_write_file(templates_readme, text); g_free(text); - g_free(templates_readme); } + g_free(templates_readme); } g_free(filedefs_dir); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1175] trunk
by ntrel＠users.sourceforge.net 12 Jan '07

12 Jan '07

Revision: 1175 http://svn.sourceforge.net/geany/?rev=1175&view=rev Author: ntrel Date: 2007-01-12 05:04:39 -0800 (Fri, 12 Jan 2007) Log Message: ----------- Don't select the current document when reordering tabs (fixes #1632708). Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/treeviews.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-12 12:33:17 UTC (rev 1174) +++ trunk/ChangeLog 2007-01-12 13:04:39 UTC (rev 1175) @@ -5,6 +5,9 @@ syntax, and C++ .h headers use correct syntax). Add symbols_get_context_separator() and use for calltips and the symbol list. + * src/treeviews.c, src/document.c: + Don't select the current document when reordering tabs (fixes + #1632708). 2007-01-11 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-01-12 12:33:17 UTC (rev 1174) +++ trunk/src/document.c 2007-01-12 13:04:39 UTC (rev 1175) @@ -281,9 +281,9 @@ sci_set_lines_wrapped(sci, app->pref_editor_line_breaking); // signal for insert-key(works without too, but to update the right status bar) -/* g_signal_connect((GtkWidget*) sci, "key-press-event", - G_CALLBACK(keybindings_got_event), GINT_TO_POINTER(new_idx)); -*/ // signal for the popup menu + //g_signal_connect((GtkWidget*) sci, "key-press-event", + //G_CALLBACK(keybindings_got_event), GINT_TO_POINTER(new_idx)); + // signal for the popup menu g_signal_connect((GtkWidget*) sci, "button-press-event", G_CALLBACK(on_editor_button_press_event), GINT_TO_POINTER(new_idx)); @@ -316,6 +316,14 @@ tabnum = notebook_new_tab(new_idx); gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), tabnum); + // select document in sidebar + { + GtkTreeSelection *sel; + + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); + gtk_tree_selection_select_iter(sel, &this->iter); + } + ui_close_buttons_toggle(); this->is_valid = TRUE; // do this last to prevent UI updating with NULL items. Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2007-01-12 12:33:17 UTC (rev 1174) +++ trunk/src/treeviews.c 2007-01-12 13:04:39 UTC (rev 1175) @@ -325,18 +325,14 @@ } -// Also sets doc_list[idx].iter. +/* Also sets doc_list[idx].iter. + * This is called recursively in treeviews_openfiles_update_all(). */ void treeviews_openfiles_add(gint idx) { GtkTreeIter *iter = &doc_list[idx].iter; - GtkTreeSelection *sel; gtk_list_store_append(tv.store_openfiles, iter); treeviews_openfiles_update(idx); - - // select opened file - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - gtk_tree_selection_select_iter(sel, iter); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1174] trunk
by ntrel＠users.sourceforge.net 12 Jan '07

12 Jan '07

Revision: 1174 http://svn.sourceforge.net/geany/?rev=1174&view=rev Author: ntrel Date: 2007-01-12 04:33:17 -0800 (Fri, 12 Jan 2007) Log Message: ----------- Use '::' context separator for C also (so C/C++ share the same syntax, and C++ .h headers use correct syntax). Add symbols_get_context_separator() and use for calltips and the symbol list. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c trunk/src/symbols.c trunk/src/symbols.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-11 11:59:40 UTC (rev 1173) +++ trunk/ChangeLog 2007-01-12 12:33:17 UTC (rev 1174) @@ -1,3 +1,12 @@ +2007-01-12 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/sci_cb.c, src/symbols.c, src/symbols.h: + Use '::' context separator for C also (so C/C++ share the same + syntax, and C++ .h headers use correct syntax). + Add symbols_get_context_separator() and use for calltips and the + symbol list. + + 2007-01-11 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/sci_cb.c: Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-01-11 11:59:40 UTC (rev 1173) +++ trunk/src/sci_cb.c 2007-01-12 12:33:17 UTC (rev 1174) @@ -537,7 +537,7 @@ } -static gchar *tag_to_calltip(const TMTag *tag, gint ft_id) +static gchar *tag_to_calltip(const TMTag *tag, filetype_id ft_id) { GString *str; gchar *result; @@ -559,11 +559,10 @@ } if (tag->atts.entry.scope) { + const gchar *cosep = symbols_get_context_separator(ft_id); + g_string_append(str, tag->atts.entry.scope); - if (ft_id == GEANY_FILETYPES_D) - g_string_append_c(str, '.'); - else - g_string_append(str, "::"); + g_string_append(str, cosep); } g_string_append(str, tag->name); g_string_append_c(str, ' '); Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-01-11 11:59:40 UTC (rev 1173) +++ trunk/src/symbols.c 2007-01-12 12:33:17 UTC (rev 1174) @@ -150,6 +150,32 @@ } +const gchar *symbols_get_context_separator(filetype_id ft_id) +{ + gchar *cosep; + + switch (ft_id) + { + case GEANY_FILETYPES_C: // for C++ .h headers or C structs + case GEANY_FILETYPES_CPP: + { + static gchar cc[] = "::"; + + cosep = cc; + } + break; + + default: + { + static gchar def[] = "."; + + cosep = def; + } + } + return cosep; // return ptr to static string +} + + const GList *symbols_get_tag_list(gint idx, guint tag_types) { static GList *tag_names = NULL; @@ -162,6 +188,8 @@ GeanySymbol *symbol; gboolean doc_is_utf8 = FALSE; gchar *utf8_name; + const gchar *cosep = + symbols_get_context_separator(FILETYPE_ID(doc_list[idx].file_type)); if (tag_names) { @@ -191,9 +219,6 @@ else utf8_name = tag->name; if ((tag->atts.entry.scope != NULL) && isalpha(tag->atts.entry.scope[0])) { - // context separator - gchar *cosep = (doc_list[idx].file_type->id == GEANY_FILETYPES_CPP) ? "::" : "."; - symbol = g_new0(GeanySymbol, 1); symbol->str = g_strdup_printf("%s%s%s [%ld]", tag->atts.entry.scope, cosep, utf8_name, tag->atts.entry.line); Modified: trunk/src/symbols.h =================================================================== --- trunk/src/symbols.h 2007-01-11 11:59:40 UTC (rev 1173) +++ trunk/src/symbols.h 2007-01-12 12:33:17 UTC (rev 1174) @@ -25,6 +25,8 @@ #ifndef GEANY_SYMBOLS_H #define GEANY_SYMBOLS_H 1 +#include "filetypes.h" + extern const guint TM_GLOBAL_TYPE_MASK; @@ -32,6 +34,8 @@ GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types); +const gchar *symbols_get_context_separator(filetype_id ft_id); + const GList *symbols_get_tag_list(gint idx, guint tag_types); GString *symbols_get_macro_list(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1173] trunk
by ntrel＠users.sourceforge.net 11 Jan '07

11 Jan '07

Revision: 1173 http://svn.sourceforge.net/geany/?rev=1173&view=rev Author: ntrel Date: 2007-01-11 03:59:40 -0800 (Thu, 11 Jan 2007) Log Message: ----------- Fix commenting multiple lines (oops). Set single undo action when toggling multiple lines. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-09 23:53:25 UTC (rev 1172) +++ trunk/ChangeLog 2007-01-11 11:59:40 UTC (rev 1173) @@ -1,3 +1,10 @@ +2007-01-11 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/sci_cb.c: + Fix commenting multiple lines (oops). + Set single undo action when toggling multiple lines. + + 2007-01-09 Enrico Tröger <enrico.troeger(a)uvena.de> * src/callbacks.c: Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-01-09 23:53:25 UTC (rev 1172) +++ trunk/src/sci_cb.c 2007-01-11 11:59:40 UTC (rev 1173) @@ -1309,7 +1309,7 @@ buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); if (buf_len <= 0) - break; + continue; sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; @@ -1433,6 +1433,8 @@ co_len = strlen(co); if (co_len == 0) return; + SSM(doc_list[idx].sci, SCI_BEGINUNDOACTION, 0, 0); + for (i = first_line; (i <= last_line) && (! break_loop); i++) { gint buf_len; @@ -1443,7 +1445,7 @@ buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); if (buf_len <= 0) - break; + continue; sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; @@ -1535,6 +1537,8 @@ } } + SSM(doc_list[idx].sci, SCI_ENDUNDOACTION, 0, 0); + // restore selection if there is one if (sel_start < sel_end) { @@ -1634,7 +1638,7 @@ buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); if (buf_len <= 0) - break; + continue; sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

09 Jan '07

Revision: 1172 http://svn.sourceforge.net/geany/?rev=1172&view=rev Author: eht16 Date: 2007-01-09 15:53:25 -0800 (Tue, 09 Jan 2007) Log Message: ----------- Try to fix paste problems on Windows (should close #1628951). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-09 16:53:27 UTC (rev 1171) +++ trunk/ChangeLog 2007-01-09 23:53:25 UTC (rev 1172) @@ -1,3 +1,9 @@ +2007-01-09 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/callbacks.c: + Try to fix paste problems on Windows (should close #1628951). + + 2007-01-09 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/utils.c, src/sci_cb.c, src/sciwrappers.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-01-09 16:53:27 UTC (rev 1171) +++ trunk/src/callbacks.c 2007-01-09 23:53:25 UTC (rev 1172) @@ -383,8 +383,7 @@ gchar *content = gtk_clipboard_wait_for_text(gtk_clipboard_get(GDK_NONE)); if (content != NULL) { - sci_insert_text(doc_list[idx].sci, - sci_get_current_position(doc_list[idx].sci), content); + sci_replace_sel(doc_list[idx].sci, content); g_free(content); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1171] trunk
by ntrel＠users.sourceforge.net 09 Jan '07

09 Jan '07

Revision: 1171 http://svn.sourceforge.net/geany/?rev=1171&view=rev Author: ntrel Date: 2007-01-09 08:53:27 -0800 (Tue, 09 Jan 2007) Log Message: ----------- Prevent some possible buffer overflows. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c trunk/src/sciwrappers.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-08 18:24:45 UTC (rev 1170) +++ trunk/ChangeLog 2007-01-09 16:53:27 UTC (rev 1171) @@ -1,3 +1,9 @@ +2007-01-09 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/utils.c, src/sci_cb.c, src/sciwrappers.c: + Prevent some possible buffer overflows. + + 2007-01-08 Enrico Tröger <enrico.troeger(a)uvena.de> * doc/geany.docbook, src/keybindings.c, src/keybindings.h: Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-01-08 18:24:45 UTC (rev 1170) +++ trunk/src/sci_cb.c 2007-01-09 16:53:27 UTC (rev 1171) @@ -259,7 +259,7 @@ { gint start, pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); start = pos; - while (sci_get_char_at(sci, --start) != '&') ; + while (start > 0 && sci_get_char_at(sci, --start) != '&') ; SSM(sci, SCI_INSERTTEXT, pos - 1, (sptr_t) nt->text); } @@ -897,7 +897,7 @@ sci_get_text_range(sci, pos - 16, pos - 1, buf); // check the first 8 characters of buf for whitespace, but only in this line i = 14; - while (isalpha(buf[i])) i--; // find pos before keyword + while (i >= 0 && isalpha(buf[i])) i--; // find pos before keyword while (i >= 0 && buf[i] != '\n' && buf[i] != '\r') // we want to stay in this line('\n' check) { if (! isspace(buf[i])) @@ -1177,7 +1177,7 @@ x = strlen(indent); // find the start of the <table tag i = 1; - while (sci_get_char_at(sci, pos - i) != '<') i++; + while (i <= pos && sci_get_char_at(sci, pos - i) != '<') i++; // add all non whitespace before the tag to the indent string while ((pos - i) != indent_pos) { @@ -1301,12 +1301,17 @@ for (i = first_line; (i <= last_line) && (! break_loop); i++) { + gint buf_len; + line_start = sci_get_position_from_line(doc_list[idx].sci, i); line_len = sci_get_line_length(doc_list[idx].sci, i); x = 0; - sci_get_text_range(doc_list[idx].sci, line_start, MIN((line_start + 255), (line_start + line_len - 1)), sel); - sel[MIN(255, (line_len - 1))] = '\0'; + buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); + if (buf_len <= 0) + break; + sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); + sel[buf_len] = '\0'; while (isspace(sel[x])) x++; @@ -1430,12 +1435,17 @@ for (i = first_line; (i <= last_line) && (! break_loop); i++) { + gint buf_len; + line_start = sci_get_position_from_line(doc_list[idx].sci, i); line_len = sci_get_line_length(doc_list[idx].sci, i); x = 0; - sci_get_text_range(doc_list[idx].sci, line_start, MIN((line_start + 255), (line_start + line_len - 1)), sel); - sel[MIN(255, (line_len - 1))] = '\0'; + buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); + if (buf_len <= 0) + break; + sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); + sel[buf_len] = '\0'; while (isspace(sel[x])) x++; @@ -1616,17 +1626,18 @@ for (i = first_line; (i <= last_line) && (! break_loop); i++) { + gint buf_len; + line_start = sci_get_position_from_line(doc_list[idx].sci, i); line_len = sci_get_line_length(doc_list[idx].sci, i); x = 0; - sci_get_text_range(doc_list[idx].sci, line_start, MIN((line_start + 256), (line_start + line_len - 1)), sel); - sel[MIN(256, (line_len - 1))] = '\0'; + buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); + if (buf_len <= 0) + break; + sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); + sel[buf_len] = '\0'; - /// TODO fix the above code to remove the described segfault below - // The following loop causes a segfault when the cursor is on the last line of doc and - // there are no other characters on this line and Geany was compiled with -O2, with -O0 - // all works fine. while (isspace(sel[x])) x++; // to skip blank lines Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2007-01-08 18:24:45 UTC (rev 1170) +++ trunk/src/sciwrappers.c 2007-01-09 16:53:27 UTC (rev 1171) @@ -756,6 +756,7 @@ } +/* text will be zero terminated and must be allocated (end - start + 1) bytes */ void sci_get_text_range(ScintillaObject *sci, gint start, gint end, gchar *text) { struct TextRange tr; Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-01-08 18:24:45 UTC (rev 1170) +++ trunk/src/utils.c 2007-01-09 16:53:27 UTC (rev 1171) @@ -470,7 +470,7 @@ if (end < 0) end = 0; // skip whitespaces between identifier and ( - while (isspace(sci_get_char_at(sci, end))) end--; + while (end > 0 && isspace(sci_get_char_at(sci, end))) end--; start = end; c = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

08 Jan '07

Revision: 1170 http://svn.sourceforge.net/geany/?rev=1170&view=rev Author: eht16 Date: 2007-01-08 10:24:45 -0800 (Mon, 08 Jan 2007) Log Message: ----------- Improved tool tip for terminal emulation. Modified Paths: -------------- trunk/ChangeLog trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-08 18:15:06 UTC (rev 1169) +++ trunk/ChangeLog 2007-01-08 18:24:45 UTC (rev 1170) @@ -3,6 +3,7 @@ * doc/geany.docbook, src/keybindings.c, src/keybindings.h: Added keyboard shortcut for Save As. Added missing documentation for some keyboard shortcuts. + * src/vte.c: Improved tool tip for terminal emulation. 2007-01-07 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2007-01-08 18:15:06 UTC (rev 1169) +++ trunk/src/vte.c 2007-01-08 18:24:45 UTC (rev 1170) @@ -577,7 +577,7 @@ gtk_table_attach(GTK_TABLE(table), entry_emulation, 1, 2, 4, 5, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, entry_emulation, _("Controls how the terminal emulator should behave. xterm is a good start."), NULL); + gtk_tooltips_set_tip(tooltips, entry_emulation, _("Controls how the terminal emulator should behave. Do not change this value unless you know exactly what you are doing."), NULL); label = gtk_label_new(_("Shell:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

08 Jan '07

Revision: 1169 http://svn.sourceforge.net/geany/?rev=1169&view=rev Author: eht16 Date: 2007-01-08 10:15:06 -0800 (Mon, 08 Jan 2007) Log Message: ----------- Added keyboard shortcut for Save As. Added missing documentation for some keyboard shortcuts. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook trunk/src/keybindings.c trunk/src/keybindings.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-07 18:48:56 UTC (rev 1168) +++ trunk/ChangeLog 2007-01-08 18:15:06 UTC (rev 1169) @@ -1,3 +1,10 @@ +2007-01-08 Enrico Tröger <enrico.troeger(a)uvena.de> + + * doc/geany.docbook, src/keybindings.c, src/keybindings.h: + Added keyboard shortcut for Save As. + Added missing documentation for some keyboard shortcuts. + + 2007-01-07 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/utils.c, src/utils.h, src/encodings.c, src/document.c, Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-01-07 18:48:56 UTC (rev 1168) +++ trunk/doc/geany.docbook 2007-01-08 18:15:06 UTC (rev 1169) @@ -1146,6 +1146,10 @@ <entry>Saves the current file.</entry> </row> <row> + <entry>Save As</entry> + <entry>Saves the current file under a new name.</entry> + </row> + <row> <entry>Save all</entry> <entry>Saves all open files.</entry> </row> @@ -1180,6 +1184,10 @@ </entry> </row> <row> + <entry>Insert date</entry> + <entry>Inserts a customisable date.</entry> + </row> + <row> <entry>Preferences</entry> <entry>Opens preferences dialog.</entry> </row> @@ -1200,6 +1208,11 @@ <entry>Opens the Find in files dialog.</entry> </row> <row> + <entry>Next message</entry> + <entry>Jumps to the line with the next message from the last call + to Find usage.</entry> + </row> + <row> <entry>Go to line</entry> <entry>Opens the Go to line dialog.</entry> </row> @@ -1268,6 +1281,12 @@ </entry> </row> <row> + <entry>Next error</entry> + <entry>Jumps to the line with the next error from the last build + process. + </entry> + </row> + <row> <entry>Run</entry> <entry>Executes the current file in a terminal emulation.</entry> </row> @@ -1310,6 +1329,14 @@ <entry align="left" spanname="hspan">Editing operations</entry> </row> <row> + <entry>Convert selection to lower case</entry> + <entry>Converts the current selection to lower case.</entry> + </row> + <row> + <entry>Convert selection to upper case</entry> + <entry>Converts the current selection to upper case.</entry> + </row> + <row> <entry>Duplicate line or selection</entry> <entry>Duplicates the current line or selection.</entry> </row> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-01-07 18:48:56 UTC (rev 1168) +++ trunk/src/keybindings.c 2007-01-08 18:15:06 UTC (rev 1169) @@ -52,6 +52,7 @@ 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_saveas(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); @@ -110,6 +111,8 @@ GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open")); keys[GEANY_KEYS_MENU_SAVE] = fill(cb_func_menu_save, GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save")); + keys[GEANY_KEYS_MENU_SAVEAS] = fill(cb_func_menu_saveas, + 0, 0, "menu_saveas", _("Save as")); keys[GEANY_KEYS_MENU_SAVEALL] = fill(cb_func_menu_saveall, GDK_S, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_saveall", _("Save all")); keys[GEANY_KEYS_MENU_PRINT] = fill(cb_func_menu_print, @@ -278,6 +281,7 @@ // apply the settings GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SAVEALL, menu_save_all1); + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SAVEAS, menu_save_as1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_PRINT, print1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_CLOSE, menu_close1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_CLOSEALL, menu_close_all1); @@ -471,6 +475,11 @@ on_save_all1_activate(NULL, NULL); } +static void cb_func_menu_saveas(G_GNUC_UNUSED guint key_id) +{ + on_save_as1_activate(NULL, NULL); +} + static void cb_func_menu_close(G_GNUC_UNUSED guint key_id) { on_close1_activate(NULL, NULL); Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2007-01-07 18:48:56 UTC (rev 1168) +++ trunk/src/keybindings.h 2007-01-08 18:15:06 UTC (rev 1169) @@ -46,6 +46,7 @@ GEANY_KEYS_MENU_NEW = 0, GEANY_KEYS_MENU_OPEN, GEANY_KEYS_MENU_SAVE, + GEANY_KEYS_MENU_SAVEAS, GEANY_KEYS_MENU_SAVEALL, GEANY_KEYS_MENU_PRINT, GEANY_KEYS_MENU_CLOSE, 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
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2007