Commits March 2011

commits@lists.geany.org

4 participants
116 discussions

SF.net SVN: geany:[5627] trunk
by colombanw＠users.sourceforge.net 25 Mar '11

25 Mar '11

Revision: 5627 http://geany.svn.sourceforge.net/geany/?rev=5627&view=rev Author: colombanw Date: 2011-03-25 15:34:21 +0000 (Fri, 25 Mar 2011) Log Message: ----------- Update Vala keywords (based on a patch from Matthew Brush, thanks) Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.vala Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-24 22:00:34 UTC (rev 5626) +++ trunk/ChangeLog 2011-03-25 15:34:21 UTC (rev 5627) @@ -1,3 +1,9 @@ +2011-03-25 Colomban Wendling <colomban(at)geany(dot)org> + + * data/filetypes.vala: + Update Vala keywords (based on a patch from Matthew Brush, thanks). + + 2011-03-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/filebrowser.c: Modified: trunk/data/filetypes.vala =================================================================== --- trunk/data/filetypes.vala 2011-03-24 22:00:34 UTC (rev 5626) +++ trunk/data/filetypes.vala 2011-03-25 15:34:21 UTC (rev 5627) @@ -26,10 +26,9 @@ [keywords] # all items must be in one line -primary=else if switch case default break continue return for foreach in do while is try catch finally throw namespace interface class struct enum signal errordomain construct callback get set base const static var weak virtual abstract override inline extern public protected private delegate out ref lock using true false null generic new delete base this value typeof sizeof throws requires ensures void bool char uchar int uint short ushort long ulong size_t ssize_t int8 uint8 int16 uint16 int32 uint32 int64 uint64 float double unichar string constpointer time_t -#secondary= -# these are some doxygen keywords (incomplete) -docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +primary=abstract as async base bool break callback case catch char class const constpointer construct continue default delegate delete do double dynamic else ensures enum errordomain extern false finally float for foreach generic get global if in inline int int16 int32 int64 int8 interface internal is lock long namespace new null out override owned private protected public ref requires return set sealed short signal size_t sizeof ssize_t static string struct switch this throw throws time_t true try typeof uchar uint uint16 uint32 uint64 uint8 ulong unichar unowned ushort using value var virtual void weak while yield +# these are some doxygen and valadoc keywords (incomplete) +docComment=attention author brief bug class code date def deprecated enum example exception file fn inheritDoc link namespace note param remarks return see since struct throw throws todo typedef union var version warning [lexer_properties] styling.within.preprocessor=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:[5626] trunk
by colombanw＠users.sourceforge.net 24 Mar '11

24 Mar '11

Revision: 5626 http://geany.svn.sourceforge.net/geany/?rev=5626&view=rev Author: colombanw Date: 2011-03-24 22:00:34 +0000 (Thu, 24 Mar 2011) Log Message: ----------- Fix some compiler warnings * Shadowed function (splitwindow plugin); * Invalid escape sequence (classbuilder plugin); * Non-static local functions (classbuilder plugin); * Missing function argument type (keybindings.c). Modified Paths: -------------- trunk/plugins/classbuilder.c trunk/plugins/splitwindow.c trunk/src/keybindings.c Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2011-03-24 22:00:18 UTC (rev 5625) +++ trunk/plugins/classbuilder.c 2011-03-24 22:00:34 UTC (rev 5626) @@ -201,7 +201,7 @@ {fileheader}\n\ {namespace_decl}\n\ {base_include}\n\ -{abstract_decl}class {class_name}{base_decl}{implements_decl}\n\{\n\ +{abstract_decl}class {class_name}{base_decl}{implements_decl}\n{\n\ {singleton_impl}\ {constructor_impl}\ {destructor_impl}\n\ @@ -356,7 +356,7 @@ } /* Creates a new option label, indented on the left */ -GtkWidget *cc_option_label_new(const gchar *text) +static GtkWidget *cc_option_label_new(const gchar *text) { GtkWidget *align; GtkWidget *label; @@ -373,10 +373,8 @@ /* Attaches a new section label at the specified table row, optionally * padded at the top, and returns the new label. */ -GtkWidget *cc_table_attach_section_label(GtkWidget *table, - const gchar *text, - gint row, - gboolean top_padding) +static GtkWidget *cc_table_attach_section_label(GtkWidget *table, const gchar *text, + gint row, gboolean top_padding) { gchar *markup; GtkWidget *label, *align; @@ -401,9 +399,7 @@ /* Attach a new option label at the specified table row and returns * the label */ -GtkWidget *cc_table_attach_option_label(GtkWidget *table, - const gchar *text, - gint row) +static GtkWidget *cc_table_attach_option_label(GtkWidget *table, const gchar *text, gint row) { GtkWidget *opt_label = cc_option_label_new(text); gtk_table_attach(GTK_TABLE(table), opt_label, @@ -416,9 +412,7 @@ * The label associated with the widget is set as data on the entry * with the "label" key, if access to it is needed later. The entry * widget is returned. */ -GtkWidget *cc_table_attach_option_entry(GtkWidget *table, - const gchar *text, - gint row) +static GtkWidget *cc_table_attach_option_entry(GtkWidget *table, const gchar *text, gint row) { GtkWidget *label; GtkWidget *entry; @@ -431,7 +425,7 @@ return entry; } -void show_dialog_create_class(gint type) +static void show_dialog_create_class(gint type) { CreateClassDialog *cc_dlg; GtkWidget *main_box, *table, *label, *hdr_hbox; Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2011-03-24 22:00:18 UTC (rev 5625) +++ trunk/plugins/splitwindow.c 2011-03-24 22:00:34 UTC (rev 5626) @@ -174,14 +174,14 @@ static GtkWidget *ui_tool_button_new(const gchar *stock_id, const gchar *label, const gchar *tooltip) { GtkToolItem *item; - gchar *dup = NULL; + gchar *dupl = NULL; if (stock_id && !label) { label = ui_get_stock_label(stock_id); } - dup = utils_str_remove_chars(g_strdup(label), "_"); - label = dup; + dupl = utils_str_remove_chars(g_strdup(label), "_"); + label = dupl; item = gtk_tool_button_new(NULL, label); if (stock_id) @@ -192,7 +192,7 @@ if (tooltip) ui_widget_set_tooltip_text(GTK_WIDGET(item), tooltip); - g_free(dup); + g_free(dupl); return GTK_WIDGET(item); } Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2011-03-24 22:00:18 UTC (rev 5625) +++ trunk/src/keybindings.c 2011-03-24 22:00:34 UTC (rev 5626) @@ -1778,7 +1778,7 @@ } -static void update_filename_label() +static void update_filename_label(void) { if (!switch_dialog) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5625] trunk
by colombanw＠users.sourceforge.net 24 Mar '11

24 Mar '11

Revision: 5625 http://geany.svn.sourceforge.net/geany/?rev=5625&view=rev Author: colombanw Date: 2011-03-24 22:00:18 +0000 (Thu, 24 Mar 2011) Log Message: ----------- Improve usage of G_(UN)?LIKELY() G_(UN)?LIKELY() should be only used on whole conditional expressions, and only if the branching is very highly predictable, not if it is only more probable. These macros should be used with care because a wrong prediction may be a lot worst than what a good prediction can give. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c trunk/plugins/saveactions.c trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/document.c trunk/src/document.h trunk/src/editor.c trunk/src/encodings.c trunk/src/filetypes.c trunk/src/highlighting.c trunk/src/log.c trunk/src/main.c trunk/src/plugins.c trunk/src/printing.c trunk/src/project.c trunk/src/search.c trunk/src/socket.c trunk/src/toolbar.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/ChangeLog 2011-03-24 22:00:18 UTC (rev 5625) @@ -19,6 +19,12 @@ src/search.c, src/toolbar.c, src/ui_utils.c, src/ui_utils.h: Make Shift-Enter in search dialog and toolbar search entries search backwards. + * plugins/filebrowser.c, plugins/saveactions.c, src/callbacks.c, + src/dialogs.c, src/document.c, src/document.h, src/editor.c, + src/encodings.c, src/filetypes.c, src/highlighting.c, src/log.c, + src/main.c, src/plugins.c, src/printing.c, src/project.c, src/search.c, + src/socket.c, src/toolbar.c, src/utils.c, src/utils.h: + Improve usage of G_LIKELY() and G_UNLIKELY() macros. 2011-03-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/plugins/filebrowser.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -123,7 +123,7 @@ { gsize len; - if (! NZV(base_name)) + if (G_UNLIKELY(! NZV(base_name))) return FALSE; #ifdef G_OS_WIN32 Modified: trunk/plugins/saveactions.c =================================================================== --- trunk/plugins/saveactions.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/plugins/saveactions.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -91,7 +91,7 @@ { gchar *tmp; - if (! NZV(utf8_dir)) + if (G_UNLIKELY(! NZV(utf8_dir))) return FALSE; tmp = utils_get_locale_from_utf8(utf8_dir); Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/callbacks.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -692,7 +692,7 @@ { GeanyDocument *doc; - if (G_UNLIKELY(main_status.opening_session_files) || G_UNLIKELY(main_status.closing_all)) + if (G_UNLIKELY(main_status.opening_session_files || main_status.closing_all)) return; if (page_num == (guint) -1 && page != NULL) @@ -1931,7 +1931,7 @@ } /* substitute the wildcard %s and run the command if it is non empty */ - if (NZV(command)) + if (G_LIKELY(NZV(command))) { utils_str_replace_all(&command, "%s", word); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/dialogs.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -470,7 +470,7 @@ { case GEANY_RESPONSE_RENAME: /* rename doesn't check for empty filename or overwriting */ - if (! NZV(new_filename)) + if (G_UNLIKELY(! NZV(new_filename))) { utils_beep(); break; Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/document.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -143,7 +143,7 @@ { GeanyDocument *doc = documents[i]; - if (! doc->is_valid || G_UNLIKELY(! doc->real_path)) + if (! doc->is_valid || ! doc->real_path) continue; if (filenamecmp(realname, doc->real_path) == 0) @@ -191,7 +191,7 @@ { doc = documents[i]; - if (! doc->is_valid || G_UNLIKELY(doc->file_name == NULL)) + if (! doc->is_valid || doc->file_name == NULL) continue; if (filenamecmp(utf8_filename, doc->file_name) == 0) @@ -2953,8 +2953,8 @@ /* doc may be closed now */ ret = TRUE; } - else if (! use_gio_filemon && /* ignore these checks when using GIO */ - (G_UNLIKELY(doc->priv->mtime > cur_time) || G_UNLIKELY(st.st_mtime > cur_time))) + else if (G_UNLIKELY(! use_gio_filemon && /* ignore these checks when using GIO */ + (doc->priv->mtime > cur_time || st.st_mtime > cur_time))) { g_warning("%s: Something is wrong with the time stamps.", G_STRFUNC); } Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/document.h 2011-03-24 22:00:18 UTC (rev 5625) @@ -141,7 +141,7 @@ * @note This should not be used to check the result of the main API functions, * these only need a NULL-pointer check - @c document_get_current() != @c NULL. */ #define DOC_VALID(doc_ptr) \ - (G_LIKELY((doc_ptr) != NULL) && G_LIKELY((doc_ptr)->is_valid)) + (G_LIKELY((doc_ptr) != NULL && (doc_ptr)->is_valid)) /** * Returns the filename of the document passed or @c GEANY_STRING_UNTITLED Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/editor.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -817,7 +817,7 @@ (*line)++; while (*line <= lineMaxSubord) { - if (G_UNLIKELY(force)) + if (force) { if (visLevels > 0) SSM(sci, SCI_SHOWLINES, *line, *line); @@ -833,7 +833,7 @@ levelLine = SSM(sci, SCI_GETFOLDLEVEL, *line, 0); if (levelLine & SC_FOLDLEVELHEADERFLAG) { - if (G_UNLIKELY(force)) + if (force) { if (visLevels > 1) SSM(sci, SCI_SETFOLDEXPANDED, *line, 1); @@ -1970,7 +1970,7 @@ GString *words; const gchar **entities = symbols_get_html_entities(); - if (*root != '&' || G_UNLIKELY(entities == NULL)) + if (*root != '&' || entities == NULL) return FALSE; words = g_string_sized_new(500); @@ -2973,7 +2973,7 @@ if (x < line_len && sel[x] != '\0') { /* use single line comment */ - if (cc == NULL || cc[0] == '\0') + if (! NZV(cc)) { single_line = TRUE; @@ -3108,7 +3108,7 @@ while (isspace(sel[x])) x++; /* use single line comment */ - if (cc == NULL || cc[0] == '\0') + if (! NZV(cc)) { gboolean do_continue = FALSE; single_line = TRUE; @@ -3505,7 +3505,7 @@ whitespace = " "; } - if (G_UNLIKELY(style == SCE_D_COMMENTNESTED)) + if (style == SCE_D_COMMENTNESTED) continuation = "+"; /* for nested comments in D */ result = g_strconcat(whitespace, continuation, " ", NULL); Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/encodings.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -282,7 +282,7 @@ gchar *encoding = NULL; regmatch_t pmatch[10]; - if (G_UNLIKELY(! pregs_loaded) || G_UNLIKELY(buffer == NULL)) + if (G_UNLIKELY(! pregs_loaded || buffer == NULL)) return NULL; if (size > 512) Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/filetypes.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -1088,7 +1088,7 @@ /* default extension */ result = g_key_file_get_string(configh, "settings", "extension", NULL); if (result == NULL) result = g_key_file_get_string(config, "settings", "extension", NULL); - if (G_LIKELY(result != NULL)) + if (result != NULL) { setptr(filetypes[ft_id]->extension, result); } @@ -1137,7 +1137,7 @@ /* read context action */ result = g_key_file_get_string(configh, "settings", "context_action_cmd", NULL); if (result == NULL) result = g_key_file_get_string(config, "settings", "context_action_cmd", NULL); - if (G_LIKELY(result != NULL)) + if (result != NULL) { setptr(filetypes[ft_id]->context_action_cmd, result); } @@ -1274,11 +1274,11 @@ pft = ft->priv; /* when reloading, proceed only if the settings were already loaded */ - if (reload && G_UNLIKELY(! pft->keyfile_loaded)) + if (G_UNLIKELY(reload && ! pft->keyfile_loaded)) return; /* when not reloading, load the settings only once */ - if (! reload && G_LIKELY(pft->keyfile_loaded)) + if (G_LIKELY(! reload && pft->keyfile_loaded)) return; pft->keyfile_loaded = TRUE; @@ -1484,7 +1484,7 @@ *filename = NULL; *line = -1; - if (!NZV(regstr)) + if (G_UNLIKELY(! NZV(regstr))) return FALSE; if (!ft->priv->error_regex_compiled || regstr != ft->priv->last_string) Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/highlighting.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -249,7 +249,7 @@ gint c; /* ignore empty strings */ - if (!NZV(str)) + if (G_UNLIKELY(! NZV(str))) return; c = utils_strtod(str, NULL, FALSE); Modified: trunk/src/log.c =================================================================== --- trunk/src/log.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/log.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -118,7 +118,7 @@ { gchar *time_str; - if (G_LIKELY(app != NULL) && app->debug_mode) + if (G_LIKELY(app != NULL && app->debug_mode)) { #ifdef G_OS_WIN32 /* On Windows g_log_default_handler() is not enough, we need to print it Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/main.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -331,7 +331,7 @@ g_assert(*line == -1 && *column == -1); - if (! NZV(filename)) + if (G_UNLIKELY(! NZV(filename))) return; /* allow to open files like "test:0" */ @@ -834,7 +834,7 @@ locale_filename = utils_get_locale_from_utf8(project_prefs.session_file); - if (NZV(locale_filename)) + if (G_LIKELY(NZV(locale_filename))) project_load_file(locale_filename); g_free(locale_filename); Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/plugins.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -705,7 +705,7 @@ /* read plugin name, etc. */ plugin_set_info(&plugin->info); - if (!NZV(plugin->info.name)) + if (G_UNLIKELY(! NZV(plugin->info.name))) { geany_debug("No plugin name set in plugin_set_info() for \"%s\" - ignoring plugin!", fname); Modified: trunk/src/printing.c =================================================================== --- trunk/src/printing.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/printing.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -311,7 +311,7 @@ g_free(data); datetime = utils_get_date_time(printing_prefs.page_header_datefmt, &(dinfo->print_time)); - if (NZV(datetime)) + if (G_LIKELY(NZV(datetime))) { data = g_strdup_printf("<b>%s</b>", datetime); pango_layout_set_markup(layout, data, -1); Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/project.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -684,7 +684,7 @@ else file_name = gtk_label_get_text(GTK_LABEL(e->file_name)); - if (! NZV(file_name)) + if (G_UNLIKELY(! NZV(file_name))) { SHOW_ERR(_("You have specified an invalid project filename.")); gtk_widget_grab_focus(e->file_name); Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/search.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -1085,7 +1085,7 @@ /* clear previous search indicators */ editor_indicator_clear(doc->editor, GEANY_INDICATOR_SEARCH); - if (!NZV(search_text)) + if (G_UNLIKELY(! NZV(search_text))) return 0; ttf.chrg.cpMin = 0; @@ -1160,7 +1160,7 @@ search_data.flags = int_search_flags(settings.find_case_sensitive, settings.find_match_whole_word, settings.find_regexp, settings.find_match_word_start); - if (search_data.text[0] == '\0') + if (! NZV(search_data.text)) { fail: utils_beep(); @@ -1430,7 +1430,7 @@ GeanyEncodingIndex enc_idx = gtk_combo_box_get_active( GTK_COMBO_BOX(fif_dlg.encoding_combo)); - if (!NZV(utf8_dir)) + if (G_UNLIKELY(! NZV(utf8_dir))) ui_set_statusbar(FALSE, _("Invalid directory for find in files.")); else if (NZV(search_text)) { @@ -1908,7 +1908,7 @@ doc = document_get_current(); g_return_if_fail(doc != NULL); - if (!NZV(search_text)) + if (G_UNLIKELY(! NZV(search_text))) { utils_beep(); return; Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/socket.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -93,9 +93,9 @@ #ifdef G_OS_WIN32 #define REMOTE_CMD_PORT 49876 -#define SOCKET_IS_VALID(s) (G_LIKELY((s) != INVALID_SOCKET)) +#define SOCKET_IS_VALID(s) ((s) != INVALID_SOCKET) #else -#define SOCKET_IS_VALID(s) (G_LIKELY((s) >= 0)) +#define SOCKET_IS_VALID(s) ((s) >= 0) #define INVALID_SOCKET (-1) #endif #define BUFFER_LENGTH 4096 @@ -468,7 +468,7 @@ gchar val; sock = socket(AF_INET, SOCK_STREAM, 0); - if (! SOCKET_IS_VALID(sock)) + if (G_UNLIKELY(! SOCKET_IS_VALID(sock))) { geany_debug("fd_open_inet(): socket() failed: %d\n", WSAGetLastError()); return -1; @@ -511,7 +511,7 @@ struct sockaddr_in addr; sock = socket(AF_INET, SOCK_STREAM, 0); - if (! SOCKET_IS_VALID(sock)) + if (G_UNLIKELY(! SOCKET_IS_VALID(sock))) { geany_debug("fd_connect_inet(): socket() failed: %d\n", WSAGetLastError()); return -1; Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/toolbar.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -793,7 +793,7 @@ return; gtk_tree_model_get(model, &iter, TB_EDITOR_COL_ACTION, &name, -1); - if (! NZV(name)) + if (G_UNLIKELY(! NZV(name))) return; atom = gdk_atom_intern(tb_editor_dnd_targets[0].target, FALSE); @@ -869,7 +869,7 @@ if (utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) g_string_append_printf(data, "\t\t<separator/>\n"); - else if (NZV(action_name)) + else if (G_LIKELY(NZV(action_name))) g_string_append_printf(data, "\t\t<toolitem action='%s' />\n", action_name); g_free(action_name); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/utils.c 2011-03-24 22:00:18 UTC (rev 5625) @@ -423,7 +423,7 @@ /* NULL-safe version of g_path_is_absolute(). */ gboolean utils_is_absolute_path(const gchar *path) { - if (! NZV(path)) + if (G_UNLIKELY(! NZV(path))) return FALSE; return g_path_is_absolute(path); @@ -832,7 +832,7 @@ return default_value; tmp = g_key_file_get_integer(config, section, key, &error); - if (G_UNLIKELY(error)) + if (error) { g_error_free(error); return default_value; @@ -863,7 +863,7 @@ return default_value; tmp = g_key_file_get_boolean(config, section, key, &error); - if (G_UNLIKELY(error)) + if (error) { g_error_free(error); return default_value; @@ -893,7 +893,7 @@ return g_strdup(default_value); tmp = g_key_file_get_string(config, section, key, NULL); - if (G_UNLIKELY(!tmp)) + if (!tmp) { return g_strdup(default_value); } @@ -1941,7 +1941,7 @@ gchar *w = string; g_return_val_if_fail(string, NULL); - if (!NZV(chars)) + if (G_UNLIKELY(! NZV(chars))) return string; foreach_str(r, string) Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2011-03-24 17:59:05 UTC (rev 5624) +++ trunk/src/utils.h 2011-03-24 22:00:18 UTC (rev 5625) @@ -35,7 +35,7 @@ /** Returns TRUE if @a ptr points to a non-zero value. */ #define NZV(ptr) \ - (G_LIKELY((ptr)) && G_LIKELY((ptr)[0])) + ((ptr) && (ptr)[0]) /** * Frees @a ptr (if not @c NULL), then assigns @a result to it. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5624] trunk
by ntrel＠users.sourceforge.net 24 Mar '11

24 Mar '11

Revision: 5624 http://geany.svn.sourceforge.net/geany/?rev=5624&view=rev Author: ntrel Date: 2011-03-24 17:59:05 +0000 (Thu, 24 Mar 2011) Log Message: ----------- Make VTE copy/paste shortcuts work if 'Override Geany keybindings' is not set. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-24 17:33:47 UTC (rev 5623) +++ trunk/ChangeLog 2011-03-24 17:59:05 UTC (rev 5624) @@ -5,6 +5,9 @@ * src/keybindings.c, src/vte.c: Add fixed shortcuts for VTE copy (Ctrl-Shift-C) and paste (Ctrl-Shift-V). + * src/keybindings.c: + Make VTE copy/paste shortcuts work if 'Override Geany + keybindings' is not set. 2011-03-24 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2011-03-24 17:33:47 UTC (rev 5623) +++ trunk/src/keybindings.c 2011-03-24 17:59:05 UTC (rev 5624) @@ -1074,6 +1074,9 @@ GeanyKeyGroup *group; GtkWidget *widget; + /* let VTE copy/paste override any user keybinding */ + if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) && (keyval == GDK_c || keyval == GDK_v)) + return TRUE; if (! vc->enable_bash_keys) return FALSE; if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != vc->vte) @@ -1083,9 +1086,6 @@ return FALSE; if (state == 0 && (keyval < GDK_F1 || keyval > GDK_F35)) /* e.g. backspace */ return FALSE; - /* let VTE copy/paste override any user keybinding */ - if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) && (keyval == GDK_c || keyval == GDK_v)) - return TRUE; /* make focus commands override any bash commands */ group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_FOCUS); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5623] trunk
by ntrel＠users.sourceforge.net 24 Mar '11

24 Mar '11

Revision: 5623 http://geany.svn.sourceforge.net/geany/?rev=5623&view=rev Author: ntrel Date: 2011-03-24 17:33:47 +0000 (Thu, 24 Mar 2011) Log Message: ----------- Add fixed shortcuts for VTE copy (Ctrl-Shift-C) and paste (Ctrl-Shift-V). Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-24 16:52:34 UTC (rev 5622) +++ trunk/ChangeLog 2011-03-24 17:33:47 UTC (rev 5623) @@ -2,6 +2,9 @@ * plugins/filebrowser.c: Add history to filter entry. + * src/keybindings.c, src/vte.c: + Add fixed shortcuts for VTE copy (Ctrl-Shift-C) and paste + (Ctrl-Shift-V). 2011-03-24 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2011-03-24 16:52:34 UTC (rev 5622) +++ trunk/src/keybindings.c 2011-03-24 17:33:47 UTC (rev 5623) @@ -1083,6 +1083,9 @@ return FALSE; if (state == 0 && (keyval < GDK_F1 || keyval > GDK_F35)) /* e.g. backspace */ return FALSE; + /* let VTE copy/paste override any user keybinding */ + if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) && (keyval == GDK_c || keyval == GDK_v)) + return TRUE; /* make focus commands override any bash commands */ group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_FOCUS); Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2011-03-24 16:52:34 UTC (rev 5622) +++ trunk/src/vte.c 2011-03-24 17:33:47 UTC (rev 5623) @@ -60,7 +60,6 @@ static gboolean clean = TRUE; static GModule *module = NULL; static struct VteFunctions *vf; -static gboolean popup_menu_created = FALSE; static gchar *gtk_menu_key_accel = NULL; static gint vte_prefs_tab_num = -1; @@ -232,6 +231,15 @@ } +static void on_vte_realize(void) +{ + /* the vte widget has to be realised before color changes take effect */ + vte_apply_user_settings(); + + vf->vte_terminal_im_append_menuitems(VTE_TERMINAL(vc->vte), GTK_MENU_SHELL(vc->im_submenu)); +} + + static void create_vte(void) { GtkWidget *vte, *scrollbar, *hbox, *frame; @@ -240,6 +248,9 @@ scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(vte)->adjustment)); GTK_WIDGET_UNSET_FLAGS(scrollbar, GTK_CAN_FOCUS); + /* create menu now so copy/paste shortcuts work */ + vc->menu = vte_create_popup_menu(); + frame = gtk_frame_new(NULL); hbox = gtk_hbox_new(FALSE, 0); @@ -271,8 +282,7 @@ gtk_widget_show_all(frame); gtk_notebook_insert_page(GTK_NOTEBOOK(msgwindow.notebook), frame, gtk_label_new(_("Terminal")), MSG_VTE); - /* the vte widget has to be realised before color changes take effect */ - g_signal_connect_after(vte, "realize", G_CALLBACK(vte_apply_user_settings), NULL); + g_signal_connect_after(vte, "realize", G_CALLBACK(on_vte_realize), NULL); } @@ -282,8 +292,7 @@ /* free the vte widget before unloading vte module * this prevents a segfault on X close window if the message window is hidden */ gtk_widget_destroy(vc->vte); - if (popup_menu_created) - gtk_widget_destroy(vc->menu); + gtk_widget_destroy(vc->menu); g_free(vc->emulation); g_free(vc->shell); g_free(vc->font); @@ -378,17 +387,9 @@ { if (event->button == 3) { - if (G_UNLIKELY(! popup_menu_created)) - { - vc->menu = vte_create_popup_menu(); - vf->vte_terminal_im_append_menuitems(VTE_TERMINAL(vc->vte), GTK_MENU_SHELL(vc->im_submenu)); - popup_menu_created = TRUE; - } - gtk_widget_grab_focus(vc->vte); gtk_menu_popup(GTK_MENU(vc->menu), NULL, NULL, NULL, NULL, event->button, event->time); } - return FALSE; } @@ -507,15 +508,23 @@ static GtkWidget *vte_create_popup_menu(void) { GtkWidget *menu, *item; + GtkAccelGroup *accel_group; menu = gtk_menu_new(); + accel_group = gtk_accel_group_new(); + gtk_window_add_accel_group(GTK_WINDOW(main_widgets.window), accel_group); + item = gtk_image_menu_item_new_from_stock("gtk-copy", NULL); + gtk_widget_add_accelerator(item, "activate", accel_group, + GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_COPY)); item = gtk_image_menu_item_new_from_stock("gtk-paste", NULL); + gtk_widget_add_accelerator(item, "activate", accel_group, + GDK_v, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_PASTE)); @@ -566,7 +575,7 @@ gtk_container_add(GTK_CONTAINER(menu), item); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu); - + /* submenu populated after vte realized */ return menu; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5622] trunk/src
by colombanw＠users.sourceforge.net 24 Mar '11

24 Mar '11

Revision: 5622 http://geany.svn.sourceforge.net/geany/?rev=5622&view=rev Author: colombanw Date: 2011-03-24 16:52:34 +0000 (Thu, 24 Mar 2011) Log Message: ----------- Make a few variable holding strings constant Modified Paths: -------------- trunk/src/tools.c trunk/src/ui_utils.c Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2011-03-24 16:51:02 UTC (rev 5621) +++ trunk/src/tools.c 2011-03-24 16:52:34 UTC (rev 5622) @@ -584,7 +584,8 @@ GtkWidget *dialog, *label, *vbox, *table; GeanyDocument *doc; guint chars = 0, lines = 0, words = 0; - gchar *text, *range; + gchar *text; + const gchar *range; doc = document_get_current(); g_return_if_fail(doc != NULL); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2011-03-24 16:51:02 UTC (rev 5621) +++ trunk/src/ui_utils.c 2011-03-24 16:52:34 UTC (rev 5622) @@ -2015,9 +2015,9 @@ typedef struct GeanySharedMenu { - gchar *menu; - gchar *menubar_item; - gchar *popup_item; + const gchar *menu; + const gchar *menubar_item; + const gchar *popup_item; } GeanySharedMenu; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5621] trunk
by colombanw＠users.sourceforge.net 24 Mar '11

24 Mar '11

Revision: 5621 http://geany.svn.sourceforge.net/geany/?rev=5621&view=rev Author: colombanw Date: 2011-03-24 16:51:02 +0000 (Thu, 24 Mar 2011) Log Message: ----------- Make Shift-Enter in search dialog and toolbar search entries search backwards Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/document.c trunk/src/document.h trunk/src/geanyentryaction.c trunk/src/search.c trunk/src/toolbar.c trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/ChangeLog 2011-03-24 16:51:02 UTC (rev 5621) @@ -8,6 +8,11 @@ * doc/geany.txt, doc/geany.html: Update the documentation to talk about real-time tag parsing. + * doc/geany.txt, doc/geany.html, src/callbacks.c, src/callbacks.h, + src/document.c, src/document.h, src/geanyentryaction.c, + src/search.c, src/toolbar.c, src/ui_utils.c, src/ui_utils.h: + Make Shift-Enter in search dialog and toolbar search entries search + backwards. 2011-03-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/doc/geany.html 2011-03-24 16:51:02 UTC (rev 5621) @@ -1578,7 +1578,8 @@ <h4><a class="toc-backref" href="#id60">Search bar</a></h4> <p>The quickest way to find some text is to use the search bar entry in the toolbar. This performs a case-insensitive search in the current -document whilst you type. Pressing Enter will search again.</p> +document whilst you type. Pressing Enter will search again, and pressing +Shift-Enter will search backwards.</p> </div> </div> <div class="section" id="find"> @@ -6483,7 +6484,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2011-03-24 02:06 UTC. +Generated on: 2011-03-24 16:40 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/doc/geany.txt 2011-03-24 16:51:02 UTC (rev 5621) @@ -1167,7 +1167,8 @@ `````````` The quickest way to find some text is to use the search bar entry in the toolbar. This performs a case-insensitive search in the current -document whilst you type. Pressing Enter will search again. +document whilst you type. Pressing Enter will search again, and pressing +Shift-Enter will search backwards. Find ^^^^ Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/src/callbacks.c 2011-03-24 16:51:02 UTC (rev 5621) @@ -535,24 +535,22 @@ /* store text, clear search flags so we can use Search->Find Next/Previous */ -static void setup_find_next(const gchar *text) +static void setup_find(const gchar *text, gboolean backwards) { setptr(search_data.text, g_strdup(text)); search_data.flags = 0; - search_data.backwards = FALSE; + search_data.backwards = backwards; search_data.search_bar = TRUE; } -/* search text */ -void -on_toolbar_search_entry_changed(GtkAction *action, const gchar *text, gpointer user_data) +static void do_toolbar_search(const gchar *text, gboolean incremental, gboolean backwards) { GeanyDocument *doc = document_get_current(); gboolean result; - setup_find_next(text); - result = document_search_bar_find(doc, search_data.text, 0, GPOINTER_TO_INT(user_data)); + setup_find(text, backwards); + result = document_search_bar_find(doc, search_data.text, 0, incremental, backwards); if (search_data.search_bar) ui_set_search_entry_background(toolbar_get_widget_child_by_name("SearchEntry"), result); } @@ -560,6 +558,22 @@ /* search text */ void +on_toolbar_search_entry_changed(GtkAction *action, const gchar *text, gpointer user_data) +{ + do_toolbar_search(text, TRUE, FALSE); +} + + +/* search text */ +void +on_toolbar_search_entry_activate(GtkAction *action, const gchar *text, gpointer user_data) +{ + do_toolbar_search(text, FALSE, GPOINTER_TO_INT(user_data)); +} + + +/* search text */ +void on_toolbutton_search_clicked (GtkAction *action, gpointer user_data) { @@ -571,8 +585,8 @@ { const gchar *text = gtk_entry_get_text(GTK_ENTRY(entry)); - setup_find_next(text); - result = document_search_bar_find(doc, search_data.text, 0, FALSE); + setup_find(text, FALSE); + result = document_search_bar_find(doc, search_data.text, 0, FALSE, FALSE); if (search_data.search_bar) ui_set_search_entry_background(entry, result); } Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/src/callbacks.h 2011-03-24 16:51:02 UTC (rev 5621) @@ -143,6 +143,11 @@ gpointer user_data); void +on_toolbar_search_entry_activate (GtkAction *action, + const gchar *text, + gpointer user_data); + +void on_toggle_case1_activate (GtkMenuItem *menuitem, gpointer user_data); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/src/document.c 2011-03-24 16:51:02 UTC (rev 5621) @@ -1826,7 +1826,8 @@ /* special search function, used from the find entry in the toolbar * return TRUE if text was found otherwise FALSE * return also TRUE if text is empty */ -gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gint flags, gboolean inc) +gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gint flags, gboolean inc, + gboolean backwards) { gint start_pos, search_pos; struct Sci_TextToFind ttf; @@ -1836,20 +1837,28 @@ if (! *text) return TRUE; - start_pos = (inc) ? sci_get_selection_start(doc->editor->sci) : + start_pos = (inc || backwards) ? sci_get_selection_start(doc->editor->sci) : sci_get_selection_end(doc->editor->sci); /* equal if no selection */ - /* search cursor to end */ + /* search cursor to end or start */ ttf.chrg.cpMin = start_pos; - ttf.chrg.cpMax = sci_get_length(doc->editor->sci); + ttf.chrg.cpMax = backwards ? 0 : sci_get_length(doc->editor->sci); ttf.lpstrText = (gchar *)text; search_pos = sci_find_text(doc->editor->sci, flags, &ttf); - /* if no match, search start to cursor */ + /* if no match, search start (or end) to cursor */ if (search_pos == -1) { - ttf.chrg.cpMin = 0; - ttf.chrg.cpMax = start_pos + strlen(text); + if (backwards) + { + ttf.chrg.cpMin = sci_get_length(doc->editor->sci); + ttf.chrg.cpMax = start_pos; + } + else + { + ttf.chrg.cpMin = 0; + ttf.chrg.cpMax = start_pos + strlen(text); + } search_pos = sci_find_text(doc->editor->sci, flags, &ttf); } Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/src/document.h 2011-03-24 16:51:02 UTC (rev 5621) @@ -214,7 +214,8 @@ void document_open_files(const GSList *filenames, gboolean readonly, GeanyFiletype *ft, const gchar *forced_enc); -gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gint flags, gboolean inc); +gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gint flags, gboolean inc, + gboolean backwards); gint document_find_text(GeanyDocument *doc, const gchar *text, gint flags, gboolean search_backwards, gboolean scroll, GtkWidget *parent); Modified: trunk/src/geanyentryaction.c =================================================================== --- trunk/src/geanyentryaction.c 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/src/geanyentryaction.c 2011-03-24 16:51:02 UTC (rev 5621) @@ -47,6 +47,7 @@ enum { ENTRY_ACTIVATE, + ENTRY_ACTIVATE_BACKWARD, ENTRY_CHANGED, LAST_SIGNAL @@ -67,6 +68,7 @@ gtk_entry_set_width_chars(GTK_ENTRY(priv->entry), 9); ui_entry_add_clear_icon(GTK_ENTRY(priv->entry)); + ui_entry_add_activate_backward_signal(GTK_ENTRY(priv->entry)); gtk_widget_show(priv->entry); @@ -86,6 +88,15 @@ } +static void delegate_entry_activate_backward_cb(GtkEntry *entry, GeanyEntryAction *action) +{ + GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action); + const gchar *text = gtk_entry_get_text(GTK_ENTRY(priv->entry)); + + g_signal_emit(action, signals[ENTRY_ACTIVATE_BACKWARD], 0, text); +} + + static void delegate_entry_changed_cb(GtkEditable *editable, GeanyEntryAction *action) { GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action); @@ -104,8 +115,10 @@ G_CALLBACK(ui_editable_insert_text_callback), NULL); g_signal_connect(priv->entry, "changed", G_CALLBACK(delegate_entry_changed_cb), action); g_signal_connect(priv->entry, "activate", G_CALLBACK(delegate_entry_activate_cb), action); + g_signal_connect(priv->entry, "activate-backward", + G_CALLBACK(delegate_entry_activate_backward_cb), action); - GTK_ACTION_CLASS(geany_entry_action_parent_class)->connect_proxy(action, widget); + GTK_ACTION_CLASS(geany_entry_action_parent_class)->connect_proxy(action, widget); } @@ -121,18 +134,26 @@ signals[ENTRY_CHANGED] = g_signal_new("entry-changed", G_TYPE_FROM_CLASS(klass), - (GSignalFlags) 0, + G_SIGNAL_RUN_LAST, 0, - 0, NULL, + NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); signals[ENTRY_ACTIVATE] = g_signal_new("entry-activate", G_TYPE_FROM_CLASS(klass), - (GSignalFlags) 0, + G_SIGNAL_RUN_LAST, 0, + NULL, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); + signals[ENTRY_ACTIVATE_BACKWARD] = g_signal_new("entry-activate-backward", + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, 0, NULL, + NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); } Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/src/search.c 2011-03-24 16:51:02 UTC (rev 5621) @@ -160,6 +160,9 @@ on_find_entry_activate(GtkEntry *entry, gpointer user_data); static void +on_find_entry_activate_backward(GtkEntry *entry, gpointer user_data); + +static void on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data); static void @@ -476,6 +479,9 @@ g_signal_connect(gtk_bin_get_child(GTK_BIN(entry)), "activate", G_CALLBACK(on_find_entry_activate), NULL); + ui_entry_add_activate_backward_signal(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry)))); + g_signal_connect(gtk_bin_get_child(GTK_BIN(entry)), "activate-backward", + G_CALLBACK(on_find_entry_activate_backward), NULL); g_signal_connect(find_dlg.dialog, "response", G_CALLBACK(on_find_dialog_response), entry); g_signal_connect(find_dlg.dialog, "delete-event", @@ -1109,6 +1115,18 @@ } +static void +on_find_entry_activate_backward(GtkEntry *entry, gpointer user_data) +{ + /* can't search backwards with a regexp */ + if (search_data.flags & SCFIND_REGEXP) + utils_beep(); + else + on_find_dialog_response(NULL, GEANY_RESPONSE_FIND_PREVIOUS, + ui_lookup_widget(GTK_WIDGET(entry), "entry")); +} + + #define int_search_flags(match_case, whole_word, regexp, word_start) \ ((match_case ? SCFIND_MATCHCASE : 0) | \ (whole_word ? SCFIND_WHOLEWORD : 0) | \ Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/src/toolbar.c 2011-03-24 16:51:02 UTC (rev 5621) @@ -381,9 +381,11 @@ action_searchentry = geany_entry_action_new( "SearchEntry", _("Search"), _("Find the entered text in the current file"), FALSE); g_signal_connect(action_searchentry, "entry-activate", - G_CALLBACK(on_toolbar_search_entry_changed), GINT_TO_POINTER(FALSE)); + G_CALLBACK(on_toolbar_search_entry_activate), GINT_TO_POINTER(FALSE)); + g_signal_connect(action_searchentry, "entry-activate-backward", + G_CALLBACK(on_toolbar_search_entry_activate), GINT_TO_POINTER(TRUE)); g_signal_connect(action_searchentry, "entry-changed", - G_CALLBACK(on_toolbar_search_entry_changed), GINT_TO_POINTER(TRUE)); + G_CALLBACK(on_toolbar_search_entry_changed), NULL); gtk_action_group_add_action(group, action_searchentry); action_gotoentry = geany_entry_action_new( Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/src/ui_utils.c 2011-03-24 16:51:02 UTC (rev 5621) @@ -1436,6 +1436,35 @@ } +/* Adds a :activate-backwards signal emitted by default when <Shift>Return is pressed */ +void ui_entry_add_activate_backward_signal(GtkEntry *entry) +{ + static gboolean installed = FALSE; + + g_return_if_fail(GTK_IS_ENTRY(entry)); + + if (G_UNLIKELY(! installed)) + { + GtkBindingSet *binding_set; + + installed = TRUE; + + /* try to handle the unexpected case where GTK would already have installed the signal */ + if (g_signal_lookup("activate-backward", G_TYPE_FROM_INSTANCE(entry))) + { + g_warning("Signal GtkEntry:activate-backward is unexpectedly already installed"); + return; + } + + g_signal_new("activate-backward", G_TYPE_FROM_INSTANCE(entry), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + binding_set = gtk_binding_set_by_class(GTK_ENTRY_GET_CLASS(entry)); + gtk_binding_entry_add_signal(binding_set, GDK_Return, GDK_SHIFT_MASK, "activate-backward", 0); + } +} + + static void add_to_size_group(GtkWidget *widget, gpointer size_group) { g_return_if_fail(GTK_IS_SIZE_GROUP(size_group)); Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2011-03-24 16:34:10 UTC (rev 5620) +++ trunk/src/ui_utils.h 2011-03-24 16:51:02 UTC (rev 5621) @@ -211,6 +211,8 @@ void ui_entry_add_clear_icon(GtkEntry *entry); +void ui_entry_add_activate_backward_signal(GtkEntry *entry); + void ui_editable_insert_text_callback(GtkEditable *editable, gchar *new_text, gint new_text_len, gint *position, gpointer data); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5620] trunk
by ntrel＠users.sourceforge.net 24 Mar '11

24 Mar '11

Revision: 5620 http://geany.svn.sourceforge.net/geany/?rev=5620&view=rev Author: ntrel Date: 2011-03-24 16:34:10 +0000 (Thu, 24 Mar 2011) Log Message: ----------- Add history to filter entry. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-24 02:11:46 UTC (rev 5619) +++ trunk/ChangeLog 2011-03-24 16:34:10 UTC (rev 5620) @@ -1,3 +1,9 @@ +2011-03-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * plugins/filebrowser.c: + Add history to filter entry. + + 2011-03-24 Colomban Wendling <colomban(at)geany(dot)org> * doc/geany.txt, doc/geany.html: Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2011-03-24 02:11:46 UTC (rev 5619) +++ trunk/plugins/filebrowser.c 2011-03-24 16:34:10 UTC (rev 5620) @@ -74,6 +74,7 @@ static GtkTreeIter *last_dir_iter = NULL; static GtkEntryCompletion *entry_completion = NULL; +static GtkWidget *filter_combo; static GtkWidget *filter_entry; static GtkWidget *path_combo; static GtkWidget *path_entry; @@ -785,11 +786,11 @@ } -static void on_path_combo_changed(GtkComboBox *combo, gpointer user_data) +static void ui_combo_box_changed(GtkComboBox *combo, gpointer user_data) { /* we get this callback on typing as well as choosing an item */ if (gtk_combo_box_get_active(combo) >= 0) - on_path_entry_activate(GTK_ENTRY(path_entry), NULL); + gtk_widget_activate(GTK_BIN(combo)->child); } @@ -802,6 +803,7 @@ { clear_filter(); } + ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(filter_combo), NULL, 0); refresh(); } @@ -905,7 +907,8 @@ label = gtk_label_new(_("Filter:")); - filter_entry = gtk_entry_new(); + filter_combo = gtk_combo_box_entry_new_text(); + filter_entry = GTK_BIN(filter_combo)->child; if (gtk_check_version(2, 15, 2) == NULL) { @@ -915,9 +918,10 @@ ui_widget_set_tooltip_text(filter_entry, _("Filter your files with the usual wildcards. Separate multiple patterns with a space.")); g_signal_connect(filter_entry, "activate", G_CALLBACK(on_filter_activate), NULL); + g_signal_connect(filter_combo, "changed", G_CALLBACK(ui_combo_box_changed), NULL); gtk_box_pack_start(GTK_BOX(filterbar), label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(filterbar), filter_entry, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(filterbar), filter_combo, TRUE, TRUE, 0); return filterbar; } @@ -1107,7 +1111,7 @@ path_combo = gtk_combo_box_entry_new_text(); gtk_box_pack_start(GTK_BOX(file_view_vbox), path_combo, FALSE, FALSE, 2); - g_signal_connect(path_combo, "changed", G_CALLBACK(on_path_combo_changed), NULL); + g_signal_connect(path_combo, "changed", G_CALLBACK(ui_combo_box_changed), NULL); path_entry = GTK_BIN(path_combo)->child; g_signal_connect(path_entry, "activate", G_CALLBACK(on_path_entry_activate), NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5619] trunk
by colombanw＠users.sourceforge.net 23 Mar '11

23 Mar '11

Revision: 5619 http://geany.svn.sourceforge.net/geany/?rev=5619&view=rev Author: colombanw Date: 2011-03-24 02:11:46 +0000 (Thu, 24 Mar 2011) Log Message: ----------- Improve wording of the last commit and update the ChangeLog Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-23 22:36:56 UTC (rev 5618) +++ trunk/ChangeLog 2011-03-24 02:11:46 UTC (rev 5619) @@ -1,3 +1,9 @@ +2011-03-24 Colomban Wendling <colomban(at)geany(dot)org> + + * doc/geany.txt, doc/geany.html: + Update the documentation to talk about real-time tag parsing. + + 2011-03-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/main.c: Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-03-23 22:36:56 UTC (rev 5618) +++ trunk/doc/geany.html 2011-03-24 02:11:46 UTC (rev 5619) @@ -1909,12 +1909,11 @@ tags files, as described below.</p> <div class="section" id="workspace-tags"> <h3><a class="toc-backref" href="#id78">Workspace tags</a></h3> -<p>Tags for each document are parsed whenever a file is loaded or saved, and -possibly when modified (see <em>Symbol list update frequency</em> preference in the -<a class="reference internal" href="#editor-completions-preferences">Editor Completions preferences</a>). These are shown in the Symbol list in -the Sidebar. These tags are also used for autocompletion of symbols and -calltips for all documents open in the current session that have the same -filetype.</p> +<p>Tags for each document are parsed whenever a file is loaded, saved or +modified (see <em>Symbol list update frequency</em> preference in the <a class="reference internal" href="#editor-completions-preferences">Editor +Completions preferences</a>). These are shown in the Symbol list in the +Sidebar. These tags are also used for autocompletion of symbols and calltips +for all documents open in the current session that have the same filetype.</p> <p>The <em>Go to Tag</em> commands can be used with all workspace tags. See <a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> @@ -2433,11 +2432,11 @@ <dt>Symbol list update frequency</dt> <dd><p class="first">The minimum delay (in milliseconds) between two symbol list updates.</p> <p>This option determines how frequently the tag list is updated for the -current document. The smaller is the delay the more up-to-date is the -symbol list (and then the completions); but rebuilding the symbol list -has a cost in performance, especially with large files.</p> -<p>The default value is 250, which means the symbol list will be updated at -most 4 times per second, even if the document changes continuously.</p> +current document. The smaller the delay, the more up-to-date the symbol +list (and then the completions); but rebuilding the symbol list has a +cost in performance, especially with large files.</p> +<p>The default value is 250ms, which means the symbol list will be updated +at most four times per second, even if the document changes continuously.</p> <p class="last">A value of 0 disables automatic updates, so the symbol list will only be updated upon document saving.</p> </dd> @@ -6484,7 +6483,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2011-03-23 22:34 UTC. +Generated on: 2011-03-24 02:06 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-03-23 22:36:56 UTC (rev 5618) +++ trunk/doc/geany.txt 2011-03-24 02:11:46 UTC (rev 5619) @@ -1505,12 +1505,11 @@ Workspace tags ^^^^^^^^^^^^^^ -Tags for each document are parsed whenever a file is loaded or saved, and -possibly when modified (see *Symbol list update frequency* preference in the -`Editor Completions preferences`_). These are shown in the Symbol list in -the Sidebar. These tags are also used for autocompletion of symbols and -calltips for all documents open in the current session that have the same -filetype. +Tags for each document are parsed whenever a file is loaded, saved or +modified (see *Symbol list update frequency* preference in the `Editor +Completions preferences`_). These are shown in the Symbol list in the +Sidebar. These tags are also used for autocompletion of symbols and calltips +for all documents open in the current session that have the same filetype. The *Go to Tag* commands can be used with all workspace tags. See `Go to tag definition`_. @@ -2096,12 +2095,12 @@ The minimum delay (in milliseconds) between two symbol list updates. This option determines how frequently the tag list is updated for the - current document. The smaller is the delay the more up-to-date is the - symbol list (and then the completions); but rebuilding the symbol list - has a cost in performance, especially with large files. + current document. The smaller the delay, the more up-to-date the symbol + list (and then the completions); but rebuilding the symbol list has a + cost in performance, especially with large files. - The default value is 250, which means the symbol list will be updated at - most 4 times per second, even if the document changes continuously. + The default value is 250ms, which means the symbol list will be updated + at most four times per second, even if the document changes continuously. A value of 0 disables automatic updates, so the symbol list will only be updated upon document saving. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5618] trunk/doc
by colombanw＠users.sourceforge.net 23 Mar '11

23 Mar '11

Revision: 5618 http://geany.svn.sourceforge.net/geany/?rev=5618&view=rev Author: colombanw Date: 2011-03-23 22:36:56 +0000 (Wed, 23 Mar 2011) Log Message: ----------- Update the documentation to talk about real-time tag parsing Modified Paths: -------------- trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-03-22 23:08:43 UTC (rev 5617) +++ trunk/doc/geany.html 2011-03-23 22:36:56 UTC (rev 5618) @@ -1909,10 +1909,12 @@ tags files, as described below.</p> <div class="section" id="workspace-tags"> <h3><a class="toc-backref" href="#id78">Workspace tags</a></h3> -<p>Tags for each document are parsed whenever a file is loaded or -saved. These are shown in the Symbol list in the Sidebar. These tags -are also used for autocompletion of symbols and calltips for all documents -open in the current session that have the same filetype.</p> +<p>Tags for each document are parsed whenever a file is loaded or saved, and +possibly when modified (see <em>Symbol list update frequency</em> preference in the +<a class="reference internal" href="#editor-completions-preferences">Editor Completions preferences</a>). These are shown in the Symbol list in +the Sidebar. These tags are also used for autocompletion of symbols and +calltips for all documents open in the current session that have the same +filetype.</p> <p>The <em>Go to Tag</em> commands can be used with all workspace tags. See <a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> @@ -2428,6 +2430,17 @@ <dd>The number of rows to display for the autocompletion window.</dd> <dt>Max. symbol name suggestions</dt> <dd>The maximum number of items in the autocompletion list.</dd> +<dt>Symbol list update frequency</dt> +<dd><p class="first">The minimum delay (in milliseconds) between two symbol list updates.</p> +<p>This option determines how frequently the tag list is updated for the +current document. The smaller is the delay the more up-to-date is the +symbol list (and then the completions); but rebuilding the symbol list +has a cost in performance, especially with large files.</p> +<p>The default value is 250, which means the symbol list will be updated at +most 4 times per second, even if the document changes continuously.</p> +<p class="last">A value of 0 disables automatic updates, so the symbol list will only be +updated upon document saving.</p> +</dd> </dl> </div> <div class="section" id="auto-close-quotes-and-brackets"> @@ -6471,7 +6484,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2011-03-20 14:49 UTC. +Generated on: 2011-03-23 22:34 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-03-22 23:08:43 UTC (rev 5617) +++ trunk/doc/geany.txt 2011-03-23 22:36:56 UTC (rev 5618) @@ -1505,10 +1505,12 @@ Workspace tags ^^^^^^^^^^^^^^ -Tags for each document are parsed whenever a file is loaded or -saved. These are shown in the Symbol list in the Sidebar. These tags -are also used for autocompletion of symbols and calltips for all documents -open in the current session that have the same filetype. +Tags for each document are parsed whenever a file is loaded or saved, and +possibly when modified (see *Symbol list update frequency* preference in the +`Editor Completions preferences`_). These are shown in the Symbol list in +the Sidebar. These tags are also used for autocompletion of symbols and +calltips for all documents open in the current session that have the same +filetype. The *Go to Tag* commands can be used with all workspace tags. See `Go to tag definition`_. @@ -2090,7 +2092,21 @@ Max. symbol name suggestions The maximum number of items in the autocompletion list. +Symbol list update frequency + The minimum delay (in milliseconds) between two symbol list updates. + This option determines how frequently the tag list is updated for the + current document. The smaller is the delay the more up-to-date is the + symbol list (and then the completions); but rebuilding the symbol list + has a cost in performance, especially with large files. + + The default value is 250, which means the symbol list will be updated at + most 4 times per second, even if the document changes continuously. + + A value of 0 disables automatic updates, so the symbol list will only be + updated upon document saving. + + Auto-close quotes and brackets `````````````````````````````` 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
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2011