Commits March 2007

commits@lists.geany.org

3 participants
87 discussions

SF.net SVN: geany: [1353] trunk
by eht16＠users.sourceforge.net 01 Mar '07

01 Mar '07

Revision: 1353 http://svn.sourceforge.net/geany/?rev=1353&view=rev Author: eht16 Date: 2007-03-01 13:45:43 -0800 (Thu, 01 Mar 2007) Log Message: ----------- Set IO channels for custom commands to blocking mode (thanks to Jeff Pohlmeyer). Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/tools.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-01 17:36:51 UTC (rev 1352) +++ trunk/ChangeLog 2007-03-01 21:45:43 UTC (rev 1353) @@ -15,6 +15,9 @@ sci_get_pos_at_line_sel_start(), sci_get_pos_at_line_sel_end(). * src/document.c: Improved replacing in rectangle selections (closes #1665571). + * src/build.c, src/tools.c, src/utils.c, src/utils.h: + Set IO channels for custom commands to blocking mode + (thanks to Jeff Pohlmeyer). 2007-02-28 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-03-01 17:36:51 UTC (rev 1352) +++ trunk/src/build.c 2007-03-01 21:45:43 UTC (rev 1353) @@ -483,9 +483,9 @@ // use GIOChannels to monitor stdout and stderr utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, - build_iofunc, GINT_TO_POINTER(0)); + TRUE, build_iofunc, GINT_TO_POINTER(0)); utils_set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, - build_iofunc, GINT_TO_POINTER(1)); + TRUE, build_iofunc, GINT_TO_POINTER(1)); g_strfreev(argv); g_free(working_dir); Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-03-01 17:36:51 UTC (rev 1352) +++ trunk/src/tools.c 2007-03-01 21:45:43 UTC (rev 1353) @@ -616,10 +616,10 @@ // use GIOChannel to monitor stdout utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, - cc_iofunc, GINT_TO_POINTER(idx)); + FALSE, cc_iofunc, GINT_TO_POINTER(idx)); // copy program's stderr to Geany's stdout to help error tracking utils_set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, - cc_iofunc_err, (gpointer)command); + FALSE, cc_iofunc_err, (gpointer)command); // get selection len = sci_get_selected_text_length(doc_list[idx].sci); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-03-01 17:36:51 UTC (rev 1352) +++ trunk/src/utils.c 2007-03-01 21:45:43 UTC (rev 1353) @@ -1208,14 +1208,17 @@ } -GIOChannel *utils_set_up_io_channel(gint fd, GIOCondition cond, GIOFunc func, gpointer data) +GIOChannel *utils_set_up_io_channel( + gint fd, GIOCondition cond, gboolean nblock, GIOFunc func, gpointer data) { GIOChannel *ioc; //const gchar *encoding; ioc = g_io_channel_unix_new(fd); - g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL); + if (nblock) + g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL); + g_io_channel_set_encoding(ioc, NULL, NULL); /* if (! g_get_charset(&encoding)) Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2007-03-01 17:36:51 UTC (rev 1352) +++ trunk/src/utils.h 2007-03-01 21:45:43 UTC (rev 1353) @@ -126,7 +126,8 @@ // returned string must be freed. gchar *utils_get_current_time_string(); -GIOChannel *utils_set_up_io_channel(gint fd, GIOCondition cond, GIOFunc func, gpointer data); +GIOChannel *utils_set_up_io_channel(gint fd, GIOCondition cond, gboolean nblock, + GIOFunc func, gpointer data); gchar **utils_read_file_in_array(const gchar *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: [1352] trunk
by eht16＠users.sourceforge.net 01 Mar '07

01 Mar '07

Revision: 1352 http://svn.sourceforge.net/geany/?rev=1352&view=rev Author: eht16 Date: 2007-03-01 09:36:51 -0800 (Thu, 01 Mar 2007) Log Message: ----------- Added sci_get_selection_mode(), sci_set_selection_mode(), sci_get_pos_at_line_sel_start(), sci_get_pos_at_line_sel_end(). Improved replacing in rectangle selections (closes #1665571). Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-01 15:54:12 UTC (rev 1351) +++ trunk/ChangeLog 2007-03-01 17:36:51 UTC (rev 1352) @@ -10,8 +10,13 @@ * src/tools.c, src/utils.c: Applied patch from Jeff Pohlmeyer to improve the custom command execution code(thanks). + * src/sciwrappers.c, src/sciwrappers.h: + Added sci_get_selection_mode(), sci_set_selection_mode(), + sci_get_pos_at_line_sel_start(), sci_get_pos_at_line_sel_end(). + * src/document.c: + Improved replacing in rectangle selections (closes #1665571). + - 2007-02-28 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/msgwindow.c, src/msgwindow.h, src/search.c: Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-03-01 15:54:12 UTC (rev 1351) +++ trunk/src/document.c 2007-03-01 17:36:51 UTC (rev 1352) @@ -77,7 +77,7 @@ /* Returns -1 if no text found or the new range endpoint after replacing. */ static gint document_replace_range(gint idx, const gchar *find_text, const gchar *replace_text, - gint flags, gint start, gint end, gboolean escaped_chars); + gint flags, gint start, gint end, gboolean escaped_chars, gboolean scroll_to_match); static void document_undo_clear(gint idx); static void document_redo_add(gint idx, guint type, gpointer data); @@ -1249,7 +1249,7 @@ /* Returns -1 if no text found or the new range endpoint after replacing. */ static gint document_replace_range(gint idx, const gchar *find_text, const gchar *replace_text, - gint flags, gint start, gint end, gboolean escaped_chars) + gint flags, gint start, gint end, gboolean escaped_chars, gboolean scroll_to_match) { gint search_pos; gint count = 0; @@ -1264,11 +1264,12 @@ ttf.chrg.cpMin = start; ttf.chrg.cpMax = end; ttf.lpstrText = (gchar*)find_text; - + while (TRUE) { search_pos = sci_find_text(doc_list[idx].sci, flags, &ttf); - if (search_pos == -1) break; + if (search_pos == -1) + break; find_len = ttf.chrgText.cpMax - ttf.chrgText.cpMin; if (search_pos + find_len > end) @@ -1291,9 +1292,10 @@ show_replace_summary(idx, count, find_text, replace_text, escaped_chars); if (match_found) - { - // scroll last match in view. - sci_goto_pos(doc_list[idx].sci, ttf.chrg.cpMin, TRUE); + { // scroll last match in view, will destroy the existing selection + if (scroll_to_match) + sci_goto_pos(doc_list[idx].sci, ttf.chrg.cpMin, TRUE); + return end; } else @@ -1304,32 +1306,96 @@ void document_replace_sel(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, gboolean escaped_chars) { - gint selection_end, selection_start; + gint selection_end, selection_start, selection_mode, selected_lines, last_line; + gint max_column = 0; + gboolean replaced = FALSE; g_return_if_fail(find_text != NULL && replace_text != NULL); if (idx == -1 || ! *find_text) return; selection_start = sci_get_selection_start(doc_list[idx].sci); selection_end = sci_get_selection_end(doc_list[idx].sci); + // do we have a selection? if ((selection_end - selection_start) == 0) { utils_beep(); return; } - selection_end = document_replace_range(idx, find_text, replace_text, flags, - selection_start, selection_end, escaped_chars); - if (selection_end == -1) + selection_mode = sci_get_selection_mode(doc_list[idx].sci); + selected_lines = sci_get_lines_selected(doc_list[idx].sci); + // handle rectangle, multi line selections (it doesn't matter on a single line) + if (selection_mode == SC_SEL_RECTANGLE && selected_lines > 1) { - // no replacements - utils_beep(); + gint first_line, line, line_start, line_end, tmp; + + sci_start_undo_action(doc_list[idx].sci); + + first_line = sci_get_line_from_position(doc_list[idx].sci, selection_start); + // Find the last line with chars selected (not EOL char) + last_line = sci_get_line_from_position(doc_list[idx].sci, selection_end - 1); + last_line = MAX(first_line, last_line); + for (line = first_line; line < (first_line + selected_lines); line++) + { + line_start = sci_get_pos_at_line_sel_start(doc_list[idx].sci, line); + line_end = sci_get_pos_at_line_sel_end(doc_list[idx].sci, line); + + // skip line if there is no selection + if (line_start != INVALID_POSITION) + { + // don't let document_replace_range() scroll to match to keep our selection + tmp = document_replace_range(idx, find_text, replace_text, flags, + line_start, line_end, escaped_chars, FALSE); + if (tmp != -1) + { + replaced = TRUE; + // this gets the greatest column within the selection after replacing + max_column = MAX(max_column, + tmp - sci_get_position_from_line(doc_list[idx].sci, line)); + } + } + } + sci_end_undo_action(doc_list[idx].sci); } else { - // update the selection for the new endpoint - sci_set_selection_start(doc_list[idx].sci, selection_start); - sci_set_selection_end(doc_list[idx].sci, selection_end); + selection_end = document_replace_range(idx, find_text, replace_text, flags, + selection_start, selection_end, escaped_chars, TRUE); + if (selection_end != -1) + replaced = TRUE; } + + if (replaced) + { // update the selection for the new endpoint + + if (selection_mode == SC_SEL_RECTANGLE && selected_lines > 1) + { + // now we can scroll to the selection and destroy it because we rebuild it later + //sci_goto_pos(doc_list[idx].sci, selection_start, FALSE); + + // Note: the selection will be wrapped to last_line + 1 if max_column is greater than + // the highest column on the last line. The wrapped selection is completely different + // from the original one, so skip the selection at all + /// TODO is there a better way to handle the wrapped selection? + if ((sci_get_line_length(doc_list[idx].sci, last_line) - 1) >= max_column) + { + // for keeping and adjusting the selection in multi line rectangle selection we + // need the last line of the original selection and the greatest column number after + // replacing and set the selection end to the last line at the greatest column + sci_set_selection_start(doc_list[idx].sci, selection_start); + sci_set_selection_end(doc_list[idx].sci, + sci_get_position_from_line(doc_list[idx].sci, last_line) + max_column); + sci_set_selection_mode(doc_list[idx].sci, selection_mode); + } + } + else + { + sci_set_selection_start(doc_list[idx].sci, selection_start); + sci_set_selection_end(doc_list[idx].sci, selection_end); + } + } + else // no replacements + utils_beep(); } @@ -1342,7 +1408,8 @@ if (idx == -1 || ! *find_text) return FALSE; len = sci_get_length(doc_list[idx].sci); - if (document_replace_range(idx, find_text, replace_text, flags, 0, len, escaped_chars) == -1) + if (document_replace_range( + idx, find_text, replace_text, flags, 0, len, escaped_chars, TRUE) == -1) { utils_beep(); return FALSE; Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2007-03-01 15:54:12 UTC (rev 1351) +++ trunk/src/sciwrappers.c 2007-03-01 17:36:51 UTC (rev 1352) @@ -911,3 +911,24 @@ { SSM(sci, SCI_SETUSETABS, set, 0); } + +gint sci_get_pos_at_line_sel_start(ScintillaObject *sci, gint line) +{ + return SSM(sci, SCI_GETLINESELSTARTPOSITION, line, 0); +} + +gint sci_get_pos_at_line_sel_end(ScintillaObject *sci, gint line) +{ + return SSM(sci, SCI_GETLINESELENDPOSITION, line, 0); +} + +gint sci_get_selection_mode(ScintillaObject *sci) +{ + return SSM(sci, SCI_GETSELECTIONMODE, 0, 0); +} + +void sci_set_selection_mode(ScintillaObject *sci, gint mode) +{ + SSM(sci, SCI_SETSELECTIONMODE, mode, 0); +} + Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2007-03-01 15:54:12 UTC (rev 1351) +++ trunk/src/sciwrappers.h 2007-03-01 17:36:51 UTC (rev 1352) @@ -80,6 +80,12 @@ gint sci_get_selection_start (ScintillaObject* sci); gint sci_get_selection_end (ScintillaObject* sci); void sci_replace_sel (ScintillaObject* sci, gchar* text); +gint sci_get_selection_mode (ScintillaObject* sci); +void sci_set_selection_mode (ScintillaObject* sci, gint mode); +gint sci_get_pos_at_line_sel_start(ScintillaObject*sci, gint line); +gint sci_get_pos_at_line_sel_end (ScintillaObject* sci, gint line); +void sci_set_selection_start (ScintillaObject* sci, gint position); +void sci_set_selection_end (ScintillaObject* sci, gint position); gint sci_get_length (ScintillaObject* sci); void sci_get_text (ScintillaObject* sci,gint len,gchar* text); @@ -87,15 +93,13 @@ gint sci_get_selected_text_length(ScintillaObject* sci); gchar * sci_get_line (ScintillaObject* sci, gint line_num); gint sci_get_line_length (ScintillaObject* sci, gint line); -gint sci_get_line_count ( ScintillaObject* sci ); +gint sci_get_line_count (ScintillaObject* sci); void sci_get_xy_from_position (ScintillaObject* sci,gint pos, gint* x, gint* y); gint sci_get_position_from_xy (ScintillaObject* sci, gint x, gint y, gboolean nearby); void sci_set_undo_collection (ScintillaObject* sci, gboolean set); gboolean sci_get_undo_collection (ScintillaObject* sci); -void sci_set_selection_start (ScintillaObject* sci, gint position); -void sci_set_selection_end (ScintillaObject* sci, gint position); gint sci_get_line_end_position (ScintillaObject* sci, gint line); void sci_toggle_fold (ScintillaObject* sci, gint line); @@ -147,6 +151,7 @@ void sci_target_start (ScintillaObject * sci, gint start); void sci_target_end (ScintillaObject * sci, gint end); gint sci_target_replace (ScintillaObject * sci, const gchar *text, gboolean regex); + void sci_set_keywords (ScintillaObject * sci, gint k, gchar *text); gint sci_get_lexer (ScintillaObject * sci); void sci_set_readonly (ScintillaObject * sci, gboolean readonly); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1351] trunk/src/project.c
by ntrel＠users.sourceforge.net 01 Mar '07

01 Mar '07

Revision: 1351 http://svn.sourceforge.net/geany/?rev=1351&view=rev Author: ntrel Date: 2007-03-01 07:54:12 -0800 (Thu, 01 Mar 2007) Log Message: ----------- Edit confirm project close text. Modified Paths: -------------- trunk/src/project.c Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-03-01 12:38:31 UTC (rev 1350) +++ trunk/src/project.c 2007-03-01 15:54:12 UTC (rev 1351) @@ -348,7 +348,8 @@ if (app->project != NULL) { gchar *msg = - _("There is already an open project \"%s\". Do you want to close it before proceed?"); + _("The '%s' project is already open." + "Do you want to close it before proceeding?"); if (dialogs_show_question(msg, app->project->name)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1350] trunk/src/project.c
by ntrel＠users.sourceforge.net 01 Mar '07

01 Mar '07

Revision: 1350 http://svn.sourceforge.net/geany/?rev=1350&view=rev Author: ntrel Date: 2007-03-01 04:38:31 -0800 (Thu, 01 Mar 2007) Log Message: ----------- avoid using __VA_ARGS__ because older gcc 2.x versions probably don't support C99. Modified Paths: -------------- trunk/src/project.c Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-03-01 11:42:11 UTC (rev 1349) +++ trunk/src/project.c 2007-03-01 12:38:31 UTC (rev 1350) @@ -69,7 +69,8 @@ static void on_entries_changed(GtkEditable *editable, PropertyDialogElements *e); -#define SHOW_ERR(...) dialogs_show_msgbox(GTK_MESSAGE_ERROR, __VA_ARGS__) +// avoid using __VA_ARGS__ because older gcc 2.x versions probably don't support C99 +#define SHOW_ERR(args...) dialogs_show_msgbox(GTK_MESSAGE_ERROR, args) #define MAX_NAME_LEN 50 // "projects" is part of the default project base path so be carefully when translating // please avoid special characters and spaces, look at the source for details or ask Frank This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1349] trunk/src/tools.c
by eht16＠users.sourceforge.net 01 Mar '07

01 Mar '07

Revision: 1349 http://svn.sourceforge.net/geany/?rev=1349&view=rev Author: eht16 Date: 2007-03-01 03:42:11 -0800 (Thu, 01 Mar 2007) Log Message: ----------- Replaced glibc printf extension %m with strerror() call. Modified Paths: -------------- trunk/src/tools.c Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-03-01 11:38:14 UTC (rev 1348) +++ trunk/src/tools.c 2007-03-01 11:42:11 UTC (rev 1349) @@ -30,6 +30,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> +#include <errno.h> #ifdef G_OS_UNIX # include <sys/types.h> @@ -632,7 +633,8 @@ wrote = write(stdin_fd, sel, remaining); if (wrote < 0) { - g_warning("%s: %s: %m\n", __func__, "Failed sending data to command"); + g_warning("%s: %s: %s\n", __func__, "Failed sending data to command", + strerror(errno)); break; } remaining -= wrote; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1348] trunk
by ntrel＠users.sourceforge.net 01 Mar '07

01 Mar '07

Revision: 1348 http://svn.sourceforge.net/geany/?rev=1348&view=rev Author: ntrel Date: 2007-03-01 03:38:14 -0800 (Thu, 01 Mar 2007) Log Message: ----------- Run Make All and Make Custom from the project base directory, if set. Add project_get_make_dir(). Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/project.c trunk/src/project.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-01 10:54:37 UTC (rev 1347) +++ trunk/ChangeLog 2007-03-01 11:38:14 UTC (rev 1348) @@ -1,3 +1,10 @@ +2007-03-01 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/build.c, src/project.c, src/project.h: + Run Make All and Make Custom from the project base directory, if set. + Add project_get_make_dir(). + + 2007-03-01 Enrico Tröger <enrico.troeger(a)uvena.de> * src/tools.c, src/utils.c: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-03-01 10:54:37 UTC (rev 1347) +++ trunk/src/build.c 2007-03-01 11:38:14 UTC (rev 1348) @@ -48,6 +48,7 @@ #include "document.h" #include "keybindings.h" #include "vte.h" +#include "project.h" BuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_ALL, NULL}; @@ -75,7 +76,7 @@ static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data); static gboolean build_create_shellscript(const gint idx, const gchar *fname, const gchar *cmd, gboolean autoclose); -static GPid build_spawn_cmd(gint idx, const gchar *cmd); +static GPid build_spawn_cmd(gint idx, const gchar *cmd, const gchar *dir); static void on_make_target_dialog_response(GtkDialog *dialog, gint response, gpointer user_data); static void on_make_target_entry_activate(GtkEntry *entry, gpointer user_data); static void set_stop_button(gboolean stop); @@ -116,7 +117,7 @@ build_info.type = GBO_BUILD; } - return build_spawn_cmd(idx, cmd); + return build_spawn_cmd(idx, cmd, NULL); } @@ -280,6 +281,7 @@ GPid build_make_file(gint idx, gint build_opts) { GString *cmdstr; + const gchar *dir = NULL; GPid pid; if (idx < 0 || doc_list[idx].file_name == NULL) return (GPid) 1; @@ -300,14 +302,16 @@ { build_info.type = GBO_MAKE_CUSTOM; g_string_append(cmdstr, build_info.custom_target); + dir = project_get_make_dir(); } else // GBO_MAKE_ALL { build_info.type = GBO_MAKE_ALL; g_string_append(cmdstr, "all"); + dir = project_get_make_dir(); } - pid = build_spawn_cmd(idx, cmdstr->str); + pid = build_spawn_cmd(idx, cmdstr->str, dir); // if dir is NULL, idx filename is used g_string_free(cmdstr, TRUE); return pid; } @@ -322,7 +326,7 @@ cmd = doc_list[idx].file_type->programs->compiler; build_info.type = GBO_COMPILE; - return build_spawn_cmd(idx, cmd); + return build_spawn_cmd(idx, cmd, NULL); } @@ -397,13 +401,15 @@ g_free(locale_filename); build_info.type = GBO_BUILD; - pid = build_spawn_cmd(idx, cmdstr->str); + pid = build_spawn_cmd(idx, cmdstr->str, NULL); g_string_free(cmdstr, TRUE); return pid; } -static GPid build_spawn_cmd(gint idx, const gchar *cmd) +/* dir is the UTF-8 working directory to run cmd in. It can be NULL to use the + * idx document directory */ +static GPid build_spawn_cmd(gint idx, const gchar *cmd, const gchar *dir) { GError *error = NULL; gchar **argv; @@ -434,19 +440,22 @@ g_free(tmp); g_free(executable); - utf8_cmd_string = utils_get_utf8_from_locale(cmd_string); - argv = g_new0(gchar *, 4); argv[0] = g_strdup("/bin/sh"); argv[1] = g_strdup("-c"); argv[2] = cmd_string; argv[3] = NULL; - working_dir = g_path_get_dirname(locale_filename); - utf8_working_dir = g_path_get_dirname(doc_list[idx].file_name); + utf8_cmd_string = utils_get_utf8_from_locale(cmd_string); + utf8_working_dir = (dir != NULL) ? g_strdup(dir) : + g_path_get_dirname(doc_list[idx].file_name); + working_dir = utils_get_locale_from_utf8(utf8_working_dir); + gtk_list_store_clear(msgwindow.store_compiler); + gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); msgwin_compiler_add_fmt(COLOR_BLUE, _("%s (in directory: %s)"), utf8_cmd_string, utf8_working_dir); - gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); + g_free(utf8_working_dir); + g_free(utf8_cmd_string); // set the build info for the message window g_free(build_info.dir); @@ -461,8 +470,6 @@ g_strfreev(argv); g_error_free(error); g_free(working_dir); - g_free(utf8_working_dir); - g_free(utf8_cmd_string); g_free(locale_filename); error = NULL; return (GPid) 0; @@ -481,8 +488,6 @@ build_iofunc, GINT_TO_POINTER(1)); g_strfreev(argv); - g_free(utf8_working_dir); - g_free(utf8_cmd_string); g_free(working_dir); g_free(locale_filename); Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-03-01 10:54:37 UTC (rev 1347) +++ trunk/src/project.c 2007-03-01 11:38:14 UTC (rev 1348) @@ -701,3 +701,13 @@ return TRUE; } + + +const gchar *project_get_make_dir() +{ + if (app->project != NULL) + return app->project->base_path; + else + return NULL; +} + Modified: trunk/src/project.h =================================================================== --- trunk/src/project.h 2007-03-01 10:54:37 UTC (rev 1347) +++ trunk/src/project.h 2007-03-01 11:38:14 UTC (rev 1348) @@ -51,4 +51,6 @@ void project_properties(); +const gchar *project_get_make_dir(); + #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: [1347] trunk
by eht16＠users.sourceforge.net 01 Mar '07

01 Mar '07

Revision: 1347 http://svn.sourceforge.net/geany/?rev=1347&view=rev Author: eht16 Date: 2007-03-01 02:54:37 -0800 (Thu, 01 Mar 2007) Log Message: ----------- Applied patch from Jeff Pohlmeyer to improve the custom command execution code(thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/tools.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-02-28 17:24:22 UTC (rev 1346) +++ trunk/ChangeLog 2007-03-01 10:54:37 UTC (rev 1347) @@ -1,3 +1,10 @@ +2007-03-01 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/tools.c, src/utils.c: + Applied patch from Jeff Pohlmeyer to improve the custom command + execution code(thanks). + + 2007-02-28 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/msgwindow.c, src/msgwindow.h, src/search.c: Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-02-28 17:24:22 UTC (rev 1346) +++ trunk/src/tools.c 2007-03-01 10:54:37 UTC (rev 1347) @@ -536,23 +536,35 @@ gint idx = GPOINTER_TO_INT(data); gchar *msg = NULL; GString *str = g_string_sized_new(256); + GIOStatus rv; + GError *err = NULL; - while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg != NULL) + do { - g_string_append(str, msg); - g_free(msg); - } - /// without the following if we replace the selection several hundred times with "" because - /// we get to often in this callback but I don't know why - if (str->len > 0) - { + rv = g_io_channel_read_line(ioc, &msg, NULL, NULL, &err); + if (msg != NULL) + { + g_string_append(str, msg); + g_free(msg); + } + if (err != NULL) + { + geany_debug("%s: %s", __func__, err->message); + g_error_free(err); + err = NULL; + } + } while (rv == G_IO_STATUS_NORMAL || rv == G_IO_STATUS_AGAIN); + + if (rv == G_IO_STATUS_EOF) + { // Command completed successfully sci_replace_sel(doc_list[idx].sci, str->str); } + else + { // Something went wrong? + g_warning("%s: %s\n", __func__, "Incomplete command output"); + } g_string_free(str, TRUE); - - return TRUE; } - return FALSE; } @@ -599,11 +611,9 @@ NULL, NULL, &pid, &stdin_fd, &stdout_fd, &stderr_fd, &error)) { gchar *sel; - gint len; + gint len, remaining, wrote; // use GIOChannel to monitor stdout - /// TODO there is something wrong with the whole channel code because the callback is - /// called about several hundred times utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, cc_iofunc, GINT_TO_POINTER(idx)); // copy program's stderr to Geany's stdout to help error tracking @@ -616,7 +626,17 @@ sci_get_selected_text(doc_list[idx].sci, sel); // write data to the command - write(stdin_fd, sel, len - 1); + remaining = len - 1; + do + { + wrote = write(stdin_fd, sel, remaining); + if (wrote < 0) + { + g_warning("%s: %s: %m\n", __func__, "Failed sending data to command"); + break; + } + remaining -= wrote; + } while (remaining > 0); close(stdin_fd); g_free(sel); } Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-02-28 17:24:22 UTC (rev 1346) +++ trunk/src/utils.c 2007-03-01 10:54:37 UTC (rev 1347) @@ -1211,14 +1211,16 @@ GIOChannel *utils_set_up_io_channel(gint fd, GIOCondition cond, GIOFunc func, gpointer data) { GIOChannel *ioc; - GError *error = NULL; - const gchar *encoding; + //const gchar *encoding; ioc = g_io_channel_unix_new(fd); g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL); + g_io_channel_set_encoding(ioc, NULL, NULL); +/* if (! g_get_charset(&encoding)) { // hope this works reliably + GError *error = NULL; g_io_channel_set_encoding(ioc, encoding, &error); if (error) { @@ -1227,6 +1229,7 @@ return ioc; } } +*/ // "auto-close" ;-) g_io_channel_set_close_on_unref(ioc, TRUE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2007