Commits September 2006

commits@lists.geany.org

3 participants
80 discussions

SF.net SVN: geany: [806] trunk/src/msgwindow.c
by ntrel＠users.sourceforge.net 09 Sep '06

09 Sep '06

Revision: 806 http://svn.sourceforge.net/geany/?rev=806&view=rev Author: ntrel Date: 2006-09-09 07:26:54 -0700 (Sat, 09 Sep 2006) Log Message: ----------- Check msgwin visible before scrolling Modified Paths: -------------- trunk/src/msgwindow.c Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-09-09 12:03:11 UTC (rev 805) +++ trunk/src/msgwindow.c 2006-09-09 14:26:54 UTC (rev 806) @@ -192,15 +192,18 @@ gtk_list_store_append(msgwindow.store_compiler, &iter); gtk_list_store_set(msgwindow.store_compiler, &iter, 0, color, 1, string, -1); - path = gtk_tree_model_get_path( - gtk_tree_view_get_model(GTK_TREE_VIEW(msgwindow.tree_compiler)), &iter); - gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(msgwindow.tree_compiler), path, NULL, TRUE, 0.5, 0.5); + if (app->msgwindow_visible) + { + path = gtk_tree_model_get_path( + gtk_tree_view_get_model(GTK_TREE_VIEW(msgwindow.tree_compiler)), &iter); + gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(msgwindow.tree_compiler), path, NULL, TRUE, 0.5, 0.5); - if (scroll) - { - gtk_tree_view_set_cursor(GTK_TREE_VIEW(msgwindow.tree_compiler), path, NULL, FALSE); + if (scroll) + { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(msgwindow.tree_compiler), path, NULL, FALSE); + } + gtk_tree_path_free(path); } - gtk_tree_path_free(path); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [805] trunk
by ntrel＠users.sourceforge.net 09 Sep '06

09 Sep '06

Revision: 805 http://svn.sourceforge.net/geany/?rev=805&view=rev Author: ntrel Date: 2006-09-09 05:03:11 -0700 (Sat, 09 Sep 2006) Log Message: ----------- Reorder the recent files list if necessary when a file is (re)opened - closes #1552178. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-08 15:05:32 UTC (rev 804) +++ trunk/ChangeLog 2006-09-09 12:03:11 UTC (rev 805) @@ -1,3 +1,10 @@ +2006-09-09 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/document.c, src/ui_utils.c: + Reorder the recent files list if necessary when a file is + (re)opened - closes #1552178. + + 2006-09-08 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/build.c, src/msgwindow.c, src/msgwindow.h: Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-09-08 15:05:32 UTC (rev 804) +++ trunk/src/document.c 2006-09-09 12:03:11 UTC (rev 805) @@ -573,6 +573,7 @@ idx = document_find_by_filename(utf8_filename, FALSE); if (idx >= 0) { + ui_add_recent_file(utf8_filename); // either add or reorder recent item gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), gtk_notebook_page_num(GTK_NOTEBOOK(app->notebook), (GtkWidget*) doc_list[idx].sci)); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2006-09-08 15:05:32 UTC (rev 804) +++ trunk/src/ui_utils.c 2006-09-09 12:03:11 UTC (rev 805) @@ -945,6 +945,7 @@ } ui_update_recent_menu(); } + else ui_recent_file_loaded(filename); // filename already in recent 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: [804] trunk
by ntrel＠users.sourceforge.net 08 Sep '06

08 Sep '06

Revision: 804 http://svn.sourceforge.net/geany/?rev=804&view=rev Author: ntrel Date: 2006-09-08 08:05:32 -0700 (Fri, 08 Sep 2006) Log Message: ----------- Use handle_forced_encoding(), handle_encoding() and handle_bom() when opening files. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-08 13:40:30 UTC (rev 803) +++ trunk/ChangeLog 2006-09-08 15:05:32 UTC (rev 804) @@ -15,6 +15,9 @@ * src/build.c: Show messages window on build failure. Show build success message on status bar if messages window hidden. + * src/document.c: + Use handle_forced_encoding(), handle_encoding() and handle_bom() + when opening files. 2006-09-07 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-09-08 13:40:30 UTC (rev 803) +++ trunk/src/document.c 2006-09-08 15:05:32 UTC (rev 804) @@ -419,6 +419,114 @@ } +// reload file with specified encoding +static gboolean +handle_forced_encoding(gchar **data, gsize *size, const gchar *forced_enc, gchar **enc, + gboolean *bom) +{ + if (utils_strcmp(forced_enc, "UTF-8")) + { + if (! g_utf8_validate(*data, *size, NULL)) + { + return FALSE; + } + else + { + *bom = utils_strcmp(utils_scan_unicode_bom(*data), "UTF-8"); + *enc = g_strdup(forced_enc); + } + } + else + { + gchar *converted_text = utils_convert_to_utf8_from_charset(*data, *size, forced_enc, FALSE); + if (converted_text == NULL) + { + return FALSE; + } + else + { + g_free(*data); + *data = (void*)converted_text; + *size = strlen(converted_text); + *bom = utils_strcmp(utils_scan_unicode_bom(*data), "UTF-8"); + *enc = g_strdup(forced_enc); + } + } + return TRUE; +} + + +static gboolean +handle_encoding(gchar **data, gsize *size, gchar **enc, gboolean *bom) +{ + if (*size > 0) + { // the usual way to detect encoding and convert to UTF-8 + if (*size >= 4) + { + *enc = utils_scan_unicode_bom(*data); + } + if (*enc != NULL) + { + *bom = TRUE; + if ((*enc)[4] != '8') // the BOM indicated something else than UTF-8 + { + gchar *converted_text = utils_convert_to_utf8_from_charset(*data, *size, *enc, FALSE); + if (converted_text == NULL) + { + g_free(*enc); + *enc = NULL; + *bom = FALSE; + } + else + { + g_free(*data); + *data = (void*)converted_text; + *size = strlen(converted_text); + } + } + } + // this if is important, else doesn't work because enc can be altered in the above block + if (*enc == NULL) + { + if (g_utf8_validate(*data, *size, NULL)) + { + *enc = g_strdup("UTF-8"); + } + else + { + gchar *converted_text = utils_convert_to_utf8(*data, *size, enc); + + if (converted_text == NULL) + { + return FALSE; + } + else + { + g_free(*data); + *data = (void*)converted_text; + *size = strlen(converted_text); + } + } + } + } + else + { + *enc = g_strdup("UTF-8"); + } + return TRUE; +} + + +static void +handle_bom(gchar **data) +{ + gchar *data_without_bom; + data_without_bom = g_strdup(*data + 3); + g_free(*data); + *data = data_without_bom; +} + + /* If idx is set to -1, it creates a new tab, opens the file from filename and * set the cursor to pos. * If idx is greater than -1, it reloads the file in the tab corresponding to @@ -499,121 +607,36 @@ /* Determine character encoding and convert to utf-8*/ if (reload && forced_enc != NULL) - { // reload file with specified encoding - if (utils_strcmp(forced_enc, "UTF-8")) + { + if (! handle_forced_encoding(&data, &size, forced_enc, &enc, &bom)) { - if (! g_utf8_validate(data, size, NULL)) - { - msgwin_status_add(_("The file \"%s\" is not valid %s."), utf8_filename, "UTF-8"); - utils_beep(); - g_free(data); - g_free(utf8_filename); - g_free(locale_filename); - return -1; - } - else - { - bom = utils_strcmp(utils_scan_unicode_bom(data), "UTF-8"); - enc = g_strdup(forced_enc); - } + msgwin_status_add(_("The file \"%s\" is not valid %s."), utf8_filename, forced_enc); + utils_beep(); + g_free(data); + g_free(utf8_filename); + g_free(locale_filename); + return -1; } - else - { - gchar *converted_text = utils_convert_to_utf8_from_charset(data, size, forced_enc, FALSE); - if (converted_text == NULL) - { - msgwin_status_add(_("The file \"%s\" is not valid %s."), utf8_filename, forced_enc); - utils_beep(); - g_free(data); - g_free(utf8_filename); - g_free(locale_filename); - return -1; - } - else - { - g_free(data); - data = (void*)converted_text; - size = strlen(converted_text); - bom = utils_strcmp(utils_scan_unicode_bom(data), "UTF-8"); - enc = g_strdup(forced_enc); - } - } } - else if (size > 0) - { // the usual way to detect encoding and convert to UTF-8 - if (size >= 4) - { - enc = utils_scan_unicode_bom(data); - } - if (enc != NULL) - { - bom = TRUE; - if (enc[4] != '8') // the BOM indicated something else than UTF-8 - { - gchar *converted_text = utils_convert_to_utf8_from_charset(data, size, enc, FALSE); - if (converted_text == NULL) - { - g_free(enc); - enc = NULL; - bom = FALSE; - } - else - { - g_free(data); - data = (void*)converted_text; - size = strlen(converted_text); - } - } - } - // this if is important, else doesn't work because enc can be altered in the above block - if (enc == NULL) - { - if (g_utf8_validate(data, size, NULL)) - { - enc = g_strdup("UTF-8"); - } - else - { - gchar *converted_text = utils_convert_to_utf8(data, size, &enc); - - if (converted_text == NULL) - { - msgwin_status_add( - _("The file \"%s\" does not look like a text file or the file encoding is not supported."), - utf8_filename); - utils_beep(); - g_free(data); - g_free(utf8_filename); - g_free(locale_filename); - return -1; - } - else - { - g_free(data); - data = (void*)converted_text; - size = strlen(converted_text); - } - } - } - } - else + else if (! handle_encoding(&data, &size, &enc, &bom)) { - enc = g_strdup("UTF-8"); - } - - if (bom) - { - gchar *data_without_bom; - data_without_bom = g_strdup(data + 3); + msgwin_status_add( + _("The file \"%s\" does not look like a text file or the file encoding is not supported."), + utf8_filename); + utils_beep(); g_free(data); - data = data_without_bom; + g_free(utf8_filename); + g_free(locale_filename); + return -1; } + if (bom) handle_bom(&data); + if (! reload) idx = document_create_new_sci(utf8_filename); if (idx == -1) return -1; // really should not happen // set editor mode and add the text to the ScintillaObject - sci_set_text(doc_list[idx].sci, data); // NULL terminated data; avoids Unsaved + sci_set_text(doc_list[idx].sci, data); // NULL terminated data; avoids modifying sci editor_mode = utils_get_line_endings(data, size); sci_set_eol_mode(doc_list[idx].sci, editor_mode); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [803] trunk
by ntrel＠users.sourceforge.net 08 Sep '06

08 Sep '06

Revision: 803 http://svn.sourceforge.net/geany/?rev=803&view=rev Author: ntrel Date: 2006-09-08 06:40:30 -0700 (Fri, 08 Sep 2006) Log Message: ----------- Show messages window on build failure. Show build success message on status bar if messages window hidden. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-08 13:39:32 UTC (rev 802) +++ trunk/ChangeLog 2006-09-08 13:40:30 UTC (rev 803) @@ -8,6 +8,13 @@ Make C, C++, Ruby and Java error message parsing more tolerant so that linker errors are also parsed if debug line info is available. Group all gcc-like error message parsing information together. + * src/msgwindow.c, src/msgwindow.h: + Allow compiler and find messages to be added when the messages + window is hidden. + Add msgwin_show(). + * src/build.c: + Show messages window on build failure. + Show build success message on status bar if messages window hidden. 2006-09-07 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-09-08 13:39:32 UTC (rev 802) +++ trunk/src/build.c 2006-09-08 13:40:30 UTC (rev 803) @@ -37,6 +37,7 @@ #include "support.h" #include "utils.h" +#include "ui_utils.h" #include "dialogs.h" #include "msgwindow.h" #include "document.h" @@ -525,10 +526,13 @@ if (failure) { msgwin_compiler_add(COLOR_DARK_RED, TRUE, _("Compilation failed.")); + if (! app->msgwindow_visible) msgwin_show(); } else { - msgwin_compiler_add(COLOR_BLUE, TRUE, _("Compilation finished successfully.")); + gchar *msg = _("Compilation finished successfully."); + msgwin_compiler_add(COLOR_BLUE, TRUE, msg); + if (! app->msgwindow_visible) ui_set_statusbar(msg, FALSE); } #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: [802] trunk/src
by ntrel＠users.sourceforge.net 08 Sep '06

08 Sep '06

Revision: 802 http://svn.sourceforge.net/geany/?rev=802&view=rev Author: ntrel Date: 2006-09-08 06:39:32 -0700 (Fri, 08 Sep 2006) Log Message: ----------- Allow compiler and find messages to be added when the messages window is hidden. Add msgwin_show(). Modified Paths: -------------- trunk/src/msgwindow.c trunk/src/msgwindow.h Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-09-08 11:25:56 UTC (rev 801) +++ trunk/src/msgwindow.c 2006-09-08 13:39:32 UTC (rev 802) @@ -168,8 +168,8 @@ void msgwin_compiler_add(gint msg_color, gboolean scroll, gchar const *format, ...) { GtkTreeIter iter; + GtkTreePath *path; GdkColor *color; - GtkTreePath *path; static GdkColor red = {0, 65535, 0, 0}; static GdkColor dark_red = {0, 65535 / 2, 0, 0}; static GdkColor blue = {0, 0, 0, 65535}; @@ -177,8 +177,6 @@ static gchar string[512]; va_list args; - if (! app->msgwindow_visible) return; - va_start(args, format); g_vsnprintf(string, 511, format, args); va_end(args); @@ -194,7 +192,8 @@ gtk_list_store_append(msgwindow.store_compiler, &iter); gtk_list_store_set(msgwindow.store_compiler, &iter, 0, color, 1, string, -1); - path = gtk_tree_model_get_path(gtk_tree_view_get_model(GTK_TREE_VIEW(msgwindow.tree_compiler)), &iter); + path = gtk_tree_model_get_path( + gtk_tree_view_get_model(GTK_TREE_VIEW(msgwindow.tree_compiler)), &iter); gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(msgwindow.tree_compiler), path, NULL, TRUE, 0.5, 0.5); if (scroll) @@ -205,16 +204,24 @@ } +void msgwin_show() +{ + app->msgwindow_visible = TRUE; + gtk_widget_show(lookup_widget(app->window, "scrolledwindow1")); +} + + // adds string to the msg treeview void msgwin_msg_add(gint line, gint idx, gchar *string) { GtkTreeIter iter; static gint state = 0; - if (! app->msgwindow_visible) return; + if (! app->msgwindow_visible) msgwin_show(); gtk_list_store_append(msgwindow.store_msg, &iter); - gtk_list_store_set(msgwindow.store_msg, &iter, 0, line, 1, idx, 2, ((state++ % 2) == 0) ? &white : &dark, 3, string, -1); + gtk_list_store_set(msgwindow.store_msg, &iter, 0, line, 1, idx, 2, + ((state++ % 2) == 0) ? &white : &dark, 3, string, -1); } @@ -227,8 +234,6 @@ gchar *statusmsg, *time_str; va_list args; - //if (! app->msgwindow_visible) return; - va_start(args, format); g_vsnprintf(string, 511, format, args); va_end(args); Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2006-09-08 11:25:56 UTC (rev 801) +++ trunk/src/msgwindow.h 2006-09-08 13:39:32 UTC (rev 802) @@ -71,6 +71,8 @@ void msgwin_prepare_compiler_tree_view(void); +void msgwin_show(); + void msgwin_msg_add(gint line, gint idx, gchar *string); void msgwin_compiler_add(gint msg_color, gboolean scroll, gchar const *format, ...); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [801] trunk
by ntrel＠users.sourceforge.net 08 Sep '06

08 Sep '06

Revision: 801 http://svn.sourceforge.net/geany/?rev=801&view=rev Author: ntrel Date: 2006-09-08 04:25:56 -0700 (Fri, 08 Sep 2006) Log Message: ----------- Make C, C++, Ruby and Java error message parsing more tolerant so that linker errors are also parsed if debug line info is available. Modified Paths: -------------- trunk/ChangeLog trunk/src/msgwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-08 10:20:15 UTC (rev 800) +++ trunk/ChangeLog 2006-09-08 11:25:56 UTC (rev 801) @@ -4,6 +4,10 @@ Show parsable errors in red; stderr and compile failure in dark red. * src/callbacks.c: Fix compilation problem with sci_cb_do_comment. * src/document.c: Quick fix for C89 compatibility. + * src/msgwindow.c: + Make C, C++, Ruby and Java error message parsing more tolerant so + that linker errors are also parsed if debug line info is available. + Group all gcc-like error message parsing information together. 2006-09-07 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-09-08 10:20:15 UTC (rev 800) +++ trunk/src/msgwindow.c 2006-09-08 11:25:56 UTC (rev 801) @@ -413,30 +413,6 @@ { return; } - // 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' - data.pattern = ":"; - data.min_fields = 4; - data.line_idx = 1; - data.file_idx = 0; - break; - } - case GEANY_FILETYPES_FORTRAN: - case GEANY_FILETYPES_LATEX: - { - // ./kommtechnik_2b.tex:18: Emergency stop. - data.pattern = ":"; - data.min_fields = 3; - data.line_idx = 1; - data.file_idx = 0; - break; - } case GEANY_FILETYPES_PHP: { // Parse error: parse error, unexpected T_CASE in brace_bug.php on line 3 @@ -529,10 +505,21 @@ data.file_idx = -1; break; } + /* All GNU gcc-like error messages */ + case GEANY_FILETYPES_C: + case GEANY_FILETYPES_CPP: + case GEANY_FILETYPES_RUBY: + case GEANY_FILETYPES_JAVA: + // only gcc is supported, I don't know any other C(++) compilers and their error messages + // empty.h:4: Warnung: type defaults to `int' in declaration of `foo' + // empty.c:21: error: conflicting types for `foo' + // Only parse file and line, so that linker errors will also work (with -g) + case GEANY_FILETYPES_FORTRAN: + case GEANY_FILETYPES_LATEX: + // ./kommtechnik_2b.tex:18: Emergency stop. case GEANY_FILETYPES_MAKE: // Assume makefile is building with gcc default: // The default is a GNU gcc type error { - // gantry.d:6: variable gantry.main.c reference to auto class must be auto data.pattern = ":"; data.min_fields = 3; data.line_idx = 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: [800] trunk
by ntrel＠users.sourceforge.net 08 Sep '06

08 Sep '06

Revision: 800 http://svn.sourceforge.net/geany/?rev=800&view=rev Author: ntrel Date: 2006-09-08 03:20:15 -0700 (Fri, 08 Sep 2006) Log Message: ----------- Show parsable errors in red; stderr and compile failure in dark red Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/callbacks.c trunk/src/document.c trunk/src/msgwindow.c trunk/src/msgwindow.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-07 17:40:44 UTC (rev 799) +++ trunk/ChangeLog 2006-09-08 10:20:15 UTC (rev 800) @@ -1,3 +1,11 @@ +2006-09-08 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/build.c, src/msgwindow.c, src/msgwindow.h: + Show parsable errors in red; stderr and compile failure in dark red. + * src/callbacks.c: Fix compilation problem with sci_cb_do_comment. + * src/document.c: Quick fix for C89 compatibility. + + 2006-09-07 Enrico Tröger <enrico.troeger(a)uvena.de> * src/socket.c, src/main.c, src/callbacks.c: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-09-07 17:40:44 UTC (rev 799) +++ trunk/src/build.c 2006-09-08 10:20:15 UTC (rev 800) @@ -468,31 +468,29 @@ { //GIOStatus s; gchar *msg; - guint x = 1; while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg) { //if (s != G_IO_STATUS_NORMAL && s != G_IO_STATUS_EOF) break; - if (GPOINTER_TO_INT(data)) - msgwin_compiler_add(COLOR_RED, FALSE, g_strstrip(msg)); - else - msgwin_compiler_add(COLOR_BLACK, FALSE, g_strstrip(msg)); + gint color; + color = (GPOINTER_TO_INT(data)) ? COLOR_DARK_RED : COLOR_BLACK; + g_strstrip(msg); if (app->pref_editor_use_indicators) { gchar *filename; gint line; - msgwin_parse_compiler_error_line(g_strstrip(msg), &filename, &line); - if (line != -1) + msgwin_parse_compiler_error_line(msg, &filename, &line); + if (line != -1 && filename != NULL) { gint idx = document_find_by_filename(filename, FALSE); - // document_set_indicator will check valid idx - document_set_indicator(idx, line - 1); + document_set_indicator(idx, line - 1); // will check valid idx + color = COLOR_RED; // error message parsed on the line } g_free(filename); } + msgwin_compiler_add(color, FALSE, msg); - x++; g_free(msg); } } @@ -526,11 +524,11 @@ if (failure) { - msgwin_compiler_add(COLOR_BLUE, TRUE, _("compilation finished unsuccessful")); + msgwin_compiler_add(COLOR_DARK_RED, TRUE, _("Compilation failed.")); } else { - msgwin_compiler_add(COLOR_BLUE, TRUE, _("compilation finished successful")); + msgwin_compiler_add(COLOR_BLUE, TRUE, _("Compilation finished successfully.")); } #endif Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-09-07 17:40:44 UTC (rev 799) +++ trunk/src/callbacks.c 2006-09-08 10:20:15 UTC (rev 800) @@ -2468,7 +2468,7 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_comment(idx, -1); + sci_cb_do_comment(idx); } @@ -2478,7 +2478,7 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_uncomment(idx, -1); + sci_cb_do_uncomment(idx); } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-09-07 17:40:44 UTC (rev 799) +++ trunk/src/document.c 2006-09-08 10:20:15 UTC (rev 800) @@ -1566,11 +1566,13 @@ void document_undo(gint idx) { + undo_action *action; + +#if 1 sci_undo(doc_list[idx].sci); return; +#endif - undo_action *action; - if (idx == -1 || ! doc_list[idx].is_valid) return; action = g_trash_stack_pop(&doc_list[idx].undo_actions); Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-09-07 17:40:44 UTC (rev 799) +++ trunk/src/msgwindow.c 2006-09-08 10:20:15 UTC (rev 800) @@ -171,6 +171,7 @@ GdkColor *color; GtkTreePath *path; static GdkColor red = {0, 65535, 0, 0}; + static GdkColor dark_red = {0, 65535 / 2, 0, 0}; static GdkColor blue = {0, 0, 0, 65535}; static GdkColor black = {0, 0, 0, 0}; static gchar string[512]; @@ -185,6 +186,7 @@ switch (msg_color) { case COLOR_RED: color = &red; break; + case COLOR_DARK_RED: color = &dark_red; break; case COLOR_BLUE: color = &blue; break; default: color = &black; } Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2006-09-07 17:40:44 UTC (rev 799) +++ trunk/src/msgwindow.h 2006-09-08 10:20:15 UTC (rev 800) @@ -28,6 +28,7 @@ enum { COLOR_RED, + COLOR_DARK_RED, COLOR_BLACK, COLOR_BLUE }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [799] trunk/src
by eht16＠users.sourceforge.net 07 Sep '06

07 Sep '06

Revision: 799 http://svn.sourceforge.net/geany/?rev=799&view=rev Author: eht16 Date: 2006-09-07 10:40:44 -0700 (Thu, 07 Sep 2006) Log Message: ----------- Moved the socket code from main.c to socket.c. Modified Paths: -------------- trunk/src/Makefile.am trunk/src/makefile.win32 Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2006-09-07 15:51:24 UTC (rev 798) +++ trunk/src/Makefile.am 2006-09-07 17:40:44 UTC (rev 799) @@ -25,6 +25,7 @@ sci_cb.c sci_cb.h \ sciwrappers.c sciwrappers.h \ document.c document.h \ + socket.c socket.h \ utils.c utils.h \ ui_utils.c ui_utils.h \ support.c support.h \ Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2006-09-07 15:51:24 UTC (rev 798) +++ trunk/src/makefile.win32 2006-09-07 17:40:44 UTC (rev 799) @@ -45,7 +45,7 @@ CCFLAGS=-Wall -O2 -g -mms-bitfields $(DEFINES) $(INCLUDEDIRS) OBJS = treeviews.o templates.o encodings.o about.o prefs.o win32.o build.o msgwindow.o dialogs.o \ - filetypes.o interface.o main.o support.o callbacks.o utils.o ui_utils.o \ + filetypes.o interface.o main.o support.o callbacks.o utils.o ui_utils.o socket.o \ highlighting.o sci_cb.o document.o sciwrappers.o keyfile.o keybindings.o search.o notebook.o .c.o: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [798] trunk
by eht16＠users.sourceforge.net 07 Sep '06

07 Sep '06

Revision: 798 http://svn.sourceforge.net/geany/?rev=798&view=rev Author: eht16 Date: 2006-09-07 08:51:24 -0700 (Thu, 07 Sep 2006) Log Message: ----------- Moved the socket code from main.c to socket.c. Remove an unchanged empty document when loading a new file (closes #1545129). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c trunk/src/main.c trunk/src/main.h Added Paths: ----------- trunk/src/socket.c trunk/src/socket.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-06 18:26:08 UTC (rev 797) +++ trunk/ChangeLog 2006-09-07 15:51:24 UTC (rev 798) @@ -1,3 +1,11 @@ +2006-09-07 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/socket.c, src/main.c, src/callbacks.c: + Moved the socket code from main.c to socket.c. + * src/document.c: Remove an unchanged empty document when loading a + new file (closes #1545129). + + 2006-09-06 Enrico Tröger <enrico.troeger(a)uvena.de> * src/callbacks.c, src/document.c, src/ui_utils.c, src/sci_cb.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-09-06 18:26:08 UTC (rev 797) +++ trunk/src/callbacks.c 2006-09-07 15:51:24 UTC (rev 798) @@ -60,7 +60,11 @@ # include "vte.h" #endif +#ifdef HAVE_SOCKET +# include "socket.h" +#endif + // represents the state while closing all tabs(used to prevent notebook switch page signals) static gboolean closing_all = FALSE; @@ -2464,7 +2468,7 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_comment(idx); + sci_cb_do_comment(idx, -1); } @@ -2474,7 +2478,7 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_uncomment(idx); + sci_cb_do_uncomment(idx, -1); } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-09-06 18:26:08 UTC (rev 797) +++ trunk/src/document.c 2006-09-07 15:51:24 UTC (rev 798) @@ -231,10 +231,18 @@ PangoFontDescription *pfd; gchar *title, *fname; GtkTreeIter iter; - gint new_idx = document_get_new_idx(); + gint new_idx; document *this; gint tabnum; + if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) == 1) + { + gint idx = document_get_cur_idx(); + // remove the empty document and open a new one + if (doc_list[idx].file_name == NULL && ! doc_list[idx].changed) document_remove(0); + } + + new_idx = document_get_new_idx(); if (new_idx == -1) return -1; this = &(doc_list[new_idx]); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-09-06 18:26:08 UTC (rev 797) +++ trunk/src/main.c 2006-09-07 15:51:24 UTC (rev 798) @@ -25,20 +25,12 @@ #include <time.h> #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> -#include <fcntl.h> #include <errno.h> #include <string.h> #include <stdlib.h> #include "geany.h" -#ifdef HAVE_SOCKET -#include <sys/socket.h> -#include <sys/un.h> -#include <netinet/in.h> -#endif - #include "main.h" #include "interface.h" #include "support.h" @@ -59,6 +51,10 @@ #include "sci_cb.h" #include "search.h" +#ifdef HAVE_SOCKET +# include "socket.h" +#endif + #ifdef HAVE_VTE # include "vte.h" #endif @@ -66,37 +62,7 @@ #define N_(String) (String) -#ifdef HAVE_SOCKET -static struct -{ - gboolean ignore_socket; - gchar *file_name; - GIOChannel *read_ioc; - gint lock_socket; - gint lock_socket_tag; -} socket_info; -static gboolean ignore_socket = FALSE; -static gint socket_init(gint argc, gchar **argv); - -static gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpointer data); - -#ifdef G_OS_WIN32 -static gint socket_fd_connect_inet (gushort port); -static gint socket_fd_open_inet (gushort port); -#endif -static gint socket_fd_connect_unix (const gchar *path); -static gint socket_fd_open_unix (const gchar *path); - -static gint socket_fd_write (gint sock, const gchar *buf, gint len); -static gint socket_fd_write_all (gint sock, const gchar *buf, gint len); -static gint socket_fd_gets (gint sock, gchar *buf, gint len); -static gint socket_fd_check_io (gint fd, GIOCondition cond); -static gint socket_fd_read (gint sock, gchar *buf, gint len); -static gint socket_fd_recv (gint fd, gchar *buf, gint len, gint flags); -static gint socket_fd_close (gint sock); -#endif - CommandLineOptions cl_options; // fields initialised in parse_command_line_options static gboolean debug_mode = FALSE; @@ -108,6 +74,9 @@ static gboolean no_vte = FALSE; static gchar *lib_vte = NULL; #endif +#ifdef HAVE_SOCKET +static gboolean ignore_socket = FALSE; +#endif static gboolean generate_datafiles = FALSE; static GOptionEntry entries[] = @@ -674,436 +643,3 @@ return 0; } - -#ifdef HAVE_SOCKET -/* (Unix domain) socket support to replace the old FIFO code - * (taken from Sylpheed, thanks) */ -static gint socket_init(gint argc, gchar **argv) -{ - gint sock; - -#ifdef G_OS_WIN32 - HANDLE hmutex; - - hmutex = CreateMutexA(NULL, FALSE, "Geany"); - if (! hmutex) - { - geany_debug("cannot create Mutex\n"); - return -1; - } - if (GetLastError() != ERROR_ALREADY_EXISTS) - { - sock = socket_fd_open_inet(REMOTE_CMD_PORT); - if (sock < 0) - return 0; - return sock; - } - - sock = socket_fd_connect_inet(REMOTE_CMD_PORT); - if (sock < 0) - return -1; -#else - - if (socket_info.file_name == NULL) - socket_info.file_name = g_strdup_printf("%s%cgeany_socket", app->configdir, G_DIR_SEPARATOR); - - sock = socket_fd_connect_unix(socket_info.file_name); - if (sock < 0) - { - unlink(socket_info.file_name); - return socket_fd_open_unix(socket_info.file_name); - } -#endif - - // 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); - } - - socket_fd_close(sock); - return -1; -} - - -gint socket_finalize(void) -{ - if (socket_info.lock_socket < 0) return -1; - - if (socket_info.lock_socket_tag > 0) - g_source_remove(socket_info.lock_socket_tag); - if (socket_info.read_ioc) - { - g_io_channel_shutdown(socket_info.read_ioc, FALSE, NULL); - g_io_channel_unref(socket_info.read_ioc); - socket_info.read_ioc = NULL; - } - -#ifndef G_OS_WIN32 - unlink(socket_info.file_name); - g_free(socket_info.file_name); -#endif - - return 0; -} - - -#ifdef G_OS_WIN32 -#define SockDesc SOCKET -#define SOCKET_IS_VALID(s) ((s) != INVALID_SOCKET) -#else -#define SockDesc gint -#define SOCKET_IS_VALID(s) ((s) >= 0) -#define INVALID_SOCKET (-1) -#endif - - -static gint socket_fd_connect_unix(const gchar *path) -{ -#ifdef G_OS_UNIX - gint sock; - struct sockaddr_un addr; - - sock = socket(PF_UNIX, SOCK_STREAM, 0); - if (sock < 0) - { - perror("fd_connect_unix(): socket"); - return -1; - } - - memset(&addr, 0, sizeof(addr)); - addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1); - - if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) - { - socket_fd_close(sock); - return -1; - } - - return sock; -#else - return -1; -#endif -} - - -static gint socket_fd_open_unix(const gchar *path) -{ -#ifdef G_OS_UNIX - gint sock; - struct sockaddr_un addr; - gint val; - - sock = socket(PF_UNIX, SOCK_STREAM, 0); - - if (sock < 0) - { - perror("sock_open_unix(): socket"); - return -1; - } - - val = 1; - if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) - { - perror("setsockopt"); - socket_fd_close(sock); - return -1; - } - - memset(&addr, 0, sizeof(addr)); - addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1); - - if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) - { - perror("bind"); - socket_fd_close(sock); - return -1; - } - - if (listen(sock, 1) < 0) - { - perror("listen"); - socket_fd_close(sock); - return -1; - } - - return sock; -#else - return -1; -#endif -} - - -static gint socket_fd_close(gint fd) -{ -#ifdef G_OS_WIN32 - return closesocket(fd); -#else - return close(fd); -#endif -} - - -#ifdef G_OS_WIN32 -static gint socket_fd_open_inet(gushort port) -{ - SockDesc sock; - struct sockaddr_in addr; - gint val; - - sock = socket(AF_INET, SOCK_STREAM, 0); - if (! SOCKET_IS_VALID(sock)) - { -#ifdef G_OS_WIN32 - geany_debug("fd_open_inet(): socket() failed: %ld\n", WSAGetLastError()); -#else - perror("fd_open_inet(): socket"); -#endif - return -1; - } - - val = 1; - if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) - { - perror("setsockopt"); - socket_fd_close(sock); - return -1; - } - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - - if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) - { - perror("bind"); - socket_fd_close(sock); - return -1; - } - - if (listen(sock, 1) < 0) - { - perror("listen"); - socket_fd_close(sock); - return -1; - } - - return sock; -} - - -static gint socket_fd_connect_inet(gushort port) -{ - SockDesc sock; - struct sockaddr_in addr; - - sock = socket(AF_INET, SOCK_STREAM, 0); - if (! SOCKET_IS_VALID(sock)) - { -#ifdef G_OS_WIN32 - geany_debug("fd_connect_inet(): socket() failed: %ld\n", WSAGetLastError()); -#else - perror("fd_connect_inet(): socket"); -#endif - return -1; - } - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - - if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) - { - socket_fd_close(sock); - return -1; - } - - return sock; -} -#endif - - -static gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpointer data) -{ - gint fd, sock; - gchar buf[4096]; - struct sockaddr_in caddr; - guint caddr_len; - - caddr_len = sizeof(caddr); - - fd = g_io_channel_unix_get_fd(source); - sock = accept(fd, (struct sockaddr *)&caddr, &caddr_len); - - // first get the command - if (socket_fd_gets(sock, buf, sizeof(buf)) != -1 && strncmp(buf, "open", 4) == 0) - { - geany_debug("remote command: open"); - while (socket_fd_gets(sock, buf, sizeof(buf)) != -1 && *buf != '.') - { - g_strstrip(buf); // remove \n char - - if (g_file_test(buf, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) - document_open_file(-1, buf, 0, FALSE, NULL, NULL); - else - geany_debug("got data from socket, but it does not look like a filename"); - } - gtk_window_deiconify(GTK_WINDOW(app->window)); - gtk_window_present(GTK_WINDOW(app->window)); - } - - socket_fd_close(sock); - - return TRUE; -} - - -static gint socket_fd_gets(gint fd, gchar *buf, gint len) -{ - gchar *newline, *bp = buf; - gint n; - - if (--len < 1) - return -1; - do - { - if ((n = socket_fd_recv(fd, bp, len, MSG_PEEK)) <= 0) - return -1; - if ((newline = memchr(bp, '\n', n)) != NULL) - n = newline - bp + 1; - if ((n = socket_fd_read(fd, bp, n)) < 0) - return -1; - bp += n; - len -= n; - } while (! newline && len); - - *bp = '\0'; - return bp - buf; -} - - -static gint socket_fd_recv(gint fd, gchar *buf, gint len, gint flags) -{ - if (socket_fd_check_io(fd, G_IO_IN) < 0) - return -1; - - return recv(fd, buf, len, flags); -} - - -static gint socket_fd_read(gint fd, gchar *buf, gint len) -{ - if (socket_fd_check_io(fd, G_IO_IN) < 0) - return -1; - -#ifdef G_OS_WIN32 - return recv(fd, buf, len, 0); -#else - return read(fd, buf, len); -#endif -} - - -static gint socket_fd_check_io(gint fd, GIOCondition cond) -{ - struct timeval timeout; - fd_set fds; - gint flags; - - timeout.tv_sec = 60; - timeout.tv_usec = 0; - -#ifdef G_OS_UNIX - // checking for non-blocking mode - - flags = fcntl(fd, F_GETFL, 0); - if (flags < 0) - { - perror("fcntl"); - return 0; - } - - if ((flags & O_NONBLOCK) != 0) - return 0; -#endif - - FD_ZERO(&fds); - FD_SET(fd, &fds); - - if (cond == G_IO_IN) - { - select(fd + 1, &fds, NULL, NULL, &timeout); - } - else - { - select(fd + 1, NULL, &fds, NULL, &timeout); - } - - if (FD_ISSET(fd, &fds)) - { - return 0; - } - else - { - geany_debug("Socket IO timeout\n"); - return -1; - } -} - - -static gint socket_fd_write_all(gint fd, const gchar *buf, gint len) -{ - gint n, wrlen = 0; - - while (len) - { - n = socket_fd_write(fd, buf, len); - if (n <= 0) - return -1; - len -= n; - wrlen += n; - buf += n; - } - - return wrlen; -} - - -gint socket_fd_write(gint fd, const gchar *buf, gint len) -{ - if (socket_fd_check_io(fd, G_IO_OUT) < 0) - return -1; - -#ifdef G_OS_WIN32 - return send(fd, buf, len, 0); -#else - return write(fd, buf, len); -#endif -} - - -#endif - - Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2006-09-06 18:26:08 UTC (rev 797) +++ trunk/src/main.h 2006-09-07 15:51:24 UTC (rev 798) @@ -33,10 +33,8 @@ extern CommandLineOptions cl_options; -#ifdef HAVE_SOCKET -gint socket_finalize(); -#endif - void geany_debug(gchar const *format, ...); +gchar *get_argv_filename(const gchar *filename); + #endif Added: trunk/src/socket.c =================================================================== --- trunk/src/socket.c (rev 0) +++ trunk/src/socket.c 2006-09-07 15:51:24 UTC (rev 798) @@ -0,0 +1,487 @@ +/* + * socket.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2006 Enrico Tröger <enrico.troeger(a)uvena.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + + +#include "geany.h" + +#ifdef HAVE_SOCKET + +#include <sys/socket.h> +#include <sys/un.h> +#include <netinet/in.h> +#include <unistd.h> +#include <fcntl.h> + +#include "main.h" +#include "socket.h" +#include "document.h" + + + +#ifdef G_OS_WIN32 +static gint socket_fd_connect_inet (gushort port); +static gint socket_fd_open_inet (gushort port); +#endif +static gint socket_fd_connect_unix (const gchar *path); +static gint socket_fd_open_unix (const gchar *path); + +static gint socket_fd_write (gint sock, const gchar *buf, gint len); +static gint socket_fd_write_all (gint sock, const gchar *buf, gint len); +static gint socket_fd_gets (gint sock, gchar *buf, gint len); +static gint socket_fd_check_io (gint fd, GIOCondition cond); +static gint socket_fd_read (gint sock, gchar *buf, gint len); +static gint socket_fd_recv (gint fd, gchar *buf, gint len, gint flags); +static gint socket_fd_close (gint sock); + + + +/* (Unix domain) socket support to replace the old FIFO code + * (taken from Sylpheed, thanks) */ +gint socket_init(gint argc, gchar **argv) +{ + gint sock; + +#ifdef G_OS_WIN32 + HANDLE hmutex; + + hmutex = CreateMutexA(NULL, FALSE, "Geany"); + if (! hmutex) + { + geany_debug("cannot create Mutex\n"); + return -1; + } + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + sock = socket_fd_open_inet(REMOTE_CMD_PORT); + if (sock < 0) + return 0; + return sock; + } + + sock = socket_fd_connect_inet(REMOTE_CMD_PORT); + if (sock < 0) + return -1; +#else + + if (socket_info.file_name == NULL) + socket_info.file_name = g_strdup_printf("%s%cgeany_socket", app->configdir, G_DIR_SEPARATOR); + + sock = socket_fd_connect_unix(socket_info.file_name); + if (sock < 0) + { + unlink(socket_info.file_name); + return socket_fd_open_unix(socket_info.file_name); + } +#endif + + // 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); + } + + socket_fd_close(sock); + return -1; +} + + +gint socket_finalize(void) +{ + if (socket_info.lock_socket < 0) return -1; + + if (socket_info.lock_socket_tag > 0) + g_source_remove(socket_info.lock_socket_tag); + if (socket_info.read_ioc) + { + g_io_channel_shutdown(socket_info.read_ioc, FALSE, NULL); + g_io_channel_unref(socket_info.read_ioc); + socket_info.read_ioc = NULL; + } + +#ifndef G_OS_WIN32 + unlink(socket_info.file_name); + g_free(socket_info.file_name); +#endif + + return 0; +} + + +#ifdef G_OS_WIN32 +#define SockDesc SOCKET +#define SOCKET_IS_VALID(s) ((s) != INVALID_SOCKET) +#else +#define SockDesc gint +#define SOCKET_IS_VALID(s) ((s) >= 0) +#define INVALID_SOCKET (-1) +#endif + + +static gint socket_fd_connect_unix(const gchar *path) +{ +#ifdef G_OS_UNIX + gint sock; + struct sockaddr_un addr; + + sock = socket(PF_UNIX, SOCK_STREAM, 0); + if (sock < 0) + { + perror("fd_connect_unix(): socket"); + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1); + + if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) + { + socket_fd_close(sock); + return -1; + } + + return sock; +#else + return -1; +#endif +} + + +static gint socket_fd_open_unix(const gchar *path) +{ +#ifdef G_OS_UNIX + gint sock; + struct sockaddr_un addr; + gint val; + + sock = socket(PF_UNIX, SOCK_STREAM, 0); + + if (sock < 0) + { + perror("sock_open_unix(): socket"); + return -1; + } + + val = 1; + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) + { + perror("setsockopt"); + socket_fd_close(sock); + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1); + + if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) + { + perror("bind"); + socket_fd_close(sock); + return -1; + } + + if (listen(sock, 1) < 0) + { + perror("listen"); + socket_fd_close(sock); + return -1; + } + + return sock; +#else + return -1; +#endif +} + + +static gint socket_fd_close(gint fd) +{ +#ifdef G_OS_WIN32 + return closesocket(fd); +#else + return close(fd); +#endif +} + + +#ifdef G_OS_WIN32 +static gint socket_fd_open_inet(gushort port) +{ + SockDesc sock; + struct sockaddr_in addr; + gint val; + + sock = socket(AF_INET, SOCK_STREAM, 0); + if (! SOCKET_IS_VALID(sock)) + { +#ifdef G_OS_WIN32 + geany_debug("fd_open_inet(): socket() failed: %ld\n", WSAGetLastError()); +#else + perror("fd_open_inet(): socket"); +#endif + return -1; + } + + val = 1; + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) + { + perror("setsockopt"); + socket_fd_close(sock); + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + + if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) + { + perror("bind"); + socket_fd_close(sock); + return -1; + } + + if (listen(sock, 1) < 0) + { + perror("listen"); + socket_fd_close(sock); + return -1; + } + + return sock; +} + + +static gint socket_fd_connect_inet(gushort port) +{ + SockDesc sock; + struct sockaddr_in addr; + + sock = socket(AF_INET, SOCK_STREAM, 0); + if (! SOCKET_IS_VALID(sock)) + { +#ifdef G_OS_WIN32 + geany_debug("fd_connect_inet(): socket() failed: %ld\n", WSAGetLastError()); +#else + perror("fd_connect_inet(): socket"); +#endif + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + + if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) + { + socket_fd_close(sock); + return -1; + } + + return sock; +} +#endif + + +gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpointer data) +{ + gint fd, sock; + gchar buf[4096]; + struct sockaddr_in caddr; + guint caddr_len; + + caddr_len = sizeof(caddr); + + fd = g_io_channel_unix_get_fd(source); + sock = accept(fd, (struct sockaddr *)&caddr, &caddr_len); + + // first get the command + if (socket_fd_gets(sock, buf, sizeof(buf)) != -1 && strncmp(buf, "open", 4) == 0) + { + geany_debug("remote command: open"); + while (socket_fd_gets(sock, buf, sizeof(buf)) != -1 && *buf != '.') + { + g_strstrip(buf); // remove \n char + + if (g_file_test(buf, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + document_open_file(-1, buf, 0, FALSE, NULL, NULL); + else + geany_debug("got data from socket, but it does not look like a filename"); + } + gtk_window_deiconify(GTK_WINDOW(app->window)); + gtk_window_present(GTK_WINDOW(app->window)); + } + + socket_fd_close(sock); + + return TRUE; +} + + +static gint socket_fd_gets(gint fd, gchar *buf, gint len) +{ + gchar *newline, *bp = buf; + gint n; + + if (--len < 1) + return -1; + do + { + if ((n = socket_fd_recv(fd, bp, len, MSG_PEEK)) <= 0) + return -1; + if ((newline = memchr(bp, '\n', n)) != NULL) + n = newline - bp + 1; + if ((n = socket_fd_read(fd, bp, n)) < 0) + return -1; + bp += n; + len -= n; + } while (! newline && len); + + *bp = '\0'; + return bp - buf; +} + + +static gint socket_fd_recv(gint fd, gchar *buf, gint len, gint flags) +{ + if (socket_fd_check_io(fd, G_IO_IN) < 0) + return -1; + + return recv(fd, buf, len, flags); +} + + +static gint socket_fd_read(gint fd, gchar *buf, gint len) +{ + if (socket_fd_check_io(fd, G_IO_IN) < 0) + return -1; + +#ifdef G_OS_WIN32 + return recv(fd, buf, len, 0); +#else + return read(fd, buf, len); +#endif +} + + +static gint socket_fd_check_io(gint fd, GIOCondition cond) +{ + struct timeval timeout; + fd_set fds; + gint flags; + + timeout.tv_sec = 60; + timeout.tv_usec = 0; + +#ifdef G_OS_UNIX + // checking for non-blocking mode + + flags = fcntl(fd, F_GETFL, 0); + if (flags < 0) + { + perror("fcntl"); + return 0; + } + + if ((flags & O_NONBLOCK) != 0) + return 0; +#endif + + FD_ZERO(&fds); + FD_SET(fd, &fds); + + if (cond == G_IO_IN) + { + select(fd + 1, &fds, NULL, NULL, &timeout); + } + else + { + select(fd + 1, NULL, &fds, NULL, &timeout); + } + + if (FD_ISSET(fd, &fds)) + { + return 0; + } + else + { + geany_debug("Socket IO timeout\n"); + return -1; + } +} + + +static gint socket_fd_write_all(gint fd, const gchar *buf, gint len) +{ + gint n, wrlen = 0; + + while (len) + { + n = socket_fd_write(fd, buf, len); + if (n <= 0) + return -1; + len -= n; + wrlen += n; + buf += n; + } + + return wrlen; +} + + +gint socket_fd_write(gint fd, const gchar *buf, gint len) +{ + if (socket_fd_check_io(fd, G_IO_OUT) < 0) + return -1; + +#ifdef G_OS_WIN32 + return send(fd, buf, len, 0); +#else + return write(fd, buf, len); +#endif +} + + +#endif + + Added: trunk/src/socket.h =================================================================== --- trunk/src/socket.h (rev 0) +++ trunk/src/socket.h 2006-09-07 15:51:24 UTC (rev 798) @@ -0,0 +1,44 @@ +/* + * socket.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + + +#ifndef GEANY_SOCKET_H +#define GEANY_SOCKET_H 1 + + +struct +{ + gboolean ignore_socket; + gchar *file_name; + GIOChannel *read_ioc; + gint lock_socket; + gint lock_socket_tag; +} socket_info; + +gint socket_init(gint argc, gchar **argv); + +gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpointer data); + +gint socket_finalize(); + + +#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: [797] trunk/src/document.c
by eht16＠users.sourceforge.net 06 Sep '06

06 Sep '06

Revision: 797 http://svn.sourceforge.net/geany/?rev=797&view=rev Author: eht16 Date: 2006-09-06 11:26:08 -0700 (Wed, 06 Sep 2006) Log Message: ----------- Fixed wrong function call order when removing documents. Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-09-06 17:53:58 UTC (rev 796) +++ trunk/src/document.c 2006-09-06 18:26:08 UTC (rev 797) @@ -330,8 +330,6 @@ g_free(doc_list[idx].encoding); g_free(doc_list[idx].file_name); tm_workspace_remove_object(doc_list[idx].tm_file, TRUE); - document_undo_clear(idx); - document_redo_clear(idx); doc_list[idx].is_valid = FALSE; doc_list[idx].sci = NULL; doc_list[idx].file_name = NULL; @@ -339,6 +337,8 @@ doc_list[idx].encoding = NULL; doc_list[idx].has_bom = FALSE; doc_list[idx].tm_file = NULL; + document_undo_clear(idx); + document_redo_clear(idx); if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) == 0) { ui_update_tag_list(-1, FALSE); 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 September 2006