Commits

commits@lists.geany.org

1 participants
11750 discussions

SF.net SVN: geany: [553] trunk
by eht16＠users.sourceforge.net 14 Jul '06

14 Jul '06

Revision: 553 Author: eht16 Date: 2006-07-14 03:15:12 -0700 (Fri, 14 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=553&view=rev Log Message: ----------- Fixed autocompletion for filetype C++. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/highlighting.c trunk/tagmanager/tm_tag.c trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-13 19:49:33 UTC (rev 552) +++ trunk/ChangeLog 2006-07-14 10:15:12 UTC (rev 553) @@ -1,3 +1,9 @@ +2006-07-14 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/filetypes.c, src/highlighting.c, tagmanager/tm_tag.c, + tagmanager/tm_workspace.c: Fixed autocompletion for filetype C++. + + 2006-07-13 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/build.c, src/interface.c, src/utils.c, src/utils.h, src/geany.h, Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-07-13 19:49:33 UTC (rev 552) +++ trunk/src/filetypes.c 2006-07-14 10:15:12 UTC (rev 553) @@ -67,8 +67,7 @@ #define CPP filetypes[GEANY_FILETYPES_CPP] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_CPP]->id = GEANY_FILETYPES_CPP; - // C++ has langType 1, but to get the global tags for C, too, we use the langType of C - filetypes[GEANY_FILETYPES_CPP]->lang = 0; + filetypes[GEANY_FILETYPES_CPP]->lang = 1; filetypes[GEANY_FILETYPES_CPP]->name = g_strdup("C++"); filetypes[GEANY_FILETYPES_CPP]->has_tags = TRUE; filetypes[GEANY_FILETYPES_CPP]->title = g_strdup(_("C++ source file")); Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-07-13 19:49:33 UTC (rev 552) +++ trunk/src/highlighting.c 2006-07-14 10:15:12 UTC (rev 553) @@ -235,7 +235,7 @@ // why? if I let this out, the indicator remains green with PHP SSM(sci, SCI_INDICSETFORE, 0, invert(0x0000ff)); SSM(sci, SCI_INDICSETFORE, 2, invert(0x0000ff)); - + // define marker symbols // 0 -> line marker SSM(sci, SCI_MARKERDEFINE, 0, SC_MARK_SHORTARROW); @@ -506,8 +506,7 @@ if (! app->ignore_global_tags && ! global_c_tags_loaded) { // 0 is the langType used in TagManager (see the table in tagmanager/parsers.h) - // C++ is a special case, here we use 0 to have C global tags in C++, too - tm_workspace_load_global_tags(GEANY_DATA_DIR G_DIR_SEPARATOR_S "global.tags", 0); + tm_workspace_load_global_tags(GEANY_DATA_DIR G_DIR_SEPARATOR_S "global.tags", 1); global_c_tags_loaded = TRUE; } } Modified: trunk/tagmanager/tm_tag.c =================================================================== --- trunk/tagmanager/tm_tag.c 2006-07-13 19:49:33 UTC (rev 552) +++ trunk/tagmanager/tm_tag.c 2006-07-14 10:15:12 UTC (rev 553) @@ -210,7 +210,7 @@ if ((NULL == fgets((gchar*)buf, BUFSIZ, fp)) || ('\0' == *buf)) return FALSE; - if (mode == 0) + if (mode == 0 || mode == 1) { for (start = end = buf, status = TRUE; (TRUE == status); start = end, ++ end) { @@ -291,11 +291,12 @@ #endif break; } + tag->atts.file.lang = mode; } *end = changed_char; } } - else + else { // alternative parser for PHP and LaTeX global tags files with the following format // tagname|return value|arglist|description\n @@ -314,7 +315,7 @@ fields = g_strsplit((gchar*)start, "|", -1); field_len = g_strv_length(fields); - + if (field_len >= 1) tag->name = g_strdup(fields[0]); else tag->name = NULL; if (field_len >= 2 && fields[1] != NULL) tag->atts.entry.var_type = g_strdup(fields[1]); @@ -324,7 +325,7 @@ g_strfreev(fields); } } - + if (NULL == tag->name) return FALSE; if (tm_tag_file_t != tag->type) Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2006-07-13 19:49:33 UTC (rev 552) +++ trunk/tagmanager/tm_workspace.c 2006-07-14 10:15:12 UTC (rev 553) @@ -152,7 +152,7 @@ // resort the whole array, because tm_tags_find expects a sorted array and it is not sorted // when global.tags, php.tags and latex.tags are loaded at the same time tm_tags_sort(theWorkspace->global_tags, attr, TRUE); - + return TRUE; } @@ -444,8 +444,8 @@ , gboolean partial, langType lang) { static GPtrArray *tags = NULL; - TMTag **matches[2], **match; - int i, len, tagCount[2]={0,0}, tagIter; + TMTag **matches[2]; + int len, tagCount[2]={0,0}, tagIter; gint tags_lang; if ((!theWorkspace) || (!name)) @@ -460,38 +460,67 @@ matches[0] = tm_tags_find(theWorkspace->work_object.tags_array, name, partial, &tagCount[0]); matches[1] = tm_tags_find(theWorkspace->global_tags, name, partial, &tagCount[1]); - for (i = 0; i < 2; ++i) + + // file tags + if (matches[0] && *matches[0]) { - match = matches[i]; - if (match && *match) + // tag->atts.file.lang contains the line of the tag and + // tags->atts.entry.file->lang contains the language + tags_lang = (*matches[0])->atts.entry.file->lang; + + for (tagIter=0;tagIter<tagCount[0];++tagIter) { - // for global tags: tag->atts.file.lang contains the language and - // tags->atts.entry.file->lang is NULL - // for "usual" tags: tag->atts.file.lang contains the line of the tag and - // tags->atts.entry.file->lang contains the language - if ((*match)->atts.entry.file != NULL) - tags_lang = (*match)->atts.entry.file->lang; - else - tags_lang = (*match)->atts.file.lang; - - for (tagIter=0;tagIter<tagCount[i];++tagIter) + if ((type & (*matches[0])->type) && (lang == -1 || tags_lang == lang)) + g_ptr_array_add(tags, *matches[0]); + if (partial) { - if ((type & (*match)->type) && (lang == -1 || tags_lang == lang)) - g_ptr_array_add(tags, *match); - if (partial) - { - if (0 != strncmp((*match)->name, name, len)) - break; - } - else - { - if (0 != strcmp((*match)->name, name)) - break; - } - ++ match; + if (0 != strncmp((*matches[0])->name, name, len)) + break; } + else + { + if (0 != strcmp((*matches[0])->name, name)) + break; + } + ++ matches[0]; } } + + // global tags + if (matches[1] && *matches[1]) + { + int tags_lang_alt = 0; + // tag->atts.file.lang contains the language and + // tags->atts.entry.file is NULL + tags_lang = (*matches[1])->atts.file.lang; + // tags_lang_alt is used to load C global tags only once for C and C++ + // lang = 1 is C++, lang = 0 is C + // if we have lang 0, than accept also lang 1 for C++ + if (tags_lang == 0) // C or C++ + tags_lang_alt = 1; + else + tags_lang_alt = tags_lang; // otherwise just ignore it + + for (tagIter=0;tagIter<tagCount[1];++tagIter) + { + if ((type & (*matches[1])->type) && (lang == -1 || + tags_lang == lang || tags_lang_alt == lang)) + g_ptr_array_add(tags, *matches[1]); + + if (partial) + { + if (0 != strncmp((*matches[1])->name, name, len)) + break; + } + else + { + if (0 != strcmp((*matches[1])->name, name)) + break; + } + ++ matches[1]; + } + } + tm_tags_sort(tags, attrs, TRUE); return tags; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [552] trunk
by ntrel＠users.sourceforge.net 13 Jul '06

13 Jul '06

Revision: 552 Author: ntrel Date: 2006-07-13 12:49:33 -0700 (Thu, 13 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=552&view=rev Log Message: ----------- Remove unwanted tooltip for the menubar. Modified Paths: -------------- trunk/geany.glade trunk/src/interface.c Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-07-13 14:30:44 UTC (rev 551) +++ trunk/geany.glade 2006-07-13 19:49:33 UTC (rev 552) @@ -31,7 +31,6 @@ <child> <widget class="GtkMenuBar" id="menubar1"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Undo the last modification</property> <child> <widget class="GtkMenuItem" id="menuitem1"> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-07-13 14:30:44 UTC (rev 551) +++ trunk/src/interface.c 2006-07-13 19:49:33 UTC (rev 552) @@ -228,7 +228,6 @@ menubar1 = gtk_menu_bar_new (); gtk_widget_show (menubar1); gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, menubar1, _("Undo the last modification"), NULL); menuitem1 = gtk_menu_item_new_with_mnemonic (_("_File")); gtk_widget_show (menuitem1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [551] trunk
by ntrel＠users.sourceforge.net 13 Jul '06

13 Jul '06

Revision: 551 Author: ntrel Date: 2006-07-13 07:30:44 -0700 (Thu, 13 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=551&view=rev Log Message: ----------- Added basic Find in files search functionality. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/Makefile.am trunk/src/build.c trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/geany.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/main.c trunk/src/msgwindow.c trunk/src/msgwindow.h trunk/src/prefs.c trunk/src/utils.c trunk/src/utils.h Added Paths: ----------- trunk/src/search.c trunk/src/search.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/ChangeLog 2006-07-13 14:30:44 UTC (rev 551) @@ -1,3 +1,12 @@ +2006-07-13 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/build.c, src/interface.c, src/utils.c, src/utils.h, src/geany.h, + src/msgwindow.c, src/msgwindow.h, src/callbacks.c, src/callbacks.h, + src/keyfile.c, src/search.c, src/search.h, src/prefs.c, + src/dialogs.c, src/main.c, src/dialogs.h, src/Makefile.am, + geany.glade: Added basic Find in files search functionality. + + 2006-07-11 Enrico Tröger <enrico.troeger(a)uvena.de> * src/dialogs.c: Moved dialogs_show_prefs_dialog() to src/prefs.c. Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/geany.glade 2006-07-13 14:30:44 UTC (rev 551) @@ -58,7 +58,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image791"> + <widget class="GtkImage" id="image799"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -151,7 +151,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image792"> + <widget class="GtkImage" id="image800"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -228,7 +228,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image793"> + <widget class="GtkImage" id="image801"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -359,7 +359,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image794"> + <widget class="GtkImage" id="image802"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -391,7 +391,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image795"> + <widget class="GtkImage" id="image803"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -569,7 +569,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image796"> + <widget class="GtkImage" id="image804"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -583,6 +583,21 @@ </child> <child> + <widget class="GtkSeparatorMenuItem" id="separator27"> + <property name="visible">True</property> + </widget> + </child> + + <child> + <widget class="GtkMenuItem" id="find_in_files1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Find in f_iles</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_find_in_files1_activate" last_modification_time="Thu, 06 Jul 2006 11:31:09 GMT"/> + </widget> + </child> + + <child> <widget class="GtkSeparatorMenuItem" id="separator11"> <property name="visible">True</property> </widget> @@ -596,7 +611,7 @@ <signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image797"> + <widget class="GtkImage" id="image805"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -631,7 +646,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image798"> + <widget class="GtkImage" id="image806"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -653,7 +668,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image799"> + <widget class="GtkImage" id="image807"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -4703,7 +4718,7 @@ <child> <widget class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="n_rows">4</property> + <property name="n_rows">5</property> <property name="n_columns">3</property> <property name="homogeneous">False</property> <property name="row_spacing">7</property> @@ -5024,6 +5039,84 @@ <property name="y_options"></property> </packing> </child> + + <child> + <widget class="GtkLabel" id="label171"> + <property name="visible">True</property> + <property name="label" translatable="yes">Grep</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">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry_grep"> + <property name="visible">True</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">4</property> + <property name="bottom_attach">5</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button_grep"> + <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="image808"> + <property name="visible">True</property> + <property name="stock">gtk-directory</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">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/Makefile.am 2006-07-13 14:30:44 UTC (rev 551) @@ -14,6 +14,7 @@ geany_SOURCES = \ main.c geany.h \ + search.c search.h \ notebook.c notebook.h \ keybindings.c keybindings.h \ templates.c templates.h \ Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/build.c 2006-07-13 14:30:44 UTC (rev 551) @@ -41,7 +41,6 @@ #include "document.h" -static GIOChannel *build_set_up_io_channel (gint fd, GIOCondition cond, GIOFunc func, gpointer data); static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data); static gboolean build_create_shellscript(const gint idx, const gchar *fname, const gchar *cmd); static GPid build_spawn_cmd(gint idx, gchar **cmd); @@ -303,8 +302,10 @@ } // use GIOChannels to monitor stdout and stderr - build_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, build_iofunc, GINT_TO_POINTER(0)); - build_set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, build_iofunc, GINT_TO_POINTER(1)); + utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, + build_iofunc, GINT_TO_POINTER(0)); + utils_set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, + build_iofunc, GINT_TO_POINTER(1)); g_strfreev(argv); g_free(utf8_working_dir); @@ -497,35 +498,6 @@ } -static GIOChannel *build_set_up_io_channel(gint fd, GIOCondition cond, GIOFunc func, gpointer data) -{ - GIOChannel *ioc; - GError *error = NULL; - const gchar *encoding; - - ioc = g_io_channel_unix_new(fd); - - g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL); - if (! g_get_charset(&encoding)) - { // hope this works reliably - g_io_channel_set_encoding(ioc, encoding, &error); - if (error) - { - geany_debug("compile: %s", error->message); - g_error_free(error); - return ioc; - } - } - // "auto-close" ;-) - g_io_channel_set_close_on_unref(ioc, TRUE); - - g_io_add_watch(ioc, cond, func, data); - g_io_channel_unref(ioc); - - return ioc; -} - - void build_exit_cb(GPid child_pid, gint status, gpointer user_data) { #ifdef G_OS_UNIX Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/callbacks.c 2006-07-13 14:30:44 UTC (rev 551) @@ -48,6 +48,7 @@ #include "treeviews.h" #include "keybindings.h" #include "encodings.h" +#include "search.h" #ifdef GEANY_WIN32 @@ -1437,52 +1438,11 @@ { if (GPOINTER_TO_INT(user_data) == 4) { // double click in the message treeview (results of 'Find usage') - GtkTreeIter iter; - GtkTreeModel *model; - GtkTreeSelection *selection; - gint idx; - gint line; - - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(msgwindow.tree_msg)); - if (gtk_tree_selection_get_selected(selection, &model, &iter)) - { - gtk_tree_model_get(model, &iter, 0, &line, 1, &idx, -1); - if (idx >= 0 && doc_list[idx].is_valid) - { - utils_goto_line(idx, line); - } - } + msgwin_goto_messages_file_line(); } else if (GPOINTER_TO_INT(user_data) == 5) { // double click in the compiler treeview - GtkTreeIter iter; - GtkTreeModel *model; - GtkTreeSelection *selection; - gchar *string; - - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(msgwindow.tree_compiler)); - if (gtk_tree_selection_get_selected(selection, &model, &iter)) - { - gtk_tree_model_get(model, &iter, 1, &string, -1); - if (string != NULL) - { - gint line; - gint idx; - gchar *filename; - utils_parse_compiler_error_line(string, &filename, &line); - if (filename != NULL && line > -1) - { - // use document_open_file to find an already open file, or open it in place - idx = document_open_file(-1, filename, 0, FALSE, NULL); - // document_set_indicator will check valid idx - document_set_indicator(idx, line - 1); - // utils_goto_file_line will check valid filename. - utils_goto_file_line(filename, FALSE, line); - } - g_free(filename); - } - g_free(string); - } + msgwin_goto_compiler_file_line(); } } @@ -1987,6 +1947,43 @@ void +on_find_in_files1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + dialogs_show_find_in_files(); +} + + +void +on_find_in_files_dialog_response (GtkDialog *dialog, + gint response, + gpointer user_data) +{ + if (response == GTK_RESPONSE_ACCEPT) + { + const gchar *entry_text = + gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(user_data)))); + gchar *search_text = g_strstrip(g_strdup(entry_text)); + + if (search_text && *search_text) + { + gchar *cur_dir = utils_get_current_file_dir(); + if (cur_dir) + search_find_in_files(search_text, cur_dir); + else + msgwin_status_add(_("Invalid directory for find in files.")); + g_free(cur_dir); + } + else + msgwin_status_add(_("No text to find.")); + + g_free(search_text); + } + gtk_widget_hide(app->find_in_files_dialog); +} + + +void on_toolbutton_new_clicked (GtkToolButton *toolbutton, gpointer user_data) { Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/callbacks.h 2006-07-13 14:30:44 UTC (rev 551) @@ -394,11 +394,19 @@ gpointer user_data); void -on_new_with_template (GtkMenuItem *menuitem, +on_find_in_files1_activate (GtkMenuItem *menuitem, gpointer user_data); +void +on_find_in_files_dialog_response (GtkDialog *dialog, + gint response, + gpointer user_data); void +on_new_with_template (GtkMenuItem *menuitem, + gpointer user_data); + +void on_toolbutton_new_clicked (GtkToolButton *toolbutton, gpointer user_data); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/dialogs.c 2006-07-13 14:30:44 UTC (rev 551) @@ -801,6 +801,8 @@ gint idx = document_get_cur_idx(); gchar *sel = NULL; + if (idx == -1 || ! doc_list[idx].is_valid) return; + if (sci_get_lines_selected(doc_list[idx].sci) == 1) { sel = g_malloc(sci_get_selected_text_length(doc_list[idx].sci)); @@ -817,7 +819,7 @@ gtk_dialog_add_button(GTK_DIALOG(app->find_dialog), "gtk-find", GTK_RESPONSE_ACCEPT); - label = gtk_label_new(_("Enter the search text here")); + label = gtk_label_new(_("Enter the search text here:")); gtk_misc_set_padding(GTK_MISC(label), 0, 6); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); @@ -925,11 +927,11 @@ gtk_dialog_add_action_widget(GTK_DIALOG(app->replace_dialog), button, GEANY_RESPONSE_REPLACE); - label_find = gtk_label_new(_("Enter the search text here")); + label_find = gtk_label_new(_("Enter the search text here:")); gtk_misc_set_padding(GTK_MISC(label_find), 0, 6); gtk_misc_set_alignment(GTK_MISC(label_find), 0, 0); - label_replace = gtk_label_new(_("Enter the replace text here")); + label_replace = gtk_label_new(_("Enter the replace text here:")); gtk_misc_set_padding(GTK_MISC(label_replace), 0, 6); gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0); @@ -1014,6 +1016,81 @@ g_free(sel); } + +void dialogs_show_find_in_files(void) +{ + static GtkWidget *dirlabel = NULL, *combo = NULL; + GtkWidget *entry; //the child GtkEntry of combo + gint idx = document_get_cur_idx(); + gchar *sel = NULL; + gchar *cur_dir, *dirtext; + + if (idx == -1 || ! doc_list[idx].is_valid) return; + + if (app->find_in_files_dialog == NULL) + { + GtkWidget *label; + + app->find_in_files_dialog = gtk_dialog_new_with_buttons( + _("Find in files"), GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + + gtk_dialog_add_button(GTK_DIALOG(app->find_in_files_dialog), "gtk-find", GTK_RESPONSE_ACCEPT); + gtk_dialog_set_default_response(GTK_DIALOG(app->find_in_files_dialog), + GTK_RESPONSE_ACCEPT); + + dirlabel = gtk_label_new(""); + gtk_misc_set_alignment(GTK_MISC(dirlabel), 0, 0); + + label = gtk_label_new(_("Enter the search text here:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + + combo = gtk_combo_box_entry_new_text(); + entry = gtk_bin_get_child(GTK_BIN(combo)); + gtk_entry_set_max_length(GTK_ENTRY(entry), 248); + gtk_entry_set_width_chars(GTK_ENTRY(entry), 50); + gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); + + g_signal_connect((gpointer) app->find_in_files_dialog, "response", + G_CALLBACK(on_find_in_files_dialog_response), combo); + g_signal_connect((gpointer) app->find_in_files_dialog, "delete_event", + G_CALLBACK(gtk_widget_hide), NULL); + + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(app->find_in_files_dialog)->vbox), + dirlabel, TRUE, TRUE, 6); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(app->find_in_files_dialog)->vbox), + label, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(app->find_in_files_dialog)->vbox), + combo, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(app->find_in_files_dialog)->vbox), + gtk_label_new(""), TRUE, TRUE, 0); + + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(app->find_in_files_dialog)->vbox), 6); + + gtk_widget_show_all(app->find_in_files_dialog); + } + + if (sci_get_lines_selected(doc_list[idx].sci) == 1) + { + sel = g_malloc(sci_get_selected_text_length(doc_list[idx].sci)); + sci_get_selected_text(doc_list[idx].sci, sel); + } + + entry = GTK_BIN(combo)->child; + if (sel) gtk_entry_set_text(GTK_ENTRY(entry), sel); + g_free(sel); + gtk_widget_grab_focus(entry); + + cur_dir = utils_get_current_file_dir(); + dirtext = g_strdup_printf(_("Current directory: %s"), cur_dir); + g_free(cur_dir); + gtk_label_set_text(GTK_LABEL(dirlabel), dirtext); + g_free(dirtext); + + gtk_widget_show(app->find_in_files_dialog); +} + + void dialogs_show_includes_arguments_tex(void) { GtkWidget *dialog, *label, *entries[4]; Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/dialogs.h 2006-07-13 14:30:44 UTC (rev 551) @@ -61,6 +61,8 @@ void dialogs_show_replace(void); +void dialogs_show_find_in_files(void); + void dialogs_show_goto_line(void); void dialogs_show_includes_arguments_gen(void); Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/geany.h 2006-07-13 14:30:44 UTC (rev 551) @@ -78,6 +78,7 @@ #define GEANY_DEFAULT_TOOLS_TERMINAL "xterm" #define GEANY_DEFAULT_TOOLS_BROWSER "mozilla" #define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr" +#define GEANY_DEFAULT_TOOLS_GREP "grep" #define GEANY_DEFAULT_MRU_LENGHTH 10 #define GEANY_DEFAULT_FONT_SYMBOL_LIST "Cursor 8" #define GEANY_DEFAULT_FONT_MSG_WINDOW "Cursor 8" @@ -202,6 +203,7 @@ gchar *tools_make_cmd; gchar *tools_term_cmd; gchar *tools_print_cmd; + gchar *tools_grep_cmd; GtkIconSize toolbar_icon_size; GtkWidget *toolbar; GtkWidget *run_button; @@ -230,6 +232,7 @@ GtkWidget *prefs_dialog; GtkWidget *find_dialog; GtkWidget *replace_dialog; + GtkWidget *find_in_files_dialog; GtkWidget *default_tag_tree; const TMWorkspace *tm_workspace; GQueue *recent_queue; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/interface.c 2006-07-13 14:30:44 UTC (rev 551) @@ -37,7 +37,7 @@ GtkWidget *menuitem1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image791; + GtkWidget *image799; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -49,7 +49,7 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image792; + GtkWidget *image800; GtkWidget *revert1; GtkWidget *separator21; GtkWidget *preferences2; @@ -58,7 +58,7 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image793; + GtkWidget *image801; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -74,11 +74,11 @@ GtkWidget *menu_select_all1; GtkWidget *separator25; GtkWidget *insert_include2; - GtkWidget *image794; + GtkWidget *image802; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image795; + GtkWidget *image803; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -99,16 +99,18 @@ GtkWidget *find_next1; GtkWidget *find_previous1; GtkWidget *replace1; - GtkWidget *image796; + GtkWidget *image804; + GtkWidget *separator27; + GtkWidget *find_in_files1; GtkWidget *separator11; GtkWidget *go_to_line1; - GtkWidget *image797; + GtkWidget *image805; GtkWidget *menuitem3; GtkWidget *menuitem3_menu; GtkWidget *menu_change_font1; - GtkWidget *image798; + GtkWidget *image806; GtkWidget *menu_choose_color1; - GtkWidget *image799; + GtkWidget *image807; GtkWidget *menu_separator4; GtkWidget *menu_fullscreen1; GtkWidget *menu_show_messages_window1; @@ -243,9 +245,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1); - image791 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image791); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image791); + image799 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image799); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image799); menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -290,9 +292,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image792 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image792); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image792); + image800 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image800); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image800); revert1 = gtk_image_menu_item_new_from_stock ("gtk-revert-to-saved", accel_group); gtk_widget_show (revert1); @@ -331,9 +333,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image793 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image793); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image793); + image801 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image801); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image801); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -399,9 +401,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image794 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image794); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image794); + image802 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image802); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image802); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -413,9 +415,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image795 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image795); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image795); + image803 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image803); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image803); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -502,10 +504,19 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image796 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image796); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image796); + image804 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image804); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image804); + separator27 = gtk_separator_menu_item_new (); + gtk_widget_show (separator27); + gtk_container_add (GTK_CONTAINER (search1_menu), separator27); + gtk_widget_set_sensitive (separator27, FALSE); + + find_in_files1 = gtk_menu_item_new_with_mnemonic (_("Find in f_iles")); + gtk_widget_show (find_in_files1); + gtk_container_add (GTK_CONTAINER (search1_menu), find_in_files1); + separator11 = gtk_separator_menu_item_new (); gtk_widget_show (separator11); gtk_container_add (GTK_CONTAINER (search1_menu), separator11); @@ -515,9 +526,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image797 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image797); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image797); + image805 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image805); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image805); menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menuitem3); @@ -531,18 +542,18 @@ gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image798 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image798); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image798); + image806 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image806); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image806); menu_choose_color1 = gtk_image_menu_item_new_with_mnemonic (_("Show _Colour Chooser")); gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL); - image799 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image799); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image799); + image807 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image807); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image807); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -1096,6 +1107,9 @@ g_signal_connect ((gpointer) replace1, "activate", G_CALLBACK (on_replace1_activate), NULL); + g_signal_connect ((gpointer) find_in_files1, "activate", + G_CALLBACK (on_find_in_files1_activate), + NULL); g_signal_connect ((gpointer) go_to_line1, "activate", G_CALLBACK (on_go_to_line1_activate), NULL); @@ -1250,7 +1264,7 @@ GLADE_HOOKUP_OBJECT (window1, menuitem1_menu, "menuitem1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image791, "image791"); + GLADE_HOOKUP_OBJECT (window1, image799, "image799"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1262,7 +1276,7 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image792, "image792"); + GLADE_HOOKUP_OBJECT (window1, image800, "image800"); GLADE_HOOKUP_OBJECT (window1, revert1, "revert1"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); GLADE_HOOKUP_OBJECT (window1, preferences2, "preferences2"); @@ -1271,7 +1285,7 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image793, "image793"); + GLADE_HOOKUP_OBJECT (window1, image801, "image801"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1287,11 +1301,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_select_all1, "menu_select_all1"); GLADE_HOOKUP_OBJECT (window1, separator25, "separator25"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image794, "image794"); + GLADE_HOOKUP_OBJECT (window1, image802, "image802"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image795, "image795"); + GLADE_HOOKUP_OBJECT (window1, image803, "image803"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1312,16 +1326,18 @@ GLADE_HOOKUP_OBJECT (window1, find_next1, "find_next1"); GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image796, "image796"); + GLADE_HOOKUP_OBJECT (window1, image804, "image804"); + GLADE_HOOKUP_OBJECT (window1, separator27, "separator27"); + GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, separator11, "separator11"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image797, "image797"); + GLADE_HOOKUP_OBJECT (window1, image805, "image805"); GLADE_HOOKUP_OBJECT (window1, menuitem3, "menuitem3"); GLADE_HOOKUP_OBJECT (window1, menuitem3_menu, "menuitem3_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image798, "image798"); + GLADE_HOOKUP_OBJECT (window1, image806, "image806"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image799, "image799"); + GLADE_HOOKUP_OBJECT (window1, image807, "image807"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); GLADE_HOOKUP_OBJECT (window1, menu_show_messages_window1, "menu_show_messages_window1"); @@ -2005,6 +2021,10 @@ GtkWidget *entry_print; GtkWidget *button_print; GtkWidget *image763; + GtkWidget *label171; + GtkWidget *entry_grep; + GtkWidget *button_grep; + GtkWidget *image808; GtkWidget *label96; GtkWidget *vbox9; GtkWidget *label120; @@ -2769,7 +2789,7 @@ gtk_box_pack_start (GTK_BOX (vbox2), label17, FALSE, FALSE, 0); gtk_misc_set_padding (GTK_MISC (label17), 0, 6); - table1 = gtk_table_new (4, 3, FALSE); + table1 = gtk_table_new (5, 3, FALSE); gtk_widget_show (table1); gtk_box_pack_start (GTK_BOX (vbox2), table1, TRUE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table1), 7); @@ -2871,6 +2891,29 @@ gtk_widget_show (image763); gtk_container_add (GTK_CONTAINER (button_print), image763); + label171 = gtk_label_new (_("Grep")); + gtk_widget_show (label171); + gtk_table_attach (GTK_TABLE (table1), label171, 0, 1, 4, 5, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label171), 0, 0.5); + + entry_grep = gtk_entry_new (); + gtk_widget_show (entry_grep); + gtk_table_attach (GTK_TABLE (table1), entry_grep, 1, 2, 4, 5, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + + button_grep = gtk_button_new (); + gtk_widget_show (button_grep); + gtk_table_attach (GTK_TABLE (table1), button_grep, 2, 3, 4, 5, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + + image808 = gtk_image_new_from_stock ("gtk-directory", GTK_ICON_SIZE_BUTTON); + gtk_widget_show (image808); + gtk_container_add (GTK_CONTAINER (button_grep), image808); + label96 = gtk_label_new (_("Tools")); gtk_widget_show (label96); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 4), label96); @@ -3159,6 +3202,10 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, entry_print, "entry_print"); GLADE_HOOKUP_OBJECT (prefs_dialog, button_print, "button_print"); GLADE_HOOKUP_OBJECT (prefs_dialog, image763, "image763"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label171, "label171"); + GLADE_HOOKUP_OBJECT (prefs_dialog, entry_grep, "entry_grep"); + GLADE_HOOKUP_OBJECT (prefs_dialog, button_grep, "button_grep"); + GLADE_HOOKUP_OBJECT (prefs_dialog, image808, "image808"); GLADE_HOOKUP_OBJECT (prefs_dialog, label96, "label96"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox9, "vbox9"); GLADE_HOOKUP_OBJECT (prefs_dialog, label120, "label120"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/keyfile.c 2006-07-13 14:30:44 UTC (rev 551) @@ -145,6 +145,7 @@ g_key_file_set_string(config, "tools", "term_cmd", app->tools_term_cmd ? app->tools_term_cmd : ""); g_key_file_set_string(config, "tools", "browser_cmd", app->tools_browser_cmd ? app->tools_browser_cmd : ""); g_key_file_set_string(config, "tools", "print_cmd", app->tools_print_cmd ? app->tools_print_cmd : ""); + g_key_file_set_string(config, "tools", "grep_cmd", app->tools_grep_cmd? app->tools_grep_cmd: ""); for (i = 0; i < app->mru_length; i++) { @@ -337,6 +338,10 @@ g_free(tmp_string); g_free(tmp_string2); + tmp_string = g_find_program_in_path(GEANY_DEFAULT_TOOLS_GREP); + app->tools_grep_cmd = utils_get_setting_string(config, "tools", "grep_cmd", tmp_string); + g_free(tmp_string); + recent_files = g_key_file_get_string_list(config, "files", "recent_files", &len, NULL); if (recent_files != NULL) { Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/main.c 2006-07-13 14:30:44 UTC (rev 551) @@ -217,6 +217,7 @@ app->prefs_dialog = NULL; app->find_dialog = NULL; app->replace_dialog = NULL; + app->find_in_files_dialog = NULL; app->default_tag_tree = NULL; app->main_window_realized= FALSE; app->tab_order_ltr = FALSE; Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/msgwindow.c 2006-07-13 14:30:44 UTC (rev 551) @@ -29,11 +29,19 @@ #include "callbacks.h" #include "msgwindow.h" #include "utils.h" +#include "search.h" +#include "document.h" +#include <string.h> +#include <stdlib.h> + + static GdkColor dark = {0, 58832, 58832, 58832}; static GdkColor white = {0, 65535, 65535, 65535}; +static void msgwin_parse_grep_line(const gchar *string, gchar **filename, gint *line); + /* does some preparing things to the status message list widget */ void msgwin_prepare_status_tree_view(void) { @@ -235,3 +243,139 @@ return message_popup_menu; } + +gboolean msgwin_goto_compiler_file_line() +{ + GtkTreeIter iter; + GtkTreeModel *model; + GtkTreeSelection *selection; + gchar *string; + gboolean ret = FALSE; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(msgwindow.tree_compiler)); + if (gtk_tree_selection_get_selected(selection, &model, &iter)) + { + gtk_tree_model_get(model, &iter, 1, &string, -1); + if (string != NULL) + { + gint line; + gint idx; + gchar *filename; + utils_parse_compiler_error_line(string, &filename, &line); + if (filename != NULL && line > -1) + { + // use document_open_file to find an already open file, or open it in place + idx = document_open_file(-1, filename, 0, FALSE, NULL); + // document_set_indicator will check valid idx + document_set_indicator(idx, line - 1); + // utils_goto_file_line will check valid filename. + ret = utils_goto_file_line(filename, FALSE, line); + } + g_free(filename); + } + g_free(string); + } + return ret; +} + + +gboolean msgwin_goto_messages_file_line() +{ + GtkTreeIter iter; + GtkTreeModel *model; + GtkTreeSelection *selection; + gboolean ret = FALSE; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(msgwindow.tree_msg)); + if (gtk_tree_selection_get_selected(selection, &model, &iter)) + { + gint idx, line; + gchar *string; + + gtk_tree_model_get(model, &iter, 0, &line, 1, &idx, 3, &string, -1); + if (line >= 0 && idx >= 0) + utils_goto_line(idx, line); //checks valid idx + else if (line < 0 && string != NULL) + { + gchar *filename; + msgwin_parse_grep_line(string, &filename, &line); + if (filename != NULL && line > -1) + { + // use document_open_file to find an already open file, or open it in place + idx = document_open_file(-1, filename, 0, FALSE, NULL); + // utils_goto_file_line will check valid filename. + ret = utils_goto_file_line(filename, FALSE, line); + } + g_free(filename); + } + g_free(string); + } + return ret; +} + + +// Taken from utils_parse_compiler_error_line, could refactor both (keep get_cur_idx). +/* Try to parse the file and line number for string and when something useful is + * found, store the line number in *line and the relevant file with the error in + * *filename. + * *line will be -1 if no error was found in string. + * *filename must be freed unless NULL. */ +static void msgwin_parse_grep_line(const gchar *string, gchar **filename, gint *line) +{ + gchar *end = NULL; + gchar *path; + gchar **fields; + gchar *pattern; // pattern to split the error message into some fields + guint field_min_len; // used to detect errors after parsing + guint field_idx_line; // idx of the field where the line is + guint field_idx_file; // idx of the field where the filename is + guint skip_dot_slash = 0; // number of characters to skip at the beginning of the filename + gint cur_idx; + + *filename = NULL; + *line = -1; + + if (string == NULL) return; + + // conflict:3:conflicting types for `foo' + pattern = ":"; + field_min_len = 3; + field_idx_line = 1; + field_idx_file = 0; + + fields = g_strsplit_set(string, pattern, field_min_len); + + // parse the line + if (g_strv_length(fields) < field_min_len) + { + g_strfreev(fields); + return; + } + + *line = strtol(fields[field_idx_line], &end, 10); + + // if the line could not be read, line is 0 and an error occurred, so we leave + if (fields[field_idx_line] == end) + { + g_strfreev(fields); + return; + } + + // skip some characters at the beginning of the filename, at the moment only "./" + // can be extended if other "trash" is known + if (strncmp(fields[field_idx_file], "./", 2) == 0) skip_dot_slash = 2; + + // get the basename of the built file to get the path to look for other files + cur_idx = document_get_cur_idx(); + if (cur_idx >= 0 && doc_list[cur_idx].is_valid) + { + path = g_path_get_dirname(doc_list[cur_idx].file_name); + *filename = g_strconcat(path, G_DIR_SEPARATOR_S, + fields[field_idx_file] + skip_dot_slash, NULL); + g_free(path); + } + + g_strfreev(fields); +} + + Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/msgwindow.h 2006-07-13 14:30:44 UTC (rev 551) @@ -73,4 +73,8 @@ GtkWidget *msgwin_create_message_popup_menu(gint type); +gboolean msgwin_goto_compiler_file_line(); + +gboolean msgwin_goto_messages_file_line(); + #endif Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/prefs.c 2006-07-13 14:30:44 UTC (rev 551) @@ -227,7 +227,7 @@ // Tools Settings #ifdef GEANY_WIN32 - // hide related Terminal path setting + // hide related Make path setting gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "label11"), FALSE); gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "entry_com_make"), FALSE); gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "button_make"), FALSE); @@ -246,10 +246,13 @@ if (app->tools_browser_cmd) gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_browser")), app->tools_browser_cmd); - if (app->tools_browser_cmd) + if (app->tools_print_cmd) gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_print")), app->tools_print_cmd); + if (app->tools_grep_cmd) + gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_grep")), app->tools_grep_cmd); + // Template settings widget = lookup_widget(app->prefs_dialog, "entry_template_developer"); gtk_entry_set_text(GTK_ENTRY(widget), app->pref_template_developer); @@ -512,7 +515,11 @@ g_free(app->tools_print_cmd); app->tools_print_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + widget = lookup_widget(app->prefs_dialog, "entry_grep"); + g_free(app->tools_grep_cmd); + app->tools_grep_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + // Template settings widget = lookup_widget(app->prefs_dialog, "entry_template_developer"); g_free(app->pref_template_developer); @@ -1070,6 +1077,8 @@ "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_browser")); g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_print"), "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_print")); + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_grep"), + "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_grep")); g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "check_toolbar_show"), "toggled", G_CALLBACK(on_pref_toolbar_show_toggled), NULL); Added: trunk/src/search.c =================================================================== --- trunk/src/search.c (rev 0) +++ trunk/src/search.c 2006-07-13 14:30:44 UTC (rev 551) @@ -0,0 +1,214 @@ +/* + * search.c + * + * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + +#include "geany.h" +#include "search.h" +#include "support.h" +#include "utils.h" +#include "msgwindow.h" + +#include <unistd.h> +#include <stdlib.h> + +#ifdef G_OS_UNIX +# include <sys/types.h> +# include <sys/wait.h> +#endif + + +static gboolean search_read_io (GIOChannel *source, + GIOCondition condition, + gpointer data); + +static void search_close_pid(GPid child_pid, gint status, gpointer user_data); + +static gchar **search_get_argv(const gchar **argv_prefix, const gchar *dir); + +static GSList *search_get_file_list(const gchar *path, gint *length); + + +gboolean search_find_in_files(const gchar *search_text, const gchar *dir) +{ + const gchar *argv_prefix[] = {app->tools_grep_cmd, "-nHI", "--", search_text, NULL}; + gchar **argv; + GPid child_pid; + gint stdout_fd, stdin_fd; + GError *error = NULL; + gboolean ret = FALSE; + + if (! search_text || ! *search_text || ! dir) return TRUE; + if (! g_file_test(app->tools_grep_cmd, G_FILE_TEST_IS_EXECUTABLE)) + { + msgwin_status_add(_("Cannot execute grep tool '%s';" + " check the path setting in Preferences."), argv_prefix[0]); + return FALSE; + } + + gtk_list_store_clear(msgwindow.store_msg); + gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_MESSAGE); + + argv = search_get_argv(argv_prefix, dir); + if (argv == NULL) return FALSE; + + if (! g_spawn_async_with_pipes(dir, (gchar**)argv, NULL, + G_SPAWN_STDERR_TO_DEV_NULL | G_SPAWN_DO_NOT_REAP_CHILD, + NULL, NULL, &child_pid, + &stdin_fd, &stdout_fd, NULL, &error)) + { + geany_debug("%s: g_spawn_async_with_pipes() failed: %s", __func__, error->message); + msgwin_status_add(_("Process failed (%s)"), error->message); + g_error_free(error); + ret = FALSE; + } + else + { + g_child_watch_add(child_pid, search_close_pid, NULL); + utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, + search_read_io, NULL); + ret = TRUE; + } + g_strfreev(argv); + return ret; +} + + +/* Creates an argument vector of strings, copying argv_prefix[] values for + * the first arguments, then followed by filenames found in dir. + * Returns NULL if no files were found, otherwise returned vector should be fully freed. */ +static gchar **search_get_argv(const gchar **argv_prefix, const gchar *dir) +{ + guint prefix_len, list_len, i, j; + gchar **argv; + GSList *list, *item; + g_return_val_if_fail(dir != NULL, NULL); + + prefix_len = g_strv_length((gchar**)argv_prefix); + list = search_get_file_list(dir, &list_len); + if (list == NULL) return NULL; + + argv = g_new(gchar*, prefix_len + list_len + 1); + + for (i = 0; i < prefix_len; i++) + argv[i] = g_strdup(argv_prefix[i]); + + item = list; + for (j = 0; j < list_len; j++) + { + argv[i++] = item->data; + item = g_slist_next(item); + } + argv[i] = NULL; + + g_slist_free(list); + return argv; +} + + +/* Gets a list of files in the current directory, or NULL if no files found. + * The list and the data in the list should be freed after use. + * *length is set to the number of non-NULL data items in the list. */ +static GSList *search_get_file_list(const gchar *path, gint *length) +{ + GError *error = NULL; + GSList *list = NULL; + gint len = 0; + const gchar *filename; + GDir *dir; + g_return_val_if_fail(path != NULL, NULL); + + dir = g_dir_open(path, 0, &error); + if (error) + { + geany_debug("Could not open directory (%s)", error->message); + g_error_free(error); + *length = 0; + return NULL; + } + do + { + filename = g_dir_read_name(dir); + list = g_slist_append(list, g_strdup(filename)); + len++; + } while (filename != NULL); + + g_dir_close(dir); + len--; //subtract 1 for the last null data element. + *length = len; + if (len == 0) + { + g_slist_free(list); + return NULL; + } + return list; +} + + +static gboolean search_read_io (GIOChannel *source, + GIOCondition condition, + gpointer data) +{ + if (condition & (G_IO_IN | G_IO_PRI)) + { + //GIOStatus s; + gchar *msg; + + while (g_io_channel_read_line(source, &msg, NULL, NULL, NULL) && msg) + { + //if (s != G_IO_STATUS_NORMAL && s != G_IO_STATUS_EOF) break; + msgwin_msg_add(-1, -1, g_strstrip(msg)); + g_free(msg); + } + } + if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) + return FALSE; + + return TRUE; +} + + +static void search_close_pid(GPid child_pid, gint status, gpointer user_data) +{ +#ifdef G_OS_UNIX + gboolean failure = FALSE; + + if (WIFEXITED(status)) + { + if (WEXITSTATUS(status) != EXIT_SUCCESS) + failure = TRUE; + } + else if (WIFSIGNALED(status)) + { + // the terminating signal: WTERMSIG (status)); + failure = TRUE; + } + else + { // any other failure occured + failure = TRUE; + } + + msgwin_msg_add(-1, -1, (failure) ? _("Search failed.") : _("Search completed.")); +#endif + utils_beep(); + g_spawn_close_pid(child_pid); +} + + Property changes on: trunk/src/search.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/src/search.h =================================================================== --- trunk/src/search.h (rev 0) +++ trunk/src/search.h 2006-07-13 14:30:44 UTC (rev 551) @@ -0,0 +1,25 @@ +/* + * search.h + * + * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + + +gboolean search_find_in_files(const gchar *search_text, const gchar *dir); + Property changes on: trunk/src/search.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/utils.c 2006-07-13 14:30:44 UTC (rev 551) @@ -2520,6 +2520,35 @@ } +GIOChannel *utils_set_up_io_channel(gint fd, GIOCondition cond, GIOFunc func, gpointer data) +{ + GIOChannel *ioc; + GError *error = NULL; + const gchar *encoding; + + ioc = g_io_channel_unix_new(fd); + + g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL); + if (! g_get_charset(&encoding)) + { // hope this works reliably + g_io_channel_set_encoding(ioc, encoding, &error); + if (error) + { + geany_debug("%s: %s", __func__, error->message); + g_error_free(error); + return ioc; + } + } + // "auto-close" ;-) + g_io_channel_set_close_on_unref(ioc, TRUE); + + g_io_add_watch(ioc, cond, func, data); + g_io_channel_unref(ioc); + + return ioc; +} + + void utils_update_toolbar_items(void) { // show toolbar Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-07-11 17:44:42 UTC (rev 550) +++ trunk/src/utils.h 2006-07-13 14:30:44 UTC (rev 551) @@ -222,6 +222,8 @@ TMTag *utils_find_tm_tag(const GPtrArray *tags, const gchar *tag_name); +GIOChannel *utils_set_up_io_channel(gint fd, GIOCondition cond, GIOFunc func, gpointer data); + void utils_update_toolbar_items(void); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [550] trunk
by eht16＠users.sourceforge.net 11 Jul '06

11 Jul '06

Revision: 550 Author: eht16 Date: 2006-07-11 10:44:42 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=550&view=rev Log Message: ----------- Added return value and tag name to the calltip. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c trunk/src/sci_cb.c trunk/src/sci_cb.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-11 14:18:35 UTC (rev 549) +++ trunk/ChangeLog 2006-07-11 17:44:42 UTC (rev 550) @@ -8,6 +8,8 @@ Added new preferences tab for toolbar settings, several toolbar buttons can be hidden. Added Undo and Redo toolbar buttons (closes request #1519261). + * src/sci_cb.c, src/keybindings.c: + Added return value and tag name to the calltip. 2006-07-11 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-07-11 14:18:35 UTC (rev 549) +++ trunk/src/keybindings.c 2006-07-11 17:44:42 UTC (rev 550) @@ -693,14 +693,14 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_start_auto_complete(doc_list[idx].sci, sci_get_current_position(doc_list[idx].sci)); + sci_cb_start_auto_complete(doc_list[idx].sci, sci_get_current_position(doc_list[idx].sci), idx); } static void cb_func_edit_calltip(void) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_show_calltip(doc_list[idx].sci, -1); + sci_cb_show_calltip(doc_list[idx].sci, -1, idx); } static void cb_func_edit_macrolist(void) Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-07-11 14:18:35 UTC (rev 549) +++ trunk/src/sci_cb.c 2006-07-11 17:44:42 UTC (rev 550) @@ -162,7 +162,7 @@ } case '(': { // show calltips - sci_cb_show_calltip(sci, pos); + sci_cb_show_calltip(sci, pos, idx); break; } case ')': @@ -182,7 +182,7 @@ case '{': { // Tex auto-closing sci_cb_auto_close_bracket(sci, pos, nt->ch); // Tex auto-closing - sci_cb_show_calltip(sci, pos); + sci_cb_show_calltip(sci, pos, idx); break; } case '}': @@ -190,7 +190,7 @@ if (doc_list[idx].use_auto_indention) sci_cb_close_block(sci, pos - 1); break; } - default: sci_cb_start_auto_complete(sci, pos); + default: sci_cb_start_auto_complete(sci, pos, idx); } break; } @@ -348,18 +348,17 @@ } -gboolean sci_cb_show_calltip(ScintillaObject *sci, gint pos) +gboolean sci_cb_show_calltip(ScintillaObject *sci, gint pos, gint idx) { gint lexer; gint style; gchar word[GEANY_MAX_WORD_LENGTH]; - gint idx; + TMTag *tag; const GPtrArray *tags; if (sci == NULL) return FALSE; lexer = SSM(sci, SCI_GETLEXER, 0, 0); - idx = document_find_by_sci(sci); if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return FALSE; word[0] = '\0'; @@ -389,14 +388,23 @@ tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE, doc_list[idx].file_type->lang); if (tags->len == 1 && TM_TAG(tags->pdata[0])->atts.entry.arglist) { - SSM(sci, SCI_CALLTIPSHOW, pos, (sptr_t) TM_TAG(tags->pdata[0])->atts.entry.arglist); + tag = TM_TAG(tags->pdata[0]); + gchar *calltip; + if (tag->atts.entry.var_type) + calltip = g_strconcat(tag->atts.entry.var_type, " ", tag->name, + " ", tag->atts.entry.arglist, NULL); + else + calltip = g_strconcat(tag->name, " ", tag->atts.entry.arglist, NULL); + + SSM(sci, SCI_CALLTIPSHOW, pos, (sptr_t) calltip); + g_free(calltip); } return TRUE; } -gboolean sci_cb_start_auto_complete(ScintillaObject *sci, gint pos) +gboolean sci_cb_start_auto_complete(ScintillaObject *sci, gint pos, gint idx) { gint line, line_start, line_len, line_pos, current, rootlen, startword, lexer, style; gchar *linebuf, *root; @@ -449,7 +457,6 @@ else { // PHP, LaTeX, C and C++ tag autocompletion gint i = 0; - gint idx = document_find_by_sci(sci); TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) Modified: trunk/src/sci_cb.h =================================================================== --- trunk/src/sci_cb.h 2006-07-11 14:18:35 UTC (rev 549) +++ trunk/src/sci_cb.h 2006-07-11 17:44:42 UTC (rev 550) @@ -26,7 +26,7 @@ // callback func called by all editors when a signals arises void on_editor_notification(GtkWidget* editor, gint scn, gpointer lscn, gpointer user_data); -gboolean sci_cb_start_auto_complete(ScintillaObject *sci, gint pos); +gboolean sci_cb_start_auto_complete(ScintillaObject *sci, gint pos, gint idx); void sci_cb_get_indent(ScintillaObject *sci, gint pos, gboolean use_this_line); @@ -40,7 +40,7 @@ gboolean sci_cb_handle_xml(ScintillaObject *sci, gchar ch); -gboolean sci_cb_show_calltip(ScintillaObject *sci, gint pos); +gboolean sci_cb_show_calltip(ScintillaObject *sci, gint pos, gint idx); void sci_cb_do_comment(gint idx); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [549] trunk/ChangeLog
by eht16＠users.sourceforge.net 11 Jul '06

11 Jul '06

Revision: 549 Author: eht16 Date: 2006-07-11 07:18:35 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=549&view=rev Log Message: ----------- Forget a change. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-11 14:15:56 UTC (rev 548) +++ trunk/ChangeLog 2006-07-11 14:18:35 UTC (rev 549) @@ -7,6 +7,7 @@ Improved toolbar popup menu. Added new preferences tab for toolbar settings, several toolbar buttons can be hidden. + Added Undo and Redo toolbar buttons (closes request #1519261). 2006-07-11 Nick Treleaven <nick.treleaven(a)btinternet.com> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [548] trunk
by eht16＠users.sourceforge.net 11 Jul '06

11 Jul '06

Revision: 548 Author: eht16 Date: 2006-07-11 07:15:56 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=548&view=rev Log Message: ----------- Improved toolbar popup menu. Added new preferences tab for toolbar settings, several toolbar buttons can be hidden. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/geany.h trunk/src/interface.c trunk/src/keybindings.c trunk/src/keyfile.c trunk/src/main.c trunk/src/prefs.c trunk/src/prefs.h trunk/src/utils.c trunk/src/utils.h trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/ChangeLog 2006-07-11 14:15:56 UTC (rev 548) @@ -1,3 +1,14 @@ +2006-07-11 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/dialogs.c: Moved dialogs_show_prefs_dialog() to src/prefs.c. + * geany.glade, src/interface.c, src/vte.c, src/prefs.c, src/dialogs.c, + src/geany.h, src/main.c, src/callbacks.c, src/keybindings.c, + src/keyfile.c, src/utils.c: + Improved toolbar popup menu. + Added new preferences tab for toolbar settings, several toolbar + buttons can be hidden. + + 2006-07-11 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/main.c: Prefix command-line opened files with the current Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/geany.glade 2006-07-11 14:15:56 UTC (rev 548) @@ -31,6 +31,7 @@ <child> <widget class="GtkMenuBar" id="menubar1"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Undo the last modification</property> <child> <widget class="GtkMenuItem" id="menuitem1"> @@ -1154,6 +1155,51 @@ </child> <child> + <widget class="GtkToolButton" id="toolbutton_undo"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Undo the last modification</property> + <property name="stock_id">gtk-undo</property> + <property name="visible_horizontal">True</property> + <property name="visible_vertical">True</property> + <property name="is_important">False</property> + <signal name="clicked" handler="on_undo1_activate" last_modification_time="Mon, 10 Jul 2006 19:52:02 GMT"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + + <child> + <widget class="GtkToolButton" id="toolbutton_redo"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Redo the last modification</property> + <property name="stock_id">gtk-redo</property> + <property name="visible_horizontal">True</property> + <property name="visible_vertical">True</property> + <property name="is_important">False</property> + <signal name="clicked" handler="on_redo1_activate" last_modification_time="Mon, 10 Jul 2006 19:52:14 GMT"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + + <child> + <widget class="GtkSeparatorToolItem" id="separatortoolitem9"> + <property name="visible">True</property> + <property name="draw">True</property> + <property name="visible_horizontal">True</property> + <property name="visible_vertical">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + + <child> <widget class="GtkToolButton" id="toolbutton13"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Compile the current file</property> @@ -1900,19 +1946,22 @@ </child> <child> - <widget class="GtkMenuItem" id="large_icons1"> + <widget class="GtkRadioMenuItem" id="large_icons1"> <property name="visible">True</property> <property name="label" translatable="yes">Large icons</property> <property name="use_underline">True</property> + <property name="active">False</property> <signal name="activate" handler="on_toolbar_large_icons1_activate" last_modification_time="Sat, 22 Oct 2005 11:52:26 GMT"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="small_icons1"> + <widget class="GtkRadioMenuItem" id="small_icons1"> <property name="visible">True</property> <property name="label" translatable="yes">Small icons</property> <property name="use_underline">True</property> + <property name="active">False</property> + <property name="group">large_icons1</property> <signal name="activate" handler="on_toolbar_small_icons1_activate" last_modification_time="Sat, 22 Oct 2005 11:52:26 GMT"/> </widget> </child> @@ -1931,7 +1980,7 @@ <signal name="activate" handler="on_hide_toolbar1_activate" last_modification_time="Sat, 30 Apr 2005 20:23:03 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image415"> + <widget class="GtkImage" id="image800"> <property name="visible">True</property> <property name="stock">gtk-cancel</property> <property name="icon_size">1</property> @@ -2347,7 +2396,7 @@ <property name="visible">True</property> <property name="show_tabs">True</property> <property name="show_border">True</property> - <property name="tab_pos">GTK_POS_TOP</property> + <property name="tab_pos">GTK_POS_LEFT</property> <property name="scrollable">False</property> <property name="enable_popup">False</property> @@ -2742,100 +2791,7 @@ <property name="spacing">10</property> <child> - <widget class="GtkFrame" id="frame3"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkVBox" id="vbox7"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkCheckButton" id="check_toolbar_search"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Display the search field and button in the toolbar</property> - <property name="label" translatable="yes">Show search field</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="check_toolbar_goto"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Display the line number field and button in the toolbar</property> - <property name="label" translatable="yes">Show goto line field</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label98"> - <property name="visible">True</property> - <property name="label" translatable="yes">Toolbar</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</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="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> + <placeholder/> </child> <child> @@ -3648,6 +3604,509 @@ </child> <child> + <widget class="GtkVBox" id="vbox15"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">10</property> + + <child> + <widget class="GtkFrame" id="frame12"> + <property name="visible">True</property> + <property name="label_xalign">0.5</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment15"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkCheckButton" id="check_toolbar_show"> + <property name="visible">True</property> + <property name="label" translatable="yes">Show Toolbar</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label166"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</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="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkFrame" id="frame11"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment14"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkVBox" id="vbox16"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkCheckButton" id="check_toolbar_compile"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Display the Compile and Run buttons in the toolbar</property> + <property name="label" translatable="yes">Show Compile and Run</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_toolbar_colour"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Display the Colour Chooser button in the toolbar</property> + <property name="label" translatable="yes">Show Colour Chooser button</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_toolbar_zoom"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Display the Zoom In and Zoom Out buttons in the toolbar</property> + <property name="label" translatable="yes">Show Zoom In and Zoom Out</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_toolbar_undo"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Display the Redo and Undo buttons in the toolbar</property> + <property name="label" translatable="yes">Show Redo and Undo buttons</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_toolbar_search"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Display the search field and button in the toolbar</property> + <property name="label" translatable="yes">Show Search field</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_toolbar_goto"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Display the line number field and button in the toolbar</property> + <property name="label" translatable="yes">Show Goto line field</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label165"> + <property name="visible">True</property> + <property name="label" translatable="yes">Items</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</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="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkFrame" id="frame13"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment16"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkTable" id="table9"> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">4</property> + <property name="homogeneous">False</property> + <property name="row_spacing">5</property> + <property name="column_spacing">5</property> + + <child> + <widget class="GtkRadioButton" id="radio_toolbar_imagetext"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Images and text</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</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="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkRadioButton" id="radio_toolbar_image"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Images only</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radio_toolbar_imagetext</property> + </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="GtkRadioButton" id="radio_toolbar_text"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Text only</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radio_toolbar_imagetext</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</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="GtkRadioButton" id="radio_toolbar_large"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Large icons</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkRadioButton" id="radio_toolbar_small"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Small icons</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radio_toolbar_large</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label169"> + <property name="visible">True</property> + <property name="label" translatable="yes">Icon style</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="label170"> + <property name="visible">True</property> + <property name="label" translatable="yes">Icon size</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">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label167"> + <property name="visible">True</property> + <property name="label" translatable="yes">Appearance</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</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="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label164"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toolbar</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.5</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="type">tab</property> + </packing> + </child> + + <child> <widget class="GtkVBox" id="vbox5"> <property name="visible">True</property> <property name="homogeneous">False</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/callbacks.c 2006-07-11 14:15:56 UTC (rev 548) @@ -68,6 +68,10 @@ // represents the state at switching a notebook page, to update check menu items in document menu static gboolean switch_notebook_page = FALSE; +// flag to indicate the explicit change of a toggle button of the toolbar menu and so the +// toggled callback should ignore the change since it is not triggered by the user +static gboolean ignore_toolbar_toggle = FALSE; + // represents the state at switching a notebook page(in the left treeviews widget), to not emit // the selection-changed signal from tv.tree_openfiles //static gboolean switch_tv_notebook_page = FALSE; @@ -522,6 +526,8 @@ on_images_and_text2_activate (GtkMenuItem *menuitem, gpointer user_data) { + if (ignore_toolbar_toggle) return; + gtk_toolbar_set_style(GTK_TOOLBAR(app->toolbar), GTK_TOOLBAR_BOTH); app->toolbar_icon_style = GTK_TOOLBAR_BOTH; } @@ -531,6 +537,8 @@ on_images_only2_activate (GtkMenuItem *menuitem, gpointer user_data) { + if (ignore_toolbar_toggle) return; + gtk_toolbar_set_style(GTK_TOOLBAR(app->toolbar), GTK_TOOLBAR_ICONS); app->toolbar_icon_style = GTK_TOOLBAR_ICONS; } @@ -540,6 +548,8 @@ on_text_only2_activate (GtkMenuItem *menuitem, gpointer user_data) { + if (ignore_toolbar_toggle) return; + gtk_toolbar_set_style(GTK_TOOLBAR(app->toolbar), GTK_TOOLBAR_TEXT); app->toolbar_icon_style = GTK_TOOLBAR_TEXT; } @@ -624,6 +634,8 @@ on_toolbar_large_icons1_activate (GtkMenuItem *menuitem, gpointer user_data) { + if (ignore_toolbar_toggle) return; + app->toolbar_icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR; utils_update_toolbar_icons(GTK_ICON_SIZE_LARGE_TOOLBAR); } @@ -633,6 +645,8 @@ on_toolbar_small_icons1_activate (GtkMenuItem *menuitem, gpointer user_data) { + if (ignore_toolbar_toggle) return; + app->toolbar_icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR; utils_update_toolbar_icons(GTK_ICON_SIZE_SMALL_TOOLBAR); } @@ -1106,6 +1120,28 @@ { if (event->button == 3) { + GtkWidget *widget; + + ignore_toolbar_toggle = TRUE; + + switch (app->toolbar_icon_style) + { + case 0: widget = lookup_widget(app->toolbar_menu, "images_only2"); break; + case 1: widget = lookup_widget(app->toolbar_menu, "text_only2"); break; + default: widget = lookup_widget(app->toolbar_menu, "images_and_text2"); break; + } + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), TRUE); + + switch (app->toolbar_icon_size) + { + case GTK_ICON_SIZE_LARGE_TOOLBAR: + widget = lookup_widget(app->toolbar_menu, "large_icons1"); break; + default: widget = lookup_widget(app->toolbar_menu, "small_icons1"); break; + } + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), TRUE); + + ignore_toolbar_toggle = FALSE; + gtk_menu_popup(GTK_MENU(app->toolbar_menu), NULL, NULL, NULL, NULL, event->button, event->time); return TRUE; @@ -1199,15 +1235,8 @@ on_show_toolbar1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) { - if (app->toolbar_visible) - { - gtk_widget_hide(GTK_WIDGET(app->toolbar)); - } - else - { - gtk_widget_show(GTK_WIDGET(app->toolbar)); - } app->toolbar_visible = (app->toolbar_visible) ? FALSE : TRUE;; + utils_widget_show_hide(GTK_WIDGET(app->toolbar), app->toolbar_visible); } @@ -2509,3 +2538,4 @@ sci_select_all(doc_list[idx].sci); } + Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/callbacks.h 2006-07-11 14:15:56 UTC (rev 548) @@ -590,3 +590,4 @@ void on_menu_select_all1_activate (GtkMenuItem *menuitem, gpointer user_data); + Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/dialogs.c 2006-07-11 14:15:56 UTC (rev 548) @@ -42,11 +42,10 @@ #include "win32.h" #include "sciwrappers.h" #include "support.h" -#include "interface.h" +//#include "interface.h" #include "utils.h" #include "prefs.h" #include "keybindings.h" -#include "encodings.h" @@ -1661,202 +1660,6 @@ } -void dialogs_show_prefs_dialog(void) -{ - if (app->prefs_dialog == NULL) - { -#ifdef HAVE_VTE - GtkWidget *notebook, *vbox, *label, *alignment, *table; - GtkWidget *font_term, *color_fore, *color_back, *spin_scrollback, *entry_emulation; - GtkWidget *check_scroll_key, *check_scroll_out, *check_follow_path; - GtkTooltips *tooltips; - GtkObject *spin_scrollback_adj; -#endif - GtkWidget *combo; - guint i; - gchar *encoding_string; - - app->prefs_dialog = create_prefs_dialog(); - gtk_window_set_transient_for(GTK_WINDOW(app->prefs_dialog), GTK_WINDOW(app->window)); - - // init the default file encoding combo box - combo = lookup_widget(app->prefs_dialog, "combo_encoding"); - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 3); - for (i = 0; i < GEANY_ENCODINGS_MAX; i++) - { - encoding_string = encodings_to_string(&encodings[i]); - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), encoding_string); - g_free(encoding_string); - } - -#ifdef HAVE_VTE - if (app->have_vte) - { - tooltips = GTK_TOOLTIPS(lookup_widget(app->prefs_dialog, "tooltips")); - notebook = lookup_widget(app->prefs_dialog, "notebook2"); - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(notebook), vbox); - - label = gtk_label_new(_("These are settings for the virtual terminal emulator widget (VTE). They only apply, if the VTE library could be loaded.")); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_FILL); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.14, 0.19); - gtk_misc_set_padding(GTK_MISC(label), 0, 8); - - alignment = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, FALSE, 0); - gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 12, 6); - - table = gtk_table_new(8, 2, FALSE); - gtk_container_add(GTK_CONTAINER(alignment), table); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 25); - - label = gtk_label_new(_("Terminal font")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - font_term = gtk_font_button_new(); - gtk_table_attach(GTK_TABLE(table), font_term, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, font_term, _("Sets the font for the terminal widget."), NULL); - - label = gtk_label_new(_("Foreground color")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - label = gtk_label_new(_("Background color")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - color_fore = gtk_color_button_new(); - gtk_table_attach(GTK_TABLE(table), color_fore, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, color_fore, _("Sets the foreground color of the text in the terminal widget."), NULL); - gtk_color_button_set_title(GTK_COLOR_BUTTON(color_fore), _("Color Chooser")); - - color_back = gtk_color_button_new(); - gtk_table_attach(GTK_TABLE(table), color_back, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, color_back, _("Sets the background color of the text in the terminal widget."), NULL); - gtk_color_button_set_title(GTK_COLOR_BUTTON(color_back), _("Color Chooser")); - - label = gtk_label_new(_("Scrollback lines")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - spin_scrollback_adj = gtk_adjustment_new(500, 0, 5000, 1, 10, 10); - spin_scrollback = gtk_spin_button_new(GTK_ADJUSTMENT(spin_scrollback_adj), 1, 0); - gtk_table_attach(GTK_TABLE(table), spin_scrollback, 1, 2, 3, 4, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, spin_scrollback, _("Specifies the history in lines, which you can scroll back in the terminal widget."), NULL); - gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin_scrollback), TRUE); - gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spin_scrollback), TRUE); - - label = gtk_label_new(_("Terminal emulation")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - entry_emulation = gtk_entry_new(); - gtk_table_attach(GTK_TABLE(table), entry_emulation, 1, 2, 4, 5, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, entry_emulation, _("Controls how the terminal emulator should behave. xterm is a good start."), NULL); - - check_scroll_key = gtk_check_button_new_with_mnemonic(_("Scroll on keystroke")); - gtk_table_attach(GTK_TABLE(table), check_scroll_key, 1, 2, 5, 6, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, check_scroll_key, _("Whether to scroll to the bottom if a key was pressed."), NULL); - gtk_button_set_focus_on_click(GTK_BUTTON(check_scroll_key), FALSE); - - check_scroll_out = gtk_check_button_new_with_mnemonic(_("Scroll on output")); - gtk_table_attach(GTK_TABLE(table), check_scroll_out, 1, 2, 6, 7, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, check_scroll_out, _("Whether to scroll to the bottom if an output was generated."), NULL); - gtk_button_set_focus_on_click(GTK_BUTTON(check_scroll_out), FALSE); - - check_follow_path = gtk_check_button_new_with_mnemonic(_("Follow the path of the current file")); - gtk_table_attach(GTK_TABLE(table), check_follow_path, 1, 2, 7, 8, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, check_follow_path, _("Whether to execute \"cd $path\" when you switch between opened files."), NULL); - gtk_button_set_focus_on_click(GTK_BUTTON(check_follow_path), FALSE); - - label = gtk_label_new(_("Terminal")); - gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook), gtk_notebook_get_nth_page( - GTK_NOTEBOOK(notebook), 6), label); - - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "font_term", - gtk_widget_ref(font_term), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "color_fore", - gtk_widget_ref(color_fore), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "color_back", - gtk_widget_ref(color_back), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "spin_scrollback", - gtk_widget_ref(spin_scrollback), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "entry_emulation", - gtk_widget_ref(entry_emulation), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_scroll_key", - gtk_widget_ref(check_scroll_key), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_scroll_out", - gtk_widget_ref(check_scroll_out), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_follow_path", - gtk_widget_ref(check_follow_path), (GDestroyNotify) gtk_widget_unref); - - gtk_widget_show_all(vbox); - - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "font_term"), - "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(4)); - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "color_fore"), - "color-set", G_CALLBACK(on_prefs_color_choosed), GINT_TO_POINTER(2)); - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "color_back"), - "color-set", G_CALLBACK(on_prefs_color_choosed), GINT_TO_POINTER(3)); - } -#endif - g_signal_connect((gpointer) app->prefs_dialog, "response", G_CALLBACK(on_prefs_button_clicked), NULL); - g_signal_connect((gpointer) app->prefs_dialog, "delete_event", G_CALLBACK(on_prefs_delete_event), NULL); - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "tagbar_font"), - "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(1)); - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "msgwin_font"), - "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(2)); - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "editor_font"), - "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(3)); - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "long_line_color"), - "color-set", G_CALLBACK(on_prefs_color_choosed), GINT_TO_POINTER(1)); - // file chooser buttons in the tools tab - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_make"), - "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_com_make")); - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_term"), - "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_com_term")); - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_browser"), - "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_browser")); - g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_print"), - "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_print")); - - } - - prefs_init_dialog(); - gtk_widget_show(app->prefs_dialog); -} - - gboolean dialogs_show_question(const gchar *text, ...) { #ifndef GEANY_WIN32 Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/dialogs.h 2006-07-11 14:15:56 UTC (rev 548) @@ -75,8 +75,6 @@ void dialogs_show_file_properties(gint idx); -void dialogs_show_prefs_dialog(void); - gboolean dialogs_show_question(const gchar *text, ...); void dialogs_show_keyboard_shortcuts(void); Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/geany.h 2006-07-11 14:15:56 UTC (rev 548) @@ -163,8 +163,12 @@ gboolean pref_main_load_session; gboolean pref_main_save_winpos; gboolean pref_main_confirm_exit; - gboolean pref_main_show_search; - gboolean pref_main_show_goto; + gboolean pref_toolbar_show_search; + gboolean pref_toolbar_show_goto; + gboolean pref_toolbar_show_undo; + gboolean pref_toolbar_show_compile; + gboolean pref_toolbar_show_zoom; + gboolean pref_toolbar_show_colour; gint tab_pos_editor; gint tab_pos_msgwin; gint tab_pos_sidebar; @@ -215,8 +219,8 @@ GtkWidget *popup_goto_items[3]; GtkWidget *popup_items[4]; GtkWidget *menu_copy_items[4]; - GtkWidget *redo_items[2]; - GtkWidget *undo_items[2]; + GtkWidget *redo_items[3]; + GtkWidget *undo_items[3]; GtkWidget *save_buttons[2]; GtkWidget *sensitive_buttons[33]; GtkWidget *open_colorsel; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/interface.c 2006-07-11 14:15:56 UTC (rev 548) @@ -161,6 +161,9 @@ GtkWidget *toolbutton23; GtkWidget *toolbutton15; GtkWidget *separatortoolitem2; + GtkWidget *toolbutton_undo; + GtkWidget *toolbutton_redo; + GtkWidget *separatortoolitem9; GtkWidget *tmp_image; GtkWidget *toolbutton13; GtkWidget *toolbutton26; @@ -223,6 +226,7 @@ menubar1 = gtk_menu_bar_new (); gtk_widget_show (menubar1); gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, menubar1, _("Undo the last modification"), NULL); menuitem1 = gtk_menu_item_new_with_mnemonic (_("_File")); gtk_widget_show (menuitem1); @@ -770,6 +774,20 @@ gtk_widget_show (separatortoolitem2); gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem2); + toolbutton_undo = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-undo"); + gtk_widget_show (toolbutton_undo); + gtk_container_add (GTK_CONTAINER (toolbar1), toolbutton_undo); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton_undo), tooltips, _("Undo the last modification"), NULL); + + toolbutton_redo = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-redo"); + gtk_widget_show (toolbutton_redo); + gtk_container_add (GTK_CONTAINER (toolbar1), toolbutton_redo); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton_redo), tooltips, _("Redo the last modification"), NULL); + + separatortoolitem9 = (GtkWidget*) gtk_separator_tool_item_new (); + gtk_widget_show (separatortoolitem9); + gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem9); + tmp_image = gtk_image_new_from_stock ("gtk-convert", tmp_toolbar_icon_size); gtk_widget_show (tmp_image); toolbutton13 = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Compile")); @@ -1171,6 +1189,12 @@ g_signal_connect ((gpointer) toolbutton15, "clicked", G_CALLBACK (on_toolbutton15_clicked), NULL); + g_signal_connect ((gpointer) toolbutton_undo, "clicked", + G_CALLBACK (on_undo1_activate), + NULL); + g_signal_connect ((gpointer) toolbutton_redo, "clicked", + G_CALLBACK (on_redo1_activate), + NULL); g_signal_connect ((gpointer) toolbutton13, "clicked", G_CALLBACK (on_compile_button_clicked), NULL); @@ -1349,6 +1373,9 @@ GLADE_HOOKUP_OBJECT (window1, toolbutton23, "toolbutton23"); GLADE_HOOKUP_OBJECT (window1, toolbutton15, "toolbutton15"); GLADE_HOOKUP_OBJECT (window1, separatortoolitem2, "separatortoolitem2"); + GLADE_HOOKUP_OBJECT (window1, toolbutton_undo, "toolbutton_undo"); + GLADE_HOOKUP_OBJECT (window1, toolbutton_redo, "toolbutton_redo"); + GLADE_HOOKUP_OBJECT (window1, separatortoolitem9, "separatortoolitem9"); GLADE_HOOKUP_OBJECT (window1, toolbutton13, "toolbutton13"); GLADE_HOOKUP_OBJECT (window1, toolbutton26, "toolbutton26"); GLADE_HOOKUP_OBJECT (window1, separatortoolitem6, "separatortoolitem6"); @@ -1409,11 +1436,12 @@ GtkWidget *images_only2; GtkWidget *text_only2; GtkWidget *separator1; + GSList *large_icons1_group = NULL; GtkWidget *large_icons1; GtkWidget *small_icons1; GtkWidget *separator20; GtkWidget *hide_toolbar1; - GtkWidget *image415; + GtkWidget *image800; toolbar_popup_menu1 = gtk_menu_new (); @@ -1440,11 +1468,13 @@ gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), separator1); gtk_widget_set_sensitive (separator1, FALSE); - large_icons1 = gtk_menu_item_new_with_mnemonic (_("Large icons")); + large_icons1 = gtk_radio_menu_item_new_with_mnemonic (large_icons1_group, _("Large icons")); + large_icons1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (large_icons1)); gtk_widget_show (large_icons1); gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), large_icons1); - small_icons1 = gtk_menu_item_new_with_mnemonic (_("Small icons")); + small_icons1 = gtk_radio_menu_item_new_with_mnemonic (large_icons1_group, _("Small icons")); + large_icons1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (small_icons1)); gtk_widget_show (small_icons1); gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), small_icons1); @@ -1457,9 +1487,9 @@ gtk_widget_show (hide_toolbar1); gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), hide_toolbar1); - image415 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_MENU); - gtk_widget_show (image415); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (hide_toolbar1), image415); + image800 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_MENU); + gtk_widget_show (image800); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (hide_toolbar1), image800); g_signal_connect ((gpointer) images_and_text2, "activate", G_CALLBACK (on_images_and_text2_activate), @@ -1490,7 +1520,7 @@ GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, small_icons1, "small_icons1"); GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, separator20, "separator20"); GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, hide_toolbar1, "hide_toolbar1"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, image415, "image415"); + GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, image800, "image800"); return toolbar_popup_menu1; } @@ -1853,12 +1883,6 @@ GtkWidget *label162; GtkWidget *label94; GtkWidget *vbox14; - GtkWidget *frame3; - GtkWidget *alignment4; - GtkWidget *vbox7; - GtkWidget *check_toolbar_search; - GtkWidget *check_toolbar_goto; - GtkWidget *label98; GtkWidget *frame7; GtkWidget *alignment9; GtkWidget *vbox11; @@ -1901,6 +1925,35 @@ GtkWidget *combo_tab_editor; GtkWidget *label158; GtkWidget *label157; + GtkWidget *vbox15; + GtkWidget *frame12; + GtkWidget *alignment15; + GtkWidget *check_toolbar_show; + GtkWidget *label166; + GtkWidget *frame11; + GtkWidget *alignment14; + GtkWidget *vbox16; + GtkWidget *check_toolbar_compile; + GtkWidget *check_toolbar_colour; + GtkWidget *check_toolbar_zoom; + GtkWidget *check_toolbar_undo; + GtkWidget *check_toolbar_search; + GtkWidget *check_toolbar_goto; + GtkWidget *label165; + GtkWidget *frame13; + GtkWidget *alignment16; + GtkWidget *table9; + GtkWidget *radio_toolbar_imagetext; + GSList *radio_toolbar_imagetext_group = NULL; + GtkWidget *radio_toolbar_image; + GtkWidget *radio_toolbar_text; + GtkWidget *radio_toolbar_large; + GSList *radio_toolbar_large_group = NULL; + GtkWidget *radio_toolbar_small; + GtkWidget *label169; + GtkWidget *label170; + GtkWidget *label167; + GtkWidget *label164; GtkWidget *vbox5; GtkWidget *frame6; GtkWidget *alignment7; @@ -1996,6 +2049,7 @@ gtk_widget_show (notebook2); gtk_box_pack_start (GTK_BOX (dialog_vbox3), notebook2, TRUE, TRUE, 0); GTK_WIDGET_UNSET_FLAGS (notebook2, GTK_CAN_FOCUS); + gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook2), GTK_POS_LEFT); frame10 = gtk_frame_new (NULL); gtk_widget_show (frame10); @@ -2109,39 +2163,6 @@ gtk_widget_show (vbox14); gtk_container_add (GTK_CONTAINER (notebook2), vbox14); - frame3 = gtk_frame_new (NULL); - gtk_widget_show (frame3); - gtk_box_pack_start (GTK_BOX (vbox14), frame3, TRUE, TRUE, 0); - gtk_frame_set_shadow_type (GTK_FRAME (frame3), GTK_SHADOW_NONE); - - alignment4 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment4); - gtk_container_add (GTK_CONTAINER (frame3), alignment4); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment4), 0, 0, 12, 0); - - vbox7 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox7); - gtk_container_add (GTK_CONTAINER (alignment4), vbox7); - - check_toolbar_search = gtk_check_button_new_with_mnemonic (_("Show search field")); - gtk_widget_show (check_toolbar_search); - gtk_box_pack_start (GTK_BOX (vbox7), check_toolbar_search, FALSE, FALSE, 0); - GTK_WIDGET_UNSET_FLAGS (check_toolbar_search, GTK_CAN_FOCUS); - gtk_tooltips_set_tip (tooltips, check_toolbar_search, _("Display the search field and button in the toolbar"), NULL); - gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_search), FALSE); - - check_toolbar_goto = gtk_check_button_new_with_mnemonic (_("Show goto line field")); - gtk_widget_show (check_toolbar_goto); - gtk_box_pack_start (GTK_BOX (vbox7), check_toolbar_goto, FALSE, FALSE, 0); - GTK_WIDGET_UNSET_FLAGS (check_toolbar_goto, GTK_CAN_FOCUS); - gtk_tooltips_set_tip (tooltips, check_toolbar_goto, _("Display the line number field and button in the toolbar"), NULL); - gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_goto), FALSE); - - label98 = gtk_label_new (_("Toolbar")); - gtk_widget_show (label98); - gtk_frame_set_label_widget (GTK_FRAME (frame3), label98); - gtk_label_set_use_markup (GTK_LABEL (label98), TRUE); - frame7 = gtk_frame_new (NULL); gtk_widget_show (frame7); gtk_box_pack_start (GTK_BOX (vbox14), frame7, TRUE, TRUE, 0); @@ -2400,6 +2421,172 @@ gtk_widget_show (label157); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 1), label157); + vbox15 = gtk_vbox_new (FALSE, 10); + gtk_widget_show (vbox15); + gtk_container_add (GTK_CONTAINER (notebook2), vbox15); + + frame12 = gtk_frame_new (NULL); + gtk_widget_show (frame12); + gtk_box_pack_start (GTK_BOX (vbox15), frame12, FALSE, FALSE, 0); + gtk_frame_set_label_align (GTK_FRAME (frame12), 0.5, 0.5); + gtk_frame_set_shadow_type (GTK_FRAME (frame12), GTK_SHADOW_NONE); + + alignment15 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment15); + gtk_container_add (GTK_CONTAINER (frame12), alignment15); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment15), 0, 0, 12, 0); + + check_toolbar_show = gtk_check_button_new_with_mnemonic (_("Show Toolbar")); + gtk_widget_show (check_toolbar_show); + gtk_container_add (GTK_CONTAINER (alignment15), check_toolbar_show); + GTK_WIDGET_UNSET_FLAGS (check_toolbar_show, GTK_CAN_FOCUS); + gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_show), FALSE); + + label166 = gtk_label_new (""); + gtk_widget_show (label166); + gtk_frame_set_label_widget (GTK_FRAME (frame12), label166); + gtk_label_set_use_markup (GTK_LABEL (label166), TRUE); + + frame11 = gtk_frame_new (NULL); + gtk_widget_show (frame11); + gtk_box_pack_start (GTK_BOX (vbox15), frame11, FALSE, FALSE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame11), GTK_SHADOW_NONE); + + alignment14 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment14); + gtk_container_add (GTK_CONTAINER (frame11), alignment14); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment14), 0, 0, 12, 0); + + vbox16 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox16); + gtk_container_add (GTK_CONTAINER (alignment14), vbox16); + + check_toolbar_compile = gtk_check_button_new_with_mnemonic (_("Show Compile and Run")); + gtk_widget_show (check_toolbar_compile); + gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_compile, FALSE, FALSE, 0); + GTK_WIDGET_UNSET_FLAGS (check_toolbar_compile, GTK_CAN_FOCUS); + gtk_tooltips_set_tip (tooltips, check_toolbar_compile, _("Display the Compile and Run buttons in the toolbar"), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_compile), FALSE); + + check_toolbar_colour = gtk_check_button_new_with_mnemonic (_("Show Colour Chooser button")); + gtk_widget_show (check_toolbar_colour); + gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_colour, FALSE, FALSE, 0); + GTK_WIDGET_UNSET_FLAGS (check_toolbar_colour, GTK_CAN_FOCUS); + gtk_tooltips_set_tip (tooltips, check_toolbar_colour, _("Display the Colour Chooser button in the toolbar"), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_colour), FALSE); + + check_toolbar_zoom = gtk_check_button_new_with_mnemonic (_("Show Zoom In and Zoom Out")); + gtk_widget_show (check_toolbar_zoom); + gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_zoom, FALSE, FALSE, 0); + GTK_WIDGET_UNSET_FLAGS (check_toolbar_zoom, GTK_CAN_FOCUS); + gtk_tooltips_set_tip (tooltips, check_toolbar_zoom, _("Display the Zoom In and Zoom Out buttons in the toolbar"), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_zoom), FALSE); + + check_toolbar_undo = gtk_check_button_new_with_mnemonic (_("Show Redo and Undo buttons")); + gtk_widget_show (check_toolbar_undo); + gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_undo, FALSE, FALSE, 0); + GTK_WIDGET_UNSET_FLAGS (check_toolbar_undo, GTK_CAN_FOCUS); + gtk_tooltips_set_tip (tooltips, check_toolbar_undo, _("Display the Redo and Undo buttons in the toolbar"), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_undo), FALSE); + + check_toolbar_search = gtk_check_button_new_with_mnemonic (_("Show Search field")); + gtk_widget_show (check_toolbar_search); + gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_search, FALSE, FALSE, 0); + GTK_WIDGET_UNSET_FLAGS (check_toolbar_search, GTK_CAN_FOCUS); + gtk_tooltips_set_tip (tooltips, check_toolbar_search, _("Display the search field and button in the toolbar"), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_search), FALSE); + + check_toolbar_goto = gtk_check_button_new_with_mnemonic (_("Show Goto line field")); + gtk_widget_show (check_toolbar_goto); + gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_goto, FALSE, FALSE, 0); + GTK_WIDGET_UNSET_FLAGS (check_toolbar_goto, GTK_CAN_FOCUS); + gtk_tooltips_set_tip (tooltips, check_toolbar_goto, _("Display the line number field and button in the toolbar"), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_goto), FALSE); + + label165 = gtk_label_new (_("Items")); + gtk_widget_show (label165); + gtk_frame_set_label_widget (GTK_FRAME (frame11), label165); + gtk_label_set_use_markup (GTK_LABEL (label165), TRUE); + + frame13 = gtk_frame_new (NULL); + gtk_widget_show (frame13); + gtk_box_pack_start (GTK_BOX (vbox15), frame13, FALSE, FALSE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame13), GTK_SHADOW_NONE); + + alignment16 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment16); + gtk_container_add (GTK_CONTAINER (frame13), alignment16); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment16), 0, 0, 12, 0); + + table9 = gtk_table_new (2, 4, FALSE); + gtk_widget_show (table9); + gtk_container_add (GTK_CONTAINER (alignment16), table9); + gtk_table_set_row_spacings (GTK_TABLE (table9), 5); + gtk_table_set_col_spacings (GTK_TABLE (table9), 5); + + radio_toolbar_imagetext = gtk_radio_button_new_with_mnemonic (NULL, _("Images and text")); + gtk_widget_show (radio_toolbar_imagetext); + gtk_table_attach (GTK_TABLE (table9), radio_toolbar_imagetext, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_imagetext), radio_toolbar_imagetext_group); + radio_toolbar_imagetext_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_imagetext)); + + radio_toolbar_image = gtk_radio_button_new_with_mnemonic (NULL, _("Images only")); + gtk_widget_show (radio_toolbar_image); + gtk_table_attach (GTK_TABLE (table9), radio_toolbar_image, 2, 3, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_image), radio_toolbar_imagetext_group); + radio_toolbar_imagetext_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_image)); + + radio_toolbar_text = gtk_radio_button_new_with_mnemonic (NULL, _("Text only")); + gtk_widget_show (radio_toolbar_text); + gtk_table_attach (GTK_TABLE (table9), radio_toolbar_text, 3, 4, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_text), radio_toolbar_imagetext_group); + radio_toolbar_imagetext_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_text)); + + radio_toolbar_large = gtk_radio_button_new_with_mnemonic (NULL, _("Large icons")); + gtk_widget_show (radio_toolbar_large); + gtk_table_attach (GTK_TABLE (table9), radio_toolbar_large, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_large), radio_toolbar_large_group); + radio_toolbar_large_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_large)); + + radio_toolbar_small = gtk_radio_button_new_with_mnemonic (NULL, _("Small icons")); + gtk_widget_show (radio_toolbar_small); + gtk_table_attach (GTK_TABLE (table9), radio_toolbar_small, 2, 3, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_small), radio_toolbar_large_group); + radio_toolbar_large_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_small)); + + label169 = gtk_label_new (_("Icon style")); + gtk_widget_show (label169); + gtk_table_attach (GTK_TABLE (table9), label169, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label169), 0, 0.5); + + label170 = gtk_label_new (_("Icon size")); + gtk_widget_show (label170); + gtk_table_attach (GTK_TABLE (table9), label170, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label170), 0, 0.5); + + label167 = gtk_label_new (_("Appearance")); + gtk_widget_show (label167); + gtk_frame_set_label_widget (GTK_FRAME (frame13), label167); + gtk_label_set_use_markup (GTK_LABEL (label167), TRUE); + + label164 = gtk_label_new (_("Toolbar")); + gtk_widget_show (label164); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 2), label164); + vbox5 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox5); gtk_container_add (GTK_CONTAINER (notebook2), vbox5); @@ -2571,7 +2758,7 @@ label95 = gtk_label_new (_("Editor")); gtk_widget_show (label95); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 2), label95); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 3), label95); vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); @@ -2686,7 +2873,7 @@ label96 = gtk_label_new (_("Tools")); gtk_widget_show (label96); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 3), label96); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 4), label96); vbox9 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox9); @@ -2779,7 +2966,7 @@ label119 = gtk_label_new (_("Templates")); gtk_widget_show (label119); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 4), label119); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 5), label119); vbox13 = gtk_vbox_new (FALSE, 5); gtk_widget_show (vbox13); @@ -2814,7 +3001,7 @@ label151 = gtk_label_new (_("Keybindings")); gtk_widget_show (label151); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 5), label151); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 6), label151); dialog_action_area3 = GTK_DIALOG (prefs_dialog)->action_area; gtk_widget_show (dialog_action_area3); @@ -2855,12 +3042,6 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, label162, "label162"); GLADE_HOOKUP_OBJECT (prefs_dialog, label94, "label94"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox14, "vbox14"); - GLADE_HOOKUP_OBJECT (prefs_dialog, frame3, "frame3"); - GLADE_HOOKUP_OBJECT (prefs_dialog, alignment4, "alignment4"); - GLADE_HOOKUP_OBJECT (prefs_dialog, vbox7, "vbox7"); - GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_search, "check_toolbar_search"); - GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_goto, "check_toolbar_goto"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label98, "label98"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame7, "frame7"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment9, "alignment9"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox11, "vbox11"); @@ -2901,6 +3082,33 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, combo_tab_editor, "combo_tab_editor"); GLADE_HOOKUP_OBJECT (prefs_dialog, label158, "label158"); GLADE_HOOKUP_OBJECT (prefs_dialog, label157, "label157"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox15, "vbox15"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame12, "frame12"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment15, "alignment15"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_show, "check_toolbar_show"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label166, "label166"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame11, "frame11"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment14, "alignment14"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox16, "vbox16"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_compile, "check_toolbar_compile"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_colour, "check_toolbar_colour"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_zoom, "check_toolbar_zoom"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_undo, "check_toolbar_undo"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_search, "check_toolbar_search"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_goto, "check_toolbar_goto"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label165, "label165"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame13, "frame13"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment16, "alignment16"); + GLADE_HOOKUP_OBJECT (prefs_dialog, table9, "table9"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_imagetext, "radio_toolbar_imagetext"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_image, "radio_toolbar_image"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_text, "radio_toolbar_text"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_large, "radio_toolbar_large"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_small, "radio_toolbar_small"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label169, "label169"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label170, "label170"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label167, "label167"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label164, "label164"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox5, "vbox5"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame6, "frame6"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment7, "alignment7"); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/keybindings.c 2006-07-11 14:15:56 UTC (rev 548) @@ -30,6 +30,7 @@ #include "document.h" #include "callbacks.h" #include "dialogs.h" +#include "prefs.h" #include "msgwindow.h" #include "sci_cb.h" #include "sciwrappers.h" Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/keyfile.c 2006-07-11 14:15:56 UTC (rev 548) @@ -66,9 +66,6 @@ scribble_text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE); // store basic settings - g_key_file_set_boolean(config, PACKAGE, "toolbar_visible", app->toolbar_visible); - g_key_file_set_integer(config, PACKAGE, "toolbar_icon_style", app->toolbar_icon_style); - g_key_file_set_integer(config, PACKAGE, "toolbar_icon_size", app->toolbar_icon_size); if (app->pref_main_save_winpos) { g_key_file_set_integer(config, PACKAGE, "treeview_position", @@ -125,8 +122,15 @@ g_key_file_set_boolean(config, PACKAGE, "pref_main_confirm_exit", app->pref_main_confirm_exit); g_key_file_set_boolean(config, PACKAGE, "pref_main_load_session", app->pref_main_load_session); g_key_file_set_boolean(config, PACKAGE, "pref_main_save_winpos", app->pref_main_save_winpos); - g_key_file_set_boolean(config, PACKAGE, "pref_main_show_search", app->pref_main_show_search); - g_key_file_set_boolean(config, PACKAGE, "pref_main_show_goto", app->pref_main_show_goto); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show", app->toolbar_visible); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_search", app->pref_toolbar_show_search); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_goto", app->pref_toolbar_show_goto); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_zoom", app->pref_toolbar_show_zoom); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_undo", app->pref_toolbar_show_undo); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_compile", app->pref_toolbar_show_compile); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_colour", app->pref_toolbar_show_colour); + g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_style", app->toolbar_icon_style); + g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_size", app->toolbar_icon_size); g_key_file_set_boolean(config, PACKAGE, "pref_editor_new_line", app->pref_editor_new_line); g_key_file_set_boolean(config, PACKAGE, "pref_editor_replace_tabs", app->pref_editor_replace_tabs); g_key_file_set_boolean(config, PACKAGE, "pref_editor_trail_space", app->pref_editor_trail_space); @@ -218,15 +222,15 @@ config_exists = g_key_file_load_from_file(config, configfile, G_KEY_FILE_KEEP_COMMENTS, NULL); - app->toolbar_visible = utils_get_setting_boolean(config, PACKAGE, "toolbar_visible", TRUE); + app->toolbar_visible = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show", TRUE); { GtkIconSize tb_iconsize; GtkToolbarStyle tb_style; GEANY_GET_SETTING("gtk-toolbar-style", tb_style, GTK_TOOLBAR_ICONS); GEANY_GET_SETTING("gtk-toolbar-icon-size", tb_iconsize, GTK_ICON_SIZE_LARGE_TOOLBAR); - app->toolbar_icon_style = utils_get_setting_integer(config, PACKAGE, "toolbar_icon_style", tb_style); - app->toolbar_icon_size = utils_get_setting_integer(config, PACKAGE, "toolbar_icon_size", tb_iconsize); + app->toolbar_icon_style = utils_get_setting_integer(config, PACKAGE, "pref_toolbar_icon_style", tb_style); + app->toolbar_icon_size = utils_get_setting_integer(config, PACKAGE, "pref_toolbar_icon_size", tb_iconsize); } app->beep_on_errors = utils_get_setting_boolean(config, PACKAGE, "beep_on_errors", TRUE); app->mru_length = utils_get_setting_integer(config, PACKAGE, "mru_length", GEANY_DEFAULT_MRU_LENGHTH); @@ -287,8 +291,12 @@ app->pref_main_confirm_exit = utils_get_setting_boolean(config, PACKAGE, "pref_main_confirm_exit", TRUE); app->pref_main_load_session = utils_get_setting_boolean(config, PACKAGE, "pref_main_load_session", TRUE); app->pref_main_save_winpos = utils_get_setting_boolean(config, PACKAGE, "pref_main_save_winpos", TRUE); - app->pref_main_show_search = utils_get_setting_boolean(config, PACKAGE, "pref_main_show_search", TRUE); - app->pref_main_show_goto = utils_get_setting_boolean(config, PACKAGE, "pref_main_show_goto", TRUE); + app->pref_toolbar_show_search = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_search", TRUE); + app->pref_toolbar_show_goto = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_goto", TRUE); + app->pref_toolbar_show_zoom = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_zoom", FALSE); + app->pref_toolbar_show_compile = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_compile", TRUE); + app->pref_toolbar_show_undo = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_undo", FALSE); + app->pref_toolbar_show_colour = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_colour", TRUE); #ifdef HAVE_VTE app->load_vte = utils_get_setting_boolean(config, PACKAGE, "load_vte", TRUE); app->terminal_settings = utils_get_setting_string(config, PACKAGE, "terminal_settings", ""); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/main.c 2006-07-11 14:15:56 UTC (rev 548) @@ -176,20 +176,6 @@ gtk_window_set_default_size(GTK_WINDOW(app->window), app->geometry[2], app->geometry[3]); } - if (! app->pref_main_show_goto) - { - gtk_widget_hide(lookup_widget(app->window, "entry_goto_line")); - gtk_widget_hide(lookup_widget(app->window, "toolbutton25")); - gtk_widget_hide(lookup_widget(app->window, "separatortoolitem5")); - } - - if (! app->pref_main_show_search) - { - gtk_widget_hide(lookup_widget(app->window, "entry1")); - gtk_widget_hide(lookup_widget(app->window, "toolbutton18")); - gtk_widget_hide(lookup_widget(app->window, "separatortoolitem4")); - } - g_object_set(G_OBJECT(lookup_widget(app->window, "menu_line_breaking1")), "active", GINT_TO_POINTER(app->pref_editor_line_breaking), NULL); g_object_set(G_OBJECT(lookup_widget(app->window, "menu_use_auto_indention1")), "active", @@ -202,6 +188,8 @@ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(app->notebook), app->tab_pos_editor); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(msgwindow.notebook), app->tab_pos_msgwin); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(app->treeview_notebook), app->tab_pos_sidebar); + + utils_update_toolbar_items(); } @@ -308,8 +296,10 @@ app->sensitive_buttons[32] = lookup_widget(app->window, "print1"); app->redo_items[0] = lookup_widget(app->popup_menu, "redo1"); app->redo_items[1] = lookup_widget(app->window, "menu_redo2"); + app->redo_items[2] = lookup_widget(app->window, "toolbutton_redo"); app->undo_items[0] = lookup_widget(app->popup_menu, "undo1"); app->undo_items[1] = lookup_widget(app->window, "menu_undo2"); + app->undo_items[2] = lookup_widget(app->window, "toolbutton_undo"); msgwindow.tree_status = lookup_widget(app->window, "treeview3"); msgwindow.tree_msg = lookup_widget(app->window, "treeview4"); msgwindow.tree_compiler = lookup_widget(app->window, "treeview5"); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/prefs.c 2006-07-11 14:15:56 UTC (rev 548) @@ -35,6 +35,9 @@ #include "document.h" #include "keyfile.h" #include "keybindings.h" +#include "interface.h" +#include "encodings.h" +#include "callbacks.h" #ifdef HAVE_VTE # include "vte.h" @@ -93,12 +96,6 @@ // Interface settings - widget = lookup_widget(app->prefs_dialog, "check_toolbar_search"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_main_show_search); - - widget = lookup_widget(app->prefs_dialog, "check_toolbar_goto"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_main_show_goto); - widget = lookup_widget(app->prefs_dialog, "check_list_symbol"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->sidebar_symbol_visible); @@ -144,6 +141,50 @@ gtk_combo_box_set_active(GTK_COMBO_BOX(widget), app->tab_pos_sidebar); + // Toolbar settings + widget = lookup_widget(app->prefs_dialog, "check_toolbar_show"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->toolbar_visible); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_search"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_toolbar_show_search); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_goto"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_toolbar_show_goto); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_compile"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_toolbar_show_compile); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_zoom"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_toolbar_show_zoom); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_undo"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_toolbar_show_undo); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_colour"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_toolbar_show_colour); + + + switch (app->toolbar_icon_style) + { + case 0: widget = lookup_widget(app->prefs_dialog, "radio_toolbar_image"); break; + case 1: widget = lookup_widget(app->prefs_dialog, "radio_toolbar_text"); break; + default: widget = lookup_widget(app->prefs_dialog, "radio_toolbar_imagetext"); break; + } + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + + + switch (app->toolbar_icon_size) + { + case GTK_ICON_SIZE_LARGE_TOOLBAR: + widget = lookup_widget(app->prefs_dialog, "radio_toolbar_large"); break; + default: widget = lookup_widget(app->prefs_dialog, "radio_toolbar_small"); break; + } + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + // disable elements if toolbar is hidden + on_pref_toolbar_show_toggled(GTK_TOGGLE_BUTTON( + lookup_widget(app->prefs_dialog, "check_toolbar_show")), NULL); + + // Editor settings widget = lookup_widget(app->prefs_dialog, "spin_tab_width"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), app->pref_editor_tab_width); @@ -341,12 +382,6 @@ // Interface settings - widget = lookup_widget(app->prefs_dialog, "check_toolbar_search"); - app->pref_main_show_search = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - - widget = lookup_widget(app->prefs_dialog, "check_toolbar_goto"); - app->pref_main_show_goto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - widget = lookup_widget(app->prefs_dialog, "check_list_symbol"); app->sidebar_symbol_visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -376,6 +411,48 @@ app->tab_pos_sidebar = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + // Toolbar settings + widget = lookup_widget(app->prefs_dialog, "check_toolbar_show"); + app->toolbar_visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_search"); + app->pref_toolbar_show_search = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_goto"); + app->pref_toolbar_show_goto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_zoom"); + app->pref_toolbar_show_zoom = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_undo"); + app->pref_toolbar_show_undo = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_compile"); + app->pref_toolbar_show_compile = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + + widget = lookup_widget(app->prefs_dialog, "check_toolbar_colour"); + app->pref_toolbar_show_colour = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + + widget = lookup_widget(app->prefs_dialog, "radio_toolbar_imagetext"); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) app->toolbar_icon_style = 2; + else + { + widget = lookup_widget(app->prefs_dialog, "radio_toolbar_image"); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) + app->toolbar_icon_style = 0; + else + // now only the text only radio remains, so set text only + app->toolbar_icon_style = 1; + } + + + widget = lookup_widget(app->prefs_dialog, "radio_toolbar_large"); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) + app->toolbar_icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR; + else + app->toolbar_icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR; + + // Editor settings widget = lookup_widget(app->prefs_dialog, "spin_tab_width"); app->pref_editor_tab_width = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); @@ -502,12 +579,9 @@ #endif // apply the changes made - utils_widget_show_hide(lookup_widget(app->window, "entry1"), app->pref_main_show_search); - utils_widget_show_hide(lookup_widget(app->window, "toolbutton18"), app->pref_main_show_search); - utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem4"), app->pref_main_show_search); - utils_widget_show_hide(lookup_widget(app->window, "entry_goto_line"), app->pref_main_show_goto); - utils_widget_show_hide(lookup_widget(app->window, "toolbutton25"), app->pref_main_show_goto); - utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem5"), app->pref_main_show_goto); + utils_update_toolbar_items(); + utils_update_toolbar_icons(app->toolbar_icon_size); + gtk_toolbar_set_style(GTK_TOOLBAR(app->toolbar), app->toolbar_icon_style); utils_treeviews_showhide(); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(app->notebook), app->tab_pos_editor); @@ -799,3 +873,209 @@ } +void on_pref_toolbar_show_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ + gboolean sens = gtk_toggle_button_get_active(togglebutton); + + gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "frame11"), sens); + gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "frame13"), sens); +} + + +void dialogs_show_prefs_dialog(void) +{ + if (app->prefs_dialog == NULL) + { +#ifdef HAVE_VTE + GtkWidget *notebook, *vbox, *label, *alignment, *table; + GtkWidget *font_term, *color_fore, *color_back, *spin_scrollback, *entry_emulation; + GtkWidget *check_scroll_key, *check_scroll_out, *check_follow_path; + GtkTooltips *tooltips; + GtkObject *spin_scrollback_adj; +#endif + GtkWidget *combo; + guint i; + gchar *encoding_string; + + app->prefs_dialog = create_prefs_dialog(); + gtk_window_set_transient_for(GTK_WINDOW(app->prefs_dialog), GTK_WINDOW(app->window)); + + // init the default file encoding combo box + combo = lookup_widget(app->prefs_dialog, "combo_encoding"); + gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 3); + for (i = 0; i < GEANY_ENCODINGS_MAX; i++) + { + encoding_string = encodings_to_string(&encodings[i]); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), encoding_string); + g_free(encoding_string); + } + +#ifdef HAVE_VTE + if (app->have_vte) + { + tooltips = GTK_TOOLTIPS(lookup_widget(app->prefs_dialog, "tooltips")); + notebook = lookup_widget(app->prefs_dialog, "notebook2"); + vbox = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(notebook), vbox); + + label = gtk_label_new(_("These are settings for the virtual terminal emulator widget (VTE). They only apply, if the VTE library could be loaded.")); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); + gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_FILL); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_misc_set_alignment(GTK_MISC(label), 0.14, 0.19); + gtk_misc_set_padding(GTK_MISC(label), 0, 8); + + alignment = gtk_alignment_new(0.5, 0.5, 1, 1); + gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, FALSE, 0); + gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 12, 6); + + table = gtk_table_new(8, 2, FALSE); + gtk_container_add(GTK_CONTAINER(alignment), table); + gtk_table_set_row_spacings(GTK_TABLE(table), 3); + gtk_table_set_col_spacings(GTK_TABLE(table), 25); + + label = gtk_label_new(_("Terminal font")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + font_term = gtk_font_button_new(); + gtk_table_attach(GTK_TABLE(table), font_term, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, font_term, _("Sets the font for the terminal widget."), NULL); + + label = gtk_label_new(_("Foreground color")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + label = gtk_label_new(_("Background color")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + color_fore = gtk_color_button_new(); + gtk_table_attach(GTK_TABLE(table), color_fore, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, color_fore, _("Sets the foreground color of the text in the terminal widget."), NULL); + gtk_color_button_set_title(GTK_COLOR_BUTTON(color_fore), _("Color Chooser")); + + color_back = gtk_color_button_new(); + gtk_table_attach(GTK_TABLE(table), color_back, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, color_back, _("Sets the background color of the text in the terminal widget."), NULL); + gtk_color_button_set_title(GTK_COLOR_BUTTON(color_back), _("Color Chooser")); + + label = gtk_label_new(_("Scrollback lines")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + spin_scrollback_adj = gtk_adjustment_new(500, 0, 5000, 1, 10, 10); + spin_scrollback = gtk_spin_button_new(GTK_ADJUSTMENT(spin_scrollback_adj), 1, 0); + gtk_table_attach(GTK_TABLE(table), spin_scrollback, 1, 2, 3, 4, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, spin_scrollback, _("Specifies the history in lines, which you can scroll back in the terminal widget."), NULL); + gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin_scrollback), TRUE); + gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spin_scrollback), TRUE); + + label = gtk_label_new(_("Terminal emulation")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + entry_emulation = gtk_entry_new(); + gtk_table_attach(GTK_TABLE(table), entry_emulation, 1, 2, 4, 5, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, entry_emulation, _("Controls how the terminal emulator should behave. xterm is a good start."), NULL); + + check_scroll_key = gtk_check_button_new_with_mnemonic(_("Scroll on keystroke")); + gtk_table_attach(GTK_TABLE(table), check_scroll_key, 1, 2, 5, 6, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, check_scroll_key, _("Whether to scroll to the bottom if a key was pressed."), NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(check_scroll_key), FALSE); + + check_scroll_out = gtk_check_button_new_with_mnemonic(_("Scroll on output")); + gtk_table_attach(GTK_TABLE(table), check_scroll_out, 1, 2, 6, 7, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, check_scroll_out, _("Whether to scroll to the bottom if an output was generated."), NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(check_scroll_out), FALSE); + + check_follow_path = gtk_check_button_new_with_mnemonic(_("Follow the path of the current file")); + gtk_table_attach(GTK_TABLE(table), check_follow_path, 1, 2, 7, 8, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, check_follow_path, _("Whether to execute \"cd $path\" when you switch between opened files."), NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(check_follow_path), FALSE); + + label = gtk_label_new(_("Terminal")); + gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook), gtk_notebook_get_nth_page( + GTK_NOTEBOOK(notebook), 7), label); + + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "font_term", + gtk_widget_ref(font_term), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "color_fore", + gtk_widget_ref(color_fore), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "color_back", + gtk_widget_ref(color_back), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "spin_scrollback", + gtk_widget_ref(spin_scrollback), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "entry_emulation", + gtk_widget_ref(entry_emulation), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_scroll_key", + gtk_widget_ref(check_scroll_key), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_scroll_out", + gtk_widget_ref(check_scroll_out), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_follow_path", + gtk_widget_ref(check_follow_path), (GDestroyNotify) gtk_widget_unref); + + gtk_widget_show_all(vbox); + + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "font_term"), + "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(4)); + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "color_fore"), + "color-set", G_CALLBACK(on_prefs_color_choosed), GINT_TO_POINTER(2)); + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "color_back"), + "color-set", G_CALLBACK(on_prefs_color_choosed), GINT_TO_POINTER(3)); + } +#endif + g_signal_connect((gpointer) app->prefs_dialog, "response", G_CALLBACK(on_prefs_button_clicked), NULL); + g_signal_connect((gpointer) app->prefs_dialog, "delete_event", G_CALLBACK(on_prefs_delete_event), NULL); + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "tagbar_font"), + "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(1)); + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "msgwin_font"), + "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(2)); + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "editor_font"), + "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(3)); + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "long_line_color"), + "color-set", G_CALLBACK(on_prefs_color_choosed), GINT_TO_POINTER(1)); + // file chooser buttons in the tools tab + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_make"), + "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_com_make")); + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_term"), + "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_com_term")); + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_browser"), + "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_browser")); + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_print"), + "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_print")); + + g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "check_toolbar_show"), + "toggled", G_CALLBACK(on_pref_toolbar_show_toggled), NULL); + + } + + prefs_init_dialog(); + gtk_widget_show(app->prefs_dialog); +} Modified: trunk/src/prefs.h =================================================================== --- trunk/src/prefs.h 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/prefs.h 2006-07-11 14:15:56 UTC (rev 548) @@ -33,4 +33,8 @@ void on_prefs_color_choosed(GtkColorButton *widget, gpointer user_data); +void on_pref_toolbar_show_toggled(GtkToggleButton *togglebutton, gpointer user_data); + +void dialogs_show_prefs_dialog(void); + #endif Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/utils.c 2006-07-11 14:15:56 UTC (rev 548) @@ -171,9 +171,11 @@ // index 0 is the popup menu, 1 is the menubar gtk_widget_set_sensitive(app->undo_items[0], enable_undo); gtk_widget_set_sensitive(app->undo_items[1], enable_undo); + gtk_widget_set_sensitive(app->undo_items[2], enable_undo); gtk_widget_set_sensitive(app->redo_items[0], enable_redo); gtk_widget_set_sensitive(app->redo_items[1], enable_redo); + gtk_widget_set_sensitive(app->redo_items[2], enable_redo); } @@ -2518,3 +2520,43 @@ } +void utils_update_toolbar_items(void) +{ + // show toolbar + GtkWidget *widget = lookup_widget(app->window, "menu_show_toolbar1"); + if (app->toolbar_visible && ! gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) + { + app->toolbar_visible = ! app->toolbar_visible; // will be changed by the toggled callback + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), TRUE); + } + else if (! app->toolbar_visible && gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) + { + app->toolbar_visible = ! app->toolbar_visible; // will be changed by the toggled callback + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), FALSE); + } + + // search + utils_widget_show_hide(lookup_widget(app->window, "entry1"), app->pref_toolbar_show_search); + utils_widget_show_hide(lookup_widget(app->window, "toolbutton18"), app->pref_toolbar_show_search); + utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem5"), app->pref_toolbar_show_search); + // goto line + utils_widget_show_hide(lookup_widget(app->window, "entry_goto_line"), app->pref_toolbar_show_goto); + utils_widget_show_hide(lookup_widget(app->window, "toolbutton25"), app->pref_toolbar_show_goto); + utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem8"), app->pref_toolbar_show_goto); + // compile + utils_widget_show_hide(lookup_widget(app->window, "toolbutton13"), app->pref_toolbar_show_compile); + utils_widget_show_hide(lookup_widget(app->window, "toolbutton26"), app->pref_toolbar_show_compile); + utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem6"), app->pref_toolbar_show_compile); + // colour + utils_widget_show_hide(lookup_widget(app->window, "toolbutton24"), app->pref_toolbar_show_colour); + utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem3"), app->pref_toolbar_show_colour); + // zoom + utils_widget_show_hide(lookup_widget(app->window, "toolbutton20"), app->pref_toolbar_show_zoom); + utils_widget_show_hide(lookup_widget(app->window, "toolbutton21"), app->pref_toolbar_show_zoom); + utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem4"), app->pref_toolbar_show_zoom); + // undo + utils_widget_show_hide(lookup_widget(app->window, "toolbutton_undo"), app->pref_toolbar_show_undo); + utils_widget_show_hide(lookup_widget(app->window, "toolbutton_redo"), app->pref_toolbar_show_undo); + utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem9"), app->pref_toolbar_show_undo); +} + Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/utils.h 2006-07-11 14:15:56 UTC (rev 548) @@ -222,4 +222,6 @@ TMTag *utils_find_tm_tag(const GPtrArray *tags, const gchar *tag_name); +void utils_update_toolbar_items(void); + #endif Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2006-07-11 13:48:24 UTC (rev 547) +++ trunk/src/vte.c 2006-07-11 14:15:56 UTC (rev 548) @@ -331,7 +331,7 @@ case 2: { on_preferences1_activate(menuitem, NULL); - gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(app->prefs_dialog, "notebook2")), 6); + gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(app->prefs_dialog, "notebook2")), 7); break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [547] trunk
by ntrel＠users.sourceforge.net 11 Jul '06

11 Jul '06

Revision: 547 Author: ntrel Date: 2006-07-11 06:48:24 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=547&view=rev Log Message: ----------- Prefix command-line opened files with the current directory so relative paths will work better Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-10 16:46:29 UTC (rev 546) +++ trunk/ChangeLog 2006-07-11 13:48:24 UTC (rev 547) @@ -1,3 +1,9 @@ +2006-07-11 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/main.c: Prefix command-line opened files with the current + directory so relative paths will work better. + + 2006-07-10 Enrico Tröger <enrico.troeger(a)uvena.de> * src/sci_cb.c: Autocompletion only works on blank lines. Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-07-10 16:46:29 UTC (rev 546) +++ trunk/src/main.c 2006-07-11 13:48:24 UTC (rev 547) @@ -316,6 +316,26 @@ } +/* get the full file path of a command-line argument + * N.B. the result should be freed and may contain '/../' or '/./ ' */ +gchar *get_argv_filename(const gchar *filename) +{ + gchar *result; + + if (g_path_is_absolute(filename)) + result = g_strdup(filename); + else + { + //use current dir + gchar *cur_dir = g_get_current_dir(); + result = g_strjoin( + G_DIR_SEPARATOR_S, cur_dir, filename, NULL); + g_free(cur_dir); + } + return result; +} + + #ifdef HAVE_FIFO static gboolean read_fifo(GIOChannel *source, GIOCondition condition, gpointer data) { @@ -356,15 +376,18 @@ gint i; GIOChannel *ioc; - for(i = 1; i < argc; i++) + for(i = 1; i < argc && argv[i] != NULL; i++) { - if (argv[i] && g_file_test(argv[i], G_FILE_TEST_IS_REGULAR || G_FILE_TEST_IS_SYMLINK)) + gchar *filename = get_argv_filename(argv[i]); + + if (filename && g_file_test(filename, G_FILE_TEST_IS_REGULAR || G_FILE_TEST_IS_SYMLINK)) { ioc = g_io_channel_unix_new(open(fifo_name, O_WRONLY)); - g_io_channel_write_chars(ioc, argv[i], -1, NULL, NULL); + g_io_channel_write_chars(ioc, filename, -1, NULL, NULL); g_io_channel_flush(ioc, NULL); g_io_channel_shutdown(ioc, TRUE, NULL); } + g_free(filename); } } @@ -542,7 +565,9 @@ { if (opened < GEANY_MAX_OPEN_FILES) { - document_open_file(-1, argv[i], 0, FALSE, NULL); + gchar *filename = get_argv_filename(argv[i]); + document_open_file(-1, filename, 0, FALSE, NULL); + g_free(filename); opened++; } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [546] trunk
by eht16＠users.sourceforge.net 10 Jul '06

10 Jul '06

Revision: 546 Author: eht16 Date: 2006-07-10 09:46:29 -0700 (Mon, 10 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=546&view=rev Log Message: ----------- Added "Replace in all open files" option in the replace dialog. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/dialogs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-10 16:02:17 UTC (rev 545) +++ trunk/ChangeLog 2006-07-10 16:46:29 UTC (rev 546) @@ -1,6 +1,8 @@ 2006-07-10 Enrico Tröger <enrico.troeger(a)uvena.de> * src/sci_cb.c: Autocompletion only works on blank lines. + * src/callbacks.c, src/dialogs.c: + Added "Replace in all open files" option in the replace dialog. 2006-07-09 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-10 16:02:17 UTC (rev 545) +++ trunk/src/callbacks.c 2006-07-10 16:46:29 UTC (rev 546) @@ -77,6 +77,7 @@ static gboolean search_backwards; static gint search_flags_re; static gboolean search_backwards_re; +static gboolean search_in_all_buffers_re; // holds the current position where the mouse pointer is when the popup menu for the scintilla // scintilla widget is shown @@ -1894,6 +1895,8 @@ lookup_widget(GTK_WIDGET(app->replace_dialog), "check_wordstart"))); search_backwards_re = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( lookup_widget(GTK_WIDGET(app->replace_dialog), "check_back"))); + search_in_all_buffers_re = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + lookup_widget(GTK_WIDGET(app->replace_dialog), "check_all_buffers"))); find = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find)))); replace = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace)))); @@ -1911,23 +1914,37 @@ (fl2 ? SCFIND_WHOLEWORD : 0) | (fl3 ? SCFIND_REGEXP : 0) | (fl4 ? SCFIND_WORDSTART : 0); - switch (response) + + if (search_in_all_buffers_re && response == GEANY_RESPONSE_REPLACE_ALL) { - case GEANY_RESPONSE_REPLACE: + gint i; + for (i = 0; i < GEANY_MAX_OPEN_FILES; i++) { - document_replace_text(idx, find, replace, search_flags_re, search_backwards_re); - break; + if (! doc_list[i].is_valid) continue; + + document_replace_all(i, find, replace, search_flags_re); } - case GEANY_RESPONSE_REPLACE_ALL: + } + else + { + switch (response) { - document_replace_all(idx, find, replace, search_flags_re); - break; + case GEANY_RESPONSE_REPLACE: + { + document_replace_text(idx, find, replace, search_flags_re, search_backwards_re); + break; + } + case GEANY_RESPONSE_REPLACE_ALL: + { + document_replace_all(idx, find, replace, search_flags_re); + break; + } + case GEANY_RESPONSE_REPLACE_SEL: + { + document_replace_sel(idx, find, replace, search_flags_re); + break; + } } - case GEANY_RESPONSE_REPLACE_SEL: - { - document_replace_sel(idx, find, replace, search_flags_re); - break; - } } } Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-07-10 16:02:17 UTC (rev 545) +++ trunk/src/dialogs.c 2006-07-10 16:46:29 UTC (rev 546) @@ -904,7 +904,7 @@ if (app->replace_dialog == NULL) { GtkWidget *label_find, *label_replace, *entry_find, *entry_replace; - GtkWidget *checkbox1, *checkbox2, *checkbox3, *checkbox5, *checkbox4; + GtkWidget *checkbox1, *checkbox2, *checkbox3, *checkbox4, *checkbox5, *checkbox6; GtkWidget *button; GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); @@ -986,11 +986,19 @@ gtk_widget_ref(checkbox5), (GDestroyNotify)gtk_widget_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox5), FALSE); + checkbox6 = gtk_check_button_new_with_mnemonic(_("Replace in all open files")); + g_object_set_data_full(G_OBJECT(app->replace_dialog), "check_all_buffers", + gtk_widget_ref(checkbox6), (GDestroyNotify)gtk_widget_unref); + gtk_tooltips_set_tip(tooltips, checkbox6, + _("Replaces the search text in all opened files. This option is only useful(and used) if you click on \"Replace All\"."), NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(checkbox6), FALSE); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox1); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox2); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox5); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox3); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox4); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox6); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), gtk_label_new("")); gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(app->replace_dialog)->vbox), 3); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [545] trunk
by eht16＠users.sourceforge.net 10 Jul '06

10 Jul '06

Revision: 545 Author: eht16 Date: 2006-07-10 09:02:17 -0700 (Mon, 10 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=545&view=rev Log Message: ----------- Autocompletion only works on blank lines. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-09 14:41:53 UTC (rev 544) +++ trunk/ChangeLog 2006-07-10 16:02:17 UTC (rev 545) @@ -1,3 +1,8 @@ +2006-07-10 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/sci_cb.c: Autocompletion only works on blank lines. + + 2006-07-09 Enrico Tröger <enrico.troeger(a)uvena.de> * tagmanager/d.c, tagmanager/Makefile.am, tagmanager/parsers.h, Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-07-09 14:41:53 UTC (rev 544) +++ trunk/src/sci_cb.c 2006-07-10 16:02:17 UTC (rev 545) @@ -550,14 +550,17 @@ void sci_cb_auto_forif(ScintillaObject *sci, gint pos, gint idx) { - static gchar buf[8]; + static gchar buf[16]; gchar *eol; gchar *construct; - gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); - gint style = SSM(sci, SCI_GETSTYLEAT, pos - 2, 0); - //gint line = sci_get_line_from_position(sci, pos); - //gint start_style = SSM(sci, SCI_GETSTYLEAT, sci_get_position_from_line(sci, line), 0); + gint lexer, style; + gint i; + if (sci == NULL || idx == -1 || ! doc_list[idx].is_valid) return; + + lexer = SSM(sci, SCI_GETLEXER, 0, 0); + style = SSM(sci, SCI_GETSTYLEAT, pos - 2, 0); + // only for C, C++, Java, Perl and PHP if (lexer != SCLEX_CPP && lexer != SCLEX_HTML && @@ -571,6 +574,7 @@ style == SCE_C_COMMENTDOC || style == SCE_C_COMMENTLINEDOC || style == SCE_C_STRING || + style == SCE_C_CHARACTER || style == SCE_C_PREPROCESSOR)) return; if (lexer == SCLEX_HTML && ! (style >= 118 && style <= 127)) return; @@ -583,21 +587,30 @@ // get the indention if (doc_list[idx].use_auto_indention) sci_cb_get_indent(sci, pos, TRUE); eol = g_strconcat(utils_get_eol_char(idx), indent, NULL); - sci_get_text_range(sci, pos - 8, pos - 1, buf); - // "pattern", buf + x, y -> x + y = 7, because buf is (pos - 8)...(pos - 1) = 7 - if (! strncmp("if", buf + 5, 2)) + sci_get_text_range(sci, pos - 16, pos - 1, buf); + // check the first 8 characters of buf for whitespace, but only in this line + i = 14; + while (isalpha(buf[i])) i--; // find pos before keyword + while (i >= 0 && buf[i] != '\n' && buf[i] != '\r') // we want to keep in this line('\n' check) { - if (! isspace(*(buf + 4))) goto free_and_return; + if (! isspace(buf[i])) goto free_and_return; + i--; + } + // "pattern", buf + x, y -> x + y = 15, because buf is (pos - 16)...(pos - 1) = 15 + if (! strncmp("if", buf + 13, 2)) + { + if (! isspace(*(buf + 12))) goto free_and_return; + construct = g_strdup_printf("()%s{%s\t%s}%s", eol, eol, eol, eol); SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); sci_goto_pos(sci, pos + 1, TRUE); g_free(construct); } - else if (! strncmp("else", buf + 3, 4)) + else if (! strncmp("else", buf + 11, 4)) { - if (! isspace(*(buf + 2))) goto free_and_return; + if (! isspace(*(buf + 10))) goto free_and_return; construct = g_strdup_printf("%s{%s\t%s}%s", eol, eol, eol, eol); @@ -605,12 +618,12 @@ sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); g_free(construct); } - else if (! strncmp("for", buf + 4, 3)) + else if (! strncmp("for", buf + 12, 3)) { gchar *var; gint contruct_len; - if (! isspace(*(buf + 3))) goto free_and_return; + if (! isspace(*(buf + 11))) goto free_and_return; if (doc_list[idx].file_type->id == GEANY_FILETYPES_PHP) { @@ -634,9 +647,9 @@ g_free(var); g_free(construct); } - else if (! strncmp("while", buf + 2, 5)) + else if (! strncmp("while", buf + 10, 5)) { - if (! isspace(*buf + 1)) goto free_and_return; + if (! isspace(*buf + 9)) goto free_and_return; construct = g_strdup_printf("()%s{%s\t%s}%s", eol, eol, eol, eol); @@ -644,9 +657,9 @@ sci_goto_pos(sci, pos + 1, TRUE); g_free(construct); } - else if (! strncmp("do", buf + 5, 2)) + else if (! strncmp("do", buf + 13, 2)) { - if (! isspace(*(buf + 4))) goto free_and_return; + if (! isspace(*(buf + 12))) goto free_and_return; construct = g_strdup_printf("%s{%s\t%s}%swhile ();%s", eol, eol, eol, eol, eol); @@ -654,9 +667,9 @@ sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); g_free(construct); } - else if (! strncmp("try", buf + 4, 3)) + else if (! strncmp("try", buf + 12, 3)) { - if (! isspace(*(buf + 3))) goto free_and_return; + if (! isspace(*(buf + 11))) goto free_and_return; construct = g_strdup_printf("%s{%s\t%s}%scatch ()%s{%s\t%s}%s", eol, eol, eol, eol, eol, eol, eol, eol); @@ -665,9 +678,9 @@ sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); g_free(construct); } - else if (! strncmp("switch", buf + 1, 6)) + else if (! strncmp("switch", buf + 9, 6)) { - if (! isspace(*buf)) goto free_and_return; + if (! isspace(*buf + 8)) goto free_and_return; construct = g_strdup_printf("()%s{%s\tcase : break;%s\tdefault: %s}%s", eol, eol, eol, eol, eol); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

09 Jul '06

Revision: 544 Author: eht16 Date: 2006-07-09 07:41:53 -0700 (Sun, 09 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=544&view=rev Log Message: ----------- Added new filetype D(patch by Christop Berg, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/highlighting.h trunk/src/templates.c trunk/src/templates.h trunk/src/utils.c trunk/tagmanager/Makefile.am trunk/tagmanager/parsers.h Added Paths: ----------- trunk/data/filetypes.d trunk/tagmanager/d.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/ChangeLog 2006-07-09 14:41:53 UTC (rev 544) @@ -1,3 +1,11 @@ +2006-07-09 Enrico Tröger <enrico.troeger(a)uvena.de> + + * tagmanager/d.c, tagmanager/Makefile.am, tagmanager/parsers.h, + src/filetypes.c, src/highlighting.c, src/utils.c, src/build.c, + src/templates.c, data/filetypes.d: + Added new filetype D(patch by Christop Berg, thanks). + + 2006-07-08 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/keyfile.c: Fix saving the terminal tool on quitting. Added: trunk/data/filetypes.d =================================================================== --- trunk/data/filetypes.d (rev 0) +++ trunk/data/filetypes.d 2006-07-09 14:41:53 UTC (rev 544) @@ -0,0 +1,67 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +comment=0x0000ff;0xffffff;false;false +commentline=0x0000ff;0xffffff;false;false +commentdoc=0x0000ff;0xffffff;false;false +number=0x007f00;0xffffff;false;false +word=0x991111;0xffffff;true;false +word2=0x00007F;0xffffff;true;false +string=0x1E90FF;0xffffff;false;false +character=0x1E90FF;0xffffff;false;false +uuid=0x804040;0xffffff;false;false +preprocessor=0x7F7F00;0xffffff;false;false +operator=0x101030;0xffffff;false;false +identifier=0x100000;0xffffff;false;false +stringeol=0x000000;0xe0c0e0;false;false +verbatim=0x101030;0xffffff;false;false +regex=0x905010;0xffffff;false;false +commentlinedoc=0x0000ff;0xffffff;true;false +commentdockeyword=0x0000ff;0xffffff;true;true +globalclass=0xbb1111;0xffffff;true;false +# 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 + +[keywords] +# all items must be in one line +primary=__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate delete deprecated do double else enum export extern false final finally float for foreach function goto idouble if ifloat import in inout int interface invariant ireal is long mixin module new null out override package pragma private protected public real return scope short static struct super switch synchronized template this throw true try typedef typeof ubyte ucent uint ulong union unittest ushort version void volatile wchar while with +docComment=TODO FIXME + +[settings] +# the following characters are these which a "word" can contains, see documentation +wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=// +comment_close= +# this is an alternative way, so multiline comments are used +#comment_open=/* +#comment_close=*/ +# this is alternative way, so multiline comments are used +#comment_open=/+ +#comment_close=+/ + +# set to false if a comment character/string should start a column 0 of a line, true uses any +# indention of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=dmd -w -c "%f" +# the -of option is automatically added by Geany +linker=dmd -w "%f" +# you can also use the gdc compiler, please use the "gdmd" wrapper script(included with gdc) +#compiler=gdmd -w -c "%f" +#linker=gdmd -w "%f" + +run_cmd="./%e" + + Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/src/build.c 2006-07-09 14:41:53 UTC (rev 544) @@ -209,12 +209,26 @@ } } - argv = g_new0(gchar *, 4); - argv[0] = g_strdup(doc_list[idx].file_type->programs->linker); - argv[1] = g_strdup("-o"); - argv[2] = g_path_get_basename(executable); - argv[3] = NULL; + if (doc_list[idx].file_type->id == GEANY_FILETYPES_D) + { // the dmd compiler needs -of instead of -o and it accepts no whitespace after -of + gchar *tmp = g_path_get_basename(executable); + argv = g_new0(gchar *, 3); + argv[0] = g_strdup(doc_list[idx].file_type->programs->linker); + argv[1] = g_strconcat("-of", tmp, NULL); + argv[2] = NULL; + + g_free(tmp); + } + else + { + argv = g_new0(gchar *, 4); + argv[0] = g_strdup(doc_list[idx].file_type->programs->linker); + argv[1] = g_strdup("-o"); + argv[2] = g_path_get_basename(executable); + argv[3] = NULL; + } + g_free(executable); g_free(object_file); g_free(locale_filename); Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/src/filetypes.c 2006-07-09 14:41:53 UTC (rev 544) @@ -432,6 +432,25 @@ filetypes_init_build_programs(filetypes[GEANY_FILETYPES_TCL]); filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_TCL]->title, filetypes[GEANY_FILETYPES_TCL]); +#define D + filetypes[GEANY_FILETYPES_D] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_D]->id = GEANY_FILETYPES_D; + filetypes[GEANY_FILETYPES_D]->lang = 17; + filetypes[GEANY_FILETYPES_D]->name = g_strdup("D"); + filetypes[GEANY_FILETYPES_D]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_D]->title = g_strdup(_("D source file")); + filetypes[GEANY_FILETYPES_D]->extension = g_strdup("d"); + filetypes[GEANY_FILETYPES_D]->pattern = g_new0(gchar*, 3); + filetypes[GEANY_FILETYPES_D]->pattern[0] = g_strdup("*.d"); + filetypes[GEANY_FILETYPES_D]->pattern[1] = g_strdup("*.di"); + filetypes[GEANY_FILETYPES_D]->pattern[2] = NULL; + filetypes[GEANY_FILETYPES_D]->comment_open = g_strdup("//"); + filetypes[GEANY_FILETYPES_D]->comment_close = NULL; + filetypes[GEANY_FILETYPES_D]->style_func_ptr = styleset_d; + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_D]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_D]->title, filetypes[GEANY_FILETYPES_D]); + filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_D]->title, filetypes[GEANY_FILETYPES_D]); + #define ALL filetypes[GEANY_FILETYPES_ALL] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_ALL]->id = GEANY_FILETYPES_ALL; @@ -587,6 +606,8 @@ return templates_get_template_generic(GEANY_TEMPLATE_FILETYPE_PASCAL); break; case GEANY_FILETYPES_RUBY: return templates_get_template_generic(GEANY_TEMPLATE_FILETYPE_RUBY); break; + case GEANY_FILETYPES_D: + return templates_get_template_generic(GEANY_TEMPLATE_FILETYPE_D); break; default: return NULL; } } Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/src/filetypes.h 2006-07-09 14:41:53 UTC (rev 544) @@ -47,8 +47,9 @@ GEANY_FILETYPES_OMS, // 17 GEANY_FILETYPES_RUBY, // 18 GEANY_FILETYPES_TCL, // 19 - GEANY_FILETYPES_ALL, // 20 - GEANY_MAX_FILE_TYPES // 21 + GEANY_FILETYPES_D, // 20 + GEANY_FILETYPES_ALL, // 21 + GEANY_MAX_FILE_TYPES // 22 }; struct build_menu_items Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/src/highlighting.c 2006-07-09 14:41:53 UTC (rev 544) @@ -2246,5 +2246,125 @@ SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } +static void styleset_d_init(void) +{ + GKeyFile *config = g_key_file_new(); + GKeyFile *config_home = g_key_file_new(); + gchar *f = g_strconcat(app->configdir, G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S, "filetypes.d", NULL); + styleset_load_file(config, GEANY_DATA_DIR G_DIR_SEPARATOR_S "filetypes.d", G_KEY_FILE_KEEP_COMMENTS, NULL); + g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL); + types[GEANY_FILETYPES_D] = g_new(style_set, 1); + styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[0]); + styleset_get_hex(config, config_home, "styling", "comment", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[1]); + styleset_get_hex(config, config_home, "styling", "commentline", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[2]); + styleset_get_hex(config, config_home, "styling", "commentdoc", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[3]); + styleset_get_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[4]); + styleset_get_hex(config, config_home, "styling", "word", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_D]->styling[5]); + styleset_get_hex(config, config_home, "styling", "word2", "0x00007F", "0xffffff", "true", types[GEANY_FILETYPES_D]->styling[6]); + styleset_get_hex(config, config_home, "styling", "string", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[7]); + styleset_get_hex(config, config_home, "styling", "character", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[8]); + styleset_get_hex(config, config_home, "styling", "uuid", "0x804040", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[9]); + styleset_get_hex(config, config_home, "styling", "preprocessor", "0x7F7F00", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[10]); + styleset_get_hex(config, config_home, "styling", "operator", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[11]); + styleset_get_hex(config, config_home, "styling", "identifier", "0x100000", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[12]); + styleset_get_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", types[GEANY_FILETYPES_D]->styling[13]); + styleset_get_hex(config, config_home, "styling", "verbatim", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[14]); + styleset_get_hex(config, config_home, "styling", "regex", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_D]->styling[15]); + styleset_get_hex(config, config_home, "styling", "commentlinedoc", "0x0000ff", "0xffffff", "true", types[GEANY_FILETYPES_D]->styling[16]); + styleset_get_hex(config, config_home, "styling", "commentdockeyword", "0x0000ff", "0xffffff", "true", types[GEANY_FILETYPES_D]->styling[17]); + styleset_get_hex(config, config_home, "styling", "globalclass", "0xbb1111", "0xffffff", "true", types[GEANY_FILETYPES_D]->styling[18]); + styleset_get_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, types[GEANY_FILETYPES_D]->styling[19]); + + types[GEANY_FILETYPES_D]->keywords = g_new(gchar*, 3); + styleset_get_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_D, 0, "__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate delete deprecated do double else enum export extern false final finally float for foreach function goto idouble if ifloat import in inout int interface invariant ireal is long mixin module new null out override package pragma private protected public real return scope short static struct super switch synchronized template this throw true try typedef typeof ubyte ucent uint ulong union unittest ushort version void volatile wchar while with"); + styleset_get_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_D, 1, "TODO FIXME"); + types[GEANY_FILETYPES_D]->keywords[2] = NULL; + + styleset_get_wordchars(config, config_home, GEANY_FILETYPES_D, GEANY_WORDCHARS); + filetypes_get_config(config, config_home, GEANY_FILETYPES_D); + + g_key_file_free(config); + g_key_file_free(config_home); + g_free(f); + + // load global tags file for C autocompletion + if (! app->ignore_global_tags && ! global_c_tags_loaded) + { + // 0 is the langType used in TagManager (see the table in tagmanager/parsers.h) + // C++ is a special case, here we use 0 to have C global tags in C++, too + tm_workspace_load_global_tags(GEANY_DATA_DIR G_DIR_SEPARATOR_S "global.tags", 0); + global_c_tags_loaded = TRUE; + } +} + + +void styleset_d(ScintillaObject *sci) +{ + if (types[GEANY_FILETYPES_D] == NULL) styleset_d_init(); + + styleset_common(sci, 5); + + + /* Assign global keywords */ + if ((app->tm_workspace) && (app->tm_workspace->global_tags)) + { + guint j; + GPtrArray *g_typedefs = tm_tags_extract(app->tm_workspace->global_tags, tm_tag_typedef_t | tm_tag_struct_t | tm_tag_class_t); + if ((g_typedefs) && (g_typedefs->len > 0)) + { + GString *s = g_string_sized_new(g_typedefs->len * 10); + for (j = 0; j < g_typedefs->len; ++j) + { + if (!(TM_TAG(g_typedefs->pdata[j])->atts.entry.scope)) + { + g_string_append(s, TM_TAG(g_typedefs->pdata[j])->name); + g_string_append_c(s, ' '); + } + } + SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) s->str); + g_string_free(s, TRUE); + } + g_ptr_array_free(g_typedefs, TRUE); + } + + SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) types[GEANY_FILETYPES_D]->wordchars); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, 8, 0); + + SSM(sci, SCI_SETLEXER, SCLEX_CPP, 0); + + //SSM(sci, SCI_SETCONTROLCHARSYMBOL, 32, 0); + + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) types[GEANY_FILETYPES_D]->keywords[0]); + SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) types[GEANY_FILETYPES_D]->keywords[1]); + + styleset_set_style(sci, SCE_C_DEFAULT, GEANY_FILETYPES_D, 0); + styleset_set_style(sci, SCE_C_COMMENT, GEANY_FILETYPES_D, 1); + styleset_set_style(sci, SCE_C_COMMENTLINE, GEANY_FILETYPES_D, 2); + styleset_set_style(sci, SCE_C_COMMENTDOC, GEANY_FILETYPES_D, 3); + styleset_set_style(sci, SCE_C_NUMBER, GEANY_FILETYPES_D, 4); + styleset_set_style(sci, SCE_C_WORD, GEANY_FILETYPES_D, 5); + styleset_set_style(sci, SCE_C_WORD2, GEANY_FILETYPES_D, 6); + styleset_set_style(sci, SCE_C_STRING, GEANY_FILETYPES_D, 7); + styleset_set_style(sci, SCE_C_CHARACTER, GEANY_FILETYPES_D, 8); + styleset_set_style(sci, SCE_C_UUID, GEANY_FILETYPES_D, 9); + styleset_set_style(sci, SCE_C_PREPROCESSOR, GEANY_FILETYPES_D, 10); + styleset_set_style(sci, SCE_C_OPERATOR, GEANY_FILETYPES_D, 11); + styleset_set_style(sci, SCE_C_IDENTIFIER, GEANY_FILETYPES_D, 12); + styleset_set_style(sci, SCE_C_STRINGEOL, GEANY_FILETYPES_D, 13); + styleset_set_style(sci, SCE_C_VERBATIM, GEANY_FILETYPES_D, 14); + styleset_set_style(sci, SCE_C_REGEX, GEANY_FILETYPES_D, 15); + styleset_set_style(sci, SCE_C_COMMENTLINEDOC, GEANY_FILETYPES_D, 16); + styleset_set_style(sci, SCE_C_COMMENTDOCKEYWORD, GEANY_FILETYPES_D, 17); + + SSM(sci, SCI_STYLESETFORE, SCE_C_COMMENTDOCKEYWORDERROR, invert(0x0000ff)); + SSM(sci, SCI_STYLESETBACK, SCE_C_COMMENTDOCKEYWORDERROR, invert(0xffffff)); + SSM(sci, SCI_STYLESETITALIC, SCE_C_COMMENTDOCKEYWORDERROR, TRUE); + + // is used for local structs and typedefs + styleset_set_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_D, 18); + + SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); +} + Modified: trunk/src/highlighting.h =================================================================== --- trunk/src/highlighting.h 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/src/highlighting.h 2006-07-09 14:41:53 UTC (rev 544) @@ -81,4 +81,6 @@ void styleset_tcl(ScintillaObject *sci); +void styleset_d(ScintillaObject *sci); + #endif Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/src/templates.c 2006-07-09 14:41:53 UTC (rev 544) @@ -58,6 +58,7 @@ gchar *template_filename_filetype_none = templates_get_filename("template.filetype.none"); gchar *template_filename_filetype_c = templates_get_filename("template.filetype.c"); gchar *template_filename_filetype_cpp = templates_get_filename("template.filetype.cpp"); + gchar *template_filename_filetype_d = templates_get_filename("template.filetype.d"); gchar *template_filename_filetype_java = templates_get_filename("template.filetype.java"); gchar *template_filename_filetype_pascal = templates_get_filename("template.filetype.pascal"); gchar *template_filename_filetype_php = templates_get_filename("template.filetype.php"); @@ -86,6 +87,7 @@ templates_create_file(template_filename_filetype_none, templates_filetype_none); templates_create_file(template_filename_filetype_c, templates_filetype_c); templates_create_file(template_filename_filetype_cpp, templates_filetype_cpp); + templates_create_file(template_filename_filetype_d, templates_filetype_d); templates_create_file(template_filename_filetype_java, templates_filetype_java); templates_create_file(template_filename_filetype_pascal, templates_filetype_pascal); templates_create_file(template_filename_filetype_php, templates_filetype_php); @@ -138,6 +140,9 @@ templates_read_file(template_filename_filetype_c, &templates[GEANY_TEMPLATE_FILETYPE_C]); templates[GEANY_TEMPLATE_FILETYPE_C] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_C], year, date); + templates_read_file(template_filename_filetype_d, &templates[GEANY_TEMPLATE_FILETYPE_D]); + templates[GEANY_TEMPLATE_FILETYPE_D] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_D], year, date); + templates_read_file(template_filename_filetype_cpp, &templates[GEANY_TEMPLATE_FILETYPE_CPP]); templates[GEANY_TEMPLATE_FILETYPE_CPP] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_CPP], year, date); @@ -173,6 +178,7 @@ g_free(template_filename_filetype_none); g_free(template_filename_filetype_c); g_free(template_filename_filetype_cpp); + g_free(template_filename_filetype_d); g_free(template_filename_filetype_java); g_free(template_filename_filetype_php); g_free(template_filename_filetype_pascal); Modified: trunk/src/templates.h =================================================================== --- trunk/src/templates.h 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/src/templates.h 2006-07-09 14:41:53 UTC (rev 544) @@ -62,6 +62,7 @@ GEANY_TEMPLATE_FILETYPE_PHP, GEANY_TEMPLATE_FILETYPE_PASCAL, GEANY_TEMPLATE_FILETYPE_RUBY, + GEANY_TEMPLATE_FILETYPE_D, GEANY_MAX_TEMPLATES }; @@ -207,6 +208,16 @@ }\n\ "; +static const gchar templates_filetype_d[] = "\n\ +import std.stdio;\n\ +\n\ +int main(char[][] args)\n\ +{\n\ +\n\ + return 0;\n\ +}\n\ +"; + static const gchar templates_filetype_php[] = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n\ \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n\ <html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n\ Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/src/utils.c 2006-07-09 14:41:53 UTC (rev 544) @@ -2436,13 +2436,21 @@ case GEANY_FILETYPES_PASCAL: { // bandit.pas(149,3) Fatal: Syntax error, ";" expected but "ELSE" found - // still untested with other files than the opened pattern = "("; field_min_len = 2; field_idx_line = 1; field_idx_file = 0; break; } + case GEANY_FILETYPES_D: + { + // warning - pi.d(118): implicit conversion of expression (digit) of type int ... + pattern = " ("; + field_min_len = 4; + field_idx_line = 3; + field_idx_file = 2; + break; + } default: return; } Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/tagmanager/Makefile.am 2006-07-09 14:41:53 UTC (rev 544) @@ -27,6 +27,7 @@ args.c\ args.h\ c.c\ + d.c\ conf.c\ css.c\ docbook.c\ Added: trunk/tagmanager/d.c =================================================================== --- trunk/tagmanager/d.c (rev 0) +++ trunk/tagmanager/d.c 2006-07-09 14:41:53 UTC (rev 544) @@ -0,0 +1,2303 @@ +/* +* +* Copyright (c) 1996-2001, Darren Hiebert +* Copyright (c) 2006, Enrico Tröger +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* This module contains functions for parsing and scanning D source files(based on c.c). +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <string.h> +#include <setjmp.h> +//#include <glib.h> + +#include "entry.h" +#include "get.h" +#include "keyword.h" +#include "main.h" +#include "parse.h" +#include "read.h" +#include "options.h" + +/* +* MACROS +*/ +#define MaxFields 6 + +#define stringValue(a) #a +#define activeToken(st) ((st)->token [(int) (st)->tokenIndex]) +#define parentDecl(st) ((st)->parent == NULL ? \ + DECL_NONE : (st)->parent->declaration) +#define isType(token,t) (boolean) ((token)->type == (t)) +#define insideEnumBody(st) (boolean) ((st)->parent == NULL ? FALSE : \ + ((st)->parent->declaration == DECL_ENUM)) +#define isExternCDecl(st,c) (boolean) ((c) == STRING_SYMBOL && \ + ! (st)->haveQualifyingName && (st)->scope == SCOPE_EXTERN) + +#define isOneOf(c,s) (boolean) (strchr ((s), (c)) != NULL) + +/* +* DATA DECLARATIONS +*/ + +enum { NumTokens = 3 }; + +typedef enum eException { + ExceptionNone, ExceptionEOF, ExceptionFormattingError, + ExceptionBraceFormattingError +} exception_t; + +/* Used to specify type of keyword. + */ +typedef enum eKeywordId { + KEYWORD_NONE, + KEYWORD_ATTRIBUTE, KEYWORD_ABSTRACT, + KEYWORD_BOOLEAN, KEYWORD_BYTE, + KEYWORD_CATCH, KEYWORD_CHAR, KEYWORD_CLASS, KEYWORD_CONST, + KEYWORD_DOUBLE, + KEYWORD_ENUM, KEYWORD_EXPLICIT, KEYWORD_EXTERN, KEYWORD_EXTENDS, + KEYWORD_FINAL, KEYWORD_FLOAT, KEYWORD_FRIEND, + KEYWORD_IMPLEMENTS, KEYWORD_IMPORT, KEYWORD_INLINE, KEYWORD_INT, + KEYWORD_INTERFACE, + KEYWORD_LONG, + KEYWORD_MUTABLE, + KEYWORD_NAMESPACE, KEYWORD_NEW, KEYWORD_NATIVE, + KEYWORD_OPERATOR, KEYWORD_OVERLOAD, + KEYWORD_PACKAGE, KEYWORD_PRIVATE, KEYWORD_PROTECTED, KEYWORD_PUBLIC, + KEYWORD_REGISTER, + KEYWORD_SHORT, KEYWORD_SIGNED, KEYWORD_STATIC, KEYWORD_STRUCT, + KEYWORD_SYNCHRONIZED, + KEYWORD_TEMPLATE, KEYWORD_THROW, KEYWORD_THROWS, KEYWORD_TRANSIENT, + KEYWORD_TRY, KEYWORD_TYPEDEF, KEYWORD_TYPENAME, + KEYWORD_UNION, KEYWORD_UNSIGNED, KEYWORD_USING, + KEYWORD_VIRTUAL, KEYWORD_VOID, KEYWORD_VOLATILE, + KEYWORD_WCHAR_T +} keywordId; + +/* Used to determine whether keyword is valid for the current language and + * what its ID is. + */ +typedef struct sKeywordDesc { + const char *name; + keywordId id; + short isValid [3]; /* indicates languages for which kw is valid */ +} keywordDesc; + +/* Used for reporting the type of object parsed by nextToken (). + */ +typedef enum eTokenType { + TOKEN_NONE, /* none */ + TOKEN_ARGS, /* a parenthetical pair and its contents */ + TOKEN_BRACE_CLOSE, + TOKEN_BRACE_OPEN, + TOKEN_COMMA, /* the comma character */ + TOKEN_DOUBLE_COLON, /* double colon indicates nested-name-specifier */ + TOKEN_KEYWORD, + TOKEN_NAME, /* an unknown name */ + TOKEN_PACKAGE, /* a Java package name */ + TOKEN_PAREN_NAME, /* a single name in parentheses */ + TOKEN_SEMICOLON, /* the semicolon character */ + TOKEN_SPEC, /* a storage class specifier, qualifier, type, etc. */ + TOKEN_COUNT +} tokenType; + +/* This describes the scoping of the current statement. + */ +typedef enum eTagScope { + SCOPE_GLOBAL, /* no storage class specified */ + SCOPE_STATIC, /* static storage class */ + SCOPE_EXTERN, /* external storage class */ + SCOPE_FRIEND, /* declares access only */ + SCOPE_TYPEDEF, /* scoping depends upon context */ + SCOPE_COUNT +} tagScope; + +typedef enum eDeclaration { + DECL_NONE, + DECL_BASE, /* base type (default) */ + DECL_CLASS, + DECL_ENUM, + DECL_FUNCTION, + DECL_IGNORE, /* non-taggable "declaration" */ + DECL_INTERFACE, + DECL_NAMESPACE, + DECL_NOMANGLE, /* C++ name demangling block */ + DECL_PACKAGE, + DECL_STRUCT, + DECL_UNION, + DECL_COUNT +} declType; + +typedef enum eVisibilityType { + ACCESS_UNDEFINED, + ACCESS_PRIVATE, + ACCESS_PROTECTED, + ACCESS_PUBLIC, + ACCESS_COUNT +} accessType; + +/* Information about the parent class of a member (if any). + */ +typedef struct sMemberInfo { + accessType access; /* access of current statement */ + accessType accessDefault; /* access default for current statement */ +} memberInfo; + +typedef struct sTokenInfo { + tokenType type; + keywordId keyword; + vString* name; /* the name of the token */ + unsigned long lineNumber; /* line number of tag */ + fpos_t filePosition; /* file position of line containing name */ +} tokenInfo; + + +typedef enum eImplementation { + IMP_DEFAULT, + IMP_ABSTRACT, + IMP_VIRTUAL, + IMP_PURE_VIRTUAL, + IMP_COUNT +} impType; + +/* Describes the statement currently undergoing analysis. + */ +typedef struct sStatementInfo { + tagScope scope; + declType declaration; /* specifier associated with TOKEN_SPEC */ + boolean gotName; /* was a name parsed yet? */ + boolean haveQualifyingName; /* do we have a name we are considering? */ + boolean gotParenName; /* was a name inside parentheses parsed yet? */ + boolean gotArgs; /* was a list of parameters parsed yet? */ + boolean isPointer; /* is 'name' a pointer? */ + impType implementation; /* abstract or concrete implementation? */ + unsigned int tokenIndex; /* currently active token */ + tokenInfo* token [(int) NumTokens]; + tokenInfo* context; /* accumulated scope of current statement */ + tokenInfo* blockName; /* name of current block */ + memberInfo member; /* information regarding parent class/struct */ + vString* parentClasses; /* parent classes */ + struct sStatementInfo *parent; /* statement we are nested within */ + long argEndPosition; /* Position where argument list ended */ + tokenInfo* firstToken; /* First token in the statement */ +} statementInfo; + +/* Describes the type of tag being generated. + */ +typedef enum eTagType { + TAG_UNDEFINED, + TAG_CLASS, /* class name */ + TAG_ENUM, /* enumeration name */ + TAG_ENUMERATOR, /* enumerator (enumeration value) */ + TAG_FIELD, /* field (Java) */ + TAG_FUNCTION, /* function definition */ + TAG_INTERFACE, /* interface declaration */ + TAG_MEMBER, /* structure, class or interface member */ + TAG_METHOD, /* method declaration */ + TAG_NAMESPACE, /* namespace name */ + TAG_PACKAGE, /* package name */ + TAG_PROTOTYPE, /* function prototype or declaration */ + TAG_STRUCT, /* structure name */ + TAG_TYPEDEF, /* typedef name */ + TAG_UNION, /* union name */ + TAG_VARIABLE, /* variable definition */ + TAG_EXTERN_VAR, /* external variable declaration */ + TAG_MACRO, /* #define s */ + TAG_COUNT /* must be last */ +} tagType; + +typedef struct sParenInfo { + boolean isPointer; + boolean isParamList; + boolean isKnrParamList; + boolean isNameCandidate; + boolean invalidContents; + boolean nestedArgs; + unsigned int parameterCount; +} parenInfo; + +/* +* DATA DEFINITIONS +*/ + +static jmp_buf Exception; + +static langType Lang_d; + +/* Used to index into the DKinds table. */ +typedef enum { + CK_UNDEFINED = -1, + CK_CLASS, CK_DEFINE, CK_ENUMERATOR, CK_FUNCTION, + CK_ENUMERATION, CK_MEMBER, CK_NAMESPACE, CK_PROTOTYPE, + CK_STRUCT, CK_TYPEDEF, CK_UNION, CK_VARIABLE, + CK_EXTERN_VARIABLE +} cKind; + +static kindOption DKinds [] = { + { TRUE, 'c', "class", "classes"}, + { TRUE, 'd', "macro", "macro definitions"}, + { TRUE, 'e', "enumerator", "enumerators (values inside an enumeration)"}, + { TRUE, 'f', "function", "function definitions"}, + { TRUE, 'g', "enum", "enumeration names"}, + { TRUE, 'm', "member", "class, struct, and union members"}, + { TRUE, 'n', "namespace", "namespaces"}, + { FALSE, 'p', "prototype", "function prototypes"}, + { TRUE, 's', "struct", "structure names"}, + { TRUE, 't', "typedef", "typedefs"}, + { TRUE, 'u', "union", "union names"}, + { TRUE, 'v', "variable", "variable definitions"}, + { FALSE, 'x', "externvar", "external variable declarations"}, +}; + +static const keywordDesc KeywordTable [] = { + /* C++ */ + /* ANSI C | Java */ + /* keyword keyword ID \ | / */ + { "__attribute__", KEYWORD_ATTRIBUTE, { 1, 1, 0 } }, + { "abstract", KEYWORD_ABSTRACT, { 0, 0, 1 } }, + { "boolean", KEYWORD_BOOLEAN, { 0, 0, 1 } }, + { "byte", KEYWORD_BYTE, { 0, 0, 1 } }, + { "catch", KEYWORD_CATCH, { 0, 1, 0 } }, + { "char", KEYWORD_CHAR, { 1, 1, 1 } }, + { "class", KEYWORD_CLASS, { 0, 1, 1 } }, + { "const", KEYWORD_CONST, { 1, 1, 1 } }, + { "double", KEYWORD_DOUBLE, { 1, 1, 1 } }, + { "enum", KEYWORD_ENUM, { 1, 1, 0 } }, + { "explicit", KEYWORD_EXPLICIT, { 0, 1, 0 } }, + { "extends", KEYWORD_EXTENDS, { 0, 0, 1 } }, + { "extern", KEYWORD_EXTERN, { 1, 1, 0 } }, + { "final", KEYWORD_FINAL, { 0, 0, 1 } }, + { "float", KEYWORD_FLOAT, { 1, 1, 1 } }, + { "friend", KEYWORD_FRIEND, { 0, 1, 0 } }, + { "implements", KEYWORD_IMPLEMENTS, { 0, 0, 1 } }, + { "import", KEYWORD_IMPORT, { 0, 0, 1 } }, + { "inline", KEYWORD_INLINE, { 0, 1, 0 } }, + { "int", KEYWORD_INT, { 1, 1, 1 } }, + { "interface", KEYWORD_INTERFACE, { 0, 0, 1 } }, + { "long", KEYWORD_LONG, { 1, 1, 1 } }, + { "mutable", KEYWORD_MUTABLE, { 0, 1, 0 } }, + { "namespace", KEYWORD_NAMESPACE, { 0, 1, 0 } }, + { "native", KEYWORD_NATIVE, { 0, 0, 1 } }, + { "new", KEYWORD_NEW, { 0, 1, 1 } }, + { "operator", KEYWORD_OPERATOR, { 0, 1, 0 } }, + { "overload", KEYWORD_OVERLOAD, { 0, 1, 0 } }, + { "package", KEYWORD_PACKAGE, { 0, 0, 1 } }, + { "private", KEYWORD_PRIVATE, { 0, 1, 1 } }, + { "protected", KEYWORD_PROTECTED, { 0, 1, 1 } }, + { "public", KEYWORD_PUBLIC, { 0, 1, 1 } }, + { "register", KEYWORD_REGISTER, { 1, 1, 0 } }, + { "short", KEYWORD_SHORT, { 1, 1, 1 } }, + { "signed", KEYWORD_SIGNED, { 1, 1, 0 } }, + { "static", KEYWORD_STATIC, { 1, 1, 1 } }, + { "struct", KEYWORD_STRUCT, { 1, 1, 0 } }, + { "synchronized", KEYWORD_SYNCHRONIZED, { 0, 0, 1 } }, + { "template", KEYWORD_TEMPLATE, { 0, 1, 0 } }, + { "throw", KEYWORD_THROW, { 0, 1, 1 } }, + { "throws", KEYWORD_THROWS, { 0, 0, 1 } }, + { "transient", KEYWORD_TRANSIENT, { 0, 0, 1 } }, + { "try", KEYWORD_TRY, { 0, 1, 0 } }, + { "typedef", KEYWORD_TYPEDEF, { 1, 1, 0 } }, + { "typename", KEYWORD_TYPENAME, { 0, 1, 0 } }, + { "union", KEYWORD_UNION, { 1, 1, 0 } }, + { "unsigned", KEYWORD_UNSIGNED, { 1, 1, 0 } }, + { "using", KEYWORD_USING, { 0, 1, 0 } }, + { "virtual", KEYWORD_VIRTUAL, { 0, 1, 0 } }, + { "void", KEYWORD_VOID, { 1, 1, 1 } }, + { "volatile", KEYWORD_VOLATILE, { 1, 1, 1 } }, + { "wchar_t", KEYWORD_WCHAR_T, { 1, 1, 0 } } +}; + +/* +* FUNCTION PROTOTYPES +*/ +static void createTags (const unsigned int nestLevel, statementInfo *const parent); + +/* +* FUNCTION DEFINITIONS +*/ + +/* Debugging functions added by Biswa */ +#if DEBUG_C +static char *tokenTypeName[] = { + "none", "args", "'}'", "'{'", "','", "'::'", "keyword", "name", + "package", "paren-name", "';'", "spec", "count" +}; + +static char *tagScopeNames[] = { + "global", "static", "extern", "friend", "typedef", "count"}; + +static char *declTypeNames[] = { + "none", "base", "class", "enum", "function", "ignore", "interface", + "namespace", "nomangle", "package", "struct", "union", "count"}; + +static char *impTypeNames[] = { + "default", "abstract", "virtual", "pure-virtual", "count"}; + +void printToken(const tokenInfo *const token) +{ + fprintf(stderr, "Type: %s, Keyword: %d, name: %s\n", tokenTypeName[token->type], + token->keyword, vStringValue(token->name)); +} + +void printTagEntry(const tagEntryInfo *tag) +{ + fprintf(stderr, "Tag: %s (%s) [ impl: %s, scope: %s, type: %s\n", tag->name, + tag->kindName, tag->extensionFields.implementation, tag->extensionFields.scope[1], + tag->extensionFields.varType); +} + +void printStatement(const statementInfo *const statement) +{ + int i; + statementInfo *st = (statementInfo *) statement; + while (NULL != st) + { + fprintf(stderr, "Statement Info:\n------------------------\n"); + fprintf(stderr, "scope: %s, decl: %s, impl: %s\n", tagScopeNames[st->scope] + , declTypeNames[st->declaration], impTypeNames[st->implementation]); + for (i=0; i < NumTokens; ++i) + { + fprintf(stderr, "Token %d %s: ", i, (i == st->tokenIndex)?"(current)":""); + printToken(st->token[i]); + } + fprintf(stderr, "Context: "); + printToken(st->context); + fprintf(stderr, "Block: "); + printToken(st->blockName); + fprintf(stderr, "Parent classes: %s\n", vStringValue(st->parentClasses)); + fprintf(stderr, "First token: "); + printToken(st->firstToken); + if (NULL != st->parent) + fprintf(stderr, "Printing Parent:\n"); + st = st->parent; + } + fprintf(stderr, "-----------------------------------------------\n"); +} +#endif + +/* Checks if the token is a base data type (int/log/float/void/etc) */ +static boolean isBaseDataType(const char *name) +{ + return (boolean) ((0 == strcmp(name, "int")) || (0 == strcmp(name, "char")) || + (0 == strcmp(name, "long")) || (0 == strcmp(name, "float")) || + (0 == strcmp(name, "double")) || (0 == strcmp(name, "short")) || + (0 == strcmp(name, "void")) || (0 == strcmp(name, "bool"))); +} + +/*extern boolean includingDefineTags (void) +{ + return DKinds [CK_DEFINE].enabled; +} +*/ +/* +* Token management +*/ + +static void initToken (tokenInfo* const token) +{ + token->type = TOKEN_NONE; + token->keyword = KEYWORD_NONE; + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + vStringClear (token->name); +} + +static void advanceToken (statementInfo* const st) +{ + if (st->tokenIndex >= (unsigned int) NumTokens - 1) + st->tokenIndex = 0; + else + ++st->tokenIndex; + initToken (st->token [st->tokenIndex]); +} + +static tokenInfo *prevToken (const statementInfo *const st, unsigned int n) +{ + unsigned int tokenIndex; + unsigned int num = (unsigned int) NumTokens; + Assert (n < num); + tokenIndex = (st->tokenIndex + num - n) % num; + return st->token [tokenIndex]; +} + +static void setToken (statementInfo *const st, const tokenType type) +{ + tokenInfo *token; + token = activeToken (st); + initToken (token); + token->type = type; +} + +static void retardToken (statementInfo *const st) +{ + if (st->tokenIndex == 0) + st->tokenIndex = (unsigned int) NumTokens - 1; + else + --st->tokenIndex; + setToken (st, TOKEN_NONE); +} + +static tokenInfo *newToken (void) +{ + tokenInfo *const token = xMalloc (1, tokenInfo); + token->name = vStringNew (); + initToken (token); + return token; +} + +static void deleteToken (tokenInfo *const token) +{ + if (token != NULL) + { + vStringDelete (token->name); + eFree (token); + } +} + +static const char *accessString (const accessType access) +{ + static const char *const names [] ={ + "?", "private", "protected", "public", "default" + }; + Assert (sizeof (names) / sizeof (names [0]) == ACCESS_COUNT); + Assert ((int) access < ACCESS_COUNT); + return names [(int) access]; +} + +static const char *implementationString (const impType imp) +{ + static const char *const names [] ={ + "?", "abstract", "virtual", "pure virtual" + }; + Assert (sizeof (names) / sizeof (names [0]) == IMP_COUNT); + Assert ((int) imp < IMP_COUNT); + return names [(int) imp]; +} + +/* +* Debugging functions +*/ + +#ifdef TM_DEBUG + +#define boolString(c) ((c) ? "TRUE" : "FALSE") + +static const char *tokenString (const tokenType type) +{ + static const char *const names [] = { + "none", "args", "}", "{", "comma", "double colon", "keyword", "name", + "package", "paren-name", "semicolon", "specifier" + }; + Assert (sizeof (names) / sizeof (names [0]) == TOKEN_COUNT); + Assert ((int) type < TOKEN_COUNT); + return names [(int) type]; +} + +static const char *scopeString (const tagScope scope) +{ + static const char *const names [] = { + "global", "static", "extern", "friend", "typedef" + }; + Assert (sizeof (names) / sizeof (names [0]) == SCOPE_COUNT); + Assert ((int) scope < SCOPE_COUNT); + return names [(int) scope]; +} + +static const char *declString (const declType declaration) +{ + static const char *const names [] = { + "?", "base", "class", "enum", "function", "ignore", "interface", + "namespace", "no mangle", "package", "struct", "union", + }; + Assert (sizeof (names) / sizeof (names [0]) == DECL_COUNT); + Assert ((int) declaration < DECL_COUNT); + return names [(int) declaration]; +} + +static const char *keywordString (const keywordId keyword) +{ + const size_t count = sizeof (KeywordTable) / sizeof (KeywordTable [0]); + const char *name = "none"; + size_t i; + for (i = 0 ; i < count ; ++i) + { + const keywordDesc *p = &KeywordTable [i]; + + if (p->id == keyword) + { + name = p->name; + break; + } + } + return name; +} + +static void __unused__ pt (tokenInfo *const token) +{ + if (isType (token, TOKEN_NAME)) + printf ("type: %-12s: %-13s line: %lu\n", + tokenString (token->type), vStringValue (token->name), + token->lineNumber); + else if (isType (token, TOKEN_KEYWORD)) + printf ("type: %-12s: %-13s line: %lu\n", + tokenString (token->type), keywordString (token->keyword), + token->lineNumber); + else + printf ("type: %-12s line: %lu\n", + tokenString (token->type), token->lineNumber); +} + +static void __unused__ ps (statementInfo *const st) +{ + unsigned int i; + printf ("scope: %s decl: %s gotName: %s gotParenName: %s\n", + scopeString (st->scope), declString (st->declaration), + boolString (st->gotName), boolString (st->gotParenName)); + printf ("haveQualifyingName: %s\n", boolString (st->haveQualifyingName)); + printf ("access: %s default: %s\n", accessString (st->member.access), + accessString (st->member.accessDefault)); + printf ("token : "); + pt (activeToken (st)); + for (i = 1 ; i < (unsigned int) NumTokens ; ++i) + { + printf ("prev %u : ", i); + pt (prevToken (st, i)); + } + printf ("context: "); + pt (st->context); +} + +#endif + +/* +* Statement management +*/ + +static boolean isContextualKeyword (const tokenInfo *const token) +{ + boolean result; + switch (token->keyword) + { + case KEYWORD_CLASS: + case KEYWORD_ENUM: + case KEYWORD_INTERFACE: + case KEYWORD_NAMESPACE: + case KEYWORD_STRUCT: + case KEYWORD_UNION: + result = TRUE; + break; + + default: result = FALSE; break; + } + return result; +} + +static boolean isContextualStatement (const statementInfo *const st) +{ + boolean result = FALSE; + if (st != NULL) switch (st->declaration) + { + case DECL_CLASS: + case DECL_ENUM: + case DECL_INTERFACE: + case DECL_NAMESPACE: + case DECL_STRUCT: + case DECL_UNION: + result = TRUE; + break; + + default: result = FALSE; break; + } + return result; +} + +static boolean isMember (const statementInfo *const st) +{ + boolean result; + if (isType (st->context, TOKEN_NAME)) + result = TRUE; + else + result = isContextualStatement (st->parent); + return result; +} + +static void initMemberInfo (statementInfo *const st) +{ + accessType accessDefault = ACCESS_UNDEFINED; + + if (st->parent != NULL) switch (st->parent->declaration) + { + case DECL_ENUM: + case DECL_NAMESPACE: + case DECL_UNION: + accessDefault = ACCESS_UNDEFINED; + break; + + case DECL_CLASS: + accessDefault = ACCESS_PRIVATE; + break; + + case DECL_INTERFACE: + case DECL_STRUCT: + accessDefault = ACCESS_PUBLIC; + break; + + default: break; + } + st->member.accessDefault = accessDefault; + st->member.access = accessDefault; +} + +static void reinitStatement (statementInfo *const st, const boolean partial) +{ + unsigned int i; + + if (! partial) + { + st->scope = SCOPE_GLOBAL; + if (isContextualStatement (st->parent)) + st->declaration = DECL_BASE; + else + st->declaration = DECL_NONE; + } + st->gotParenName = FALSE; + st->isPointer = FALSE; + st->implementation = IMP_DEFAULT; + st->gotArgs = FALSE; + st->gotName = FALSE; + st->haveQualifyingName = FALSE; + st->tokenIndex = 0; + st->argEndPosition = 0; + + for (i = 0 ; i < (unsigned int) NumTokens ; ++i) + initToken (st->token [i]); + + initToken (st->context); + initToken (st->blockName); + vStringClear (st->parentClasses); + + /* Init member info. + */ + if (! partial) + st->member.access = st->member.accessDefault; + + /* Init first token */ + if (!partial) + initToken(st->firstToken); +} + +static void initStatement (statementInfo *const st, statementInfo *const parent) +{ + st->parent = parent; + initMemberInfo (st); + reinitStatement (st, FALSE); +} + +/* +* Tag generation functions +*/ +static cKind dTagKind (const tagType type) +{ + cKind result = CK_UNDEFINED; + switch (type) + { + case TAG_CLASS: result = CK_CLASS; break; + case TAG_ENUM: result = CK_ENUMERATION; break; + case TAG_ENUMERATOR: result = CK_ENUMERATOR; break; + case TAG_FUNCTION: result = CK_FUNCTION; break; + case TAG_MEMBER: result = CK_MEMBER; break; + case TAG_NAMESPACE: result = CK_NAMESPACE; break; + case TAG_PROTOTYPE: result = CK_PROTOTYPE; break; + case TAG_STRUCT: result = CK_STRUCT; break; + case TAG_TYPEDEF: result = CK_TYPEDEF; break; + case TAG_UNION: result = CK_UNION; break; + case TAG_VARIABLE: result = CK_VARIABLE; break; + case TAG_EXTERN_VAR: result = CK_EXTERN_VARIABLE; break; + + default: Assert ("Bad C tag type" == NULL); break; + } + return result; +} + +static const char *tagName (const tagType type) +{ + return DKinds [dTagKind (type)].name; +} + +static int tagLetter (const tagType type) +{ + return DKinds [dTagKind (type)].letter; +} + +/* +static boolean includeTag (const tagType type, const boolean isFileScope) +{ + boolean result; + if (isFileScope && ! Option.include.fileScope) + result = FALSE; + else if (isLanguage (Lang_java)) + result = JavaKinds [javaTagKind (type)].enabled; + else + result = CKinds [cTagKind (type)].enabled; + return result; +} +*/ + +static tagType declToTagType (const declType declaration) +{ + tagType type = TAG_UNDEFINED; + + switch (declaration) + { + case DECL_CLASS: type = TAG_CLASS; break; + case DECL_ENUM: type = TAG_ENUM; break; + case DECL_FUNCTION: type = TAG_FUNCTION; break; + case DECL_INTERFACE: type = TAG_INTERFACE; break; + case DECL_NAMESPACE: type = TAG_NAMESPACE; break; + case DECL_STRUCT: type = TAG_STRUCT; break; + case DECL_UNION: type = TAG_UNION; break; + + default: Assert ("Unexpected declaration" == NULL); break; + } + return type; +} + +static const char* accessField (const statementInfo *const st) +{ + const char* result = NULL; + if (st->scope == SCOPE_FRIEND) + result = "friend"; + else if (st->member.access != ACCESS_UNDEFINED) + result = accessString (st->member.access); + return result; +} + +static void addOtherFields (tagEntryInfo* const tag, const tagType type, + const statementInfo *const st, vString *const scope) +{ + /* For selected tag types, append an extension flag designating the + * parent object in which the tag is defined. + */ + switch (type) + { + default: break; + + case TAG_CLASS: + case TAG_ENUM: + case TAG_ENUMERATOR: + case TAG_FIELD: + case TAG_FUNCTION: + case TAG_INTERFACE: + case TAG_MEMBER: + case TAG_METHOD: + case TAG_PROTOTYPE: + case TAG_STRUCT: + case TAG_TYPEDEF: + case TAG_UNION: + if (isMember (st) && + ! (type == TAG_ENUMERATOR && vStringLength (scope) == 0)) + { + if (isType (st->context, TOKEN_NAME)) + tag->extensionFields.scope [0] = tagName (TAG_CLASS); + else + tag->extensionFields.scope [0] = + tagName (declToTagType (parentDecl (st))); + tag->extensionFields.scope [1] = vStringValue (scope); + } + if ((type == TAG_CLASS || type == TAG_INTERFACE || + type == TAG_STRUCT) && vStringLength (st->parentClasses) > 0) + { + + tag->extensionFields.inheritance = + vStringValue (st->parentClasses); + } + tag->extensionFields.implementation = + implementationString (st->implementation); + if (isMember (st)) + { + tag->extensionFields.access = accessField (st); + } + break; + } + + if ((TAG_FIELD == tag->type) || (TAG_MEMBER == tag->type) || + (TAG_EXTERN_VAR == tag->type) || (TAG_TYPEDEF == tag->type) || + (TAG_VARIABLE == tag->type) || (TAG_METHOD == tag->type) || + (TAG_PROTOTYPE == tag->type) || (TAG_FUNCTION == tag->type)) + { + if (((TOKEN_NAME == st->firstToken->type) || ((TOKEN_KEYWORD == st->firstToken->type) + && isBaseDataType(st->firstToken->name->buffer))) + && (0 != strcmp(vStringValue(st->firstToken->name), tag->name))) + tag->extensionFields.varType = vStringValue(st->firstToken->name); + } +} + +static void addContextSeparator (vString *const scope) +{ + vStringCatS (scope, "::"); +} + +static void findScopeHierarchy (vString *const string, + const statementInfo *const st) +{ + const char* const anon = "<anonymous>"; + boolean nonAnonPresent = FALSE; + + vStringClear (string); + if (isType (st->context, TOKEN_NAME)) + { + vStringCopy (string, st->context->name); + nonAnonPresent = TRUE; + } + if (st->parent != NULL) + { + vString *temp = vStringNew (); + const statementInfo *s; + + for (s = st->parent ; s != NULL ; s = s->parent) + { + if (isContextualStatement (s)) + { + vStringCopy (temp, string); + vStringClear (string); + if (isType (s->blockName, TOKEN_NAME)) + { + if (isType (s->context, TOKEN_NAME) && + vStringLength (s->context->name) > 0) + { + vStringCat (string, s->context->name); + addContextSeparator (string); + } + vStringCat (string, s->blockName->name); + nonAnonPresent = TRUE; + } + else + vStringCopyS (string, anon); + if (vStringLength (temp) > 0) + addContextSeparator (string); + vStringCat (string, temp); + } + } + vStringDelete (temp); + + if (! nonAnonPresent) + vStringClear (string); + } +} + +static void makeExtraTagEntry (const tagType type, tagEntryInfo *const e, + vString *const scope) +{ + if (0 && + scope != NULL && vStringLength (scope) > 0) + { + vString *const scopedName = vStringNew (); + + if (type != TAG_ENUMERATOR) + vStringCopy (scopedName, scope); + else + { + /* remove last component (i.e. enumeration name) from scope */ + const char* const sc = vStringValue (scope); + const char* colon = strrchr (sc, ':'); + if (colon != NULL) + { + while (*colon == ':' && colon > sc) + --colon; + vStringNCopy (scopedName, scope, colon + 1 - sc); + } + } + if (vStringLength (scopedName) > 0) + { + addContextSeparator (scopedName); + vStringCatS (scopedName, e->name); + e->name = vStringValue (scopedName); + makeTagEntry (e); + } + vStringDelete (scopedName); + } +} + +static void makeTag (const tokenInfo *const token, + const statementInfo *const st, + boolean isFileScope, const tagType type) +{ +#ifdef DEBUG_C + printToken(token); + fprintf(stderr, "<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>\n"); + printStatement(st); +#endif + /* Nothing is really of file scope when it appears in a header file. + */ + isFileScope = (boolean) (isFileScope && ! isHeaderFile ()); + + if (isType (token, TOKEN_NAME) && vStringLength (token->name) > 0 /* && + includeTag (type, isFileScope) */) + { + vString *scope = vStringNew (); + tagEntryInfo e; + + initTagEntry (&e, vStringValue (token->name)); + + e.lineNumber = token->lineNumber; + e.filePosition = token->filePosition; + e.isFileScope = isFileScope; + e.kindName = tagName (type); + e.kind = tagLetter (type); + e.type = type; + + findScopeHierarchy (scope, st); + addOtherFields (&e, type, st, scope); + +#ifdef DEBUG_C + printTagEntry(&e); +#endif + makeTagEntry (&e); + if (NULL != TagEntryFunction) + makeExtraTagEntry (type, &e, scope); + vStringDelete (scope); + if (NULL != e.extensionFields.arglist) + free((char *) e.extensionFields.arglist); + } +} + +static boolean isValidTypeSpecifier (const declType declaration) +{ + boolean result; + switch (declaration) + { + case DECL_BASE: + case DECL_CLASS: + case DECL_ENUM: + case DECL_STRUCT: + case DECL_UNION: + result = TRUE; + break; + + default: + result = FALSE; + break; + } + return result; +} + +static void qualifyEnumeratorTag (const statementInfo *const st, + const tokenInfo *const nameToken) +{ + if (isType (nameToken, TOKEN_NAME)) + makeTag (nameToken, st, TRUE, TAG_ENUMERATOR); +} + +static void qualifyFunctionTag (const statementInfo *const st, + const tokenInfo *const nameToken) +{ + if (isType (nameToken, TOKEN_NAME)) + { + const tagType type = TAG_FUNCTION; + const boolean isFileScope = + (boolean) (st->member.access == ACCESS_PRIVATE || + (!isMember (st) && st->scope == SCOPE_STATIC)); + + makeTag (nameToken, st, isFileScope, type); + } +} + +static void qualifyFunctionDeclTag (const statementInfo *const st, + const tokenInfo *const nameToken) +{ + if (! isType (nameToken, TOKEN_NAME)) + ; + else if (st->scope == SCOPE_TYPEDEF) + makeTag (nameToken, st, TRUE, TAG_TYPEDEF); + else if (isValidTypeSpecifier (st->declaration)) + makeTag (nameToken, st, TRUE, TAG_PROTOTYPE); +} + +static void qualifyCompoundTag (const statementInfo *const st, + const tokenInfo *const nameToken) +{ + if (isType (nameToken, TOKEN_NAME)) + { + const tagType type = declToTagType (st->declaration); + + if (type != TAG_UNDEFINED) + makeTag (nameToken, st, TRUE, type); + } +} + +static void qualifyBlockTag (statementInfo *const st, + const tokenInfo *const nameToken) +{ + switch (st->declaration) + { + case DECL_CLASS: + case DECL_ENUM: + case DECL_INTERFACE: + case DECL_NAMESPACE: + case DECL_STRUCT: + case DECL_UNION: + qualifyCompoundTag (st, nameToken); + break; + default: break; + } +} + +static void qualifyVariableTag (const statementInfo *const st, + const tokenInfo *const nameToken) +{ + /* We have to watch that we do not interpret a declaration of the + * form "struct tag;" as a variable definition. In such a case, the + * token preceding the name will be a keyword. + */ + if (! isType (nameToken, TOKEN_NAME)) + ; + else if (st->declaration == DECL_IGNORE) + ; + else if (st->scope == SCOPE_TYPEDEF) + makeTag (nameToken, st, TRUE, TAG_TYPEDEF); + else if (st->declaration == DECL_PACKAGE) + makeTag (nameToken, st, FALSE, TAG_PACKAGE); + else if (isValidTypeSpecifier (st->declaration)) + { + if (isMember (st)) + { + if (st->scope == SCOPE_GLOBAL || st->scope == SCOPE_STATIC) + makeTag (nameToken, st, TRUE, TAG_MEMBER); + } + else + { + if (st->scope == SCOPE_EXTERN || ! st->haveQualifyingName) + makeTag (nameToken, st, FALSE, TAG_EXTERN_VAR); + else + makeTag (nameToken, st, (boolean) (st->scope == SCOPE_STATIC), + TAG_VARIABLE); + } + } +} + +/* +* Parsing functions +*/ + +/* Skip to the next non-white character. + */ +static int skipToNonWhite (void) +{ + int c; + + do + c = cppGetc (); + while (isspace (c)); + + return c; +} + +/* Skips to the next brace in column 1. This is intended for cases where + * preprocessor constructs result in unbalanced braces. + */ +static void skipToFormattedBraceMatch (void) +{ + int c, next; + + c = cppGetc (); + next = cppGetc (); + while (c != EOF && (c != '\n' || next != '}')) + { + c = next; + next = cppGetc (); + } +} + +/* Skip to the matching character indicated by the pair string. If skipping + * to a matching brace and any brace is found within a different level of a + * #if conditional statement while brace formatting is in effect, we skip to + * the brace matched by its formatting. It is assumed that we have already + * read the character which starts the group (i.e. the first character of + * "pair"). + */ +static void skipToMatch (const char *const pair) +{ + const boolean braceMatching = (boolean) (strcmp ("{}", pair) == 0); + const boolean braceFormatting = (boolean) (isBraceFormat () && braceMatching); + const unsigned int initialLevel = getDirectiveNestLevel (); + const int begin = pair [0], end = pair [1]; + const unsigned long inputLineNumber = getInputLineNumber (); + int matchLevel = 1; + int c = '\0'; + while (matchLevel > 0 && (c = cppGetc ()) != EOF) + { + if (c == begin) + { + ++matchLevel; + if (braceFormatting && getDirectiveNestLevel () != initialLevel) + { + skipToFormattedBraceMatch (); + break; + } + } + else if (c == end) + { + --matchLevel; + if (braceFormatting && getDirectiveNestLevel () != initialLevel) + { + skipToFormattedBraceMatch (); + break; + } + } + } + if (c == EOF) + { + verbose ("%s: failed to find match for '%c' at line %lu\n", getInputFileName (), begin, inputLineNumber); + if (braceMatching) + longjmp (Exception, (int) ExceptionBraceFormattingError); + else + longjmp (Exception, (int) ExceptionFormattingError); + } +} + +static void skipParens (void) +{ + const int c = skipToNonWhite (); + + if (c == '(') + skipToMatch ("()"); + else + cppUngetc (c); +} + +static void skipBraces (void) +{ + const int c = skipToNonWhite (); + + if (c == '{') + skipToMatch ("{}"); + else + cppUngetc (c); +} + +static keywordId analyzeKeyword (const char *const name) +{ + const keywordId id = (keywordId) lookupKeyword (name, getSourceLanguage ()); + return id; +} + +static void analyzeIdentifier (tokenInfo *const token) +{ + char *const name = vStringValue (token->name); + const char *replacement = NULL; + boolean parensToo = FALSE; + + if (! isIgnoreToken (name, &parensToo, &replacement)) + { + if (replacement != NULL) + token->keyword = analyzeKeyword (replacement); + else + token->keyword = analyzeKeyword (vStringValue (token->name)); + + if (token->keyword == KEYWORD_NONE) + token->type = TOKEN_NAME; + else + token->type = TOKEN_KEYWORD; + } + else + { + initToken (token); + if (parensToo) + { + int c = skipToNonWhite (); + + if (c == '(') + skipToMatch ("()"); + } + } +} + +static void readIdentifier (tokenInfo *const token, const int firstChar) +{ + vString *const name = token->name; + int c = firstChar; + + initToken (token); + + do + { + vStringPut (name, c); + c = cppGetc (); + } while (isident (c)); + vStringTerminate (name); + cppUngetc (c); /* unget non-identifier character */ + + analyzeIdentifier (token); +} + +static void readPackageName (tokenInfo *const token, const int firstChar) +{ + vString *const name = token->name; + int c = firstChar; + + initToken (token); + + while (isident (c) || c == '.') + { + vStringPut (name, c); + c = cppGetc (); + } + vStringTerminate (name); + cppUngetc (c); /* unget non-package character */ +} + +static void readPackage (statementInfo *const st) +{ + tokenInfo *const token = activeToken (st); + Assert (isType (token, TOKEN_KEYWORD)); + readPackageName (token, skipToNonWhite ()); + token->type = TOKEN_NAME; + st->declaration = DECL_PACKAGE; + st->gotName = TRUE; + st->haveQualifyingName = TRUE; +} + +static void processName (statementInfo *const st) +{ + Assert (isType (activeToken (st), TOKEN_NAME)); + if (st->gotName && st->declaration == DECL_NONE) + st->declaration = DECL_BASE; + st->gotName = TRUE; + st->haveQualifyingName = TRUE; +} + +static void readOperator (statementInfo *const st) +{ + const char *const acceptable = "+-*/%^&|~!=<>,[]"; + const tokenInfo* const prev = prevToken (st,1); + tokenInfo *const token = activeToken (st); + vString *const name = token->name; + int c = skipToNonWhite (); + + /* When we arrive here, we have the keyword "operator" in 'name'. + */ + if (isType (prev, TOKEN_KEYWORD) && (prev->keyword == KEYWORD_ENUM || + prev->keyword == KEYWORD_STRUCT || prev->keyword == KEYWORD_UNION)) + ; /* ignore "operator" keyword if preceded by these keywords */ + else if (c == '(') + { + /* Verify whether this is a valid function call (i.e. "()") operator. + */ + if (cppGetc () == ')') + { + vStringPut (name, ' '); /* always separate operator from keyword */ + c = skipToNonWhite (); + if (c == '(') + vStringCatS (name, "()"); + } + else + { + skipToMatch ("()"); + c = cppGetc (); + } + } + else if (isident1 (c)) + { + /* Handle "new" and "delete" operators, and conversion functions + * (per 13.3.1.1.2 [2] of the C++ spec). + */ + boolean whiteSpace = TRUE; /* default causes insertion of space */ + do + { + if (isspace (c)) + whiteSpace = TRUE; + else + { + if (whiteSpace) + { + vStringPut (name, ' '); + whiteSpace = FALSE; + } + vStringPut (name, c); + } + c = cppGetc (); + } while (! isOneOf (c, "(;") && c != EOF); + vStringTerminate (name); + } + else if (isOneOf (c, acceptable)) + { + vStringPut (name, ' '); /* always separate operator from keyword */ + do + { + vStringPut (name, c); + c = cppGetc (); + } while (isOneOf (c, acceptable)); + vStringTerminate (name); + } + + cppUngetc (c); + + token->type = TOKEN_NAME; + token->keyword = KEYWORD_NONE; + processName (st); +} + +static void copyToken (tokenInfo *const dest, const tokenInfo *const src) +{ + dest->type = src->type; + dest->keyword = src->keyword; + dest->filePosition = src->filePosition; + dest->lineNumber = src->lineNumber; + vStringCopy (dest->name, src->name); +} + +static void setAccess (statementInfo *const st, const accessType access) +{ + if (isMember (st)) + { + int c = skipToNonWhite (); + + if (c == ':') + reinitStatement (st, FALSE); + else + cppUngetc (c); + + st->member.accessDefault = access; + st->member.access = access; + } +} + +static void discardTypeList (tokenInfo *const token) +{ + int c = skipToNonWhite (); + while (isident1 (c)) + { + readIdentifier (token, c); + c = skipToNonWhite (); + if (c == '.' || c == ',') + c = skipToNonWhite (); + } + cppUngetc (c); +} + +static void addParentClass (statementInfo *const st, tokenInfo *const token) +{ + if (vStringLength (token->name) > 0 && + vStringLength (st->parentClasses) > 0) + { + vStringPut (st->parentClasses, ','); + } + vStringCat (st->parentClasses, token->name); +} + +static void readParents (statementInfo *const st, const int qualifier) +{ + tokenInfo *const token = newToken (); + tokenInfo *const parent = newToken (); + int c; + + do + { + c = skipToNonWhite (); + if (isident1 (c)) + { + readIdentifier (token, c); + if (isType (token, TOKEN_NAME)) + vStringCat (parent->name, token->name); + else + { + addParentClass (st, parent); + initToken (parent); + } + } + else if (c == qualifier) + vStringPut (parent->name, c); + else if (c == '<') + skipToMatch ("<>"); + else if (isType (token, TOKEN_NAME)) + { + addParentClass (st, parent); + initToken (parent); + } + } while (c != '{' && c != EOF); + cppUngetc (c); + deleteToken (parent); + deleteToken (token); +} + +static void processToken (tokenInfo *const token, statementInfo *const st) +{ + switch (token->keyword) /* is it a reserved word? */ + { + default: break; + + case KEYWORD_NONE: processName (st); break; + case KEYWORD_ABSTRACT: st->implementation = IMP_ABSTRACT; break; + case KEYWORD_ATTRIBUTE: skipParens (); initToken (token); break; + case KEYWORD_CATCH: skipParens (); skipBraces (); break; + case KEYWORD_CHAR: st->declaration = DECL_BASE; break; + case KEYWORD_CLASS: st->declaration = DECL_CLASS; break; + case KEYWORD_CONST: st->declaration = DECL_BASE; break; + case KEYWORD_DOUBLE: st->declaration = DECL_BASE; break; + case KEYWORD_ENUM: st->declaration = DECL_ENUM; break; + case KEYWORD_EXTENDS: readParents (st, '.'); + setToken (st, TOKEN_NONE); break; + case KEYWORD_FLOAT: st->declaration = DECL_BASE; break; + case KEYWORD_FRIEND: st->scope = SCOPE_FRIEND; break; + case KEYWORD_IMPLEMENTS:readParents (st, '.'); + setToken (st, TOKEN_NONE); break; + case KEYWORD_IMPORT: st->declaration = DECL_IGNORE; break; + case KEYWORD_INT: st->declaration = DECL_BASE; break; + case KEYWORD_INTERFACE: st->declaration = DECL_INTERFACE; break; + case KEYWORD_LONG: st->declaration = DECL_BASE; break; + case KEYWORD_NAMESPACE: st->declaration = DECL_NAMESPACE; break; + case KEYWORD_OPERATOR: readOperator (st); break; + case KEYWORD_PACKAGE: readPackage (st); break; + case KEYWORD_PRIVATE: setAccess (st, ACCESS_PRIVATE); break; + case KEYWORD_PROTECTED: setAccess (st, ACCESS_PROTECTED); break; + case KEYWORD_PUBLIC: setAccess (st, ACCESS_PUBLIC); break; + case KEYWORD_SHORT: st->declaration = DECL_BASE; break; + case KEYWORD_SIGNED: st->declaration = DECL_BASE; break; + case KEYWORD_STRUCT: st->declaration = DECL_STRUCT; break; + case KEYWORD_THROWS: discardTypeList (token); break; + case KEYWORD_TYPEDEF: st->scope = SCOPE_TYPEDEF; break; + case KEYWORD_UNION: st->declaration = DECL_UNION; break; + case KEYWORD_UNSIGNED: st->declaration = DECL_BASE; break; + case KEYWORD_USING: st->declaration = DECL_IGNORE; break; + case KEYWORD_VOID: st->declaration = DECL_BASE; break; + case KEYWORD_VOLATILE: st->declaration = DECL_BASE; break; + case KEYWORD_VIRTUAL: st->implementation = IMP_VIRTUAL; break; + + case KEYWORD_EXTERN: + st->scope = SCOPE_EXTERN; + st->declaration = DECL_BASE; + break; + + case KEYWORD_STATIC: + st->scope = SCOPE_STATIC; + st->declaration = DECL_BASE; + break; + } +} + +/* +* Parenthesis handling functions +*/ + +static void restartStatement (statementInfo *const st) +{ + tokenInfo *const save = newToken (); + tokenInfo *token = activeToken (st); + + copyToken (save, token); + reinitStatement (st, FALSE); + token = activeToken (st); + copyToken (token, save); + deleteToken (save); + processToken (token, st); +} + +/* Skips over a the mem-initializer-list of a ctor-initializer, defined as: + * + * mem-initializer-list: + * mem-initializer, mem-initializer-list + * + * mem-initializer: + * [::] [nested-name-spec] class-name (...) + * identifier + */ +static void skipMemIntializerList (tokenInfo *const token) +{ + int c; + + do + { + c = skipToNonWhite (); + while (isident1 (c) || c == ':') + { + if (c != ':') + readIdentifier (token, c); + c = skipToNonWhite (); + } + if (c == '<') + { + skipToMatch ("<>"); + c = skipToNonWhite (); + } + if (c == '(') + { + skipToMatch ("()"); + c = skipToNonWhite (); + } + } while (c == ','); + cppUngetc (c); +} + +static void skipMacro (statementInfo *const st) +{ + tokenInfo *const prev2 = prevToken (st, 2); + + if (isType (prev2, TOKEN_NAME)) + retardToken (st); + skipToMatch ("()"); +} + +/* Skips over characters following the parameter list. This will be either + * non-ANSI style function declarations or C++ stuff. Our choices: + * + * C (K&R): + * int func (); + * int func (one, two) int one; float two; {...} + * C (ANSI): + * int func (int one, float two); + * int func (int one, float two) {...} + * C++: + * int foo (...) [const|volatile] [throw (...)]; + * int foo (...) [const|volatile] [throw (...)] [ctor-initializer] {...} + * int foo (...) [const|volatile] [throw (...)] try [ctor-initializer] {...} + * catch (...) {...} + */ +static boolean skipPostArgumentStuff (statementInfo *const st, + parenInfo *const info) +{ + tokenInfo *const token = activeToken (st); + unsigned int parameters = info->parameterCount; + unsigned int elementCount = 0; + boolean restart = FALSE; + boolean end = FALSE; + int c = skipToNonWhite (); + + do + { + switch (c) + { + case ')': break; + case ':': skipMemIntializerList (token);break; /* ctor-initializer */ + case '[': skipToMatch ("[]"); break; + case '=': cppUngetc (c); end = TRUE; break; + case '{': cppUngetc (c); end = TRUE; break; + case '}': cppUngetc (c); end = TRUE; break; + + case '(': + if (elementCount > 0) + ++elementCount; + skipToMatch ("()"); + break; + + case ';': + if (parameters == 0 || elementCount < 2) + { + cppUngetc (c); + end = TRUE; + } + else if (--parameters == 0) + end = TRUE; + break; + + default: + if (isident1 (c)) + { + readIdentifier (token, c); + switch (token->keyword) + { + case KEYWORD_ATTRIBUTE: skipParens (); break; + case KEYWORD_THROW: skipParens (); break; + case KEYWORD_CONST: break; + case KEYWORD_TRY: break; + case KEYWORD_VOLATILE: break; + case KEYWORD_WCHAR_T: st->declaration = DECL_BASE; break; + + case KEYWORD_CATCH: case KEYWORD_CLASS: + case KEYWORD_EXPLICIT: case KEYWORD_EXTERN: + case KEYWORD_FRIEND: case KEYWORD_INLINE: + case KEYWORD_MUTABLE: case KEYWORD_NAMESPACE: + case KEYWORD_NEW: case KEYWORD_OPERATOR: + case KEYWORD_OVERLOAD: case KEYWORD_PRIVATE: + case KEYWORD_PROTECTED: case KEYWORD_PUBLIC: + case KEYWORD_STATIC: case KEYWORD_TEMPLATE: + case KEYWORD_TYPEDEF: case KEYWORD_TYPENAME: + case KEYWORD_USING: case KEYWORD_VIRTUAL: + /* Never allowed within parameter declarations. + */ + restart = TRUE; + end = TRUE; + break; + + default: + if (isType (token, TOKEN_NONE)) + ; + else if (info->isKnrParamList && info->parameterCount > 0) + ++elementCount; + else + { + /* If we encounter any other identifier immediately + * following an empty parameter list, this is almost + * certainly one of those Microsoft macro "thingies" + * that the automatic source code generation sticks + * in. Terminate the current statement. + */ + restart = TRUE; + end = TRUE; + } + break; + } + } + } + if (! end) + { + c = skipToNonWhite (); + if (c == EOF) + end = TRUE; + } + } while (! end); + + if (restart) + restartStatement (st); + else + setToken (st, TOKEN_NONE); + return (boolean) (c != EOF); +} + +static void analyzePostParens (statementInfo *const st, parenInfo *const info) +{ + const unsigned long inputLineNumber = getInputLineNumber (); + int c = skipToNonWhite (); + + cppUngetc (c); + if (isOneOf (c, "{;,=")) + ; + else + { + if (! skipPostArgumentStuff (st, info)) + { + verbose ( + "%s: confusing argument declarations beginning at line %lu\n", + getInputFileName (), inputLineNumber); + longjmp (Exception, (int) ExceptionFormattingError); + } + } +} + +static int parseParens (statementInfo *const st, parenInfo *const info) +{ + tokenInfo *const token = activeToken (st); + unsigned int identifierCount = 0; + unsigned int depth = 1; + boolean firstChar = TRUE; + int nextChar = '\0'; + + info->parameterCount = 1; + do + { + int c = skipToNonWhite (); + switch (c) + { + case '&': + case '*': + info->isPointer = TRUE; + info->isKnrParamList = FALSE; + if (identifierCount == 0) + info->isParamList = FALSE; + initToken (token); + break; + + case ':': + info->isKnrParamList = FALSE; + break; + + case '.': + info->isNameCandidate = FALSE; + info->isKnrParamList = FALSE; + break; + + case ',': + info->isNameCandidate = FALSE; + if (info->isKnrParamList) + { + ++info->parameterCount; + identifierCount = 0; + } + break; + + case '=': + info->isKnrParamList = FALSE; + info->isNameCandidate = FALSE; + if (firstChar) + { + info->isParamList = FALSE; + skipMacro (st); + depth = 0; + } + break; + + case '[': + info->isKnrParamList = FALSE; + skipToMatch ("[]"); + break; + + case '<': + info->isKnrParamList = FALSE; + skipToMatch ("<>"); + break; + + case ')': + if (firstChar) + info->parameterCount = 0; + --depth; + break; + + case '(': + info->isKnrParamList = FALSE; + if (firstChar) + { + info->isNameCandidate = FALSE; + cppUngetc (c); + skipMacro (st); + depth = 0; + } + else if (isType (token, TOKEN_PAREN_NAME)) + { + c = skipToNonWhite (); + if (c == '*') /* check for function pointer */ + { + skipToMatch ("()"); + c = skipToNonWhite (); + if (c == '(') + skipToMatch ("()"); + } + else + { + cppUngetc (c); + cppUngetc ('('); + info->nestedArgs = TRUE; + } + } + else + ++depth; + break; + + default: + if (isident1 (c)) + { + if (++identifierCount > 1) + info->isKnrParamList = FALSE; + readIdentifier (token, c); + if (isType (token, TOKEN_NAME) && info->isNameCandidate) + token->type = TOKEN_PAREN_NAME; + else if (isType (token, TOKEN_KEYWORD)) + { + info->isKnrParamList = FALSE; + info->isNameCandidate = FALSE; + } + } + else + { + info->isParamList = FALSE; + info->isKnrParamList = FALSE; + info->isNameCandidate = FALSE; + info->invalidContents = TRUE; + } + break; + } + firstChar = FALSE; + } while (! info->nestedArgs && depth > 0 && + (info->isKnrParamList || info->isNameCandidate)); + + if (! info->nestedArgs) while (depth > 0) + { + skipToMatch ("()"); + --depth; + } + if (st->argEndPosition == 0) + st->argEndPosition = ftell(File.fp); + + if (! info->isNameCandidate) + initToken (token); + + return nextChar; +} + +static void initParenInfo (parenInfo *const info) +{ + info->isPointer = FALSE; + info->isParamList = TRUE; + info->isKnrParamList = TRUE; + info->isNameCandidate = TRUE; + info->invalidContents = FALSE; + info->nestedArgs = FALSE; + info->parameterCount = 0; +} + +static void analyzeParens (statementInfo *const st) +{ + tokenInfo *const prev = prevToken (st, 1); + + if (! isType (prev, TOKEN_NONE)) /* in case of ignored enclosing macros */ + { + tokenInfo *const token = activeToken (st); + parenInfo info; + int c; + + initParenInfo (&info); + parseParens (st, &info); + c = skipToNonWhite (); + cppUngetc (c); + if (info.invalidContents) + reinitStatement (st, FALSE); + else if (info.isNameCandidate && isType (token, TOKEN_PAREN_NAME) && + ! st->gotParenName && + (! info.isParamList || ! st->haveQualifyingName || + c == '(' || + (c == '=' && st->implementation != IMP_VIRTUAL) || + (st->declaration == DECL_NONE && isOneOf (c, ",;")))) + { + token->type = TOKEN_NAME; + processName (st); + st->gotParenName = TRUE; + if (! (c == '(' && info.nestedArgs)) + st->isPointer = info.isPointer; + } + else if (! st->gotArgs && info.isParamList) + { + st->gotArgs = TRUE; + setToken (st, TOKEN_ARGS); + advanceToken (st); + analyzePostParens (st, &info); + } + else + setToken (st, TOKEN_NONE); + } +} + +/* +* Token parsing functions +*/ + +static void addContext (statementInfo *const st, const tokenInfo* const token) +{ + if (isType (token, TOKEN_NAME)) + { + if (vStringLength (st->context->name) > 0) + { + vStringCatS (st->context->name, "::"); + } + vStringCat (st->context->name, token->name); + st->context->type = TOKEN_NAME; + } +} + +static void processColon (statementInfo *const st) +{ + const int c = skipToNonWhite (); + const boolean doubleColon = (boolean) (c == ':'); + + if (doubleColon) + { + setToken (st, TOKEN_DOUBLE_COLON); + st->haveQualifyingName = FALSE; + } + else + { + cppUngetc (c); + if (st->declaration == DECL_CLASS || st->declaration == DECL_STRUCT) + { + readParents (st, ':'); + } + } +} + +/* Skips over any initializing value which may follow an '=' character in a + * variable definition. + */ +static int skipInitializer (statementInfo *const st) +{ + boolean done = FALSE; + int c; + + while (! done) + { + c = skipToNonWhite (); + + if (c == EOF) + longjmp (Exception, (int) ExceptionFormattingError); + else switch (c) + { + case ',': + case ';': done = TRUE; break; + + case '0': + if (st->implementation == IMP_VIRTUAL) + st->implementation = IMP_PURE_VIRTUAL; + break; + + case '[': skipToMatch ("[]"); break; + case '(': skipToMatch ("()"); break; + case '{': skipToMatch ("{}"); break; + + case '}': + if (insideEnumBody (st)) + done = TRUE; + else if (! isBraceFormat ()) + { + verbose ("%s: unexpected closing brace at line %lu\n", + getInputFileName (), getInputLineNumber ()); + longjmp (Exception, (int) ExceptionBraceFormattingError); + } + break; + + default: break; + } + } + return c; +} + +static void processInitializer (statementInfo *const st) +{ + const boolean inEnumBody = insideEnumBody (st); + const int c = skipInitializer (st); + + if (c == ';') + setToken (st, TOKEN_SEMICOLON); + else if (c == ',') + setToken (st, TOKEN_COMMA); + else if ('}' && inEnumBody) + { + cppUngetc (c); + setToken (st, TOKEN_COMMA); + } + if (st->scope == SCOPE_EXTERN) + st->scope = SCOPE_GLOBAL; +} + +static void parseIdentifier (statementInfo *const st, const int c) +{ + tokenInfo *const token = activeToken (st); + + readIdentifier (token, c); + if (! isType (token, TOKEN_NONE)) + processToken (token, st); +} + +static void parseGeneralToken (statementInfo *const st, const int c) +{ + const tokenInfo *const prev = prevToken (st, 1); + + if (isident1(c)) + { + parseIdentifier (st, c); + if (isType (st->context, TOKEN_NAME) && + isType (activeToken (st), TOKEN_NAME) && isType (prev, TOKEN_NAME)) + { + initToken (st->context); + } + } + else if (isExternCDecl (st, c)) + { + st->declaration = DECL_NOMANGLE; + st->scope = SCOPE_GLOBAL; + } +} + +/* Reads characters from the pre-processor and assembles tokens, setting + * the current statement state. + */ +static void nextToken (statementInfo *const st) +{ + tokenInfo *token = activeToken (st); + do + { + + int c = skipToNonWhite (); + + switch (c) + { + case EOF: longjmp (Exception, (int) ExceptionEOF); break; + case '(': analyzeParens (st); token = activeToken (st); break; + case '*': st->haveQualifyingName = FALSE; break; + case ',': setToken (st, TOKEN_COMMA); break; + case ':': processColon (st); break; + case ';': setToken (st, TOKEN_SEMICOLON); break; + case '<': skipToMatch ("<>"); break; + case '=': processInitializer (st); break; + case '[': skipToMatch ("[]"); break; + case '{': setToken (st, TOKEN_BRACE_OPEN); break; + case '}': setToken (st, TOKEN_BRACE_CLOSE); break; + default: parseGeneralToken (st, c); break; + } + } while (isType (token, TOKEN_NONE)); + + /* We want to know about non-keyword variable types */ + if (TOKEN_NONE == st->firstToken->type) + { + if ((TOKEN_NAME == token->type) || ((TOKEN_KEYWORD == token->type) + && (isBaseDataType(token->name->buffer)))) + copyToken(st->firstToken, token); + } +} + +/* +* Scanning support functions +*/ + +static statementInfo *CurrentStatement = NULL; + +static statementInfo *newStatement (statementInfo *const parent) +{ + statementInfo *const st = xMalloc (1, statementInfo); + unsigned int i; + + for (i = 0 ; i < (unsigned int) NumTokens ; ++i) + st->token [i] = newToken (); + + st->context = newToken (); + st->blockName = newToken (); + st->parentClasses = vStringNew (); + st->firstToken = newToken(); + + initStatement (st, parent); + CurrentStatement = st; + + return st; +} + +static void deleteStatement (void) +{ + statementInfo *const st = CurrentStatement; + statementInfo *const parent = st->parent; + unsigned int i; + + for (i = 0 ; i < (unsigned int) NumTokens ; ++i) + { + deleteToken (st->token [i]); st->token [i] = NULL; + } + deleteToken (st->blockName); st->blockName = NULL; + deleteToken (st->context); st->context = NULL; + vStringDelete (st->parentClasses); st->parentClasses = NULL; + deleteToken(st->firstToken); + eFree (st); + CurrentStatement = parent; +} + +static void deleteAllStatements (void) +{ + while (CurrentStatement != NULL) + deleteStatement (); +} + +static boolean isStatementEnd (const statementInfo *const st) +{ + const tokenInfo *const token = activeToken (st); + boolean isEnd; + + if (isType (token, TOKEN_SEMICOLON)) + isEnd = TRUE; + else if (isType (token, TOKEN_BRACE_CLOSE)) + isEnd = (boolean) ! isContextualStatement (st); + else + isEnd = FALSE; + + return isEnd; +} + +static void checkStatementEnd (statementInfo *const st) +{ + const tokenInfo *const token = activeToken (st); + + if (isType (token, TOKEN_COMMA)) + reinitStatement (st, TRUE); + else if (isStatementEnd (st)) + { + reinitStatement (st, FALSE); + cppEndStatement (); + } + else + { + cppBeginStatement (); + advanceToken (st); + } +} + +static void nest (statementInfo *const st, const unsigned int nestLevel) +{ + switch (st->declaration) + { + case DECL_CLASS: + case DECL_ENUM: + case DECL_INTERFACE: + case DECL_NAMESPACE: + case DECL_NOMANGLE: + case DECL_STRUCT: + case DECL_UNION: + createTags (nestLevel, st); + break; + default: + skipToMatch ("{}"); + break; + } + advanceToken (st); + setToken (st, TOKEN_BRACE_CLOSE); +} + +static void tagCheck (statementInfo *const st) +{ + const tokenInfo *const token = activeToken (st); + const tokenInfo *const prev = prevToken (st, 1); + const tokenInfo *const prev2 = prevToken (st, 2); + + switch (token->type) + { + case TOKEN_NAME: + if (insideEnumBody (st)) + qualifyEnumeratorTag (st, token); + break; +#if 0 + case TOKEN_PACKAGE: + if (st->haveQualifyingName) + makeTag (token, st, FALSE, TAG_PACKAGE); + break; +#endif + case TOKEN_BRACE_OPEN: + if (isType (prev, TOKEN_ARGS)) + { + if (st->haveQualifyingName) + { + st->declaration = DECL_FUNCTION; + if (isType (prev2, TOKEN_NAME)) + copyToken (st->blockName, prev2); + qualifyFunctionTag (st, prev2); + } + } + else if (isContextualStatement (st)) + { + if (isType (prev, TOKEN_NAME)) + copyToken (st->blockName, prev); + qualifyBlockTag (st, prev); + } + break; + + case TOKEN_SEMICOLON: + case TOKEN_COMMA: + if (insideEnumBody (st)) + ; + else if (isType (prev, TOKEN_NAME)) + { + if (isContextualKeyword (prev2)) + st->scope = SCOPE_EXTERN; + else + qualifyVariableTag (st, prev); + } + else if (isType (prev, TOKEN_ARGS) && isType (prev2, TOKEN_NAME)) + { + if (st->isPointer) + qualifyVariableTag (st, prev2); + else + qualifyFunctionDeclTag (st, prev2); + } + break; + + default: break; + } +} + +/* Parses the current file and decides whether to write out and tags that + * are discovered. + */ +static void createTags (const unsigned int nestLevel, + statementInfo *const parent) +{ + statementInfo *const st = newStatement (parent); + + while (TRUE) + { + tokenInfo *token; + + nextToken (st); + token = activeToken (st); + if (isType (token, TOKEN_BRACE_CLOSE)) + { + if (nestLevel > 0) + break; + else + { + verbose ("%s: unexpected closing brace at line %lu\n", + getInputFileName (), getInputLineNumber ()); + longjmp (Exception, (int) ExceptionBraceFormattingError); + } + } + else if (isType (token, TOKEN_DOUBLE_COLON)) + { + addContext (st, prevToken (st, 1)); + advanceToken (st); + } + else + { + tagCheck (st); + if (isType (token, TOKEN_BRACE_OPEN)) + nest (st, nestLevel + 1); + checkStatementEnd (st); + } + } + deleteStatement (); +} + +static boolean findDTags (const unsigned int passCount) +{ + exception_t exception; + boolean retry; + + Assert (passCount < 3); + cppInit ((boolean) (passCount > 1)); + + exception = (exception_t) setjmp (Exception); + retry = FALSE; + if (exception == ExceptionNone) + createTags (0, NULL); + else + { + deleteAllStatements (); + if (exception == ExceptionBraceFormattingError && passCount == 1) + { + retry = TRUE; + verbose ("%s: retrying file with fallback brace matching algorithm\n", + getInputFileName ()); + } + } + cppTerminate (); + return retry; +} + +static void buildKeywordHash (const langType language, unsigned int idx) +{ + const size_t count = sizeof (KeywordTable) / sizeof (KeywordTable [0]); + size_t i; + for (i = 0 ; i < count ; ++i) + { + const keywordDesc* const p = &KeywordTable [i]; + if (p->isValid [idx]) + addKeyword (p->name, language, (int) p->id); + } +} + +static void initializeDParser (const langType language) +{ + Lang_d = language; + buildKeywordHash (language, 17); +} + + +extern parserDefinition* DParser (void) +{ + static const char *const extensions [] = { "d", "di", NULL }; + parserDefinition* def = parserNew ("D"); + def->kinds = DKinds; + def->kindCount = KIND_COUNT (DKinds); + def->extensions = extensions; + def->parser2 = findDTags; + def->initialize = initializeDParser; + return def; +} + + +/* vi:set tabstop=8 shiftwidth=4: */ Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2006-07-08 18:23:20 UTC (rev 543) +++ trunk/tagmanager/parsers.h 2006-07-09 14:41:53 UTC (rev 544) @@ -31,7 +31,8 @@ CssParser, \ RubyParser, \ TclParser, \ - ShParser + ShParser, \ + DParser /* langType of each parser @@ -52,6 +53,7 @@ 14 RubyParser 15 TclParser 16 ShParser +17 DParser */ #endif /* _PARSERS_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits