Commits July 2009

commits@lists.geany.org

4 participants
143 discussions

SF.net SVN: geany:[3990] trunk
by eht16＠users.sourceforge.net 18 Jul '09

18 Jul '09

Revision: 3990 http://geany.svn.sourceforge.net/geany/?rev=3990&view=rev Author: eht16 Date: 2009-07-18 14:45:30 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Speed up toolbar editor dialog creation. Modified Paths: -------------- trunk/ChangeLog trunk/src/toolbar.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-18 14:45:18 UTC (rev 3989) +++ trunk/ChangeLog 2009-07-18 14:45:30 UTC (rev 3990) @@ -4,6 +4,7 @@ Display item labels instead of raw names in the toolbar editor. Apply changes in the toolbar editor instantly. Show icons in the toolbar editor. + Speed up toolbar editor dialog creation. 2009-07-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2009-07-18 14:45:18 UTC (rev 3989) +++ trunk/src/toolbar.c 2009-07-18 14:45:30 UTC (rev 3990) @@ -931,11 +931,6 @@ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_used), GTK_SHADOW_ETCHED_IN); gtk_container_add(GTK_CONTAINER(swin_used), tree_used); - g_signal_connect(tbw->store_used, "row-changed", - G_CALLBACK(tb_editor_available_items_changed_cb), tbw); - g_signal_connect(tbw->store_used, "row-deleted", - G_CALLBACK(tb_editor_available_items_deleted_cb), tbw); - /* drag'n'drop */ gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(tree_available), GDK_BUTTON1_MASK, tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE); @@ -1040,6 +1035,12 @@ gtk_tree_selection_select_path(gtk_tree_view_get_selection(tbw->tree_used), path); gtk_tree_path_free(path); + /* connect the changed signals after populating the store */ + g_signal_connect(tbw->store_used, "row-changed", + G_CALLBACK(tb_editor_available_items_changed_cb), tbw); + g_signal_connect(tbw->store_used, "row-deleted", + G_CALLBACK(tb_editor_available_items_deleted_cb), tbw); + /* run it */ gtk_dialog_run(GTK_DIALOG(tbw->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:[3989] trunk
by eht16＠users.sourceforge.net 18 Jul '09

18 Jul '09

Revision: 3989 http://geany.svn.sourceforge.net/geany/?rev=3989&view=rev Author: eht16 Date: 2009-07-18 14:45:18 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Show icons in the toolbar editor. Modified Paths: -------------- trunk/ChangeLog trunk/src/toolbar.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-18 14:45:05 UTC (rev 3988) +++ trunk/ChangeLog 2009-07-18 14:45:18 UTC (rev 3989) @@ -3,6 +3,7 @@ * src/toolbar.c: Display item labels instead of raw names in the toolbar editor. Apply changes in the toolbar editor instantly. + Show icons in the toolbar editor. 2009-07-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2009-07-18 14:45:05 UTC (rev 3988) +++ trunk/src/toolbar.c 2009-07-18 14:45:18 UTC (rev 3989) @@ -548,6 +548,7 @@ { TB_EDITOR_COL_ACTION, TB_EDITOR_COL_LABEL, + TB_EDITOR_COL_ICON, TB_EDITOR_COLS_MAX }; @@ -591,32 +592,42 @@ } -static gchar *tb_editor_get_action_label(const gchar *action_name) +static void tb_editor_set_item_values(const gchar *name, GtkListStore *store, GtkTreeIter *iter) { - gchar *label, *label_clean; + gchar *icon = NULL; + gchar *label = NULL; + gchar *label_clean = NULL; GtkAction *action; - action = gtk_action_group_get_action(group, action_name); + action = gtk_action_group_get_action(group, name); if (action == NULL) { - if (utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) - label = g_strdup(TB_EDITOR_SEPARATOR_LABEL); + if (utils_str_equal(name, TB_EDITOR_SEPARATOR)) + label_clean = g_strdup(TB_EDITOR_SEPARATOR_LABEL); else - return NULL; + return; } else { + g_object_get(action, "icon-name", &icon, NULL); + if (icon == NULL) + g_object_get(action, "stock-id", &icon, NULL); + g_object_get(action, "label", &label, NULL); - if (label == NULL) - return NULL; + if (label != NULL) + /* FIXME strip mnemonics here */ + label_clean = g_strdup(label); } - /* FIXME strip mnemonics here */ - label_clean = g_strdup(label); + gtk_list_store_set(store, iter, + TB_EDITOR_COL_ACTION, name, + TB_EDITOR_COL_LABEL, label_clean, + TB_EDITOR_COL_ICON, icon, + -1); + g_free(icon); g_free(label); - - return label_clean; + g_free(label_clean); } @@ -643,7 +654,7 @@ GtkTreeModel *model_used; GtkTreeSelection *selection_used; GtkTreeIter iter_used, iter_new; - gchar *action_name, *label; + gchar *action_name; selection_used = gtk_tree_view_get_selection(tbw->tree_used); if (gtk_tree_selection_get_selected(selection_used, &model_used, &iter_used)) @@ -654,13 +665,9 @@ if (! utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) { - label = tb_editor_get_action_label(action_name); - gtk_list_store_insert_with_values(tbw->store_available, &iter_new, 1, - TB_EDITOR_COL_ACTION, action_name, - TB_EDITOR_COL_LABEL, label, - -1); + gtk_list_store_append(tbw->store_available, &iter_new); + tb_editor_set_item_values(action_name, tbw->store_available, &iter_new); tb_editor_scroll_to_iter(tbw->tree_available, &iter_new); - g_free(label); } g_free(action_name); @@ -673,7 +680,7 @@ GtkTreeModel *model_available; GtkTreeSelection *selection_available, *selection_used; GtkTreeIter iter_available, iter_new, iter_selected; - gchar *action_name, *label; + gchar *action_name; selection_available = gtk_tree_view_get_selection(tbw->tree_available); if (gtk_tree_selection_get_selected(selection_available, &model_available, &iter_available)) @@ -687,24 +694,14 @@ } selection_used = gtk_tree_view_get_selection(tbw->tree_used); - label = tb_editor_get_action_label(action_name); if (gtk_tree_selection_get_selected(selection_used, NULL, &iter_selected)) - { gtk_list_store_insert_before(tbw->store_used, &iter_new, &iter_selected); - gtk_list_store_set(tbw->store_used, &iter_new, - TB_EDITOR_COL_ACTION, action_name, - TB_EDITOR_COL_LABEL, label, - -1); - } else - gtk_list_store_insert_with_values(tbw->store_used, &iter_new, -1, - TB_EDITOR_COL_ACTION, action_name, - TB_EDITOR_COL_LABEL, label, - -1); + gtk_list_store_append(tbw->store_used, &iter_new); + tb_editor_set_item_values(action_name, tbw->store_used, &iter_new); tb_editor_scroll_to_iter(tbw->tree_used, &iter_new); - g_free(label); g_free(action_name); } } @@ -772,7 +769,6 @@ { GtkTreeIter iter, iter_before, *iter_before_ptr; GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(tree)); - gchar *label = tb_editor_get_action_label(text); if (tbw->last_drag_path != NULL) { @@ -788,20 +784,12 @@ gtk_list_store_insert_before(store, &iter, iter_before_ptr); else gtk_list_store_insert_after(store, &iter, iter_before_ptr); - - gtk_list_store_set(store, &iter, - TB_EDITOR_COL_ACTION, text, - TB_EDITOR_COL_LABEL, label, - -1); } else - gtk_list_store_insert_with_values(store, &iter, -1, - TB_EDITOR_COL_ACTION, text, - TB_EDITOR_COL_LABEL, label, - -1); + gtk_list_store_append(store, &iter); + tb_editor_set_item_values(text, store, &iter); tb_editor_scroll_to_iter(tree, &iter); - g_free(label); } if (tree != tbw->tree_used || ! is_sep) del = TRUE; @@ -877,7 +865,7 @@ { GtkWidget *dialog, *vbox, *hbox, *vbox_buttons, *button_add, *button_remove; GtkWidget *swin_available, *swin_used, *tree_available, *tree_used, *label; - GtkCellRenderer *text_renderer; + GtkCellRenderer *text_renderer, *icon_renderer; GtkTreeViewColumn *column; TBEditorWidget *tbw = g_new(TBEditorWidget, 1); @@ -891,8 +879,10 @@ gtk_window_set_default_size(GTK_WINDOW(dialog), -1, 400); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); - tbw->store_available = gtk_list_store_new(TB_EDITOR_COLS_MAX, G_TYPE_STRING, G_TYPE_STRING); - tbw->store_used = gtk_list_store_new(TB_EDITOR_COLS_MAX, G_TYPE_STRING, G_TYPE_STRING); + tbw->store_available = gtk_list_store_new(TB_EDITOR_COLS_MAX, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + tbw->store_used = gtk_list_store_new(TB_EDITOR_COLS_MAX, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); label = gtk_label_new( _("Select items to be displayed on the toolbar. Items can be reordered by drag and drop.")); @@ -904,6 +894,11 @@ gtk_tree_sortable_set_sort_column_id( GTK_TREE_SORTABLE(tbw->store_available), TB_EDITOR_COL_LABEL, GTK_SORT_ASCENDING); + icon_renderer = gtk_cell_renderer_pixbuf_new(); + column = gtk_tree_view_column_new_with_attributes( + NULL, icon_renderer, "stock-id", TB_EDITOR_COL_ICON, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_available), column); + text_renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( _("Available Items"), text_renderer, "text", TB_EDITOR_COL_LABEL, NULL); @@ -920,6 +915,11 @@ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree_used), TRUE); gtk_tree_view_set_reorderable(GTK_TREE_VIEW(tree_used), TRUE); + icon_renderer = gtk_cell_renderer_pixbuf_new(); + column = gtk_tree_view_column_new_with_attributes( + NULL, icon_renderer, "stock-id", TB_EDITOR_COL_ICON, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_used), column); + text_renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( _("Displayed Items"), text_renderer, "text", TB_EDITOR_COL_LABEL, NULL); @@ -997,10 +997,11 @@ void toolbar_configure(void) { - gchar *markup, *label; + gchar *markup; const gchar *name; GSList *sl, *used_items; GList *l, *all_items; + GtkTreeIter iter; GtkTreePath *path; TBEditorWidget *tbw; @@ -1023,22 +1024,16 @@ foreach_list(l, all_items) { name = gtk_action_get_name(l->data); - label = tb_editor_get_action_label(name); if (g_slist_find_custom(used_items, name, (GCompareFunc) strcmp) == NULL) - gtk_list_store_insert_with_values(tbw->store_available, NULL, -1, - TB_EDITOR_COL_ACTION, name, - TB_EDITOR_COL_LABEL, label, - -1); - g_free(label); + { + gtk_list_store_append(tbw->store_available, &iter); + tb_editor_set_item_values(name, tbw->store_available, &iter); + } } foreach_slist(sl, used_items) { - label = tb_editor_get_action_label(sl->data); - gtk_list_store_insert_with_values(tbw->store_used, NULL, -1, - TB_EDITOR_COL_ACTION, sl->data, - TB_EDITOR_COL_LABEL, label, - -1); - g_free(label); + gtk_list_store_append(tbw->store_used, &iter); + tb_editor_set_item_values(sl->data, tbw->store_used, &iter); } /* select first item */ path = gtk_tree_path_new_from_string("0"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3988] trunk
by eht16＠users.sourceforge.net 18 Jul '09

18 Jul '09

Revision: 3988 http://geany.svn.sourceforge.net/geany/?rev=3988&view=rev Author: eht16 Date: 2009-07-18 14:45:05 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Apply changes in the toolbar editor instantly. Modified Paths: -------------- trunk/ChangeLog trunk/src/toolbar.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-18 14:44:51 UTC (rev 3987) +++ trunk/ChangeLog 2009-07-18 14:45:05 UTC (rev 3988) @@ -2,6 +2,7 @@ * src/toolbar.c: Display item labels instead of raw names in the toolbar editor. + Apply changes in the toolbar editor instantly. 2009-07-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2009-07-18 14:44:51 UTC (rev 3987) +++ trunk/src/toolbar.c 2009-07-18 14:45:05 UTC (rev 3988) @@ -813,6 +813,66 @@ } +static gboolean tb_editor_foreach_used(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer data) +{ + gchar *action_name; + + gtk_tree_model_get(model, iter, TB_EDITOR_COL_ACTION, &action_name, -1); + + if (utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) + g_string_append_printf(data, "\t\t<separator/>\n"); + else if (NZV(action_name)) + g_string_append_printf(data, "\t\t<toolitem action='%s' />\n", action_name); + + g_free(action_name); + return FALSE; +} + + +static void tb_editor_write_markup(TBEditorWidget *tbw) +{ + /* <ui> must be the first tag, otherwise gtk_ui_manager_add_ui_from_string() will fail. */ + const gchar *template = "<ui>\n\n\ +\t<toolbar name='GeanyToolbar'>\n"; + const gchar *filename = utils_build_path(app->configdir, "ui_toolbar.xml", NULL); + GString *str = g_string_new(template); + + gtk_tree_model_foreach(GTK_TREE_MODEL(tbw->store_used), tb_editor_foreach_used, str); + + g_string_append(str, "\n\t</toolbar>\n</ui>\n"); + + toolbar_reload(str->str); + + utils_write_file(filename, str->str); + + g_string_free(str, TRUE); +} + + +static void tb_editor_available_items_changed_cb(GtkTreeModel *model, GtkTreePath *arg1, + GtkTreeIter *arg2, TBEditorWidget *tbw) +{ + tb_editor_write_markup(tbw); +} + + +static void tb_editor_available_items_deleted_cb(GtkTreeModel *model, GtkTreePath *arg1, + TBEditorWidget *tbw) +{ + tb_editor_write_markup(tbw); +} + + static TBEditorWidget *tb_editor_create_dialog(void) { GtkWidget *dialog, *vbox, *hbox, *vbox_buttons, *button_add, *button_remove; @@ -824,7 +884,6 @@ dialog = gtk_dialog_new_with_buttons(_("Customize Toolbar"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 6); @@ -872,6 +931,11 @@ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_used), GTK_SHADOW_ETCHED_IN); gtk_container_add(GTK_CONTAINER(swin_used), tree_used); + g_signal_connect(tbw->store_used, "row-changed", + G_CALLBACK(tb_editor_available_items_changed_cb), tbw); + g_signal_connect(tbw->store_used, "row-deleted", + G_CALLBACK(tb_editor_available_items_deleted_cb), tbw); + /* drag'n'drop */ gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(tree_available), GDK_BUTTON1_MASK, tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE); @@ -931,56 +995,13 @@ } -static gboolean tb_editor_foreach_used(GtkTreeModel *model, GtkTreePath *path, - GtkTreeIter *iter, gpointer data) -{ - gchar *action_name; - - gtk_tree_model_get(model, iter, TB_EDITOR_COL_ACTION, &action_name, -1); - - if (utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) - g_string_append_printf(data, "\t\t<separator/>\n"); - else if (NZV(action_name)) - g_string_append_printf(data, "\t\t<toolitem action='%s' />\n", action_name); - - g_free(action_name); - return FALSE; -} - - -static gchar *tb_editor_write_markup(TBEditorWidget *tbw) -{ - /* <ui> must be the first tag, otherwise gtk_ui_manager_add_ui_from_string() will fail. */ - const gchar *template = "<ui>\n\n\ -\t<toolbar name='GeanyToolbar'>\n"; - GString *str = g_string_new(template); - - gtk_tree_model_foreach(GTK_TREE_MODEL(tbw->store_used), tb_editor_foreach_used, str); - - g_string_append(str, "\n\t</toolbar>\n</ui>\n"); - - return g_string_free(str, FALSE); -} - - void toolbar_configure(void) { gchar *markup, *label; const gchar *name; - const gchar *filename = utils_build_path(app->configdir, "ui_toolbar.xml", NULL); GSList *sl, *used_items; GList *l, *all_items; GtkTreePath *path; - gint response; TBEditorWidget *tbw; /* read the current active toolbar items */ @@ -1025,16 +1046,8 @@ gtk_tree_path_free(path); /* run it */ - while ((response = gtk_dialog_run(GTK_DIALOG(tbw->dialog)))) - { - markup = tb_editor_write_markup(tbw); - toolbar_reload(markup); - utils_write_file(filename, markup); - g_free(markup); + gtk_dialog_run(GTK_DIALOG(tbw->dialog)); - if (response == GTK_RESPONSE_CLOSE || response == GTK_RESPONSE_DELETE_EVENT) - break; - } gtk_widget_destroy(tbw->dialog); g_slist_foreach(used_items, (GFunc) g_free, 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:[3987] trunk
by eht16＠users.sourceforge.net 18 Jul '09

18 Jul '09

Revision: 3987 http://geany.svn.sourceforge.net/geany/?rev=3987&view=rev Author: eht16 Date: 2009-07-18 14:44:51 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Display item labels instead of raw names in the toolbar editor. Modified Paths: -------------- trunk/ChangeLog trunk/src/toolbar.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-18 12:11:32 UTC (rev 3986) +++ trunk/ChangeLog 2009-07-18 14:44:51 UTC (rev 3987) @@ -1,3 +1,9 @@ +2009-07-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/toolbar.c: + Display item labels instead of raw names in the toolbar editor. + + 2009-07-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/document.c: Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2009-07-18 12:11:32 UTC (rev 3986) +++ trunk/src/toolbar.c 2009-07-18 14:44:51 UTC (rev 3987) @@ -53,7 +53,7 @@ const GtkActionEntry ui_entries[] = { /* custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" */ { "Save", GTK_STOCK_SAVE, NULL, NULL, N_("Save the current file"), G_CALLBACK(on_toolbutton_save_clicked) }, - { "SaveAll", GEANY_STOCK_SAVE_ALL, N_("Save All"), NULL, N_("Save all open files"), G_CALLBACK(on_save_all1_activate) }, + { "SaveAll", GEANY_STOCK_SAVE_ALL, NULL, NULL, N_("Save all open files"), G_CALLBACK(on_save_all1_activate) }, { "Reload", GTK_STOCK_REVERT_TO_SAVED, NULL, NULL, N_("Reload the current file from disk"), G_CALLBACK(on_toolbutton_reload_clicked) }, { "Close", GTK_STOCK_CLOSE, NULL, NULL, N_("Close the current file"), G_CALLBACK(on_toolbutton_close_clicked) }, { "CloseAll", GEANY_STOCK_CLOSE_ALL, NULL, NULL, N_("Close all open files"), G_CALLBACK(on_toolbutton_close_all_clicked) }, @@ -520,7 +520,8 @@ } -#define TB_EDITOR_SEPARATOR _("--- Separator ---") +#define TB_EDITOR_SEPARATOR _("Separator") +#define TB_EDITOR_SEPARATOR_LABEL _("--- Separator ---") typedef struct { GtkWidget *dialog; @@ -543,8 +544,13 @@ }; static const gint tb_editor_dnd_targets_len = G_N_ELEMENTS(tb_editor_dnd_targets); +enum +{ + TB_EDITOR_COL_ACTION, + TB_EDITOR_COL_LABEL, + TB_EDITOR_COLS_MAX +}; - static void tb_editor_handler_start_element(GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, @@ -585,6 +591,35 @@ } +static gchar *tb_editor_get_action_label(const gchar *action_name) +{ + gchar *label, *label_clean; + GtkAction *action; + + action = gtk_action_group_get_action(group, action_name); + if (action == NULL) + { + if (utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) + label = g_strdup(TB_EDITOR_SEPARATOR_LABEL); + else + return NULL; + } + else + { + g_object_get(action, "label", &label, NULL); + if (label == NULL) + return NULL; + } + + /* FIXME strip mnemonics here */ + label_clean = g_strdup(label); + + g_free(label); + + return label_clean; +} + + static void tb_editor_scroll_to_iter(GtkTreeView *treeview, GtkTreeIter *iter) { GtkTreePath *path = gtk_tree_model_get_path(gtk_tree_view_get_model(treeview), iter); @@ -608,20 +643,24 @@ GtkTreeModel *model_used; GtkTreeSelection *selection_used; GtkTreeIter iter_used, iter_new; - gchar *action_name; + gchar *action_name, *label; selection_used = gtk_tree_view_get_selection(tbw->tree_used); if (gtk_tree_selection_get_selected(selection_used, &model_used, &iter_used)) { - gtk_tree_model_get(model_used, &iter_used, 0, &action_name, -1); + gtk_tree_model_get(model_used, &iter_used, TB_EDITOR_COL_ACTION, &action_name, -1); if (gtk_list_store_remove(tbw->store_used, &iter_used)) gtk_tree_selection_select_iter(selection_used, &iter_used); if (! utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) { - gtk_list_store_insert_with_values(tbw->store_available, &iter_new, - -1, 0, action_name, -1); + label = tb_editor_get_action_label(action_name); + gtk_list_store_insert_with_values(tbw->store_available, &iter_new, 1, + TB_EDITOR_COL_ACTION, action_name, + TB_EDITOR_COL_LABEL, label, + -1); tb_editor_scroll_to_iter(tbw->tree_available, &iter_new); + g_free(label); } g_free(action_name); @@ -634,12 +673,13 @@ GtkTreeModel *model_available; GtkTreeSelection *selection_available, *selection_used; GtkTreeIter iter_available, iter_new, iter_selected; - gchar *action_name; + gchar *action_name, *label; selection_available = gtk_tree_view_get_selection(tbw->tree_available); if (gtk_tree_selection_get_selected(selection_available, &model_available, &iter_available)) { - gtk_tree_model_get(model_available, &iter_available, 0, &action_name, -1); + gtk_tree_model_get(model_available, &iter_available, + TB_EDITOR_COL_ACTION, &action_name, -1); if (! utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) { if (gtk_list_store_remove(tbw->store_available, &iter_available)) @@ -647,16 +687,24 @@ } selection_used = gtk_tree_view_get_selection(tbw->tree_used); + label = tb_editor_get_action_label(action_name); if (gtk_tree_selection_get_selected(selection_used, NULL, &iter_selected)) { gtk_list_store_insert_before(tbw->store_used, &iter_new, &iter_selected); - gtk_list_store_set(tbw->store_used, &iter_new, 0, action_name, -1); + gtk_list_store_set(tbw->store_used, &iter_new, + TB_EDITOR_COL_ACTION, action_name, + TB_EDITOR_COL_LABEL, label, + -1); } else - gtk_list_store_insert_with_values(tbw->store_used, &iter_new, -1, 0, action_name, -1); + gtk_list_store_insert_with_values(tbw->store_used, &iter_new, -1, + TB_EDITOR_COL_ACTION, action_name, + TB_EDITOR_COL_LABEL, label, + -1); tb_editor_scroll_to_iter(tbw->tree_used, &iter_new); + g_free(label); g_free(action_name); } } @@ -688,7 +736,7 @@ if (! gtk_tree_selection_get_selected(selection, &model, &iter)) return; - gtk_tree_model_get(model, &iter, 0, &name, -1); + gtk_tree_model_get(model, &iter, TB_EDITOR_COL_ACTION, &name, -1); if (! NZV(name)) return; @@ -724,6 +772,7 @@ { GtkTreeIter iter, iter_before, *iter_before_ptr; GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(tree)); + gchar *label = tb_editor_get_action_label(text); if (tbw->last_drag_path != NULL) { @@ -740,12 +789,19 @@ else gtk_list_store_insert_after(store, &iter, iter_before_ptr); - gtk_list_store_set(store, &iter, 0, text, -1); + gtk_list_store_set(store, &iter, + TB_EDITOR_COL_ACTION, text, + TB_EDITOR_COL_LABEL, label, + -1); } else - gtk_list_store_insert_with_values(store, &iter, -1, 0, text, -1); + gtk_list_store_insert_with_values(store, &iter, -1, + TB_EDITOR_COL_ACTION, text, + TB_EDITOR_COL_LABEL, label, + -1); tb_editor_scroll_to_iter(tree, &iter); + g_free(label); } if (tree != tbw->tree_used || ! is_sep) del = TRUE; @@ -776,22 +832,22 @@ gtk_window_set_default_size(GTK_WINDOW(dialog), -1, 400); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); - tbw->store_available = gtk_list_store_new(1, G_TYPE_STRING); - tbw->store_used = gtk_list_store_new(1, G_TYPE_STRING); + tbw->store_available = gtk_list_store_new(TB_EDITOR_COLS_MAX, G_TYPE_STRING, G_TYPE_STRING); + tbw->store_used = gtk_list_store_new(TB_EDITOR_COLS_MAX, G_TYPE_STRING, G_TYPE_STRING); label = gtk_label_new( _("Select items to be displayed on the toolbar. Items can be reordered by drag and drop.")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); tree_available = gtk_tree_view_new(); gtk_tree_view_set_model(GTK_TREE_VIEW(tree_available), GTK_TREE_MODEL(tbw->store_available)); gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree_available), TRUE); gtk_tree_sortable_set_sort_column_id( - GTK_TREE_SORTABLE(tbw->store_available), 0, GTK_SORT_ASCENDING); + GTK_TREE_SORTABLE(tbw->store_available), TB_EDITOR_COL_LABEL, GTK_SORT_ASCENDING); text_renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( - _("Available Items"), text_renderer, "text", 0, NULL); + _("Available Items"), text_renderer, "text", TB_EDITOR_COL_LABEL, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(tree_available), column); swin_available = gtk_scrolled_window_new(NULL, NULL); @@ -807,7 +863,7 @@ text_renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( - _("Displayed Items"), text_renderer, "text", 0, NULL); + _("Displayed Items"), text_renderer, "text", TB_EDITOR_COL_LABEL, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(tree_used), column); swin_used = gtk_scrolled_window_new(NULL, NULL); @@ -880,7 +936,7 @@ { gchar *action_name; - gtk_tree_model_get(model, iter, 0, &action_name, -1); + gtk_tree_model_get(model, iter, TB_EDITOR_COL_ACTION, &action_name, -1); if (utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) g_string_append_printf(data, "\t\t<separator/>\n"); @@ -918,7 +974,7 @@ void toolbar_configure(void) { - gchar *markup; + gchar *markup, *label; const gchar *name; const gchar *filename = utils_build_path(app->configdir, "ui_toolbar.xml", NULL); GSList *sl, *used_items; @@ -939,16 +995,29 @@ tbw = tb_editor_create_dialog(); /* fill the stores */ - gtk_list_store_insert_with_values(tbw->store_available, NULL, -1, 0, TB_EDITOR_SEPARATOR, -1); + gtk_list_store_insert_with_values(tbw->store_available, NULL, -1, + TB_EDITOR_COL_ACTION, TB_EDITOR_SEPARATOR, + TB_EDITOR_COL_LABEL, TB_EDITOR_SEPARATOR_LABEL, + -1); foreach_list(l, all_items) { name = gtk_action_get_name(l->data); + label = tb_editor_get_action_label(name); if (g_slist_find_custom(used_items, name, (GCompareFunc) strcmp) == NULL) - gtk_list_store_insert_with_values(tbw->store_available, NULL, -1, 0, name, -1); + gtk_list_store_insert_with_values(tbw->store_available, NULL, -1, + TB_EDITOR_COL_ACTION, name, + TB_EDITOR_COL_LABEL, label, + -1); + g_free(label); } foreach_slist(sl, used_items) { - gtk_list_store_insert_with_values(tbw->store_used, NULL, -1, 0, sl->data, -1); + label = tb_editor_get_action_label(sl->data); + gtk_list_store_insert_with_values(tbw->store_used, NULL, -1, + TB_EDITOR_COL_ACTION, sl->data, + TB_EDITOR_COL_LABEL, label, + -1); + g_free(label); } /* select first item */ path = gtk_tree_path_new_from_string("0"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3986] branches/dynamic-editor-menu/
by eht16＠users.sourceforge.net 18 Jul '09

18 Jul '09

Revision: 3986 http://geany.svn.sourceforge.net/geany/?rev=3986&view=rev Author: eht16 Date: 2009-07-18 12:11:32 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Delete dead branch Removed Paths: ------------- branches/dynamic-editor-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:[3985] branches/build-system
by elextr＠users.sourceforge.net 18 Jul '09

18 Jul '09

Revision: 3985 http://geany.svn.sourceforge.net/geany/?rev=3985&view=rev Author: elextr Date: 2009-07-18 11:10:06 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Get toolbar code from trunk Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/src/build.c Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2009-07-17 07:59:19 UTC (rev 3984) +++ branches/build-system/ChangeLog 2009-07-18 11:10:06 UTC (rev 3985) @@ -1,3 +1,8 @@ +2009-07-18 Lex Trotman <elextr(at)gmail(dot)com> + + * src/build.c + Re-incorporated toolbar changes in trunk accidently excluded in merge + 2009-07-17 Lex Trotman <elextr(at)gmail(dot)com> * src/build.c Modified: branches/build-system/src/build.c =================================================================== --- branches/build-system/src/build.c 2009-07-17 07:59:19 UTC (rev 3984) +++ branches/build-system/src/build.c 2009-07-18 11:10:06 UTC (rev 3985) @@ -91,10 +91,10 @@ static struct { - GtkWidget *run_button; - GtkWidget *compile_button; - GtkWidget *build_button; + GtkAction *run_action; + GtkAction *compile_action; GtkAction *build_action; + GtkWidget *toolmenu; GtkWidget *toolitem_build; GtkWidget *toolitem_make_all; @@ -113,6 +113,7 @@ #endif static gboolean build_create_shellscript(const gchar *fname, const gchar *cmd, gboolean autoclose); static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir); +static void set_stop_button(gboolean stop); static void run_exit_cb(GPid child_pid, gint status, gpointer user_data); static void on_set_build_commands_activate(GtkWidget *w, gpointer u); static void on_build_next_error(GtkWidget *menuitem, gpointer user_data); @@ -123,7 +124,7 @@ static void show_build_commands_dialog(void); -void build_finalize() +void build_finalize(void) { g_free(build_info.dir); g_free(build_info.custom_target); @@ -1290,6 +1291,7 @@ gint i, cmdcount, cmd, grp; gboolean vis=FALSE; gboolean have_path, build_running, exec_running, have_errors, cmd_sensitivity; + gboolean can_compile, can_make; GeanyBuildCommand *bc; if (menu_items.menu==NULL) @@ -1386,19 +1388,83 @@ } } } - ui_widget_set_sensitive(widgets.compile_button, get_build_cmd(doc, GBG_FT, - GBO_TO_CMD(GBO_COMPILE), NULL)!=NULL && have_path && ! build_running); - ui_widget_set_sensitive(widgets.build_button, get_build_cmd(doc, GBG_FT, - GBO_TO_CMD(GBO_BUILD), NULL)!=NULL && have_path && ! build_running); - if (widgets.run_button!=NULL) + + can_compile = get_build_cmd(doc, GBG_FT, GBO_TO_CMD(GBO_BUILD), NULL)!=NULL + && have_path && ! build_running; + if (widgets.toolitem_build != NULL) + gtk_widget_set_sensitive(widgets.toolitem_build, can_compile); + can_make = FALSE; + if (widgets.toolitem_make_all != NULL) + gtk_widget_set_sensitive(widgets.toolitem_make_all, + (can_make |= get_build_cmd(doc, GBG_FT, GBO_TO_CMD(GBO_MAKE_ALL), NULL)!=NULL + && ! build_running)); + if (widgets.toolitem_make_custom != NULL) + gtk_widget_set_sensitive(widgets.toolitem_make_custom, + (can_make |= get_build_cmd(doc, GBG_FT, GBO_TO_CMD(GBO_MAKE_CUSTOM), NULL)!=NULL + && ! build_running)); + if (widgets.toolitem_make_object != NULL) + gtk_widget_set_sensitive(widgets.toolitem_make_object, + (can_make |= get_build_cmd(doc, GBG_FT, GBO_TO_CMD(GBO_MAKE_OBJECT), NULL)!=NULL + && ! build_running)); + if (widgets.toolitem_set_args != NULL) + gtk_widget_set_sensitive(widgets.toolitem_set_args, TRUE); + + gtk_action_set_sensitive(widgets.compile_action, can_compile); + gtk_action_set_sensitive(widgets.build_action, can_make ); +/* gtk_action_set_sensitive(widgets.run_action, can_run || can_stop); */ + + /* show the stop command if a program is running, otherwise show run command + set_stop_button(can_stop); */ + +} + +/* Call build_menu_update() instead of calling this directly. */ +static void set_stop_button(gboolean stop) +{ +/* const gchar *button_stock_id = NULL; + GtkStockItem sitem; + GtkToolButton *run_button; + GtkWidget *menuitem = build_get_menu_items(run_info.file_type_id)->item_exec; + + run_button = GTK_TOOL_BUTTON(toolbar_get_widget_by_name("Run")); + if (run_button != NULL) + button_stock_id = gtk_tool_button_get_stock_id(run_button); + + if (stop && utils_str_equal(button_stock_id, "gtk-stop")) + return; + if (! stop && utils_str_equal(button_stock_id, "gtk-execute")) + return; + + /* use the run button also as stop button */ +/* if (stop) { - if (run_info[0].pid>1) - gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(widgets.run_button), GTK_STOCK_STOP); - else - gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(widgets.run_button), GTK_STOCK_EXECUTE); + if (run_button != NULL) + gtk_tool_button_set_stock_id(run_button, "gtk-stop"); + + if (menuitem != NULL) + { + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), + gtk_image_new_from_stock("gtk-stop", GTK_ICON_SIZE_MENU)); + gtk_stock_lookup("gtk-stop", &sitem); + gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), + sitem.label); + } } - ui_widget_set_sensitive(widgets.run_button, get_build_cmd(doc, GBG_EXEC, - GBO_TO_CMD(GBO_EXEC), NULL)!=NULL || exec_running); + else + { + if (run_button != NULL) + gtk_tool_button_set_stock_id(run_button, "gtk-execute"); + + if (menuitem != NULL) + { + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), + gtk_image_new_from_stock("gtk-execute", GTK_ICON_SIZE_MENU)); + + gtk_stock_lookup("gtk-execute", &sitem); + gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), + sitem.label); + } + }*/ } static void on_set_build_commands_activate(GtkWidget *w, gpointer u) @@ -1492,11 +1558,11 @@ ui_set_statusbar(FALSE, _("No more build errors.")); } -void build_toolbutton_build_clicked(GtkAction *action, gpointer user_data) +void build_toolbutton_build_clicked(GtkAction *action, gpointer unused) { if (last_toolbutton_action == GBO_TO_POINTER(GBO_BUILD)) { - on_build_menu_item(NULL, user_data); + on_build_menu_item(NULL, GBO_TO_POINTER(GBO_BUILD)); } else { @@ -2230,7 +2296,7 @@ { {NULL, NULL, NULL}, NULL, 0 } }; -void build_init() +void build_init(void) { GtkWidget *item; GtkWidget *toolmenu; @@ -2251,61 +2317,67 @@ } } - widgets.build_action = toolbar_get_action_by_name("Build"); - toolmenu = geany_menu_button_action_get_menu(GEANY_MENU_BUTTON_ACTION(widgets.build_action)); - if (toolmenu != NULL) - { - /* build the code */ - item = ui_image_menu_item_new(GEANY_STOCK_BUILD, _("_Build")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(toolmenu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_build_activate), NULL); - widgets.toolitem_build = item; + /* create the toolbar Build item sub menu */ + toolmenu = gtk_menu_new(); + g_object_ref(toolmenu); - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(toolmenu), item); + /* build the code */ + item = ui_image_menu_item_new(GEANY_STOCK_BUILD, _("_Build")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(toolmenu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_build_activate), + GBO_TO_POINTER(GBO_BUILD)); + widgets.toolitem_build = item; - /* build the code with make all */ - item = gtk_image_menu_item_new_with_mnemonic(_("_Make All")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(toolmenu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_make_activate), - GINT_TO_POINTER(GBO_MAKE_ALL)); - widgets.toolitem_make_all = item; + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(toolmenu), item); - /* build the code with make custom */ - item = gtk_image_menu_item_new_with_mnemonic(_("Make Custom _Target")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(toolmenu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_make_activate), - GINT_TO_POINTER(GBO_MAKE_CUSTOM)); - widgets.toolitem_make_custom = item; + /* build the code with make all */ + item = gtk_image_menu_item_new_with_mnemonic(_("_Make All")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(toolmenu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_make_activate), + GBO_TO_POINTER(GBO_MAKE_ALL)); + widgets.toolitem_make_all = item; - /* build the code with make object */ - item = gtk_image_menu_item_new_with_mnemonic(_("Make _Object")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(toolmenu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_make_activate), - GINT_TO_POINTER(GBO_MAKE_OBJECT)); - widgets.toolitem_make_object = item; + /* build the code with make custom */ + item = gtk_image_menu_item_new_with_mnemonic(_("Make Custom _Target")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(toolmenu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_make_activate), + GBO_TO_POINTER(GBO_MAKE_CUSTOM)); + widgets.toolitem_make_custom = item; - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(toolmenu), item); + /* build the code with make object */ + item = gtk_image_menu_item_new_with_mnemonic(_("Make _Object")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(toolmenu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_make_activate), + GBO_TO_POINTER(GBO_MAKE_OBJECT)); + widgets.toolitem_make_object = item; - /* arguments */ - item = ui_image_menu_item_new(GTK_STOCK_PREFERENCES, _("_Set Build Commands")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(toolmenu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_set_build_commands_activate), NULL); - widgets.toolitem_set_args = item; - } + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(toolmenu), item); - widgets.compile_button = toolbar_get_widget_by_name("Compile"); - widgets.run_button = toolbar_get_widget_by_name("Run"); - widgets.build_button = toolbar_get_widget_by_name("Build"); + /* arguments */ + item = ui_image_menu_item_new(GTK_STOCK_PREFERENCES, _("_Set Build Menu Commands")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(toolmenu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_set_build_commands_activate), NULL); + widgets.toolitem_set_args = item; + + + /* get toolbar action pointers */ + widgets.build_action = toolbar_get_action_by_name("Build"); + widgets.compile_action = toolbar_get_action_by_name("Compile"); + widgets.run_action = toolbar_get_action_by_name("Run"); + widgets.toolmenu = toolmenu; + /* set the submenu to the toolbar item */ + geany_menu_button_action_set_menu(GEANY_MENU_BUTTON_ACTION(widgets.build_action), toolmenu); + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3984] branches/build-system
by elextr＠users.sourceforge.net 17 Jul '09

17 Jul '09

Revision: 3984 http://geany.svn.sourceforge.net/geany/?rev=3984&view=rev Author: elextr Date: 2009-07-17 07:59:19 +0000 (Fri, 17 Jul 2009) Log Message: ----------- Fix substitutes and leaks in build commands Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/src/build.c Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2009-07-17 04:55:35 UTC (rev 3983) +++ branches/build-system/ChangeLog 2009-07-17 07:59:19 UTC (rev 3984) @@ -1,5 +1,13 @@ 2009-07-17 Lex Trotman <elextr(at)gmail(dot)com> + * src/build.c + Fixed substitute %f etc in commands + Fixed potential leak in build_replace_placeholder + Fixed leak in prepare_run_script (Thanks for patch Thomas) + Fixed build_replace_placeholder to not require document. + +2009-07-17 Lex Trotman <elextr(at)gmail(dot)com> + * src/build.c, src/build.h, src/filetypes.h, src/filetypes.c Fixed crash and lots of warnings, deleted some commented out code. * geany.glade, src/keyfile.c, src/prefs.c, src/prefs.h, src/project.c Modified: branches/build-system/src/build.c =================================================================== --- branches/build-system/src/build.c 2009-07-17 04:55:35 UTC (rev 3983) +++ branches/build-system/src/build.c 2009-07-17 07:59:19 UTC (rev 3984) @@ -479,30 +479,30 @@ gchar* executable; gchar* ret_str; /* to be freed when not in use anymore */ - stack = g_string_new(src); + stack = g_string_new(src); + if (doc!=NULL) + { + filename = utils_get_utf8_from_locale(doc->file_name); - g_return_val_if_fail((doc && src), NULL); + /* replace %f with the filename (including extension) */ + replacement = g_path_get_basename(filename); + utils_string_replace_all(stack, "%f", replacement); + g_free(replacement); - filename = utils_get_utf8_from_locale(doc->file_name); + /* replace %d with the absolute path of the dir of the current file */ + replacement = g_path_get_dirname(filename); + utils_string_replace_all(stack, "%d", replacement); + g_free(replacement); - /* replace %f with the filename (including extension) */ - replacement = g_path_get_basename(filename); - utils_string_replace_all(stack, "%f", replacement); - g_free(replacement); - - /* replace %e with the filename (excluding extension) */ - executable = utils_remove_ext_from_filename(filename); - replacement = g_path_get_basename(executable); - utils_string_replace_all(stack, "%e", replacement); - g_free(replacement); - - /* replace %d with the absolute path of the dir of the current file */ - replacement = g_path_get_dirname(filename); - utils_string_replace_all(stack, "%d", replacement); - g_free(replacement); - - + /* replace %e with the filename (excluding extension) */ + executable = utils_remove_ext_from_filename(filename); + replacement = g_path_get_basename(executable); + utils_string_replace_all(stack, "%e", replacement); + g_free(replacement); + } + /* replace %p with the current project's (absolute) base directory */ + replacement = NULL; /* prevent double free if no replacement found */ if (app->project) { replacement = project_get_base_path(); @@ -510,10 +510,9 @@ else if (strstr(stack->str, "%p")) { /* fall back to %d */ ui_set_statusbar(FALSE, _("failed to substitute %%p, no project active")); - replacement = g_path_get_dirname(filename); + if (doc!=NULL) + replacement = g_path_get_dirname(filename); } - else /* aganst double free */ - replacement = NULL; utils_string_replace_all(stack, "%p", replacement); g_free(replacement); @@ -564,7 +563,7 @@ #endif utf8_cmd_string = utils_get_utf8_from_locale(cmd_string); - utf8_working_dir = (dir != NULL) ? g_strdup(dir) : + utf8_working_dir = (dir != NULL && strlen(dir)>0) ? g_strdup(dir) : g_path_get_dirname(doc->file_name); working_dir = utils_get_locale_from_utf8(utf8_working_dir); @@ -638,7 +637,6 @@ gboolean result = FALSE; gchar *tmp; gchar *cmd_string; - gchar *file; if (vte_cmd_nonscript != NULL) *vte_cmd_nonscript = NULL; @@ -650,7 +648,6 @@ cmd_string = build_replace_placeholder(doc, buildcmd_cmd(cmd)); - file = g_path_get_basename(cmd_string); working_dir = build_replace_placeholder(doc, buildcmd_working_dir(cmd)); /* in utf-8 */ /* only test whether working dir exists, don't change it or else Windows support will break @@ -1053,7 +1050,7 @@ static void build_command(GeanyDocument *doc, GeanyBuildGroup grp, gint cmd, gchar *cmd_cat) { gchar *dir; - gchar *full_command; + gchar *full_command, *subs_command; GeanyBuildCommand *buildcmd = get_build_cmd(doc, grp, cmd, NULL); gchar* cmdstr; @@ -1074,9 +1071,11 @@ dir = build_replace_placeholder(doc, buildcmd_working_dir(buildcmd)); + subs_command = build_replace_placeholder(doc, full_command); build_info.grp = grp; build_info.cmd = cmd; - build_spawn_cmd(doc, full_command, dir); + build_spawn_cmd(doc, subs_command, dir); + g_free(subs_command); g_free(dir); if (cmd_cat != NULL) g_free(full_command); build_menu_update(doc); @@ -1423,7 +1422,8 @@ gint grp,cmd; last_toolbutton_action = user_data; - grp = GPOINTER_TO_GRP(user_data); cmd = GPOINTER_TO_CMD(user_data); + grp = GPOINTER_TO_GRP(user_data); + cmd = GPOINTER_TO_CMD(user_data); if ( last_toolbutton_action==GBO_TO_POINTER(GBO_MAKE_ALL)) msg = _("Build the current file with Make and the default target"); else if (last_toolbutton_action==GBO_TO_POINTER(GBO_MAKE_CUSTOM)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3983] branches/build-system
by elextr＠users.sourceforge.net 17 Jul '09

17 Jul '09

Revision: 3983 http://geany.svn.sourceforge.net/geany/?rev=3983&view=rev Author: elextr Date: 2009-07-17 04:55:35 +0000 (Fri, 17 Jul 2009) Log Message: ----------- Merge with trunk Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/HACKING branches/build-system/README.Packagers branches/build-system/THANKS branches/build-system/TODO branches/build-system/data/filetype_extensions.conf branches/build-system/data/filetypes.actionscript branches/build-system/data/filetypes.c branches/build-system/data/filetypes.common branches/build-system/data/filetypes.cpp branches/build-system/data/filetypes.cs branches/build-system/data/filetypes.d branches/build-system/data/filetypes.ferite branches/build-system/data/filetypes.glsl branches/build-system/data/filetypes.haxe branches/build-system/data/filetypes.java branches/build-system/data/filetypes.javascript branches/build-system/data/filetypes.tcl branches/build-system/data/filetypes.vala branches/build-system/data/filetypes.xml branches/build-system/data/ui_toolbar.xml branches/build-system/doc/Doxyfile.in branches/build-system/doc/geany.html branches/build-system/doc/geany.txt branches/build-system/doc/plugins.dox branches/build-system/geany.glade branches/build-system/geany.nsi branches/build-system/icons/16x16/Makefile.am branches/build-system/plugins/Makefile.am branches/build-system/plugins/classbuilder.c branches/build-system/plugins/demoplugin.c branches/build-system/plugins/export.c branches/build-system/plugins/filebrowser.c branches/build-system/plugins/geanyfunctions.h branches/build-system/plugins/genapi.py branches/build-system/plugins/htmlchars.c branches/build-system/plugins/saveactions.c branches/build-system/plugins/splitwindow.c branches/build-system/po/ChangeLog branches/build-system/po/fr.po branches/build-system/po/ru.po branches/build-system/po/tr.po branches/build-system/scintilla/CellBuffer.cxx branches/build-system/scintilla/CellBuffer.h branches/build-system/scintilla/Document.cxx branches/build-system/scintilla/Document.h branches/build-system/scintilla/Editor.cxx branches/build-system/scintilla/Editor.h branches/build-system/scintilla/LexCPP.cxx branches/build-system/scintilla/LexCaml.cxx branches/build-system/scintilla/LexD.cxx branches/build-system/scintilla/LexHTML.cxx branches/build-system/scintilla/LexOthers.cxx branches/build-system/scintilla/LexPerl.cxx branches/build-system/scintilla/LineMarker.cxx branches/build-system/scintilla/Partitioning.h branches/build-system/scintilla/PerLine.cxx branches/build-system/scintilla/PerLine.h branches/build-system/scintilla/PlatGTK.cxx branches/build-system/scintilla/PositionCache.cxx branches/build-system/scintilla/PositionCache.h branches/build-system/scintilla/ScintillaGTK.cxx branches/build-system/scintilla/WindowAccessor.cxx branches/build-system/scintilla/XPM.h branches/build-system/scintilla/include/Platform.h branches/build-system/scintilla/include/SciLexer.h branches/build-system/scintilla/include/Scintilla.h branches/build-system/scintilla/include/Scintilla.iface branches/build-system/scintilla/scintilla_changes.patch branches/build-system/src/about.c branches/build-system/src/callbacks.c branches/build-system/src/callbacks.h branches/build-system/src/dialogs.c branches/build-system/src/dialogs.h branches/build-system/src/document.c branches/build-system/src/document.h branches/build-system/src/documentprivate.h branches/build-system/src/editor.c branches/build-system/src/editor.h branches/build-system/src/filetypes.c branches/build-system/src/filetypes.h branches/build-system/src/geany.h branches/build-system/src/geanymenubuttonaction.c branches/build-system/src/geanymenubuttonaction.h branches/build-system/src/geanyobject.c branches/build-system/src/geanyobject.h branches/build-system/src/highlighting.c branches/build-system/src/interface.c branches/build-system/src/keybindings.c branches/build-system/src/keybindings.h branches/build-system/src/keyfile.c branches/build-system/src/log.c branches/build-system/src/main.c branches/build-system/src/plugindata.h branches/build-system/src/plugins.c branches/build-system/src/prefs.c branches/build-system/src/printing.c branches/build-system/src/sciwrappers.c branches/build-system/src/sciwrappers.h branches/build-system/src/search.c branches/build-system/src/search.h branches/build-system/src/symbols.c branches/build-system/src/templates.c branches/build-system/src/toolbar.c branches/build-system/src/toolbar.h branches/build-system/src/treeviews.c branches/build-system/src/treeviews.h branches/build-system/src/ui_utils.c branches/build-system/src/ui_utils.h branches/build-system/src/utils.c branches/build-system/src/utils.h branches/build-system/src/win32.c branches/build-system/tagmanager/conf.c branches/build-system/tagmanager/diff.c branches/build-system/tagmanager/include/tm_workspace.h branches/build-system/tagmanager/lua.c branches/build-system/tagmanager/tcl.c branches/build-system/wscript Added Paths: ----------- branches/build-system/icons/16x16/classviewer-method.xpm branches/build-system/icons/16x16/classviewer-var.xpm branches/build-system/plugins/geanyplugin.h Property Changed: ---------------- branches/build-system/ Property changes on: branches/build-system ___________________________________________________________________ Added: svn:mergeinfo + /trunk:3867-3982 Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/ChangeLog 2009-07-17 04:55:35 UTC (rev 3983) @@ -75,6 +75,382 @@ * src/project.h, src/project.c: Changed to load/store the new configuration info. +2009-07-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/document.c: + Enable file monitoring for files which are written to disk by Geany + for the first time. + * src/filetypes.c: + Fix broken special case handling when detecting filetypes from a + shebang or other special file headers. + + +2009-07-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/search.c: + Make Mark All keybinding clear search highlighting when there's no + current word. + * src/search.c: + Fix wrong match length when using Mark with regex. + * src/geanyobject.c, src/geanyobject.h, src/treeviews.c, + src/keyfile.c, src/main.c: + Add 'Show Paths' documents list popup item. + Add "load_settings" core-only signal emitted just after loading + main keyfile settings; useful to delay building UI elements until + settings have been read. + * src/treeviews.c: + Fix GTK warning when right-clicking on default tag tree. + * src/treeviews.c, src/treeviews.h, src/keyfile.c, src/main.c: + Add treeviews_finalize(). + Remove tv.popup_openfiles field. + + +2009-07-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c: + Fix building on GTK 2.8 (patch by Eugene Arshinov, thanks). + + +2009-07-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/utils.c: + Quote the uri before passing it to the browser when opening a + website (closes #2818635). + * src/win32: + Fix broken 'builtin' Run command for HTML files on Windows. + + +2009-07-14 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Properly fix wrong brace highlighting of non-brace character. + * src/editor.c: + Allow autocompletion in Perl double-quoted strings. + Don't autocomplete in Perl single-quoted strings (closes #2821061). + Don't autocomplete in Perl q() strings. + * data/filetypes.common: + Make Mark highlighting brighter. + * src/interface.c, doc/geany.txt, doc/geany.html, geany.glade: + Use hyphen for auto-feature terms. + * src/plugindata.h, src/geany.h, src/filetypes.c, src/filetypes.h, + src/document.h, src/main.c: + Add documents_foreach() API macro that skips invalid docs. + Make filetypes[], documents[] part of the API again. + Add GEANY() macro for sharing geany symbols between API and core. + * src/plugindata.h, src/plugins.c, doc/plugins.dox, + plugins/saveactions.c, plugins/export.c, plugins/geanyfunctions.h, + plugins/demoplugin.c, plugins/filebrowser.c, plugins/splitwindow.c, + plugins/htmlchars.c, plugins/geanyplugin.h, plugins/Makefile.am, + plugins/classbuilder.c, wscript: + Add geanyplugin.h single include for plugin API; update all core + plugins to use it. + Add sci_set_font() to API. + Update plugin howto. + * src/filetypes.c, src/filetypes.h: + Remove filetypes_foreach_named(). + + +2009-07-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c, src/about.c, src/filetypes.c, src/document.c, + src/document.h, src/main.c, THANKS: + Apply patch from Eugene Arshinov to reload color schemes via menu + (thanks). + * src/filetypes.c: + Reload filetypes.common after saving it. + * src/editor.c: + Improve wrong brace highlighting of non-brace character. + + +2009-07-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Delay highlighting matching braces by 100ms, which speeds up + scrolling with the arrow keys. + * src/keybindings.c, src/keybindings.h, src/search.c, src/search.h: + Add 'Mark All' keybinding. + * tagmanager/diff.c: + Show relative paths in diff filename tags. + + +2009-07-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/highlighting.c: + Fix setting keyword list 'classes' for Haxe + (pointed out by Andreas Mokros, thanks). + + +2009-07-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, src/keyfile.c, src/editor.c, src/editor.h, + doc/geany.txt, doc/geany.html, geany.glade: + Add 'Drop rest of word on completion' pref. + * src/editor.c, doc/geany.txt, doc/geany.html: + If autocompletion is already visible when forcing completion, show + document word completion instead of tag completion. + Docs: Minor edits of related prefs items. + * src/printing.c, src/dialogs.c, src/dialogs.h, src/plugindata.h: + Add warning when printing and editor font is not monospaced. + Fix using GtkMessageType instead of gint param for + dialogs_show_msgbox*(). + Add missing G_GNUC_PRINTF macro check to API dialog funcs. + * src/editor.c: + Support 'tab indents, space aligns' style for auto-indentation + (closes #2789109). + + +2009-07-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/document.c, src/documentprivate.h: + Rework the GIO based file monitoring code. Now it is used only + to indicate a possible change of the file, the real check if the + file has been changed is performed by stat(). + * data/filetypes.common, doc/geany.txt, src/highlighting.c: + Add style 'line_height' to increase the line height. + Add style 'marker_mark' and change style 'marker_search' to + define the style used for marked search results. + * doc/geany.txt, doc/geany.html: + Add the new 'Autocomplete all words in document' pref to the docs. + + +2009-07-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, src/keyfile.c, src/editor.c, src/editor.h, + doc/geany.txt, doc/geany.html, geany.glade, TODO: + Add 'Autocomplete all words in document' pref. + Use 'autocompletion' in dialog and docs, not 'auto completion'. + * src/editor.c: + Fix limiting number of word completion entries too much. + * src/editor.c, TODO, icons/16x16/classviewer-var.xpm, + icons/16x16/classviewer-method.xpm, icons/16x16/Makefile.am: + Show autocompletion icons for tag symbols - for now only tags with + an arglist have the 'function/method' icon, all others have the + 'variable' icon. + Note: XPMs were created from the PNGs with the ImageMagick 'convert' + program. + * src/highlighting.c: + Highlight D WYSIWYG backtick `strings` and r"strings" (closes + #1895745). + + +2009-07-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c, src/utils.h, plugins/splitwindow.c: + Fix removing underscores in translated string using no_underscore() + macro. + Set a tooltip for the Split Window plugin's Show Current tool button. + Add utils_strdupa() macro. + * src/interface.c, geany.glade: + Use stock Select All icon now we have >= GTK 2.8. + * src/treeviews.c: + Fix using project name for document items that start with the + project base path but don't match it e.g. ".../geany-plugins" + instead of ".../geany" when project name is 'geany'. + + +2009-07-04 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/build.c: + Fix warnings when the toolbar does not contain the Run button. + * tagmanager/lua.c: + Fix wrong parsing of complex expressions in the Lua parser. + * src/editor.c, src/geany.h, src/keybindings.c, src/plugindata.h, + src/utils.c: + Remove unnecessary enums. + * scintilla/*, scintilla/include/*, src/plugindata.h: + Update Scintilla to version 1.79. + * src/document.c, src/editor.c, src/sciwrappers.c, src/sciwrappers.h, + src/search.c: + Use the new Scintilla struct names prefixed with 'Sci_'. + * TODO, data/filetypes.common, doc/geany.html, doc/geany.txt, + src/highlighting.c: + Add second argument to the 'line_wrap_indent' styling setting to + control the new Scintilla indentation mode for wrapped lines. + * src/toolbar.c: + Properly close the toolbar editor on delete-events. + Fix warnings and possible crashes in the toolbar editor when the list + of displayed toolbar items is empty. + * data/filetypes.tcl: + Update Tcl keywords for Tcl 8.6 (patch by Witek Mozga, thanks). + * src/plugins.c: + Make the plugin manager dialog a bit bigger. + + +2009-06-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * doc/geany.html, doc/geany.txt: + Fix wrong default values for the 'Show Calltip' keybinding. + + +2009-06-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/filetypes.tcl, src/symbols.c: + Fix duplicate "context_action_cmd" key. + Use different icons for "Methods" and "Procedures" in the symbol + list for Tcl files. + * src/filetypes.c: + Fix a small memory leak. + * doc/geany.html, doc/geany.txt, src/editor.c, src/keybindings.c, + src/keybindings.h, src/plugindata.h: + Make the Scintilla keybindings 'Delete to end of line' and + 'Go to end of display line' configurable. + * geany.nsi: + Fix a typo (closes #2813624). + + +2009-06-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * tagmanager/tcl.c, src/symbol.c: + Improve parsing of Tcl files (parsing new Tcl8.6 style classes, + methods and namespaces). + Patch by Witek Mozga, thanks. + + +2009-06-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/ui_toolbar.xml, doc/geany.txt, doc/geany.html, src/ui_utils.c, + src/toolbar.c, src/toolbar.h: + Remove ui_toolbar.xml Configuration Files menu item. + Add a real toolbar editor dialog. + * geany.glade, src/callbacks.c, src/callbacks.h, src/interface.c, + src/prefs.c: + Add a button in the preferences dialog and an item for the toolbar + popup menu to run the toolbar editor dialog. + + +2009-06-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/dialogs.c: + Fix Gtk NULL warning with gtk_file_chooser_set_current_folder(). + Fix using locale encoding for default Save As dialog path. + * src/editor.c: + Beep when trying to activate the '...' autocompletion item. + Limit (forced) document word completion to + autocompletion_max_entries. + Beep if no completions are shown when forcing autocompletion. + + +2009-06-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/ui_toolbar.xml, src/toolbar.c: + Add 'Build' toolbar button to the default layout. + + +2009-06-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + If forcing autocompletion and there's nothing else to show, complete + from words in the current document (using code from Enrico's + 'AutoComplete Test' plugin). + + +2009-06-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/plugins.c: + Add debug message if plugin has not set a name for its keybinding + group. + * data/filetype_extensions.conf: + Add *.m4 for shell scripts. + + +2009-06-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c, doc/geany.txt, doc/geany.html, + data/filetypes.common, TODO: + Make filetypes.common named styles use the "default" named style for + all missing style fields. + Set named styles to usually leave the background style empty. This + currently allows C-like filetypes to have a common default + background color. + Allow hard-coded colors to use -1 for the default color. + Add some highlighting style examples to the manual. + + +2009-06-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/templates.c: + Create initial template files with proper platform-specific line + ending characters. + + +2009-06-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/ui_toolbar.xml, doc/geany.txt, src/build.c, + src/geanymenubuttonaction.c, src/geanymenubuttonaction.h, src/main.c, + src/plugins.c, src/templates.c, src/toolbar.c, src/toolbar.h, + src/ui_utils.c, src/ui_utils.h: + Instantly reload (i.e. rebuild) the toolbar when ui_toolbar.xml is + saved within Geany. + Refactor some related code. + * tagmanager/conf.c: + Strip trailing spaces from "Key" tags. + * geany.nsi: + Quote the full filename to the Geany executable when creating the + "Open with Geany" context menu item. + * plugins/splitwindow.c: + Avoid using deprecated GTK API. + * src/log.c, src/main.c: + Properly clean up the logging mechanism. + * src/build.c: + Fix LaTeX view commands on Windows (part of #2807688). + * src/prefs.c: + Add a popup menu for the keybinding list in the preferences dialog + to easily expand and collapse all groups. + Refactor the keybindings code for the preferences dialog, prefix all + related functions. + * src/main.c, src/ui_utils.c, src/ui_utils.h: + Init stock items before creating the toolbar (closes #2809324). + * wscript: + Generate the geany.pc file also on Windows. + * src/ui_utils.c: + Invert the logic to determine which Save All we want to use: + Use the Tango like icon only for the Tango theme and the Gnome / GTK + like icon for any other themes. + + +2009-06-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c, README.Packagers, HACKING: + Remove gsd_* default styles, use named styles instead. + Note: this relies on filetypes.common being installed. + Add load_style_entries(), which makes style initialization + simpler, used in styleset_c_like_init(). + + +2009-06-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/win32.c: + Prevent possible crash on Windows when not setting an initial + directory for native File Open/Save dialogs. + * data/filetypes.xml, src/highlighting.c: + Add style 'jscript_regex' for filetype HTML + (patch by Chris Macksey, thanks). + + +2009-06-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/filetypes.h, src/document.c, src/document.h, src/ui_utils.c: + Make GeanyDocument::file_type always be non-NULL, even for a new + document with no filetype set. + * src/editor.c: + Only autocomplete scope for scopes matching the current filetype's + language. + * data/filetypes.java, data/filetypes.cpp, data/filetypes.vala, + data/filetypes.haxe, data/filetypes.common, data/filetypes.glsl, + data/filetypes.actionscript, data/filetypes.cs, + data/filetypes.ferite, data/filetypes.c, data/filetypes.d, + data/filetypes.javascript, HACKING: + Make C++, D lexer filetypes use named styles (apart from uuid, + verbatim, regex styles). + + +2009-06-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/dialogs.c: + Don't explicitly change the current directory of the Save As dialog + so that it uses the last used directory. + + 2009-06-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/encodings.c, src/encodings.h, src/plugindata.h: Modified: branches/build-system/HACKING =================================================================== --- branches/build-system/HACKING 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/HACKING 2009-07-17 04:55:35 UTC (rev 3983) @@ -236,17 +236,23 @@ 1. Write styleset_foo_init() to setup default styles and load style settings from the filetypes.foo configuration file. You should probably start by copying and adapting another filetype's initialization, such - as styleset_asm_init(). + as styleset_tcl_init(). Another way is to use load_style_entries() + to make style initialization simpler - see styleset_c_like_init(). + +.. note:: + Please try to make your styles fit in with the other filetypes' default + colors, and to use named styles where possible. Filetypes that share a + lexer should have the same colors. Normally, styles should leave the + background color empty to match the default color. + 2. Write styleset_foo() to apply styles when a new scintilla widget - is created. Again you could copy and adapt a function like styleset_asm(). + is created. Again you could copy and adapt a function like + styleset_tcl(). 3. In highlighting_init_styles(), add ``init_styleset_case(GEANY_FILETYPES_FOO, foo);``. 4. In highlighting_set_styles(), add ``styleset_case(GEANY_FILETYPES_FOO, foo);``. -Please try to make your styles fit in with the other filetypes' default -colors. - Error message parsing ^^^^^^^^^^^^^^^^^^^^^ New-style error message parsing is done with an extended GNU-style regex Modified: branches/build-system/README.Packagers =================================================================== --- branches/build-system/README.Packagers 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/README.Packagers 2009-07-17 04:55:35 UTC (rev 3983) @@ -26,8 +26,9 @@ manual. What you shouldn't skip in your package: the filetype.* files in the data/ subdirectory, these files are important. If they are missing, -Geany has still a fallback mechanism for syntax highlighting but several -other features for certain filetypes will fail (mainly build support). +Geany still has a fallback mechanism for syntax highlighting (if +filetypes.common is installed) but several other features for certain +filetypes will fail (mainly build support). Testing your package Modified: branches/build-system/THANKS =================================================================== --- branches/build-system/THANKS 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/THANKS 2009-07-17 04:55:35 UTC (rev 3983) @@ -65,6 +65,7 @@ Simon Treny <simon(dot)treny(at)free(dot)fr> - Documents sidebar stock icons patch Elias Pschernig <elias(at)users(dot)sourceforge(dot)net> - Recent Projects menu patch Jesse Mayes <plasmasheep(at)gmail(dot)com> - Tango'ish Save All icon +Eugene Arshinov <earshinov(at)gmail(dot)com> - Reload color schemes via menu patch Translators: ------------ @@ -86,6 +87,7 @@ Jari Rahkonen <jari(dot)rahkonen(at)pp1(dot)inet(dot)fi> - fi Jean-Philippe Moal <skateinmars(at)skateinmars(dot)net> - fr Roland Baudin <roland(dot)baudin(at)thalesaleniaspace(dot)com> - fr +Lionel Fuentes <funto66(at)gmail(dot)com> - fr Gabor Kmetyko aka kilo <kg_kilo(at)freemail(dot)hu> - hu M.Baldinelli <m(dot)baldinelli(at)agora(dot)it> - it Dario Santomarco <dariello(at)yahoo(dot)it> - it Modified: branches/build-system/TODO =================================================================== --- branches/build-system/TODO 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/TODO 2009-07-17 04:55:35 UTC (rev 3983) @@ -9,19 +9,20 @@ Next version or later: o documentation: list and explain filetype modes o common default highlighting styles configurable for all - programming languages (filetypes.common named styles now done) + programming languages (done for C-like filetypes using + filetypes.common named styles) o configurable filetype and project make commands (e.g. using - bud for D) + bud for D) - see the build-system SVN branch + o (custom filetypes) o (support for adding plugin filetypes - SCI_LOADLEXERLIBRARY?) o (selectable menu of arguments to use for Make, from Make Custom) o (DBUS) - o (indent wrapped lines - Scintilla issue) - o (macro support) - o (better search & replace regex support - use + o (sci macro support) + o (better search & replace regex support e.g. multiline - use SCI_GETCHARACTERPOINTER and GNU regex?) o (parsing tags from a memory buffer instead of a file on disk) o (tango-like icons for the symbol list) - o (show autocompletion symbol icons - see SCI_REGISTERIMAGE) + o (per-workspace instances with socket support?) 1.0: Modified: branches/build-system/data/filetype_extensions.conf =================================================================== --- branches/build-system/data/filetype_extensions.conf 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetype_extensions.conf 2009-07-17 04:55:35 UTC (rev 3983) @@ -32,7 +32,7 @@ Python=*.py;*.pyw; R=*.R;*.r; Ruby=*.rb;*.rhtml;*.ruby; -Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash; +Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4; Tcl=*.tcl;*.tk;*.wish; CSS=*.css; Docbook=*.docbook; Modified: branches/build-system/data/filetypes.actionscript =================================================================== --- branches/build-system/data/filetypes.actionscript 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.actionscript 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type [keywords] # all items must be in one line Modified: branches/build-system/data/filetypes.c =================================================================== --- branches/build-system/data/filetypes.c 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.c 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type # whether arguments of preprocessor commands should be styled (only first argument is used) # 1 to enable, 0 to disable styling_within_preprocessor=1;0;false;false Modified: branches/build-system/data/filetypes.common =================================================================== --- branches/build-system/data/filetypes.common 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.common 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,8 +1,10 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic - used for filetype All/None -default=0x000000;0xffffff;false;false +# use foreground;background;bold;italic or named_style,bold,italic +# used for filetype All/None +default=default + # 3rd selection argument is true to override default foreground # 4th selection argument is true to override default background selection=0x000000;0xc0c0c0;false;false @@ -30,9 +32,14 @@ # only the first and second argument is interpreted marker_line=0x000000;0xffff00;false;false -# style for a highlighted search result (e.g when using "Mark" in Search dialogs) +# style for a marked search results (when using "Mark" in Search dialogs) +# the second argument sets the background colour for the drawn rectangle +# only the second argument is interpreted +marker_search=0x000000;0x0000f0;false;false + +# style for a marked line (e.g when using the "Toggle Marker" keybinding (Ctrl-M)) # only the first and second argument is interpreted -marker_search=0x000000;0xB8F4B8;false;false +marker_mark=0x000000;0xb8f4b8;false;false # translucency for the line marker(first argument) and the search marker (second argument) # only the first and second argument is interpreted @@ -47,7 +54,7 @@ caret_width=1;0;false;false # set foreground and background colour of indentation guides -indent_guide=0xc0c0c0;0xffffff;false;false +indent_guide=0xc0c0c0;;false;false # third argument: if true, use this foreground color. If false, use the default value defined by the filetypes. # fourth argument: if true, use this background color. If false, use the default value defined by the filetypes. @@ -76,11 +83,42 @@ # 1 - Visual flag at end of subline drawn near text, 2 - Visual flag at begin of subline drawn near text line_wrap_visuals=3;0;false;false -# sets the size of indentation of sublines for wrapped lines in terms of the width of a space, -# only first argument is interpreted -line_wrap_indent=0;0;false;false +# only first and second argument is interpreted +# first argument: sets the size of indentation of sublines for wrapped lines in terms of +# the width of a space, only used when the second argument is 0 +# second argument: wrapped sublines can be indented to the position of their first subline or +# one more indent level, possible values: +# 0 - Wrapped sublines aligned to left of window plus amount set by the first argument +# 1 - Wrapped sublines are aligned to first subline indent (use the same indentation) +# 2 - Wrapped sublines are aligned to first subline indent plus one more level of indentation +line_wrap_indent=0;1;false;false +# only first and second argument is interpreted +# first argument: amount of space to be drawn above the line's baseline +# second argument: amount of space to be drawn below the line's baseline +line_height=0;0;false;false + [settings] # which characters should be skipped when moving (or included when deleting) to word boundaries # should always include space and tab (\s\t) whitespace_chars=\s\t!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~ + +[named_styles] +# style names to use in filetypes.* [styling] sections +# use foreground;background;bold;italic +# normally background should be left blank to use the "default" style + +default=0x000000;0xffffff;false;false +comment=0xd00000 +commentdoc=0x3f5fbf +number=0x007f00 +# keyword +word=0x00007f;;true;false +# e.g. global types from a *.c.tags file +word2=0x991111;;true;false +string=0xff901e +preprocessor=0x007f7f +operator=0x301010 +# unterminated string +stringeol=0x000000;0xe0c0e0;false;false +type=0x0000d0;;true;false Modified: branches/build-system/data/filetypes.cpp =================================================================== --- branches/build-system/data/filetypes.cpp 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.cpp 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type # whether arguments of preprocessor commands should be styled (only first argument is used) # 1 to enable, 0 to disable styling_within_preprocessor=1;0;false;false Modified: branches/build-system/data/filetypes.cs =================================================================== --- branches/build-system/data/filetypes.cs 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.cs 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type # whether arguments of preprocessor commands should be styled (only first argument is used) # 1 to enable, 0 to disable styling_within_preprocessor=1;0;false;false Modified: branches/build-system/data/filetypes.d =================================================================== --- branches/build-system/data/filetypes.d 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.d 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,24 +1,24 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -commentdocnested=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -word3=0x991111;0xffffff;true;false -typedef=0x0000d0;0xffffff;true;false -string=0xff901e;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -character=0xff901e;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +commentdocnested=commentdoc +number=number +word=word +word2=word2 +word3=word2 +typedef=type +string=string +stringeol=stringeol +character=string +operator=operator +identifier=default +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc [keywords] # all items must be in one line Modified: branches/build-system/data/filetypes.ferite =================================================================== --- branches/build-system/data/filetypes.ferite 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.ferite 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type [keywords] # all items must be in one line Modified: branches/build-system/data/filetypes.glsl =================================================================== --- branches/build-system/data/filetypes.glsl 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.glsl 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type # whether arguments of preprocessor commands should be styled (only first argument is used) # 1 to enable, 0 to disable styling_within_preprocessor=1;0;false;false Modified: branches/build-system/data/filetypes.haxe =================================================================== --- branches/build-system/data/filetypes.haxe 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.haxe 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type [keywords] # all items must be in one line Modified: branches/build-system/data/filetypes.java =================================================================== --- branches/build-system/data/filetypes.java 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.java 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type [keywords] primary=abstract assert break case catch class const continue default do else extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static super switch synchronized this throw throws transient try var volatile while true false null Modified: branches/build-system/data/filetypes.javascript =================================================================== --- branches/build-system/data/filetypes.javascript 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.javascript 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type [keywords] # all items must be in one line Modified: branches/build-system/data/filetypes.tcl =================================================================== --- branches/build-system/data/filetypes.tcl 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.tcl 2009-07-17 04:55:35 UTC (rev 3983) @@ -21,13 +21,12 @@ [keywords] # all items must be in one line -tcl=after append apply array auto_execok auto_import auto_load auto_load_index auto_mkindex auto_mkindex_old auto_qualify auto_reset beep bgerror binary break case catch cd chan clock close concat continue dde default dict echo else elseif encoding eof error eval exec exit expr fblocked fconfigure fcopy file fileevent filename flush for foreach format gets glob global history http if incr info interp join lappend lassign lindex linsert list llength load loadTk lrange lrepeat lreplace lreverse lsearch lset lsort mathfunc mathop memory msgcat namespace open package parray pid pkg::create pkg_mkIndex platform platform::shell Platform-specific proc puts pwd read refchan regexp registry regsub rename resource re_syntax return Safe Base scan seek set socket source split string subst switch Tcl tcl_endOfWord tcl_findLibrary tclLog tclMacPkgSearch tclPkgSetup tclPkgUnknown tcl_startOfNextWord tcl_startOfPreviousWord tcltest tclvars tcl_wordBreakAfter tcl_wordBreakBefore tell time tm trace unknown unload unset update uplevel upvar variable vwait while +tcl=after append apply array auto_execok auto_import auto_load auto_load_index auto_mkindex auto_mkindex_old auto_qualify auto_reset beep bgerror binary break case catch cd chan clock close concat continue coroutine dde default dict echo else elseif encoding eof error eval exec exit expr fblocked fconfigure fcopy file fileevent filename flush for foreach format gets glob global history http if incr info interp join lappend lassign lindex linsert list llength load loadTk lrange lrepeat lreplace lreverse lsearch lset lsort mathfunc mathop memory msgcat namespace oo::class oo::copy oo::define oo::objdefine oo::object open package parray pid pkg::create pkg_mkIndex platform platform::shell Platform-specific proc puts pwd read refchan regexp registry regsub rename resource re_syntax return Safe Base scan seek set socket source split string subst switch tailcall Tcl tcl::prefix tcl_endOfWord tcl_findLibrary tclLog tclMacPkgSearch tclPkgSetup tclPkgUnknown tcl_startOfNextWord tcl_startOfPreviousWord tcltest tclvars tcl_wordBreakAfter tcl_wordBreakBefore tell throw time tm trace try unknown unload unset update uplevel upvar variable vwait while yield zlib tk=bell bind bindtags bitmap button canvas checkbutton clipboard colors console cursors destroy entry event focus font frame grab grid image Inter-client keysyms label labelframe listbox loadTk lower menu menubutton message option options pack panedwindow photo place radiobutton raise scale scrollbar selection send spinbox text toplevel winfo wish wm itcl=@scope body class code common component configbody constructor define destructor hull import inherit itcl itk itk_component itk_initialize itk_interior itk_option iwidgets keep method private protected public -tkcommands=tk tk_bisque tkButtonAutoInvoke tkButtonDown tkButtonEnter tkButtonInvoke tkButtonLeave tkButtonUp tkCancelRepeat tkCheckRadioDown tkCheckRadioEnter tkCheckRadioInvoke tk_chooseColor tk_chooseDirectory tkColorDialog tkColorDialog_BuildDialog tkColorDialog_CancelCmd tkColorDialog_Config tkColorDialog_CreateSelector tkColorDialog_DrawColorScale tkColorDialog_EnterColorBar tkColorDialog_HandleRGBEntry tkColorDialog_HandleSelEntry tkColorDialog_InitValues tkColorDialog_LeaveColorBar tkColorDialog_MoveSelector tkColorDialog_OkCmd tkColorDialog_RedrawColorBars tkColorDialog_RedrawFinalColor tkColorDialog_ReleaseMouse tkColorDialog_ResizeColorBars tkColorDialog_RgbToX tkColorDialog_SetRGBValue tkColorDialog_StartMove tkColorDialog_XToRgb tkConsoleAbout tkConsoleBind tkConsoleExit tkConsoleHistory tkConsoleInit tkConsoleInsert tkConsoleInvoke tkConsoleOutput tkConsolePrompt tkConsoleSource tkDarken tk_dialog tkEntryAutoScan tkEntryBackspace tkEntryButton1 tkEntryClosestGap tkEntryGetSelection tkEntryInsert tkEntryKeySelect tkEntryMouseSelect tkEntryNextWord tkEntryPaste tkEntryPreviousWord tkEntrySeeInsert tkEntrySetCursor tkEntryTranspose tkerror tkEventMotifBindings tkFDGetFileTypes tkFirstMenu tk_focusFollowsMouse tkFocusGroup_BindIn tkFocusGroup_BindOut tkFocusGroup_Create tkFocusGroup_Destroy tkFocusGroup_In tkFocusGroup_Out tk_focusNext tkFocusOK tk_focusPrev tkGenerateMenuSelect tk_getOpenFile tk_getSaveFile tkIconList tkIconList_Add tkIconList_Arrange tkIconList_AutoScan tkIconList_Btn1 tkIconList_Config tkIconList_Create tkIconList_CtrlBtn1 tkIconList_Curselection tkIconList_DeleteAll tkIconList_Double1 tkIconList_DrawSelection tkIconList_FocusIn tkIconList_FocusOut tkIconList_Get tkIconList_Goto tkIconList_Index tkIconList_Invoke tkIconList_KeyPress tkIconList_Leave1 tkIconList_LeftRight tkIconList_Motion1 tkIconList_Reset tkIconList_ReturnKey tkIconList_See tkIconList_Select tkIconList_Selection tkIconList_ShiftBtn1 tkIconList_UpDown tkListbox tkListboxAutoScan tkListboxBeginExtend tkListboxBeginSelect tkListboxBeginToggle tkListboxCancel tkListboxDataExtend tkListboxExtendUpDown tkListboxKeyAccel_Goto tkListboxKeyAccel_Key tkListboxKeyAccel_Reset tkListboxKeyAccel_Set tkListboxKeyAccel_Unset tkListboxMotion tkListboxSelectAll tkListboxUpDown tkMbButtonUp tkMbEnter tkMbLeave tkMbMotion tkMbPost tkMenuButtonDown tkMenuDownArrow tkMenuDup tkMenuEscape tkMenuFind tkMenuFindName tkMenuFirstEntry tkMenuInvoke tkMenuLeave tkMenuLeftArrow tkMenuMotion tkMenuNextEntry tkMenuNextMenu tkMenuRightArrow tk_menuSetFocus tkMenuUnpost tkMenuUpArrow tk_messageBox tkMessageBox tkMotifFDialog tkMotifFDialog_ActivateDList tkMotifFDialog_ActivateFEnt tkMotifFDialog_ActivateFList tkMotifFDialog_ActivateSEnt tkMotifFDialog_BrowseDList tkMotifFDialog_BrowseFList tkMotifFDialog_BuildUI tkMotifFDialog_CancelCmd tkMotifFDialog_Config tkMotifFDialog_Create tkMotifFDialog_FileTypes tkMotifFDialog_FilterCmd tkMotifFDialog_InterpFilter tkMotifFDialog_LoadFiles tkMotifFDialog_MakeSList tkMotifFDialog_OkCmd tkMotifFDialog_SetFilter tkMotifFDialog_SetListMode tkMotifFDialog_Update tk_optionMenu tk_popup tkPostOverPoint tkRecolorTree tkRestoreOldGrab tkSaveGrabInfo tkScaleActivate tkScaleButton2Down tkScaleButtonDown tkScaleControlPress tkScaleDrag tkScaleEndDrag tkScaleIncrement tkScreenChanged tkScrollButton2Down tkScrollButtonDown tkScrollButtonDrag tkScrollButtonUp tkScrollByPages tkScrollByUnits tkScrollDrag tkScrollEndDrag tkScrollSelect tkScrollStartDrag tkScrollTopBottom tkScrollToPos tk_setPalette tkTabToWindow tkTearOffMenu tkTextAutoScan tkTextButton1 tkTextClosestGap tk_textCopy tk_textCut tkTextInsert tkTextKeyExtend tkTextKeySelect tkTextNextPara tkTextNextPos tkTextNextWord tk_textPaste tkTextPaste tkTextPrevPara tkTextPrevPos tkTextPrevWord tkTextResetAnchor tkTextScrollPages tkTextSelectTo tkTextSetCursor tkTextTranspose tkTextUpDownLine tkTraverseToMenu tkTraverseWithinMenu tkvars tkwait toplevel ttk::button ttk::checkbutton ttk::combobox ttk::entry ttk::frame ttk::image ttk::intro ttk::label ttk::labelframe ttk::menubutton ttk::notebook ttk::panedwindow ttk::progressbar ttk::radiobutton ttk::scale ttk::scrollbar ttk::separator ttk::sizegrip ttk::style ttk::treeview ttk::widget +tkcommands=tk tk_bisque tkButtonAutoInvoke tkButtonDown tkButtonEnter tkButtonInvoke tkButtonLeave tkButtonUp tkCancelRepeat tkCheckRadioDown tkCheckRadioEnter tkCheckRadioInvoke tk_chooseColor tk_chooseDirectory tkColorDialog tkColorDialog_BuildDialog tkColorDialog_CancelCmd tkColorDialog_Config tkColorDialog_CreateSelector tkColorDialog_DrawColorScale tkColorDialog_EnterColorBar tkColorDialog_HandleRGBEntry tkColorDialog_HandleSelEntry tkColorDialog_InitValues tkColorDialog_LeaveColorBar tkColorDialog_MoveSelector tkColorDialog_OkCmd tkColorDialog_RedrawColorBars tkColorDialog_RedrawFinalColor tkColorDialog_ReleaseMouse tkColorDialog_ResizeColorBars tkColorDialog_RgbToX tkColorDialog_SetRGBValue tkColorDialog_StartMove tkColorDialog_XToRgb tkConsoleAbout tkConsoleBind tkConsoleExit tkConsoleHistory tkConsoleInit tkConsoleInsert tkConsoleInvoke tkConsoleOutput tkConsolePrompt tkConsoleSource tkDarken tk_dialog tkEntryAutoScan tkEntryBackspace tkEntryButton1 tkEntryClosestGap tkEntryGetSelection tkEntryInsert tkEntryKeySelect tkEntryMouseSelect tkEntryNextWord tkEntryPaste tkEntryPreviousWord tkEntrySeeInsert tkEntrySetCursor tkEntryTranspose tkerror tkEventMotifBindings tkFDGetFileTypes tkFirstMenu tk_focusFollowsMouse tkFocusGroup_BindIn tkFocusGroup_BindOut tkFocusGroup_Create tkFocusGroup_Destroy tkFocusGroup_In tkFocusGroup_Out tk_focusNext tkFocusOK tk_focusPrev tkGenerateMenuSelect tk_getOpenFile tk_getSaveFile tkIconList tkIconList_Add tkIconList_Arrange tkIconList_AutoScan tkIconList_Btn1 tkIconList_Config tkIconList_Create tkIconList_CtrlBtn1 tkIconList_Curselection tkIconList_DeleteAll tkIconList_Double1 tkIconList_DrawSelection tkIconList_FocusIn tkIconList_FocusOut tkIconList_Get tkIconList_Goto tkIconList_Index tkIconList_Invoke tkIconList_KeyPress tkIconList_Leave1 tkIconList_LeftRight tkIconList_Motion1 tkIconList_Reset tkIconList_ReturnKey tkIconList_See tkIconList_Select tkIconList_Selection tkIconList_ShiftBtn1 tkIconList_UpDown tkListbox tkListboxAutoScan tkListboxBeginExtend tkListboxBeginSelect tkListboxBeginToggle tkListboxCancel tkListboxDataExtend tkListboxExtendUpDown tkListboxKeyAccel_Goto tkListboxKeyAccel_Key tkListboxKeyAccel_Reset tkListboxKeyAccel_Set tkListboxKeyAccel_Unset tkListboxMotion tkListboxSelectAll tkListboxUpDown tkMbButtonUp tkMbEnter tkMbLeave tkMbMotion tkMbPost tkMenuButtonDown tkMenuDownArrow tkMenuDup tkMenuEscape tkMenuFind tkMenuFindName tkMenuFirstEntry tkMenuInvoke tkMenuLeave tkMenuLeftArrow tkMenuMotion tkMenuNextEntry tkMenuNextMenu tkMenuRightArrow tk_menuSetFocus tkMenuUnpost tkMenuUpArrow tk_messageBox tkMessageBox tkMotifFDialog tkMotifFDialog_ActivateDList tkMotifFDialog_ActivateFEnt tkMotifFDialog_ActivateFList tkMotifFDialog_ActivateSEnt tkMotifFDialog_BrowseDList tkMotifFDialog_BrowseFList tkMotifFDialog_BuildUI tkMotifFDialog_CancelCmd tkMotifFDialog_Config tkMotifFDialog_Create tkMotifFDialog_FileTypes tkMotifFDialog_FilterCmd tkMotifFDialog_InterpFilter tkMotifFDialog_LoadFiles tkMotifFDialog_MakeSList tkMotifFDialog_OkCmd tkMotifFDialog_SetFilter tkMotifFDialog_SetListMode tkMotifFDialog_Update tk_optionMenu tk_popup tkPostOverPoint tkRecolorTree tkRestoreOldGrab tkSaveGrabInfo tkScaleActivate tkScaleButton2Down tkScaleButtonDown tkScaleControlPress tkScaleDrag tkScaleEndDrag tkScaleIncrement tkScreenChanged tkScrollButton2Down tkScrollButtonDown tkScrollButtonDrag tkScrollButtonUp tkScrollByPages tkScrollByUnits tkScrollDrag tkScrollEndDrag tkScrollSelect tkScrollStartDrag tkScrollTopBottom tkScrollToPos tk_setPalette tkTabToWindow tkTearOffMenu tkTextAutoScan tkTextButton1 tkTextClosestGap tk_textCopy tk_textCut tkTextInsert tkTextKeyExtend tkTextKeySelect tkTextNextPara tkTextNextPos tkTextNextWord tk_textPaste tkTextPaste tkTextPrevPara tkTextPrevPos tkTextPrevWord tkTextResetAnchor tkTextScrollPages tkTextSelectTo tkTextSetCursor tkTextTranspose tkTextUpDownLine tkTraverseToMenu tkTraverseWithinMenu tkvars tkwait toplevel ttk::button ttk::checkbutton ttk::combobox ttk::entry ttk::frame ttk::image ttk::intro ttk::label ttk::labelframe ttk::menubutton ttk::notebook ttk::panedwindow ttk::progressbar ttk::radiobutton ttk::scale ttk::scrollbar ttk::separator ttk::sizegrip ttk::spinbox ttk::style ttk::treeview ttk::widget ttk_vsapi expand= - [settings] # default extension used when saving files #extension=tcl @@ -50,10 +49,7 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= -# context action command (please see Geany's main documentation for details) -context_action_cmd= - [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: branches/build-system/data/filetypes.vala =================================================================== --- branches/build-system/data/filetypes.vala 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.vala 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -#default=0x000000;0xffffff;false;false -#comment=0xd00000;0xffffff;false;false -#commentline=0xd00000;0xffffff;false;false -#commentdoc=0x3f5fbf;0xffffff;false;false -#number=0x007f00;0xffffff;false;false -#word=0x00007f;0xffffff;true;false -#word2=0x991111;0xffffff;true;false -#string=0xff901e;0xffffff;false;false -#character=0xff901e;0xffffff;false;false -#uuid=0x404080;0xffffff;false;false -#preprocessor=0x007F7F;0xffffff;false;false -#operator=0x301010;0xffffff;false;false -#identifier=0x000000;0xffffff;false;false -#stringeol=0x000000;0xe0c0e0;false;false -#verbatim=0x101030;0xffffff;false;false -#regex=0x105090;0xffffff;false;false -#commentlinedoc=0x3f5fbf;0xffffff;true;false -#commentdockeyword=0x3f5fbf;0xffffff;true;true -#commentdockeyworderror=0x3f5fbf;0xffffff;false;false -#globalclass=0x0000d0;0xffffff;true;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type [keywords] # all items must be in one line Modified: branches/build-system/data/filetypes.xml =================================================================== --- branches/build-system/data/filetypes.xml 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/filetypes.xml 2009-07-17 04:55:35 UTC (rev 3983) @@ -66,6 +66,7 @@ # same as operators jscript_symbols=0x301010;0xffffff;false;false jscript_stringeol=0x000000;0xe0c0e0;false;false +jscript_regex=0x105090;0xffffff;false;false # for embedded Python script (<script language="python">...</script>), Python styles from # filetypes.python are used Modified: branches/build-system/data/ui_toolbar.xml =================================================================== --- branches/build-system/data/ui_toolbar.xml 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/data/ui_toolbar.xml 2009-07-17 04:55:35 UTC (rev 3983) @@ -1,12 +1,15 @@ <!-- +<!-- This is Geany's toolbar UI definition. -The DTD can be found at http://library.gnome.org/devel/gtk/stable/GtkUIManager.html#GtkUIManager.de…. +The DTD can be found at +http://library.gnome.org/devel/gtk/stable/GtkUIManager.html#GtkUIManager.description. You can re-order all items and freely add and remove available actions. -You cannot add new actions which are not listed below. +You cannot add new actions which are not listed in the documentation. Everything you add or change must be inside the /ui/toolbar/ path. -For changes to take effect, you need to restart Geany. +For changes to take effect, you need to restart Geany. Alternatively you can use the toolbar +editor in Geany. A list of available actions can be found in the documentation included with Geany or at http://www.geany.org/manual/current/index.html#customizing-the-toolbar. @@ -26,6 +29,7 @@ <toolitem action='NavFor' /> <separator/> <toolitem action='Compile' /> + <toolitem action='Build' /> <toolitem action='Run' /> <separator/> <toolitem action='Color' /> Modified: branches/build-system/doc/Doxyfile.in =================================================================== --- branches/build-system/doc/Doxyfile.in 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/doc/Doxyfile.in 2009-07-17 04:55:35 UTC (rev 3983) @@ -94,7 +94,7 @@ #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../src/ ./ ../plugins/pluginmacros.h \ +INPUT = ../src/ ./ ../plugins/pluginmacros.h ../plugins/geanyplugin.h \ ../tagmanager/tm_source_file.c ../tagmanager/include/tm_source_file.h \ ../tagmanager/tm_work_object.c ../tagmanager/include/tm_work_object.h \ ../tagmanager/tm_workspace.c ../tagmanager/include/tm_workspace.h Modified: branches/build-system/doc/geany.html =================================================================== --- branches/build-system/doc/geany.html 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/doc/geany.html 2009-07-17 04:55:35 UTC (rev 3983) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2009-06-04" /> +<meta name="date" content="2009-07-09" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2009-06-04</td></tr> +<td>2009-07-09</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.18</td></tr> </tbody> @@ -361,69 +361,73 @@ <li><a class="reference" href="#global-configuration-file" id="id144" name="id144">Global configuration file</a></li> <li><a class="reference" href="#filetype-definition-files" id="id145" name="id145">Filetype definition files</a><ul> <li><a class="reference" href="#format" id="id146" name="id146">Format</a><ul> -<li><a class="reference" href="#styling-section" id="id147" name="id147">[styling] Section</a></li> -<li><a class="reference" href="#keywords-section" id="id148" name="id148">[keywords] Section</a></li> -<li><a class="reference" href="#settings-section" id="id149" name="id149">[settings] Section</a></li> -<li><a class="reference" href="#build-settings-section" id="id150" name="id150">[build_settings] Section</a></li> +<li><a class="reference" href="#styling-section" id="id147" name="id147">[styling] Section</a><ul> +<li><a class="reference" href="#using-a-named-style" id="id148" name="id148">Using a named style</a></li> </ul> </li> -<li><a class="reference" href="#special-file-filetypes-common" id="id151" name="id151">Special file filetypes.common</a><ul> -<li><a class="reference" href="#named-styles-section" id="id152" name="id152">[named_styles] Section</a></li> -<li><a class="reference" href="#id4" id="id153" name="id153">[styling] Section</a></li> -<li><a class="reference" href="#id5" id="id154" name="id154">[settings] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id149" name="id149">[keywords] Section</a></li> +<li><a class="reference" href="#settings-section" id="id150" name="id150">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id151" name="id151">[build_settings] Section</a></li> </ul> </li> +<li><a class="reference" href="#special-file-filetypes-common" id="id152" name="id152">Special file filetypes.common</a><ul> +<li><a class="reference" href="#named-styles-section" id="id153" name="id153">[named_styles] Section</a></li> +<li><a class="reference" href="#id4" id="id154" name="id154">[styling] Section</a></li> +<li><a class="reference" href="#id5" id="id155" name="id155">[settings] Section</a></li> </ul> </li> -<li><a class="reference" href="#filetype-extensions" id="id155" name="id155">Filetype extensions</a></li> -<li><a class="reference" href="#templates" id="id156" name="id156">Templates</a><ul> -<li><a class="reference" href="#template-meta-data" id="id157" name="id157">Template meta data</a></li> -<li><a class="reference" href="#file-templates" id="id158" name="id158">File templates</a><ul> -<li><a class="reference" href="#custom-file-templates" id="id159" name="id159">Custom file templates</a></li> -<li><a class="reference" href="#filetype-templates" id="id160" name="id160">Filetype templates</a></li> </ul> </li> -<li><a class="reference" href="#customizing-templates" id="id161" name="id161">Customizing templates</a><ul> -<li><a class="reference" href="#template-wildcards" id="id162" name="id162">Template wildcards</a></li> +<li><a class="reference" href="#filetype-extensions" id="id156" name="id156">Filetype extensions</a></li> +<li><a class="reference" href="#templates" id="id157" name="id157">Templates</a><ul> +<li><a class="reference" href="#template-meta-data" id="id158" name="id158">Template meta data</a></li> +<li><a class="reference" href="#file-templates" id="id159" name="id159">File templates</a><ul> +<li><a class="reference" href="#custom-file-templates" id="id160" name="id160">Custom file templates</a></li> +<li><a class="reference" href="#filetype-templates" id="id161" name="id161">Filetype templates</a></li> </ul> </li> +<li><a class="reference" href="#customizing-templates" id="id162" name="id162">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id163" name="id163">Template wildcards</a></li> </ul> </li> -<li><a class="reference" href="#customizing-the-toolbar" id="id163" name="id163">Customizing the toolbar</a><ul> -<li><a class="reference" href="#available-toolbar-elements" id="id164" name="id164">Available toolbar elements</a></li> </ul> </li> +<li><a class="reference" href="#customizing-the-toolbar" id="id164" name="id164">Customizing the toolbar</a><ul> +<li><a class="reference" href="#manually-editing-of-the-toolbar-layout" id="id165" name="id165">Manually editing of the toolbar layout</a></li> +<li><a class="reference" href="#available-toolbar-elements" id="id166" name="id166">Available toolbar elements</a></li> </ul> </li> -<li><a class="reference" href="#plugin-documentation" id="id165" name="id165">Plugin documentation</a><ul> -<li><a class="reference" href="#instant-save" id="id166" name="id166">Instant Save</a></li> -<li><a class="reference" href="#backup-copy" id="id167" name="id167">Backup Copy</a></li> </ul> </li> -<li><a class="reference" href="#contributing-to-this-document" id="id168" name="id168">Contributing to this document</a></li> -<li><a class="reference" href="#scintilla-keyboard-commands" id="id169" name="id169">Scintilla keyboard commands</a><ul> -<li><a class="reference" href="#keyboard-commands" id="id170" name="id170">Keyboard commands</a></li> +<li><a class="reference" href="#plugin-documentation" id="id167" name="id167">Plugin documentation</a><ul> +<li><a class="reference" href="#instant-save" id="id168" name="id168">Instant Save</a></li> +<li><a class="reference" href="#backup-copy" id="id169" name="id169">Backup Copy</a></li> </ul> </li> -<li><a class="reference" href="#tips-and-tricks" id="id171" name="id171">Tips and tricks</a><ul> -<li><a class="reference" href="#document-notebook" id="id172" name="id172">Document notebook</a></li> -<li><a class="reference" href="#editor" id="id173" name="id173">Editor</a></li> -<li><a class="reference" href="#interface" id="id174" name="id174">Interface</a></li> -<li><a class="reference" href="#gtk-related" id="id175" name="id175">GTK-related</a></li> +<li><a class="reference" href="#contributing-to-this-document" id="id170" name="id170">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id171" name="id171">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id172" name="id172">Keyboard commands</a></li> </ul> </li> -<li><a class="reference" href="#hidden-preferences" id="id176" name="id176">Hidden preferences</a></li> -<li><a class="reference" href="#compile-time-options" id="id177" name="id177">Compile-time options</a><ul> -<li><a class="reference" href="#src-geany-h" id="id178" name="id178">src/geany.h</a></li> -<li><a class="reference" href="#project-h" id="id179" name="id179">project.h</a></li> -<li><a class="reference" href="#editor-h" id="id180" name="id180">editor.h</a></li> -<li><a class="reference" href="#keyfile-c" id="id181" name="id181">keyfile.c</a></li> -<li><a class="reference" href="#build-h" id="id182" name="id182">build.h</a></li> +<li><a class="reference" href="#tips-and-tricks" id="id173" name="id173">Tips and tricks</a><ul> +<li><a class="reference" href="#document-notebook" id="id174" name="id174">Document notebook</a></li> +<li><a class="reference" href="#editor" id="id175" name="id175">Editor</a></li> +<li><a class="reference" href="#interface" id="id176" name="id176">Interface</a></li> +<li><a class="reference" href="#gtk-related" id="id177" name="id177">GTK-related</a></li> </ul> </li> -<li><a class="reference" href="#gnu-general-public-license" id="id183" name="id183">GNU General Public License</a></li> -<li><a class="reference" href="#license-for-scintilla-and-scite" id="id184" name="id184">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#hidden-preferences" id="id178" name="id178">Hidden preferences</a></li> +<li><a class="reference" href="#compile-time-options" id="id179" name="id179">Compile-time options</a><ul> +<li><a class="reference" href="#src-geany-h" id="id180" name="id180">src/geany.h</a></li> +<li><a class="reference" href="#project-h" id="id181" name="id181">project.h</a></li> +<li><a class="reference" href="#editor-h" id="id182" name="id182">editor.h</a></li> +<li><a class="reference" href="#keyfile-c" id="id183" name="id183">keyfile.c</a></li> +<li><a class="reference" href="#build-h" id="id184" name="id184">build.h</a></li> </ul> +</li> +<li><a class="reference" href="#gnu-general-public-license" id="id185" name="id185">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id186" name="id186">License for Scintilla and SciTE</a></li> +</ul> </div> <div class="section"> <h1><a class="toc-backref" href="#id11" id="introduction" name="introduction">Introduction</a></h1> @@ -438,7 +442,7 @@ <ul class="simple"> <li>Syntax highlighting</li> <li>Code folding</li> -<li>Symbol name auto-completion</li> +<li>Symbol name autocompletion</li> <li>Construct completion/snippets</li> <li>Auto-closing of XML and HTML tags</li> <li>Call tips</li> @@ -724,7 +728,7 @@ <td>Specify explicitly the path including filename or only the filename to the VTE library, e.g. <tt class="docutils literal"><span class="pre">/usr/lib/libvte.so</span></tt> or <tt class="docutils literal"><span class="pre">libvte.so</span></tt>. This option is -only needed when the auto detection does not work. Only +only needed when the auto-detection does not work. Only available if Geany was compiled with support for VTE.</td> </tr> <tr><td>-v</td> @@ -913,7 +917,7 @@ an encoding in the drop down box or by reloading the file with the file menu item "Reload as". The auto-detection works well for most encodings but there are also some encodings known where auto-detection -has its problems. Auto detecting the encoding of a file is not easy +has its problems. Auto-detecting the encoding of a file is not easy and sometimes an encoding might be detected not correctly.</p> <p>There are different ways to use different encodings in Geany:</p> <ul> @@ -1262,7 +1266,7 @@ myname=Enrico Tröger </pre> <p>Every time you write <tt class="docutils literal"><span class="pre">myname</span></tt> <TAB> in Geany, it will replace "myname" -with "Enrico Tröger". The key to start auto completion can be changed +with "Enrico Tröger". The key to start autocompletion can be changed in the preferences dialog, by default it is TAB. The corresponding keybinding is called <tt class="docutils literal"><span class="pre">Complete</span> <span class="pre">snippet</span></tt>.</p> <p>Since Geany 0.15 you can also use most of the available templates wildcards @@ -1564,14 +1568,14 @@ <h3><a class="toc-backref" href="#id70" id="workspace-tags" name="workspace-tags">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 auto completion of symbols and calltips for all documents +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" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> <div class="section"> <h3><a class="toc-backref" href="#id71" id="global-tags" name="global-tags">Global tags</a></h3> -<p>Global tags are used to provide auto completion of symbols and calltips +<p>Global tags are used to provide autocompletion of symbols and calltips without having to open the corresponding source files. This is intended for library APIs, as the tags file only has to be updated when you upgrade the library.</p> @@ -1788,7 +1792,7 @@ <dt>Suppress status messages in the status bar</dt> <dd>Remove all messages from the status bar. The messages are still displayed in the status messages window.</dd> -<dt>Auto focus widgets (focus follows mouse)</dt> +<dt>Auto-focus widgets (focus follows mouse)</dt> <dd>Give the focus automatically to widgets below the mouse cursor. This works for the main editor widget, the scribble, the toolbar search field goto line fields and the VTE.</dd> @@ -2042,16 +2046,23 @@ <p class="last">on the next line with the correct indentation based on the previous line, as long as the multi-line is not closed by <tt class="docutils literal"><span class="pre">*/</span></tt>.</p> </dd> -<dt>Automatic symbol completion</dt> +<dt>Autocomplete symbols</dt> <dd>When you start to type a symbol name, look for the full string to allow it to be completed for you.</dd> -<dt>Characters to type for completion</dt> -<dd>Number of characters of a word to type before auto completion is +<dt>Autocomplete all words in document</dt> +<dd>When you start to type a word, Geany will search the whole document for +words starting with the typed part to complete it, assuming there +are no tag names to show.</dd> +<dt>Drop rest of word on completion</dt> +<dd>Remove any word part to the right of the cursor when choosing a +completion list item.</dd> +<dt>Characters to type for autocompletion</dt> +<dd>Number of characters of a word to type before autocompletion is displayed.</dd> -<dt>Rows of symbol completion list</dt> -<dd>The maximum number of symbols to show in the auto completion window.</dd> +<dt>Completion list height</dt> +<dd>The number of rows to display for the autocompletion window.</dd> <dt>Max. symbol name suggestions</dt> -<dd>The maximum number of entries to display in the auto completion list.</dd> +<dd>The maximum number of items in the autocompletion list.</dd> </dl> </div> <div class="section"> @@ -2685,6 +2696,8 @@ <p>The following notes on the table reference cells by coordinate as (group,source):</p> <ul class="simple"> <li>General - for filetype.xxx substitute the appropriate extension for xxx.</li> +<li>System Filetypes - Labels loaded from these sources are locale sensitive +and can contain translations.</li> <li>(Filetype, Project File) and (Filetype, Preferences) - preferences use a full filetype file so that users can configure all other filetype preferences as well. Projects can only configure menu items per filetype. Saving @@ -2917,6 +2930,11 @@ <td>Deletes the current line (and any lines with a selection).</td> </tr> +<tr><td>Delete to line end</td> +<td>Ctrl-Shift-Delete</td> +<td>Deletes from the current caret position to the +end of the current line.</td> +</tr> <tr><td>Duplicate line or selection</td> <td>Ctrl-D</td> <td>Duplicates the current line or selection.</td> @@ -2941,11 +2959,14 @@ </tr> <tr><td>Complete word</td> <td>Ctrl-Space</td> -<td>Shows auto completion list.</td> +<td>Shows the autocompletion list. If already showing +tag completion, it shows document word completion +instead, even if it is not enabled for automatic +completion. Likewise if no tag suggestions are +available, it shows document word completion.</td> </tr> <tr><td>Show calltip</td> -<td>Alt-Space (Unix) -Alt-Shift-Space (Windows)</td> +<td>Ctrl-Shift-Space</td> <td>Shows call tips for the current function or method.</td> </tr> @@ -3236,6 +3257,15 @@ <td>End</td> <td>Move the caret to the end of the line.</td> </tr> +<tr><td>Go to End of Display Line</td> +<td>Alt-End</td> +<td>Move the caret to the end of the display line. +This is useful when you use line wrapping and +want to jump to the end of the wrapped, virtual +line, not the real end of the whole line. +If the line is not wrapped, it behaves like +<cite>Go to End of Line</cite>, see above.</td> +</tr> <tr><td>Go to Previous Word Part</td> <td>Ctrl-/</td> <td>Goto the previous part of the current word.</td> @@ -3510,13 +3540,19 @@ <p>In this section the colors for syntax highlighting are defined. The manual format is:</p> <ul class="simple"> -<li><tt class="docutils literal"><span class="pre">key=foreground_color;background_color;bold;italic</span></tt></li> +<li><tt class="docutils literal"><span class="pre">key=foreground_color;background_color;bold_flag;italic_flag</span></tt></li> </ul> <p>Colors have to be specified as RGB hex values prefixed by 0x. For example red is 0xff0000, blue is 0x0000ff. The values are case-insensitive, but it is a good idea to use small letters. Bold and italic are flags and should only be "true" or "false". If their value is something other than "true" or "false", "false" is assumed.</p> +<p>You can omit fields to use the <tt class="docutils literal"><span class="pre">"default"</span></tt> named style.</p> +<p>E.g. <tt class="docutils literal"><span class="pre">key=0xff0000;;true</span></tt></p> +<p>This makes the key style have red foreground text, default background +color text and bold emphasis.</p> +<div class="section"> +<h5><a class="toc-backref" href="#id148" id="using-a-named-style" name="using-a-named-style">Using a named style</a></h5> <p>The second format uses a <em>named style</em> name to reference a style defined in filetypes.common.</p> <ul class="simple"> @@ -3525,17 +3561,17 @@ </ul> <p>The bold and italic parts are optional, and if present are used to toggle the bold or italic flags to the opposite of the named style's -flags.</p> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">Commas are used for these so Geany can easily determine whether a -named style is used or not.</p> -</div> +flags. In contrast to style definition booleans, they are a literal +",bold,italic" and commas are used instead of semi-colons.</p> +<p>E.g. <tt class="docutils literal"><span class="pre">key=comment,italic</span></tt></p> +<p>This makes the key style match the <tt class="docutils literal"><span class="pre">"comment"</span></tt> named style, but with +italic emphasis.</p> <p>To define named styles, see the filetypes.common <a class="reference" href="#named-styles-section">[named_styles] Section</a>.</p> </div> +</div> <div class="section"> -<h4><a class="toc-backref" href="#id148" id="keywords-section" name="keywords-section">[keywords] Section</a></h4> +<h4><a class="toc-backref" href="#id149" id="keywords-section" name="keywords-section">[keywords] Section</a></h4> <p>This section contains keys for different keyword lists specific to the filetype. Some filetypes do not support keywords, so adding a new key will not work. You can only add or remove keywords to/from @@ -3546,7 +3582,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id149" id="settings-section" name="settings-section">[settings] Section</a></h4> +<h4><a class="toc-backref" href="#id150" id="settings-section" name="settings-section">[settings] Section</a></h4> <dl class="docutils"> <dt>extension</dt> <dd><p class="first">This is the default file extension used when saving files, not @@ -3607,7 +3643,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id150" id="build-settings-section" name="build-settings-section">[build_settings] Section</a></h4> +<h4><a class="toc-backref" href="#id151" id="build-settings-section" name="build-settings-section">[build_settings] Section</a></h4> <dl class="docutils"> <dt>error_regex</dt> <dd><p class="first">This is a GNU-style extended regular expression to parse a filename @@ -3656,13 +3692,13 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id151" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> +<h3><a class="toc-backref" href="#id152" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> <p>There is a special filetype definition file called filetypes.common. This file defines some general non-filetype-specific settings.</p> <p>See the <a class="reference" href="#format">Format</a> section for how to define styles.</p> <div class="section"> -<h4><a class="toc-backref" href="#id152" id="named-styles-section" name="named-styles-section">[named_styles] Section</a></h4> +<h4><a class="toc-backref" href="#id153" id="named-styles-section" name="named-styles-section">[named_styles] Section</a></h4> <p>Named styles declared here can be used in the [styling] section of any filetypes.* file.</p> <p>For example:</p> @@ -3687,7 +3723,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id153" id="id4" name="id4">[styling] Section</a></h4> +<h4><a class="toc-backref" href="#id154" id="id4" name="id4">[styling] Section</a></h4> <dl class="docutils"> <dt>default</dt> <dd><p class="first">This is the default style. It is used for styling files without a @@ -3804,10 +3840,17 @@ <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">line_wrap_visuals=3;0;false;false</span></tt></p> </dd> <dt>line_wrap_indent</dt> -<dd><p class="first">Sets the size of indentation of sublines for wrapped lines in terms -of the width of a space.</p> -<p>Only first argument is interpreted.</p> -<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">line_wrap_indent=0;0;false;false</span></tt></p> +<dd><p class="first">First argument: sets the size of indentation of sublines for wrapped lines +in terms of the width of a space, only used when the second argument is <tt class="docutils literal"><span class="pre">0</span></tt>.</p> +<p>Second argument: wrapped sublines can be indented to the position of their +first subline or one more indent level. Possible values:</p> +<ul class="simple"> +<li>0 - Wrapped sublines aligned to left of window plus amount set by the first argument</li> +<li>1 - Wrapped sublines are aligned to first subline indent (use the same indentation)</li> +<li>2 - Wrapped sublines are aligned to first subline indent plus one more level of indentation</li> +</ul> +<p>Only first and second argument is interpreted.</p> +<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">line_wrap_indent=0;1;false;false</span></tt></p> </dd> <dt>translucency</dt> <dd><p class="first">Translucency for the current line (first argument) and the selection @@ -3825,11 +3868,17 @@ <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">marker_line=0x000000;0xffff00;false;false</span></tt></p> </dd> <dt>marker_search</dt> -<dd><p class="first">The style for a highlighted search result (e.g when using "Mark" in -Search dialogs). The foreground color (first argument) is only used +<dd><p class="first">The style for a marked search results (when using "Mark" in Search dialogs). +The second argument sets the background colour for the drawn rectangle.</p> +<p>Only the second argument is interpreted.</p> +<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">marker_search=0x000000;0xb8f4b8;false;false</span></tt></p> +</dd> +<dt>marker_mark</dt> +<dd><p class="first">The style for a marked line (e.g when using the "Toggle Marker" keybinding +(Ctrl-M)). The foreground color (first argument) is only used when the Markers margin is enabled (see View menu).</p> <p>Only the first and second argument is interpreted.</p> -<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">marker_search=0x000000;0xB8F4B8;false;false</span></tt></p> +<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">marker_mark=0x000000;0xb8f4b8;false;false</span></tt></p> </dd> <dt>marker_translucency</dt> <dd><p class="first">Translucency for the line marker (first argument) and the search marker @@ -3839,10 +3888,17 @@ <p>Only the first and second argument is interpreted.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">marker_translucency=256;256;false;false</span></tt></p> </dd> +<dt>line_height</dt> +<dd><p class="first">Amount of space to be drawn above and below the line's baseline. +The first argument defines the amount of space to be drawn above the line, the second +argument defines the amount of space to be drawn below.</p> +<p>Only the first and second argument is interpreted.</p> +<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">line_height=0;0;false;false</span></tt></p> +</dd> </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id154" id="id5" name="id5">[settings] Section</a></h4> +<h4><a class="toc-backref" href="#id155" id="id5" name="id5">[settings] Section</a></h4> <dl class="docutils"> <dt>whitespace_chars</dt> <dd><p class="first">Characters to treat as whitespace. These characters are ignored @@ -3856,7 +3912,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id155" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> +<h2><a class="toc-backref" href="#id156" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> <p>To change the default filetype extension used when saving a new file, see <a class="reference" href="#filetype-definition-files">Filetype definition files</a>.</p> <p>You can override the list of file extensions that Geany uses for each @@ -3882,7 +3938,7 @@ </pre> </div> <div class="section"> -<h2><a class="toc-backref" href="#id156" id="templates" name="templates">Templates</a></h2> +<h2><a class="toc-backref" href="#id157" id="templates" name="templates">Templates</a></h2> <p>Geany supports the following templates:</p> <ul class="simple"> <li>ChangeLog entry</li> @@ -3905,7 +3961,7 @@ function description won't contain the correct function name but "unknown" instead.</p> <div class="section"> -<h3><a class="toc-backref" href="#id157" id="template-meta-data" name="template-meta-data">Template meta data</a></h3> +<h3><a class="toc-backref" href="#id158" id="template-meta-data" name="template-meta-data">Template meta data</a></h3> <p>Meta data can be used with all templates, but by default user set meta data is only used for the ChangeLog and File header templates.</p> <p>In the configuration dialog you can find a tab "Templates" (see @@ -3915,7 +3971,7 @@ at startup.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id158" id="file-templates" name="file-templates">File templates</a></h3> +<h3><a class="toc-backref" href="#id159" id="file-templates" name="file-templates">File templates</a></h3> <p>File templates are templates used as the basis of a new file. To use them, choose the <em>New (with Template)</em> menu item from the <em>File</em> menu.</p> @@ -3927,7 +3983,7 @@ be placed anywhere, but is usually on the first line of the file, followed by a blank line.</p> <div class="section"> -<h4><a class="toc-backref" href="#id159" id="custom-file-templates" name="custom-file-templates">Custom file templates</a></h4> +<h4><a class="toc-backref" href="#id160" id="custom-file-templates" name="custom-file-templates">Custom file templates</a></h4> <p>These are read from the <tt class="docutils literal"><span class="pre">~/.config/geany/templates/files</span></tt> directory (created the first time Geany is started). The filetype to use is detected from the template file's extension, if any. For example, creating @@ -3938,7 +3994,7 @@ template.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id160" id="filetype-templates" name="filetype-templates">Filetype templates</a></h4> +<h4><a class="toc-backref" href="#id161" id="filetype-templates" name="filetype-templates">Filetype templates</a></h4> <p>Filetype template files are read from the <tt class="docutils literal"><span class="pre">~/.config/geany/templates</span></tt> directory, and are named "filetype." followed by the filetype name, e.g. "filetype.python", "filetype.sh", etc. If you are @@ -3950,7 +4006,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id161" id="customizing-templates" name="customizing-templates">Customizing templates</a></h3> +<h3><a class="toc-backref" href="#id162" id="customizing-templates" name="customizing-templates">Customizing templates</a></h3> <p>Each template can be customized to your needs. The templates are stored in the <tt class="docutils literal"><span class="pre">~/.config/geany/templates/</span></tt> directory (see the section called <a class="reference" href="#command-line-options">Command line options</a> for further information about the configuration @@ -3958,7 +4014,7 @@ Geany ;-) ) and edit the template to your needs. There are some wildcards which will be automatically replaced by Geany at startup.</p> <div class="section"> -<h4><a class="toc-backref" href="#id162" id="template-wildcards" name="template-wildcards">Template wildcards</a></h4> +<h4><a class="toc-backref" href="#id163" id="template-wildcards" name="template-wildcards">Template wildcards</a></h4> <p>All wildcards must be enclosed by "{" and "}", e.g. {date}.</p> <table border="1" class="docutils"> <colgroup> @@ -4079,9 +4135,13 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id163" id="customizing-the-toolbar" name="customizing-the-toolbar">Customizing the toolbar</a></h2> -<p>You can add, remove and reorder the elements in the toolbar by editing -the file <tt class="docutils literal"><span class="pre">ui_toolbar.xml</span></tt>.</p> +<h2><a class="toc-backref" href="#id164" id="customizing-the-toolbar" name="customizing-the-toolbar">Customizing the toolbar</a></h2> +<p>You can add, remove and reorder the elements in the toolbar by using the toolbar editor +by manually editing the file <tt class="docutils literal"><span class="pre">ui_toolbar.xml</span></tt>.</p> +<p>The toolbar editor can be opened from the preferences editor on the Toolbar tab or +by right-clicking on the toolbar itself and choosing it from the menu.</p> +<div class="section"> +<h3><a class="toc-backref" href="#id165" id="manually-editing-of-the-toolbar-layout" name="manually-editing-of-the-toolbar-layout">Manually editing of the toolbar layout</a></h3> <p>To override the system-wide configuration file, copy it from <tt class="docutils literal"><span class="pre">$prefix/share/geany</span></tt> to your configuration directory, usually <tt class="docutils literal"><span class="pre">~/.config/geany/</span></tt>. <tt class="docutils literal"><span class="pre">$prefix</span></tt> is the path where Geany is installed @@ -4095,17 +4155,17 @@ you wish and add or remove additional separators. This file must be valid XML, otherwise the global toolbar UI definition will be used instead.</p> +<p>Your changes are applied once you save the file.</p> <div class="note"> <p class="first admonition-title">Note</p> <ol class="last arabic simple"> <li>You cannot add new actions which are not listed below.</li> <li>Everything you add or change must be inside the /ui/toolbar/ path.</li> -<li>After you finish editing the file, you need to restart Geany -for changes to take effect.</li> </ol> </div> +</div> <div class="section"> -<h3><a class="toc-backref" href="#id164" id="available-toolbar-elements" name="available-toolbar-elements">Available toolbar elements</a></h3> +<h3><a class="toc-backref" href="#id166" id="available-toolbar-elements" name="available-toolbar-elements">Available toolbar elements</a></h3> <table border="1" class="docutils"> <colgroup> <col width="19%" /> @@ -4219,9 +4279,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id165" id="plugin-documentation" name="plugin-documentation">Plugin documentation</a></h1> +<h1><a class="toc-backref" href="#id167" id="plugin-documentation" name="plugin-documentation">Plugin documentation</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id166" id="instant-save" name="instant-save">Instant Save</a></h2> +<h2><a class="toc-backref" href="#id168" id="instant-save" name="instant-save">Instant Save</a></h2> <p>This plugin sets on every new file (File->New or File-> New (with template)) a randomly chosen filename and set its filetype appropriate to the used template or when no template was used, to a configurable default filetype. @@ -4231,7 +4291,7 @@ similar.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id167" id="backup-copy" name="backup-copy">Backup Copy</a></h2> +<h2><a class="toc-backref" href="#id169" id="backup-copy" name="backup-copy">Backup Copy</a></h2> <p>This plugin creates a backup copy of the current file in Geany when it is saved. You can specify the directory where the backup copy is saved and you can configure the automatically added extension in the configure dialog @@ -4241,7 +4301,7 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id168" id="contributing-to-this-document" name="contributing-to-this-document">Contributing to this document</a></h1> +<h1><a class="toc-backref" href="#id170" id="contributing-to-this-document" name="contributing-to-this-document">Contributing to this document</a></h1> <p>This document (<tt class="docutils literal"><span class="pre">geany.txt</span></tt>) is written in <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> (or "reST"). The source file for it is located in Geany's <tt class="docutils literal"><span class="pre">doc</span></tt> subdirectory. If you intend on making changes, you should grab the @@ -4261,7 +4321,7 @@ and Fedora systems.</p> </div> <div class="section"> -<h1><a class="toc-backref" href="#id169" id="scintilla-keyboard-commands" name="scintilla-keyboard-commands">Scintilla keyboard commands</a></h1> +<h1><a class="toc-backref" href="#id171" id="scintilla-keyboard-commands" name="scintilla-keyboard-commands">Scintilla keyboard commands</a></h1> <p>Copyright © 1998, 2006 Neil Hodgson <neilh(at)scintilla(dot)org></p> <p>This appendix is distributed under the terms of the License for Scintilla and SciTE. A copy of this license can be found in the file @@ -4270,7 +4330,7 @@ Scintilla and SciTE</a>.</p> <p>20 June 2006</p> <div class="section"> -<h2><a class="toc-backref" href="#id170" id="keyboard-commands" name="keyboard-commands">Keyboard commands</a></h2> +<h2><a class="toc-backref" href="#id172" id="keyboard-commands" name="keyboard-commands">Keyboard commands</a></h2> <p>Keyboard commands for Scintilla mostly follow common Windows and GTK+ conventions. All move keys (arrows, page up/down, home and end) allows to extend or reduce the stream selection when holding the @@ -4314,9 +4374,6 @@ <tr><td>Delete to start of line.</td> <td>Ctrl+Shift+BackSpace</td> </tr> -<tr><td>Delete to end of line.</td> -<td>Ctrl+Shift+Delete</td> -</tr> <tr><td>Go to start of document.</td> <td>Ctrl+Home</td> </tr> @@ -4335,9 +4392,6 @@ <tr><td>Extend selection to end of document.</td> <td>Ctrl+Shift+End</td> </tr> -<tr><td>Go to end of display line.</td> -<td>Alt+End</td> -</tr> <tr><td>Extend selection to end of display line.</td> <td>Alt+Shift+End</td> </tr> @@ -4358,9 +4412,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id171" id="tips-and-tricks" name="tips-and-tricks">Tips and tricks</a></h1> +<h1><a class="toc-backref" href="#id173" id="tips-and-tricks" name="tips-and-tricks">Tips and tricks</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id172" id="document-notebook" name="document-notebook">Document notebook</a></h2> +<h2><a class="toc-backref" href="#id174" id="document-notebook" name="document-notebook">Document notebook</a></h2> <ul class="simple"> <li>Double-click on empty space in the notebook tab bar to open a new document.</li> @@ -4371,7 +4425,7 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id173" id="editor" name="editor">Editor</a></h2> +<h2><a class="toc-backref" href="#id175" id="editor" name="editor">Editor</a></h2> <ul class="simple"> <li>Alt-scroll wheel moves up/down a page.</li> <li>Ctrl-scroll wheel zooms in/out.</li> @@ -4381,13 +4435,13 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id174" id="interface" name="interface">Interface</a></h2> +<h2><a class="toc-backref" href="#id176" id="interface" name="interface">Interface</a></h2> <ul class="simple"> <li>Double-click on a symbol-list group to expand or compact it.</li> </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id175" id="gtk-related" name="gtk-related">GTK-related</a></h2> +<h2><a class="toc-backref" href="#id177" id="gtk-related" name="gtk-related">GTK-related</a></h2> <ul class="simple"> <li>Scrolling the mouse wheel over a notebook tab bar will switch notebook pages.</li> @@ -4402,7 +4456,7 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id176" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h1> +<h1><a class="toc-backref" href="#id178" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h1> <p>There are some uncommon preferences that are not shown in the Preferences dialog. These can be set by editing <tt class="docutils literal"><span class="pre">~/.config/geany/geany.conf</span></tt>, then restarting Geany. Search for the key name, then edit the value. Example:</p> @@ -4511,7 +4565,7 @@ </table> </div> <div class="section"> -<h1><a class="toc-backref" href="#id177" id="compile-time-options" name="compile-time-options">Compile-time options</a></h1> +<h1><a class="toc-backref" href="#id179" id="compile-time-options" name="compile-time-options">Compile-time options</a></h1> <p>There are some options which can only be changed at compile time, and some options which are used as the default for configurable options. To change these options, edit the appropriate source file @@ -4523,7 +4577,7 @@ <p class="last">Most users should not need to change these options.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id178" id="src-geany-h" name="src-geany-h">src/geany.h</a></h2> +<h2><a class="toc-backref" href="#id180" id="src-geany-h" name="src-geany-h">src/geany.h</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -4580,7 +4634,7 @@ </table> </div> <div class="section"> -<h2><a class="toc-backref" href="#id179" id="project-h" name="project-h">project.h</a></h2> +<h2><a class="toc-backref" href="#id181" id="project-h" name="project-h">project.h</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -4605,7 +4659,7 @@ </table> </div> <div class="section"> -<h2><a class="toc-backref" href="#id180" id="editor-h" name="editor-h">editor.h</a></h2> +<h2><a class="toc-backref" href="#id182" id="editor-h" name="editor-h">editor.h</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -4631,7 +4685,7 @@ </table> </div> <div class="section"> -<h2><a class="toc-backref" href="#id181" id="keyfile-c" name="keyfile-c">keyfile.c</a></h2> +<h2><a class="toc-backref" href="#id183" id="keyfile-c" name="keyfile-c">keyfile.c</a></h2> <p>These are default settings that can be overridden in the <a class="reference" href="#preferences">Preferences</a> dialog.</p> <table border="1" class="docutils"> <colgroup> @@ -4648,7 +4702,7 @@ <tbody valign="top"> <tr><td>GEANY_MIN_SYMBOLLIST_CHARS</td> <td>How many characters you need to type to -trigger the auto completion list.</td> +trigger the autocompletion list.</td> <td>4</td> </tr> <tr><td>GEANY_DISK_CHECK_TIMEOUT</td> @@ -4704,7 +4758,7 @@ <td>"~ "</td> </tr> <tr><td>GEANY_MAX_AUTOCOMPLETE_WORDS</td> -<td>How many auto completion suggestions should +<td>How many autocompletion suggestions should Geany provide.</td> <td>30</td> </tr> @@ -4712,7 +4766,7 @@ </table> </div> <div class="section"> -<h2><a class="toc-backref" href="#id182" id="build-h" name="build-h">build.h</a></h2> +<h2><a class="toc-backref" href="#id184" id="build-h" name="build-h">build.h</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -4743,7 +4797,7 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id183" id="gnu-general-public-license" name="gnu-general-public-license">GNU General Public License</a></h1> +<h1><a class="toc-backref" href="#id185" id="gnu-general-public-license" name="gnu-general-public-license">GNU General Public License</a></h1> <pre class="literal-block"> GNU GENERAL PUBLIC LICENSE Version 2, June 1991 @@ -5088,7 +5142,7 @@ </pre> </div> <div class="section"> -<h1><a class="toc-backref" href="#id184" id="license-for-scintilla-and-scite" name="license-for-scintilla-and-scite">License for Scintilla and SciTE</a></h1> +<h1><a class="toc-backref" href="#id186" id="license-for-scintilla-and-scite" name="license-for-scintilla-and-scite">License for Scintilla and SciTE</a></h1> <p>Copyright 1998-2003 by Neil Hodgson <neilh(at)scintilla(dot)org></p> <p>All Rights Reserved</p> <p>Permission to use, copy, modify, and distribute this software and @@ -5108,7 +5162,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2009-07-09 03:37 UTC. +Generated on: 2009-07-17 04:34 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: branches/build-system/doc/geany.txt =================================================================== --- branches/build-system/doc/geany.txt 2009-07-17 00:23:38 UTC (rev 3982) +++ branches/build-system/doc/geany.txt 2009-07-17 04:55:35 UTC (rev 3983) @@ -44,7 +44,7 @@ * Syntax highlighting * Code folding -* Symbol name auto-completion +* Symbol name autocompletion @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3982] branches/build-system
by elextr＠users.sourceforge.net 16 Jul '09

16 Jul '09

Revision: 3982 http://geany.svn.sourceforge.net/geany/?rev=3982&view=rev Author: elextr Date: 2009-07-17 00:23:38 +0000 (Fri, 17 Jul 2009) Log Message: ----------- Fix many warnings, remove make cmd preference Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/geany.glade branches/build-system/src/build.c branches/build-system/src/build.h branches/build-system/src/filetypes.c branches/build-system/src/filetypes.h branches/build-system/src/interface.c branches/build-system/src/keyfile.c branches/build-system/src/main.c branches/build-system/src/prefs.c branches/build-system/src/prefs.h branches/build-system/src/project.c Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/ChangeLog 2009-07-17 00:23:38 UTC (rev 3982) @@ -1,3 +1,10 @@ +2009-07-17 Lex Trotman <elextr(at)gmail(dot)com> + + * src/build.c, src/build.h, src/filetypes.h, src/filetypes.c + Fixed crash and lots of warnings, deleted some commented out code. + * geany.glade, src/keyfile.c, src/prefs.c, src/prefs.h, src/project.c + Removed make command from preferences and associated code + 2009-07-16 Lex Trotman <elextr(at)gmail(dot)com> * src/build.c, src/build.h Modified: branches/build-system/geany.glade =================================================================== --- branches/build-system/geany.glade 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/geany.glade 2009-07-17 00:23:38 UTC (rev 3982) @@ -7556,34 +7556,6 @@ <property name="column_spacing">6</property> <child> - <widget class="GtkLabel" id="label11"> - <property name="visible">True</property> - <property name="label" translatable="yes">Make:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> <widget class="GtkLabel" id="label97"> <property name="visible">True</property> <property name="label" translatable="yes">Terminal:</property> @@ -7640,28 +7612,6 @@ </child> <child> - <widget class="GtkEntry" id="entry_com_make"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Path and options for the make tool</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> - </packing> - </child> - - <child> <widget class="GtkEntry" id="entry_com_term"> <property name="visible">True</property> <property name="tooltip" translatable="yes">A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)</property> @@ -7706,35 +7656,6 @@ </child> <child> - <widget class="GtkButton" id="button_make"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - - <child> - <widget class="GtkImage" id="image285"> - <property name="visible">True</property> - <property name="stock">gtk-open</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> <widget class="GtkButton" id="button_term"> <property name="visible">True</property> <property name="can_focus">True</property> Modified: branches/build-system/src/build.c =================================================================== --- branches/build-system/src/build.c 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/src/build.c 2009-07-17 00:23:38 UTC (rev 3982) @@ -87,7 +87,7 @@ static gpointer last_toolbutton_action = GBO_TO_POINTER(GBO_BUILD); -static BuildMenuItems menu_items = {NULL}; /* only matters that menu is NULL */ +static BuildMenuItems menu_items = {NULL, {NULL, NULL, NULL, NULL}}; static struct { @@ -113,7 +113,6 @@ #endif static gboolean build_create_shellscript(const gchar *fname, const gchar *cmd, gboolean autoclose); static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir); -static void set_stop_button(gboolean stop); static void run_exit_cb(GPid child_pid, gint status, gpointer user_data); static void on_set_build_commands_activate(GtkWidget *w, gpointer u); static void on_build_next_error(GtkWidget *menuitem, gpointer user_data); @@ -180,7 +179,8 @@ *-----------------------------------------------------*/ /* the various groups of commands not in the filetype struct */ -GeanyBuildCommand *ft_def=NULL, *non_ft_proj=NULL, *non_ft_pref=NULL, *non_ft_def=NULL, *exec_proj=NULL, *exec_pref=NULL, *exec_def=NULL; +GeanyBuildCommand *ft_def=NULL, *non_ft_proj=NULL, *non_ft_pref=NULL, *non_ft_def=NULL, + *exec_proj=NULL, *exec_pref=NULL, *exec_def=NULL; /* and the regexen not in the filetype structure */ gchar *regex_pref=NULL, *regex_proj=NULL; @@ -208,7 +208,7 @@ gchar c; doc=document_get_current(); if (doc!=NULL)ft = doc->file_type; - if(ft!=NULL) + if (ft!=NULL) { printf("filetype %s\n",ft->name); cl[GBG_FT][BCS_FT] = &(ft->filecmds); @@ -224,12 +224,11 @@ for(j=0;j<GBG_COUNT;++j) { for(k=0;k<build_groups_count[j];++k) - if(cl[j][i]!=NULL && *(cl[j][i])!=NULL && (*(cl[j][i]))[k].exists) + if (cl[j][i]!=NULL && *(cl[j][i])!=NULL && (*(cl[j][i]))[k].exists) { - int n; FOREACH_GEANYBUILDCMD_ENTRY(n) { - if((*(cl[j][i]))[k].entries[n]!=NULL && (l=strlen((*(cl[j][i]))[k].entries[n]))>m)m=l; + if ((*(cl[j][i]))[k].entries[n]!=NULL && (l=strlen((*(cl[j][i]))[k].entries[n]))>m)m=l; } } } @@ -244,11 +243,11 @@ c=' '; for(j=0;j<BCS_COUNT;++j) { - if(cl[i][j]!=NULL && *(cl[i][j])!=NULL && (*(cl[i][j]))[k].exists) + if (cl[i][j]!=NULL && *(cl[i][j])!=NULL && (*(cl[i][j]))[k].exists) { FOREACH_GEANYBUILDCMD_ENTRY(n) { - if((*(cl[i][j]))[k].entries[i]!=NULL) + if ((*(cl[i][j]))[k].entries[i]!=NULL) printf("%c %*.*s",c,cc[j],cc[j],(*(cl[i][j]))[k].entries[i]); else printf("%c %*.*s",c,cc[j],cc[j]," "); @@ -267,18 +266,29 @@ /* macros to save typing and make the logic visible */ #define return_cmd_if(src, cmds) if (cmds!=NULL && cmds[cmdindex].exists && below>src)\ - {*fr=src; if(printbuildcmds)printf("cmd[%d,%d]=%d\n",cmdgrp,cmdindex,src); return &(cmds[cmdindex]);} -#define return_ft_cmd_if(src, cmds) if (ft!=NULL && ft->cmds!=NULL && ft->cmds[cmdindex].exists && below>src)\ - {*fr=src; if(printbuildcmds)printf("cmd[%d,%d]=%d\n",cmdgrp,cmdindex,src); return &(ft->cmds[cmdindex]);} + { \ + *fr=src; \ + if (printbuildcmds) \ + printf("cmd[%d,%d]=%d\n",cmdgrp,cmdindex,src); \ + return &(cmds[cmdindex]); \ + } +#define return_ft_cmd_if(src, cmds) if (ft!=NULL && ft->cmds!=NULL \ + && ft->cmds[cmdindex].exists && below>src)\ + { \ + *fr=src; \ + if (printbuildcmds) \ + printf("cmd[%d,%d]=%d\n",cmdgrp,cmdindex,src); \ + return &(ft->cmds[cmdindex]); \ + } /* get the next lowest command taking priority into account */ -static GeanyBuildCommand *get_next_build_cmd(GeanyDocument *doc, gint cmdgrp, gint cmdindex, gint below, gint *from) +static GeanyBuildCommand *get_next_build_cmd(GeanyDocument *doc, gint cmdgrp, gint cmdindex, + gint below, gint *from) { - GeanyBuildSource srcindex; GeanyFiletype *ft=NULL; gint sink, *fr = &sink; - if(printbuildcmds)printfcmds(); + if (printbuildcmds)printfcmds(); if (cmdgrp>=GBG_COUNT)return NULL; if (from!=NULL)fr=from; if (doc==NULL)doc=document_get_current(); @@ -314,12 +324,12 @@ } /* shortcut to start looking at the top */ -static GeanyBuildCommand *get_build_cmd(GeanyDocument *doc, gint grp, gint index, gint *from) +static GeanyBuildCommand *get_build_cmd(GeanyDocument *doc, gint grp, gint cmdindex, gint *from) { - return get_next_build_cmd(doc, grp, index, BCS_COUNT, from); + return get_next_build_cmd(doc, grp, cmdindex, BCS_COUNT, from); } -#define return_nonblank_regex(src, ptr) if((ptr)!=NULL && strlen(ptr)>0){ *fr = (src); return &(ptr); } +#define return_nonblank_regex(src, ptr) if ((ptr)!=NULL && strlen(ptr)>0){ *fr = (src); return &(ptr); } /* like get_build_cmd, but for regexen, used by filetypes */ gchar **get_build_regex(GeanyBuildGroup grp, GeanyFiletype *ft, gint *from) @@ -331,7 +341,7 @@ if (ft==NULL) { GeanyDocument *doc=document_get_current(); - if(doc!=NULL)ft=doc->file_type; + if (doc!=NULL)ft=doc->file_type; } if (ft==NULL) return NULL; return_nonblank_regex(BCS_PROJ, ft->projerror_regex_string); @@ -621,7 +631,6 @@ gchar *locale_filename = NULL; gboolean have_project; GeanyProject *project = app->project; - GeanyFiletype *ft = doc->file_type; GeanyBuildCommand *cmd = NULL; gchar *executable = NULL; gchar *working_dir = NULL; @@ -680,7 +689,7 @@ if (! result) { ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created)"), - cmd); + cmd_string); } utils_free_pointers(4, cmd_string, tmp, executable, locale_filename, NULL); @@ -815,7 +824,8 @@ if (run_info[cmdindex].pid > 0) { - g_child_watch_add(run_info[cmdindex].pid, (GChildWatchFunc) run_exit_cb, (gpointer)&(run_info[cmdindex])); + g_child_watch_add(run_info[cmdindex].pid, (GChildWatchFunc) run_exit_cb, + (gpointer)&(run_info[cmdindex])); build_menu_update(doc); } free_strings: @@ -999,11 +1009,11 @@ static void run_exit_cb(GPid child_pid, gint status, gpointer user_data) { - RunInfo *run_info = (RunInfo*)user_data; + RunInfo *run_info_data = (RunInfo*)user_data; g_spawn_close_pid(child_pid); - run_info->pid = 0; + run_info_data->pid = 0; /* reset the stop button and menu item to the original meaning */ build_menu_update(NULL); } @@ -1025,7 +1035,8 @@ str = g_strdup_printf( "#!/bin/sh\n\nrm $0\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ \n\n%s\n", cmd, (autoclose) ? "" : - "\necho \"Press return to continue\"\n#to be more compatible with shells like dash\ndummy_var=\"\"\nread dummy_var"); + "\necho \"Press return to continue\"\n#to be more compatible with shells like " + "dash\ndummy_var=\"\"\nread dummy_var"); #endif fputs(str, fp); @@ -1083,14 +1094,14 @@ { GeanyDocument *doc = document_get_current(); setptr(build_info.custom_target, g_strdup(input)); - build_command(doc, GBO_TO_GBG(GBO_MAKE_CUSTOM), GBO_TO_CMD(GBO_MAKE_CUSTOM), build_info.custom_target); + build_command(doc, GBO_TO_GBG(GBO_MAKE_CUSTOM), GBO_TO_CMD(GBO_MAKE_CUSTOM), + build_info.custom_target); } static void on_build_menu_item(GtkWidget *w, gpointer user_data) { GeanyDocument *doc = document_get_current(); - filetype_id ft_id; - GeanyFiletype *ft; + GeanyBuildCommand *bc; gint grp=GPOINTER_TO_GRP(user_data); gint cmd=GPOINTER_TO_CMD(user_data); @@ -1117,11 +1128,12 @@ kill_process(&run_info[cmd].pid); return; } - GeanyBuildCommand *bc = get_build_cmd(doc, grp, cmd, NULL); + bc = get_build_cmd(doc, grp, cmd, NULL); if (bc!=NULL && strcmp(buildcmd_cmd(bc), "builtin")==0) { + gchar *uri; if (doc==NULL)return; - gchar *uri = g_strconcat("file:///", g_path_skip_root(doc->file_name), NULL); + uri = g_strconcat("file:///", g_path_skip_root(doc->file_name), NULL); utils_open_browser(uri); g_free(uri); @@ -1156,23 +1168,40 @@ const gchar *fix_label; callback *cb; } build_menu_specs[] = { - { GTK_STOCK_CONVERT, GEANY_KEYS_BUILD_COMPILE, GBO_TO_GBG(GBO_COMPILE), GBO_TO_CMD(GBO_COMPILE), NULL, on_build_menu_item }, - { GEANY_STOCK_BUILD, GEANY_KEYS_BUILD_LINK, GBO_TO_GBG(GBO_BUILD), GBO_TO_CMD(GBO_BUILD), NULL, on_build_menu_item }, - { NULL, -1, MENU_FT_REST, GBO_TO_CMD(GBO_BUILD)+1, NULL, on_build_menu_item }, - { NULL, -1, MENU_SEPARATOR, GBF_SEP_1, NULL, NULL }, - { NULL, GEANY_KEYS_BUILD_MAKE, GBO_TO_GBG(GBO_MAKE_ALL), GBO_TO_CMD(GBO_MAKE_ALL), NULL, on_build_menu_item }, - { NULL, GEANY_KEYS_BUILD_MAKEOWNTARGET, GBO_TO_GBG(GBO_MAKE_CUSTOM), GBO_TO_CMD(GBO_MAKE_CUSTOM), NULL, on_build_menu_item }, - { NULL, GEANY_KEYS_BUILD_MAKEOBJECT, GBO_TO_GBG(GBO_MAKE_OBJECT), GBO_TO_CMD(GBO_MAKE_OBJECT), NULL, on_build_menu_item }, - { NULL, -1, MENU_NON_FT_REST, GBO_TO_CMD(GBO_MAKE_OBJECT)+1, NULL, on_build_menu_item }, - { NULL, -1, MENU_SEPARATOR, GBF_SEP_2, NULL, NULL }, - { NULL, GEANY_KEYS_BUILD_NEXTERROR, MENU_NEXT_ERROR, GBF_NEXT_ERROR, N_("_Next Error"), on_build_next_error }, - { NULL, GEANY_KEYS_BUILD_PREVIOUSERROR, MENU_PREV_ERROR, GBF_PREV_ERROR, N_("_Previous Error"), on_build_previous_error }, - { NULL, -1, MENU_SEPARATOR, GBF_SEP_3, NULL, NULL }, - { GTK_STOCK_EXECUTE, GEANY_KEYS_BUILD_RUN, GBO_TO_GBG(GBO_EXEC), GBO_TO_CMD(GBO_EXEC), NULL, on_build_menu_item }, - { NULL, -1, MENU_EXEC_REST, GBO_TO_CMD(GBO_EXEC)+1, NULL, on_build_menu_item }, - { NULL, -1, MENU_SEPARATOR, GBF_SEP_4, NULL, NULL }, - { GTK_STOCK_PREFERENCES, GEANY_KEYS_BUILD_OPTIONS, MENU_COMMANDS, GBF_COMMANDS, N_("_Set Build Commands"), on_set_build_commands_activate }, - { NULL, -1, MENU_DONE, 0, NULL, NULL } + { GTK_STOCK_CONVERT, GEANY_KEYS_BUILD_COMPILE, GBO_TO_GBG(GBO_COMPILE), + GBO_TO_CMD(GBO_COMPILE), NULL, on_build_menu_item }, + { GEANY_STOCK_BUILD, GEANY_KEYS_BUILD_LINK, GBO_TO_GBG(GBO_BUILD), + GBO_TO_CMD(GBO_BUILD), NULL, on_build_menu_item }, + { NULL, -1, MENU_FT_REST, + GBO_TO_CMD(GBO_BUILD)+1, NULL, on_build_menu_item }, + { NULL, -1, MENU_SEPARATOR, + GBF_SEP_1, NULL, NULL }, + { NULL, GEANY_KEYS_BUILD_MAKE, GBO_TO_GBG(GBO_MAKE_ALL), + GBO_TO_CMD(GBO_MAKE_ALL), NULL, on_build_menu_item }, + { NULL, GEANY_KEYS_BUILD_MAKEOWNTARGET, GBO_TO_GBG(GBO_MAKE_CUSTOM), + GBO_TO_CMD(GBO_MAKE_CUSTOM), NULL, on_build_menu_item }, + { NULL, GEANY_KEYS_BUILD_MAKEOBJECT, GBO_TO_GBG(GBO_MAKE_OBJECT), + GBO_TO_CMD(GBO_MAKE_OBJECT), NULL, on_build_menu_item }, + { NULL, -1, MENU_NON_FT_REST, + GBO_TO_CMD(GBO_MAKE_OBJECT)+1, NULL, on_build_menu_item }, + { NULL, -1, MENU_SEPARATOR, + GBF_SEP_2, NULL, NULL }, + { NULL, GEANY_KEYS_BUILD_NEXTERROR, MENU_NEXT_ERROR, + GBF_NEXT_ERROR, N_("_Next Error"), on_build_next_error }, + { NULL, GEANY_KEYS_BUILD_PREVIOUSERROR, MENU_PREV_ERROR, + GBF_PREV_ERROR, N_("_Previous Error"), on_build_previous_error }, + { NULL, -1, MENU_SEPARATOR, + GBF_SEP_3, NULL, NULL }, + { GTK_STOCK_EXECUTE, GEANY_KEYS_BUILD_RUN, GBO_TO_GBG(GBO_EXEC), + GBO_TO_CMD(GBO_EXEC), NULL, on_build_menu_item }, + { NULL, -1, MENU_EXEC_REST, + GBO_TO_CMD(GBO_EXEC)+1, NULL, on_build_menu_item }, + { NULL, -1, MENU_SEPARATOR, + GBF_SEP_4, NULL, NULL }, + { GTK_STOCK_PREFERENCES, GEANY_KEYS_BUILD_OPTIONS, MENU_COMMANDS, + GBF_COMMANDS, N_("_Set Build Commands"), on_set_build_commands_activate }, + { NULL, -1, MENU_DONE, + 0, NULL, NULL } }; static void create_build_menu_item(GtkWidget *menu, GeanyKeyGroup *group, GtkAccelGroup *ag, @@ -1196,7 +1225,7 @@ menu_items.menu_item[grp][cmd] = item; } -static void create_build_menu(BuildMenuItems *menu_items) +static void create_build_menu(BuildMenuItems *build_menu_items) { GtkWidget *menu; GtkAccelGroup *accel_group = gtk_accel_group_new(); @@ -1204,10 +1233,10 @@ gint i,j; menu = gtk_menu_new(); - menu_items->menu_item[GBG_FT] = g_new0(GtkWidget*, build_groups_count[GBG_FT]); - menu_items->menu_item[GBG_NON_FT] = g_new0(GtkWidget*, build_groups_count[GBG_NON_FT]); - menu_items->menu_item[GBG_EXEC] = g_new0(GtkWidget*, build_groups_count[GBG_EXEC]); - menu_items->menu_item[GBG_FIXED] = g_new0(GtkWidget*, GBF_COUNT); + build_menu_items->menu_item[GBG_FT] = g_new0(GtkWidget*, build_groups_count[GBG_FT]); + build_menu_items->menu_item[GBG_NON_FT] = g_new0(GtkWidget*, build_groups_count[GBG_NON_FT]); + build_menu_items->menu_item[GBG_EXEC] = g_new0(GtkWidget*, build_groups_count[GBG_EXEC]); + build_menu_items->menu_item[GBG_FIXED] = g_new0(GtkWidget*, GBF_COUNT); for (i=0; build_menu_specs[i].build_grp != MENU_DONE; ++i) { @@ -1217,11 +1246,12 @@ GtkWidget *item = gtk_separator_menu_item_new(); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - menu_items->menu_item[GBG_FIXED][bs->build_cmd] = item; + build_menu_items->menu_item[GBG_FIXED][bs->build_cmd] = item; } else if (bs->fix_label!=NULL) { - create_build_menu_item(menu, keygroup, accel_group, bs, gettext(bs->fix_label), GBG_FIXED, bs->build_cmd); + create_build_menu_item(menu, keygroup, accel_group, bs, gettext(bs->fix_label), + GBG_FIXED, bs->build_cmd); } else if (bs->build_grp >= MENU_FT_REST && bs->build_grp <= MENU_SEPARATOR) { @@ -1240,7 +1270,7 @@ create_build_menu_item(menu, keygroup, accel_group, bs, lbl, bs->build_grp, bs->build_cmd); } } - menu_items->menu = menu; + build_menu_items->menu = menu; gtk_widget_show(menu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(ui_lookup_widget(main_widgets.window, "menu_build1")), menu); } @@ -1260,7 +1290,6 @@ { gint i, cmdcount, cmd, grp; gboolean vis=FALSE; - gboolean got_cmd[ MENU_DONE ]; gboolean have_path, build_running, exec_running, have_errors, cmd_sensitivity; GeanyBuildCommand *bc; @@ -1333,7 +1362,6 @@ else { GtkWidget *image; - gint cmdindex; exec_running = run_info[cmd].pid>1; cmd_sensitivity = bc!=NULL || exec_running; gtk_widget_set_sensitive(menu_item, cmd_sensitivity); @@ -1359,8 +1387,10 @@ } } } - ui_widget_set_sensitive(widgets.compile_button, get_build_cmd(doc, GBG_FT, GBO_TO_CMD(GBO_COMPILE), NULL)!=NULL && have_path && ! build_running); - ui_widget_set_sensitive(widgets.build_button, get_build_cmd(doc, GBG_FT, GBO_TO_CMD(GBO_BUILD), NULL)!=NULL && have_path && ! build_running); + ui_widget_set_sensitive(widgets.compile_button, get_build_cmd(doc, GBG_FT, + GBO_TO_CMD(GBO_COMPILE), NULL)!=NULL && have_path && ! build_running); + ui_widget_set_sensitive(widgets.build_button, get_build_cmd(doc, GBG_FT, + GBO_TO_CMD(GBO_BUILD), NULL)!=NULL && have_path && ! build_running); if (widgets.run_button!=NULL) { if (run_info[0].pid>1) @@ -1368,7 +1398,8 @@ else gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(widgets.run_button), GTK_STOCK_EXECUTE); } - ui_widget_set_sensitive(widgets.run_button, get_build_cmd(doc, GBG_EXEC, GBO_TO_CMD(GBO_EXEC), NULL)!=NULL || exec_running); + ui_widget_set_sensitive(widgets.run_button, get_build_cmd(doc, GBG_EXEC, + GBO_TO_CMD(GBO_EXEC), NULL)!=NULL || exec_running); } static void on_set_build_commands_activate(GtkWidget *w, gpointer u) @@ -1493,7 +1524,7 @@ gint src; enum GeanyBuildCmdEntries i; GeanyBuildCommand *bc = get_next_build_cmd(NULL, r->grp, r->cmd, r->dst, &src); - if(bc != NULL) + if (bc != NULL) { r->cmdsrc = bc; r->src = src; @@ -1535,18 +1566,15 @@ static RowWidgets *build_add_dialog_row(GeanyDocument *doc, GtkTable *table, gint row, GeanyBuildSource dst, gint grp, gint cmd, gboolean dir) { - GtkWidget *label, *clear, *clearicon; - RowWidgets *roww; - gchar *labeltxt, *cmdtxt; + GtkWidget *label, *clear, *clearicon; + RowWidgets *roww; GeanyBuildCommand *bc; - gint src; + guint src; enum GeanyBuildCmdEntries i; - gboolean ribd; /* run in base directory */ gint column = 0; label = gtk_label_new(g_strdup_printf("%d:", cmd+1)); - g_free(labeltxt); gtk_table_attach(table, label, column, column+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); roww = g_new0(RowWidgets, 1); roww->src = BCS_COUNT; @@ -1557,7 +1585,8 @@ { column+=1; roww->entries[i] = gtk_entry_new(); - gtk_table_attach(table, roww->entries[i], column, column+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, roww->entries[i], column, column+1, row, row+1, GTK_FILL, + GTK_FILL | GTK_EXPAND, 0, 0); } column++; clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_SMALL_TOOLBAR); @@ -1566,7 +1595,7 @@ g_signal_connect((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_row), (gpointer)roww); gtk_table_attach(table, clear, column, column+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); roww->cmdsrc = bc = get_build_cmd(doc, grp, cmd, &src); - if(bc!=NULL)roww->src = src; + if (bc!=NULL)roww->src = src; FOREACH_GEANYBUILDCMD_ENTRY(i) { @@ -1590,13 +1619,15 @@ gchar **fileregexstring, **nonfileregexstring; } TableFields; -GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, TableData *table_data, GeanyFiletype *ft) +GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, TableData *table_data, + GeanyFiletype *ft) { - GtkWidget *label, *sep, *regex, *clearicon, *clear; + GtkWidget *label, *sep, *clearicon, *clear; TableFields *fields; GtkTable *table; gchar **ch, *txt; - gint col, row, cmdindex, cmd, src; + gint col, row, cmdindex, cmd; + guint src; gboolean sensitivity; table = GTK_TABLE(gtk_table_new(build_items_count+12, 5, FALSE)); @@ -1630,11 +1661,13 @@ gtk_entry_set_text(GTK_ENTRY(fields->fileregex), *(fields->fileregexstring)); if (src>dst) sensitivity = FALSE; } - gtk_table_attach(table, fields->fileregex, DC_ENTRIES+1, DC_CLEAR, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, fields->fileregex, DC_ENTRIES+1, DC_CLEAR, row, row+1, GTK_FILL, + GTK_FILL | GTK_EXPAND, 0, 0); clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_SMALL_TOOLBAR); clear = gtk_button_new(); gtk_button_set_image(GTK_BUTTON(clear), clearicon); - g_signal_connect_swapped((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_regex_row), (gpointer)(fields->fileregex)); + g_signal_connect_swapped((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_regex_row), + (gpointer)(fields->fileregex)); gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); gtk_widget_set_sensitive(fields->fileregex, sensitivity); gtk_widget_set_sensitive(clear, sensitivity); @@ -1657,11 +1690,13 @@ gtk_entry_set_text(GTK_ENTRY(fields->nonfileregex), *(fields->nonfileregexstring)); sensitivity = src>dst?FALSE:TRUE; } - gtk_table_attach(table, fields->nonfileregex, DC_ENTRIES+1, DC_CLEAR, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, fields->nonfileregex, DC_ENTRIES+1, DC_CLEAR, row, row+1, GTK_FILL, + GTK_FILL | GTK_EXPAND, 0, 0); clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_SMALL_TOOLBAR); clear = gtk_button_new(); gtk_button_set_image(GTK_BUTTON(clear), clearicon); - g_signal_connect_swapped((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_regex_row), (gpointer)(fields->nonfileregex)); + g_signal_connect_swapped((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_regex_row), + (gpointer)(fields->nonfileregex)); gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); gtk_widget_set_sensitive(fields->nonfileregex, sensitivity); gtk_widget_set_sensitive(clear, sensitivity); @@ -1713,7 +1748,6 @@ static gboolean read_row(BuildDestination *dst, TableData table_data, gint drow, gint grp, gint cmd) { gchar *entries[BC_CMDENTRIES_COUNT]; - gboolean dir; gboolean changed = FALSE; GeanyBuildSource src; enum GeanyBuildCmdEntries i; @@ -1734,13 +1768,28 @@ changed=TRUE; } } - if ((table_data->rows[drow]->cmdsrc==NULL && /* originally there was no content */ - (strlen(entries[BC_LABEL])>0 || strlen(entries[BC_COMMAND])>0 - || strlen(entries[BC_WORKING_DIR])>0)) || /* and now there is some or */ - (table_data->rows[drow]->cmdsrc!=NULL && /* originally there was content and */ - (stcmp(entries[BC_LABEL], table_data->rows[drow]->cmdsrc->entries[BC_LABEL])!=0 || /* label is different or */ - stcmp(entries[BC_COMMAND], table_data->rows[drow]->cmdsrc->entries[BC_COMMAND])!=0 || /* command is different or */ - stcmp(entries[BC_WORKING_DIR], table_data->rows[drow]->cmdsrc->entries[BC_WORKING_DIR])!=0 )))/* dir is different */ + if ( + ( + table_data->rows[drow]->cmdsrc==NULL /* originally there was no content */ + && + ( + strlen(entries[BC_LABEL])>0 /* but now one field has some */ + || strlen(entries[BC_COMMAND])>0 + || strlen(entries[BC_WORKING_DIR])>0 + ) + ) + || + ( + table_data->rows[drow]->cmdsrc!=NULL /* originally there was content */ + && + ( /* and some of it was changed */ + stcmp(entries[BC_LABEL], table_data->rows[drow]->cmdsrc->entries[BC_LABEL])!=0 + || stcmp(entries[BC_COMMAND], table_data->rows[drow]->cmdsrc->entries[BC_COMMAND])!=0 + || stcmp(entries[BC_WORKING_DIR], + table_data->rows[drow]->cmdsrc->entries[BC_WORKING_DIR])!=0 + ) + ) + ) { if (dst->dst[grp]!=NULL) { @@ -1789,8 +1838,7 @@ gboolean read_build_commands(BuildDestination *dst, TableData table_data, gint response) { - gint cmdindex, grp, cmd; - gchar *reg; + gint cmdindex, cmd; gboolean changed = FALSE; if (response == GTK_RESPONSE_ACCEPT) @@ -1807,16 +1855,13 @@ return changed; } -/* sets of commands to get from the build dialog, NULL gets pointer set later */ -static BuildDestination prefdsts={ { NULL, &non_ft_pref, &exec_pref }, NULL }; - static void show_build_commands_dialog() { GtkWidget *dialog, *table; GeanyDocument *doc = document_get_current(); GeanyFiletype *ft = NULL; gchar *title = _("Set Build Commands"); - gint cmdindex, response; + gint response; TableData table_data; BuildDestination prefdsts; @@ -1881,9 +1926,10 @@ #define set_key_cmd(key,cmd) (key[prefixlen+3]=cmd[0], key[prefixlen+4]=cmd[1]) #define set_key_fld(key,fld) (key[prefixlen+6]=fld[0], key[prefixlen+7]=fld[1]) -static void load_build_menu_grp(GKeyFile *config, GeanyBuildCommand **dst, gint grp, gchar *prefix, gboolean loc) +static void load_build_menu_grp(GKeyFile *config, GeanyBuildCommand **dst, gint grp, + gchar *prefix, gboolean loc) { - gint i, cmd, prefixlen; /* NOTE prefixlen used in macros above */ + gint cmd, prefixlen; /* NOTE prefixlen used in macros above */ GeanyBuildCommand *dstcmd; gchar *key; static gchar cmdbuf[3]=" "; @@ -1909,9 +1955,11 @@ dstcmd[cmd].exists = TRUE; setptr(dstcmd[cmd].entries[BC_LABEL], label); set_key_fld(key,"CM"); - setptr(dstcmd[cmd].entries[BC_COMMAND], g_key_file_get_string(config, build_grp_name, key, NULL)); + setptr(dstcmd[cmd].entries[BC_COMMAND], + g_key_file_get_string(config, build_grp_name, key, NULL)); set_key_fld(key,"WD"); - setptr(dstcmd[cmd].entries[BC_WORKING_DIR], g_key_file_get_string(config, build_grp_name, key, NULL)); + setptr(dstcmd[cmd].entries[BC_WORKING_DIR], + g_key_file_get_string(config, build_grp_name, key, NULL)); } else dstcmd[cmd].exists = FALSE; } @@ -1940,14 +1988,16 @@ load_build_menu_grp(config, &(ft->filecmds), GBG_FT, NULL, TRUE); load_build_menu_grp(config, &(ft->ftdefcmds), GBG_NON_FT, NULL, TRUE); load_build_menu_grp(config, &(ft->execcmds), GBG_EXEC, NULL, TRUE); - setptr(ft->error_regex_string, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); + setptr(ft->error_regex_string, + g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); break; case BCS_HOME_FT: ft = (GeanyFiletype*)p; if (ft==NULL)return; load_build_menu_grp(config, &(ft->homefilecmds), GBG_FT, NULL, FALSE); load_build_menu_grp(config, &(ft->homeexeccmds), GBG_EXEC, NULL, FALSE); - setptr(ft->homeerror_regex_string, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); + setptr(ft->homeerror_regex_string, + g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); break; case BCS_PREF: load_build_menu_grp(config, &non_ft_pref, GBG_NON_FT, NULL, FALSE); @@ -1964,7 +2014,6 @@ if (ftlist!=NULL) { gchar **ftname; - GeanyFiletype *ft; if (pj->build_filetypes_list==NULL) pj->build_filetypes_list = g_ptr_array_new(); g_ptr_array_set_size(pj->build_filetypes_list, 0); for (ftname=ftlist; *ftname!=NULL; ++ftname) @@ -1975,7 +2024,8 @@ gchar *regkey = g_strdup_printf("%serror_regex", *ftname); g_ptr_array_add(pj->build_filetypes_list, ft); load_build_menu_grp(config, &(ft->projfilecmds), GBG_FT, *ftname, FALSE); - setptr(ft->projerror_regex_string, g_key_file_get_string(config, build_grp_name, regkey, NULL)); + setptr(ft->projerror_regex_string, + g_key_file_get_string(config, build_grp_name, regkey, NULL)); g_free(regkey); } } @@ -1991,7 +2041,7 @@ /* set GeanyBuildCommand if it doesn't already exist and there is a command */ #define ASSIGNIF(type, id, string, value) \ - if(value!=NULL && !type[GBO_TO_CMD(id)].exists && (value)!=NULL && strlen(value)>0) { \ + if (value!=NULL && !type[GBO_TO_CMD(id)].exists && (value)!=NULL && strlen(value)>0) { \ type[GBO_TO_CMD(id)].exists = TRUE; \ type[GBO_TO_CMD(id)].entries[BC_LABEL] = g_strdup(_(string)); \ type[GBO_TO_CMD(id)].entries[BC_COMMAND] = (value); \ @@ -2010,7 +2060,8 @@ if (ft->execcmds==NULL)ft->execcmds = g_new0(GeanyBuildCommand, build_groups_count[GBG_EXEC]); value = g_key_file_get_string(config, "build_settings", "run_cmd", NULL); ASSIGNIF(ft->execcmds, GBO_EXEC, "_Execute", value); - if(ft->error_regex_string==NULL)ft->error_regex_string = g_key_file_get_string(config, "build_settings", "error_regex", NULL); + if (ft->error_regex_string==NULL) + ft->error_regex_string = g_key_file_get_string(config, "build_settings", "error_regex", NULL); break; case BCS_PROJ: if (non_ft_proj==NULL)non_ft_proj = g_new0(GeanyBuildCommand, build_groups_count[GBG_NON_FT]); @@ -2029,8 +2080,10 @@ if (non_ft_pref==NULL)non_ft_pref = g_new0(GeanyBuildCommand, build_groups_count[GBG_NON_FT]); value = g_key_file_get_string(config, "tools", "make_cmd", NULL); ASSIGNIF(non_ft_pref, GBO_MAKE_ALL, g_strdup(_("_Make")), value); - ASSIGNIF(non_ft_pref, GBO_MAKE_CUSTOM, g_strdup(_("Make Custom _Target")), g_strdup_printf("%s ",value)); - ASSIGNIF(non_ft_pref, GBO_MAKE_OBJECT, g_strdup(_("Make _Object")), g_strdup_printf("%s %%e.o",value)); + ASSIGNIF(non_ft_pref, GBO_MAKE_CUSTOM, g_strdup(_("Make Custom _Target")), + g_strdup_printf("%s ",value)); + ASSIGNIF(non_ft_pref, GBO_MAKE_OBJECT, g_strdup(_("Make _Object")), + g_strdup_printf("%s %%e.o",value)); break; default: break; @@ -2044,7 +2097,7 @@ gint count=0; enum GeanyBuildCmdEntries i; - if (src==NULL)return; + if (src==NULL)return 0; prefixlen = prefix==NULL?0:strlen(prefix); key = g_strconcat(prefix==NULL?"":prefix, fixedkey, NULL); for (cmd=0; cmd<build_groups_count[grp]; ++cmd) @@ -2052,7 +2105,7 @@ if (src[cmd].changed) { static gchar cmdbuf[4]=" "; - if (cmd<0 || cmd>=100)return; /* ensure no buffer overflow */ + if (cmd<0 || cmd>=100)return count; /* ensure no buffer overflow */ sprintf(cmdbuf, "%02d", cmd); set_key_grp(key, groups[grp]); set_key_cmd(key, cmdbuf); @@ -2093,7 +2146,7 @@ gchar *regkey = g_strdup_printf("%serror_regex", ft->name); i += save_build_menu_grp(d->config, ft->projfilecmds, GBG_FT, ft->name); - if(ft->projerror_regex_string!=NULL && strlen(ft->projerror_regex_string)>0) + if (ft->projerror_regex_string!=NULL && strlen(ft->projerror_regex_string)>0) { g_key_file_set_string(d->config, build_grp_name, regkey, ft->projerror_regex_string); i+=1; @@ -2101,7 +2154,7 @@ else g_key_file_remove_key(d->config, build_grp_name,regkey, NULL); g_free(regkey); - if(i>0)g_ptr_array_add(d->ft_names, ft->name); + if (i>0)g_ptr_array_add(d->ft_names, ft->name); } void save_build_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src) @@ -2119,7 +2172,7 @@ save_build_menu_grp(config, ft->homefilecmds, GBG_FT, NULL); save_build_menu_grp(config, ft->homeexeccmds, GBG_EXEC, NULL); regkey = g_strdup_printf("%serror_regex", ft->name); - if(ft->homeerror_regex_string!=NULL && strlen(ft->homeerror_regex_string)>0) + if (ft->homeerror_regex_string!=NULL && strlen(ft->homeerror_regex_string)>0) g_key_file_set_string(config, build_grp_name, regkey, ft->projerror_regex_string); else g_key_file_remove_key(config, build_grp_name,regkey, NULL); @@ -2128,7 +2181,7 @@ case BCS_PREF: save_build_menu_grp(config, non_ft_pref, GBG_NON_FT, NULL); save_build_menu_grp(config, exec_pref, GBG_EXEC, NULL); - if(regex_pref!=NULL && strlen(regex_pref)>0) + if (regex_pref!=NULL && strlen(regex_pref)>0) g_key_file_set_string(config, build_grp_name, "error_regex", regex_pref); else g_key_file_remove_key(config, build_grp_name, "error_regex", NULL); @@ -2137,7 +2190,7 @@ pj = (GeanyProject*)ptr; save_build_menu_grp(config, non_ft_proj, GBG_NON_FT, NULL); save_build_menu_grp(config, exec_proj, GBG_EXEC, NULL); - if(regex_proj!=NULL && strlen(regex_proj)>0) + if (regex_proj!=NULL && strlen(regex_proj)>0) g_key_file_set_string(config, build_grp_name, "error_regex", regex_proj); else g_key_file_remove_key(config, build_grp_name, "error_regex", NULL); @@ -2145,7 +2198,8 @@ data.ft_names = g_ptr_array_new(); g_ptr_array_foreach(pj->build_filetypes_list, foreach_project_filetype, (gpointer)(&data)); if (data.ft_names->pdata!=NULL) - g_key_file_set_string_list(config, build_grp_name, "filetypes", (const gchar**)(data.ft_names->pdata), data.ft_names->len); + g_key_file_set_string_list(config, build_grp_name, "filetypes", + (const gchar**)(data.ft_names->pdata), data.ft_names->len); else g_key_file_remove_key(config, build_grp_name, "filetypes", NULL); g_ptr_array_free(data.ft_names, TRUE); @@ -2155,7 +2209,7 @@ } } -void set_build_grp_count(GeanyBuildGroup grp, guint count) +void set_build_grp_count(GeanyBuildGroup grp, gint count) { gint i, sum; if (count>build_groups_count[grp]) @@ -2180,7 +2234,7 @@ { GtkWidget *item; GtkWidget *toolmenu; - gint i, cmdindex, defindex; + gint i, cmdindex; ft_def = g_new0(GeanyBuildCommand, build_groups_count[GBG_FT]); non_ft_def = g_new0(GeanyBuildCommand, build_groups_count[GBG_NON_FT]); Modified: branches/build-system/src/build.h =================================================================== --- branches/build-system/src/build.h 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/src/build.h 2009-07-17 00:23:38 UTC (rev 3982) @@ -154,7 +154,7 @@ void save_build_menu( GKeyFile *config, gpointer ptr, GeanyBuildSource src ); -void set_build_grp_count( GeanyBuildGroup grp, guint count ); +void set_build_grp_count( GeanyBuildGroup grp, gint count ); gchar **get_build_regex(GeanyBuildGroup grp, GeanyFiletype *ft, gint *from); Modified: branches/build-system/src/filetypes.c =================================================================== --- branches/build-system/src/filetypes.c 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/src/filetypes.c 2009-07-17 00:23:38 UTC (rev 3982) @@ -1119,44 +1119,7 @@ /* read build settings */ load_build_menu( config, BCS_FT, (gpointer)ft ); load_build_menu( configh, BCS_HOME_FT, (gpointer)ft ); -/* result = g_key_file_get_string(configh, "build_settings", "compiler", NULL); - if (result == NULL) result = g_key_file_get_string(config, "build_settings", "compiler", NULL); - if (G_LIKELY(result != NULL)) - { - filetypes[ft_id]->programs->compiler = result; - filetypes[ft_id]->actions->can_compile = TRUE; - } - result = g_key_file_get_string(configh, "build_settings", "linker", NULL); - if (result == NULL) result = g_key_file_get_string(config, "build_settings", "linker", NULL); - if (result != NULL) - { - filetypes[ft_id]->programs->linker = result; - filetypes[ft_id]->actions->can_link = TRUE; - } - - result = g_key_file_get_string(configh, "build_settings", "run_cmd", NULL); - if (result == NULL) result = g_key_file_get_string(config, "build_settings", "run_cmd", NULL); - if (G_LIKELY(result != NULL)) - { - filetypes[ft_id]->programs->run_cmd = result; - filetypes[ft_id]->actions->can_exec = TRUE; - } - - result = g_key_file_get_string(configh, "build_settings", "run_cmd2", NULL); - if (result == NULL) result = g_key_file_get_string(config, "build_settings", "run_cmd2", NULL); - if (result != NULL) - { - filetypes[ft_id]->programs->run_cmd2 = result; - filetypes[ft_id]->actions->can_exec = TRUE; - } - - result = g_key_file_get_string(configh, "build_settings", "error_regex", NULL); - if (result == NULL) result = g_key_file_get_string(config, "build_settings", "error_regex", NULL); - if (result != NULL) - { - set_error_regex(ft, result); - } */ } Modified: branches/build-system/src/filetypes.h =================================================================== --- branches/build-system/src/filetypes.h 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/src/filetypes.h 2009-07-17 00:23:38 UTC (rev 3982) @@ -99,23 +99,6 @@ #define FILETYPE_ID(filetype_ptr) \ (((filetype_ptr) != NULL) ? (filetype_ptr)->id : GEANY_FILETYPES_NONE) -/* -struct build_actions -{ - gboolean can_compile; - gboolean can_link; - gboolean can_exec; -}; - -struct build_programs -{ - gchar *compiler; - gchar *linker; - gchar *run_cmd; - gchar *run_cmd2; - gboolean modified; -}; - /** Represents a filetype. */ struct GeanyFiletype { @@ -131,8 +114,6 @@ gchar *comment_open; gchar *comment_close; gboolean comment_use_indent; -/* struct build_programs *programs; - struct build_actions *actions; /* TODO: make private */ GeanyBuildCommand *filecmds; /* these need to be visible since used in build.c so not in private part */ GeanyBuildCommand *ftdefcmds; /* filetype dependent defaults for non_ft commands */ GeanyBuildCommand *execcmds; Modified: branches/build-system/src/interface.c =================================================================== --- branches/build-system/src/interface.c 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/src/interface.c 2009-07-17 00:23:38 UTC (rev 3982) @@ -2551,14 +2551,10 @@ GtkWidget *vbox2; GtkWidget *vbox33; GtkWidget *table1; - GtkWidget *label11; GtkWidget *label97; GtkWidget *label117; - GtkWidget *entry_com_make; GtkWidget *entry_com_term; GtkWidget *entry_browser; - GtkWidget *button_make; - GtkWidget *image285; GtkWidget *button_term; GtkWidget *image286; GtkWidget *button_browser; @@ -4109,13 +4105,6 @@ gtk_table_set_row_spacings (GTK_TABLE (table1), 3); gtk_table_set_col_spacings (GTK_TABLE (table1), 6); - label11 = gtk_label_new (_("Make:")); - gtk_widget_show (label11); - gtk_table_attach (GTK_TABLE (table1), label11, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label11), 0, 0.5); - label97 = gtk_label_new (_("Terminal:")); gtk_widget_show (label97); gtk_table_attach (GTK_TABLE (table1), label97, 0, 1, 1, 2, @@ -4130,13 +4119,6 @@ (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label117), 0, 0.5); - entry_com_make = gtk_entry_new (); - gtk_widget_show (entry_com_make); - gtk_table_attach (GTK_TABLE (table1), entry_com_make, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, entry_com_make, _("Path and options for the make tool"), NULL); - entry_com_term = gtk_entry_new (); gtk_widget_show (entry_com_term); gtk_table_attach (GTK_TABLE (table1), entry_com_term, 1, 2, 1, 2, @@ -4151,16 +4133,6 @@ (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, entry_browser, _("Path (and possibly additional arguments) to your favorite browser"), NULL); - button_make = gtk_button_new (); - gtk_widget_show (button_make); - gtk_table_attach (GTK_TABLE (table1), button_make, 2, 3, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - - image285 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image285); - gtk_container_add (GTK_CONTAINER (button_make), image285); - button_term = gtk_button_new (); gtk_widget_show (button_term); gtk_table_attach (GTK_TABLE (table1), button_term, 2, 3, 1, 2, @@ -4848,14 +4820,10 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, vbox2, "vbox2"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox33, "vbox33"); GLADE_HOOKUP_OBJECT (prefs_dialog, table1, "table1"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label11, "label11"); GLADE_HOOKUP_OBJECT (prefs_dialog, label97, "label97"); GLADE_HOOKUP_OBJECT (prefs_dialog, label117, "label117"); - GLADE_HOOKUP_OBJECT (prefs_dialog, entry_com_make, "entry_com_make"); GLADE_HOOKUP_OBJECT (prefs_dialog, entry_com_term, "entry_com_term"); GLADE_HOOKUP_OBJECT (prefs_dialog, entry_browser, "entry_browser"); - GLADE_HOOKUP_OBJECT (prefs_dialog, button_make, "button_make"); - GLADE_HOOKUP_OBJECT (prefs_dialog, image285, "image285"); GLADE_HOOKUP_OBJECT (prefs_dialog, button_term, "button_term"); GLADE_HOOKUP_OBJECT (prefs_dialog, image286, "image286"); GLADE_HOOKUP_OBJECT (prefs_dialog, button_browser, "button_browser"); Modified: branches/build-system/src/keyfile.c =================================================================== --- branches/build-system/src/keyfile.c 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/src/keyfile.c 2009-07-17 00:23:38 UTC (rev 3982) @@ -397,7 +397,6 @@ g_key_file_set_string(config, PACKAGE, "pref_template_datetime", template_prefs.datetime_format); /* tools settings */ - g_key_file_set_string(config, "tools", "make_cmd", tool_prefs.make_cmd ? tool_prefs.make_cmd : ""); g_key_file_set_string(config, "tools", "term_cmd", tool_prefs.term_cmd ? tool_prefs.term_cmd : ""); g_key_file_set_string(config, "tools", "browser_cmd", tool_prefs.browser_cmd ? tool_prefs.browser_cmd : ""); g_key_file_set_string(config, "tools", "grep_cmd", tool_prefs.grep_cmd ? tool_prefs.grep_cmd : ""); @@ -771,7 +770,6 @@ template_prefs.datetime_format = utils_get_setting_string(config, PACKAGE, "pref_template_datetime", "%d.%m.%Y %H:%M:%S %Z"); /* tools */ - tool_prefs.make_cmd = utils_get_setting_string(config, "tools", "make_cmd", GEANY_DEFAULT_TOOLS_MAKE); tool_prefs.term_cmd = utils_get_setting_string(config, "tools", "term_cmd", GEANY_DEFAULT_TOOLS_TERMINAL); tool_prefs.browser_cmd = utils_get_setting_string(config, "tools", "browser_cmd", GEANY_DEFAULT_TOOLS_BROWSER); tool_prefs.grep_cmd = utils_get_setting_string(config, "tools", "grep_cmd", GEANY_DEFAULT_TOOLS_GREP); Modified: branches/build-system/src/main.c =================================================================== --- branches/build-system/src/main.c 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/src/main.c 2009-07-17 00:23:38 UTC (rev 3982) @@ -1175,7 +1175,6 @@ g_free(template_prefs.mail); g_free(template_prefs.initials); g_free(template_prefs.version); - g_free(tool_prefs.make_cmd); g_free(tool_prefs.term_cmd); g_free(tool_prefs.browser_cmd); g_free(tool_prefs.grep_cmd); Modified: branches/build-system/src/prefs.c =================================================================== --- branches/build-system/src/prefs.c 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/src/prefs.c 2009-07-17 00:23:38 UTC (rev 3982) @@ -457,8 +457,6 @@ (editor_prefs.autoclose_chars & GEANY_AC_DQUOTE)); /* Tools Settings */ - if (tool_prefs.make_cmd) - gtk_entry_set_text(GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make")), tool_prefs.make_cmd); if (tool_prefs.term_cmd) gtk_entry_set_text(GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_term")), tool_prefs.term_cmd); @@ -849,9 +847,6 @@ | (autoclose_brackets[4] ? GEANY_AC_DQUOTE : 0); /* Tools Settings */ - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make"); - g_free(tool_prefs.make_cmd); - tool_prefs.make_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_term"); g_free(tool_prefs.term_cmd); @@ -1490,7 +1485,7 @@ ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "project_file_path_entry")); ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "extra_plugin_path_entry")); ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_toggle_mark")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make")); + /* ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make")); */ ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_term")); ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_browser")); ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_grep")); @@ -1528,9 +1523,9 @@ "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(3)); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "long_line_color"), "color-set", G_CALLBACK(on_prefs_color_choosed), GINT_TO_POINTER(1)); - /* file chooser buttons in the tools tab */ + /* file chooser buttons in the tools tab g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_make"), - "clicked", G_CALLBACK(on_prefs_tools_button_clicked), ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make")); + "clicked", G_CALLBACK(on_prefs_tools_button_clicked), ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make")); */ g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_term"), "clicked", G_CALLBACK(on_prefs_tools_button_clicked), ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_term")); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_browser"), Modified: branches/build-system/src/prefs.h =================================================================== --- branches/build-system/src/prefs.h 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/src/prefs.h 2009-07-17 00:23:38 UTC (rev 3982) @@ -46,7 +46,6 @@ typedef struct GeanyToolPrefs { gchar *browser_cmd; - gchar *make_cmd; gchar *term_cmd; gchar *grep_cmd; gchar *context_action_cmd; Modified: branches/build-system/src/project.c =================================================================== --- branches/build-system/src/project.c 2009-07-16 17:41:25 UTC (rev 3981) +++ branches/build-system/src/project.c 2009-07-17 00:23:38 UTC (rev 3982) @@ -327,7 +327,7 @@ static void remove_foreach_project_filetype( gpointer data, gpointer user_data ) { GeanyFiletype *ft = (GeanyFiletype*)data; - if(ft!=NULL) + if (ft!=NULL) { setptr( ft->projfilecmds, NULL); setptr(ft->projerror_regex_string, NULL); @@ -524,7 +524,7 @@ label = gtk_label_new(_("Project")); gtk_widget_show(table); /* needed to switch current page */ gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), table, label, 0); - if(doc!=NULL) ft=doc->file_type; + if (doc!=NULL) ft=doc->file_type; table = build_commands_table( doc, BCS_PROJ, &(e->build_properties), ft ); label = gtk_label_new(_("Build")); gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), table, label, 2); @@ -752,8 +752,8 @@ setptr(p->description, g_strdup(gtk_text_buffer_get_text(buffer, &start, &end, FALSE))); /* read the project build menu */ - if( doc!=NULL )ft=doc->file_type; - if( ft!=NULL ) + if ( doc!=NULL )ft=doc->file_type; + if ( ft!=NULL ) { menu_dst.dst[GBG_FT] = &(ft->projfilecmds); oldvalue = ft->projfilecmds; @@ -769,11 +769,11 @@ menu_dst.dst[GBG_EXEC] = &exec_proj; menu_dst.nonfileregexstr = &regex_proj; read_build_commands( &menu_dst, e->build_properties, GTK_RESPONSE_ACCEPT ); - if(ft!=NULL && ft->projfilecmds!=oldvalue && ft->project_list_entry<0) + if (ft!=NULL && ft->projfilecmds!=oldvalue && ft->project_list_entry<0) { - if(p->build_filetypes_list==NULL)p->build_filetypes_list = g_ptr_array_new(); + if (p->build_filetypes_list==NULL)p->build_filetypes_list = g_ptr_array_new(); ft->project_list_entry = p->build_filetypes_list->len; - g_ptr_array_add( p->build_filetypes_list, ft ); + g_ptr_array_add(p->build_filetypes_list, ft); } build_menu_update(doc); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3981] trunk
by eht16＠users.sourceforge.net 16 Jul '09

16 Jul '09

Revision: 3981 http://geany.svn.sourceforge.net/geany/?rev=3981&view=rev Author: eht16 Date: 2009-07-16 17:41:25 +0000 (Thu, 16 Jul 2009) Log Message: ----------- Fix broken special case handling when detecting filetypes from a shebang or other special file headers. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-16 15:54:45 UTC (rev 3980) +++ trunk/ChangeLog 2009-07-16 17:41:25 UTC (rev 3981) @@ -1,8 +1,11 @@ 2009-07-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/document.c: - Enable file monitoring for files which are written to disk by Geany + Enable file monitoring for files which are written to disk by Geany for the first time. + * src/filetypes.c: + Fix broken special case handling when detecting filetypes from a + shebang or other special file headers. 2009-07-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-07-16 15:54:45 UTC (rev 3980) +++ trunk/src/filetypes.c 2009-07-16 17:41:25 UTC (rev 3981) @@ -807,9 +807,9 @@ return FALSE; va_start(args, first); + test = first; while (1) { - test = va_arg(args, gint); if (test == -1) break; @@ -818,6 +818,7 @@ result = TRUE; break; } + test = va_arg(args, gint); } va_end(args); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2009