Commits August 2006

commits@lists.geany.org

3 participants
123 discussions

SF.net SVN: geany: [746] trunk
by ntrel＠users.sourceforge.net 19 Aug '06

19 Aug '06

Revision: 746 Author: ntrel Date: 2006-08-19 08:07:11 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=746&view=rev Log Message: ----------- Remember the VTE current directory Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/geany.h trunk/src/keyfile.c trunk/src/main.c trunk/src/prefs.c trunk/src/vte.c trunk/src/vte.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-19 14:46:04 UTC (rev 745) +++ trunk/ChangeLog 2006-08-19 15:07:11 UTC (rev 746) @@ -14,6 +14,13 @@ * src/callbacks.c: Fix a segfault at startup if terminal follow path setting is enabled. + * src/geany.h, src/callbacks.c, src/keyfile.c, src/vte.c, src/vte.h, + src/prefs.c, src/main.c: + Move HAVE_VTE MyApp settings to vte_info struct in src/vte.c. + * src/vte.c, src/vte.h: + Add vte_get_working_directory adapted from Terminal by os-cillation. + * src/vte.c, src/keyfile.c: Remember the VTE current directory. + * src/callbacks.c: Only send VTE cd command if directory is different. 2006-08-18 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-08-19 14:46:04 UTC (rev 745) +++ trunk/src/callbacks.c 2006-08-19 15:07:11 UTC (rev 746) @@ -141,8 +141,8 @@ } scintilla_release_resources(); #ifdef HAVE_VTE - if (app->have_vte) vte_close(); - g_free(app->lib_vte); + if (vte_info.have_vte) vte_close(); + g_free(vte_info.lib_vte); #endif gtk_widget_destroy(app->window); @@ -779,23 +779,25 @@ if (idx >= 0 && app->opening_session_files == FALSE) { utils_check_disk_status(idx); - } #ifdef HAVE_VTE - // at startup, idx is always -1, so terminal startup dir is wrong, - // but we could remember the vte dir to fix this. - if (idx >= 0 && app->have_vte && vc->follow_path && doc_list[idx].file_name != NULL) - { - gchar *path; - gchar *cmd; + if (vte_info.have_vte && vc->follow_path && doc_list[idx].file_name != NULL) + { + gchar *path; + gchar *cmd; - path = g_path_get_dirname(doc_list[idx].file_name); - cmd = g_strconcat("cd ", path, "\n", NULL); - vte_send_cmd(cmd); - g_free(path); - g_free(cmd); + path = g_path_get_dirname(doc_list[idx].file_name); + vte_get_working_directory(); // refresh vte_info.dir + if (! g_str_equal(path, vte_info.dir)) + { + cmd = g_strconcat("cd ", path, "\n", NULL); + vte_send_cmd(cmd); + g_free(cmd); + } + g_free(path); + } +#endif } -#endif } Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-08-19 14:46:04 UTC (rev 745) +++ trunk/src/geany.h 2006-08-19 15:07:11 UTC (rev 746) @@ -172,12 +172,6 @@ gboolean ignore_fifo; GIOChannel *fifo_ioc; #endif -#ifdef HAVE_VTE - gboolean load_vte; - gboolean have_vte; - gchar *lib_vte; - gchar *terminal_settings; -#endif gchar *long_line_color; gchar *pref_template_developer; gchar *pref_template_company; Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-08-19 14:46:04 UTC (rev 745) +++ trunk/src/keyfile.c 2006-08-19 15:07:11 UTC (rev 746) @@ -31,6 +31,7 @@ #include "document.h" #include "sciwrappers.h" #include "encodings.h" +#include "vte.h" static gchar *scribble_text = NULL; @@ -108,10 +109,12 @@ g_key_file_set_boolean(config, PACKAGE, "auto_close_xml_tags", app->pref_editor_auto_close_xml_tags); g_key_file_set_boolean(config, PACKAGE, "auto_complete_constructs", app->pref_editor_auto_complete_constructs); #ifdef HAVE_VTE - g_key_file_set_boolean(config, PACKAGE, "load_vte", app->load_vte); + g_key_file_set_boolean(config, PACKAGE, "load_vte", vte_info.load_vte); g_key_file_set_comment(config, PACKAGE, "terminal_settings", _(" VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output;follow path of file"), NULL); - g_key_file_set_string(config, PACKAGE, "terminal_settings", app->terminal_settings); + g_key_file_set_string(config, PACKAGE, "terminal_settings", vte_info.terminal_settings); + vte_get_working_directory(); // refresh vte_info.dir + g_key_file_set_string(config, PACKAGE, "terminal_dir", vte_info.dir); #endif g_key_file_set_string(config, PACKAGE, "custom_date_format", app->custom_date_format); g_key_file_set_string(config, PACKAGE, "editor_font", app->editor_font); @@ -321,8 +324,9 @@ app->pref_toolbar_show_colour = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_colour", TRUE); app->pref_toolbar_show_fileops = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_fileops", 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", ""); + vte_info.load_vte = utils_get_setting_boolean(config, PACKAGE, "load_vte", TRUE); + vte_info.terminal_settings = utils_get_setting_string(config, PACKAGE, "terminal_settings", ""); + vte_info.dir = utils_get_setting_string(config, PACKAGE, "terminal_dir", NULL); #endif app->pref_template_developer = utils_get_setting_string(config, PACKAGE, "pref_template_developer", g_get_real_name()); app->pref_template_company = utils_get_setting_string(config, PACKAGE, "pref_template_company", ""); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-08-19 14:46:04 UTC (rev 745) +++ trunk/src/main.c 2006-08-19 15:07:11 UTC (rev 746) @@ -515,7 +515,7 @@ app->ignore_fifo = ignore_fifo; #endif #ifdef HAVE_VTE - app->lib_vte = lib_vte; + vte_info.lib_vte = lib_vte; #endif app->ignore_global_tags = ignore_global_tags; } @@ -586,8 +586,7 @@ configuration_load(); // do this here to let cmdline options overwrite configuration settings #ifdef HAVE_VTE - app->have_vte = app->load_vte; - if (no_vte) app->have_vte = FALSE; + vte_info.have_vte = (no_vte) ? FALSE : vte_info.load_vte; #endif if (no_msgwin) app->msgwindow_visible = FALSE; Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-08-19 14:46:04 UTC (rev 745) +++ trunk/src/prefs.c 2006-08-19 15:07:11 UTC (rev 746) @@ -322,10 +322,10 @@ // make VTE switch visible only when VTE is compiled in, it is hidden by default widget = lookup_widget(app->prefs_dialog, "check_vte"); gtk_widget_show(widget); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->load_vte); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), vte_info.load_vte); // VTE settings - if (app->have_vte) + if (vte_info.have_vte) { widget = lookup_widget(app->prefs_dialog, "font_term"); gtk_font_button_set_font_name(GTK_FONT_BUTTON(widget), vc->font); @@ -568,10 +568,10 @@ #ifdef HAVE_VTE widget = lookup_widget(app->prefs_dialog, "check_vte"); - app->load_vte = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + vte_info.load_vte = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); // VTE settings - if (app->have_vte) + if (vte_info.have_vte) { gchar *hex_color_back, *hex_color_fore; @@ -591,10 +591,10 @@ widget = lookup_widget(app->prefs_dialog, "check_follow_path"); vc->follow_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - g_free(app->terminal_settings); + g_free(vte_info.terminal_settings); hex_color_fore = utils_get_hex_from_color(vc->color_fore); hex_color_back = utils_get_hex_from_color(vc->color_back); - app->terminal_settings = g_strdup_printf("%s;%s;%s;%d;%s;%s;%s;%s", vc->font, + vte_info.terminal_settings = g_strdup_printf("%s;%s;%s;%d;%s;%s;%s;%s", vc->font, hex_color_fore, hex_color_back, vc->scrollback_lines, vc->emulation, utils_btoa(vc->scroll_on_key), utils_btoa(vc->scroll_on_out), @@ -933,7 +933,7 @@ } #ifdef HAVE_VTE - if (app->have_vte) + if (vte_info.have_vte) { tooltips = GTK_TOOLTIPS(lookup_widget(app->prefs_dialog, "tooltips")); notebook = lookup_widget(app->prefs_dialog, "notebook2"); Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2006-08-19 14:46:04 UTC (rev 745) +++ trunk/src/vte.c 2006-08-19 15:07:11 UTC (rev 746) @@ -37,6 +37,8 @@ #include "callbacks.h" +VteInfo vte_info; + extern gchar **environ; static pid_t pid; static GModule *module = NULL; @@ -103,15 +105,15 @@ GtkWidget *vte, *scrollbar, *hbox, *frame; - if (app->have_vte == FALSE) + if (vte_info.have_vte == FALSE) { // app->have_vte can be false, even if VTE is compiled in, think of command line option geany_debug("Disabling terminal support"); return; } - if (app->lib_vte && strlen(app->lib_vte)) + if (vte_info.lib_vte && strlen(vte_info.lib_vte)) { - module = g_module_open(app->lib_vte, G_MODULE_BIND_LAZY); + module = g_module_open(vte_info.lib_vte, G_MODULE_BIND_LAZY); } else { @@ -122,13 +124,13 @@ if (module == NULL) { - app->have_vte = FALSE; + vte_info.have_vte = FALSE; geany_debug("Could not load libvte.so.4, terminal support disabled"); return; } else { - app->have_vte = TRUE; + vte_info.have_vte = TRUE; vf = g_new0(struct vte_funcs, 1); vc = g_new0(struct vte_conf, 1); vte_register_symbols(module); @@ -234,7 +236,8 @@ } env = vte_get_child_environment(); - pid = vf->vte_terminal_fork_command(VTE_TERMINAL(vte), shell, NULL, env, dir, TRUE, TRUE, TRUE); + pid = vf->vte_terminal_fork_command(VTE_TERMINAL(vte), shell, NULL, env, + (vte_info.dir == NULL) ? dir : vte_info.dir, TRUE, TRUE, TRUE); g_strfreev(env); } @@ -310,12 +313,13 @@ static void vte_get_settings(void) { - gchar **values = g_strsplit(app->terminal_settings, ";", 8); + gchar **values = g_strsplit(vte_info.terminal_settings, ";", 8); if (g_strv_length(values) != 8) { - app->terminal_settings = g_strdup_printf("Monospace 10;#FFFFFF;#000000;500;xterm;true;true;false"); - values = g_strsplit(app->terminal_settings, ";", 8); + vte_info.terminal_settings = + g_strdup_printf("Monospace 10;#FFFFFF;#000000;500;xterm;true;true;false"); + values = g_strsplit(vte_info.terminal_settings, ";", 8); } vc->font = g_strdup(values[0]); vc->color_fore = g_new0(GdkColor, 1); @@ -408,6 +412,49 @@ } +/* Taken from Terminal by os-cillation: terminal_screen_get_working_directory, thanks. + * Determinies the working directory using various OS-specific mechanisms. */ +const gchar* vte_get_working_directory() +{ + gchar buffer[4096 + 1]; + gchar *file; + gchar *cwd; + gint length; + + if (pid >= 0) + { + file = g_strdup_printf ("/proc/%d/cwd", pid); + length = readlink (file, buffer, sizeof (buffer)); + + if (length > 0 && *buffer == '/') + { + buffer[length] = '\0'; + g_free(vte_info.dir); + vte_info.dir = g_strdup (buffer); + } + else if (length == 0) + { + cwd = g_get_current_dir (); + if (G_LIKELY (cwd != NULL)) + { + if (chdir (file) == 0) + { + g_free(vte_info.dir); + vte_info.dir = g_get_current_dir (); + chdir (cwd); + } + + g_free (cwd); + } + } + + g_free (file); + } + + return vte_info.dir; +} + + /* void vte_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, GtkSelectionData *data, guint info, guint time) Modified: trunk/src/vte.h =================================================================== --- trunk/src/vte.h 2006-08-19 14:46:04 UTC (rev 745) +++ trunk/src/vte.h 2006-08-19 15:07:11 UTC (rev 746) @@ -30,6 +30,20 @@ #include <unistd.h> +#ifdef HAVE_VTE +typedef struct +{ + gboolean load_vte; + gboolean have_vte; + gchar *lib_vte; + gchar *terminal_settings; + gchar *dir; +} VteInfo; + +extern VteInfo vte_info; +#endif + + void vte_init(void); void vte_close(void); @@ -38,6 +52,8 @@ void vte_send_cmd(const gchar *cmd); +const gchar* vte_get_working_directory(); + /* void vte_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, GtkSelectionData *data, guint info, guint time); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [745] trunk
by eht16＠users.sourceforge.net 19 Aug '06

19 Aug '06

Revision: 745 Author: eht16 Date: 2006-08-19 07:46:04 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=745&view=rev Log Message: ----------- Comment already commented lines, too (re-closes #1521714). Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-19 12:56:30 UTC (rev 744) +++ trunk/ChangeLog 2006-08-19 14:46:04 UTC (rev 745) @@ -6,6 +6,8 @@ * src/dialogs.c, src/callbacks.c: Replaced dialogs_show_make_target() by dialogs_show_input() to have a general input dialog. + * src/sci_cb.c: + Comment already commented lines, too (re-closes #1521714). 2006-08-19 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-08-19 12:56:30 UTC (rev 744) +++ trunk/src/sci_cb.c 2006-08-19 14:46:04 UTC (rev 745) @@ -1102,6 +1102,8 @@ // use single line comment if (cc == NULL || strlen(cc) == 0) { + /* disabled because of #1521714, it makes sense to double(or triple, ...) comment + * if someone think it is not that good we could introduce a config option for it gboolean do_continue = FALSE; switch (strlen(co)) { @@ -1112,7 +1114,7 @@ default: return; } if (do_continue) continue; - + */ if (ft->comment_use_indent) sci_insert_text(doc_list[idx].sci, line_start + x, co); 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: [744] trunk
by eht16＠users.sourceforge.net 19 Aug '06

19 Aug '06

Revision: 744 Author: eht16 Date: 2006-08-19 05:56:30 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=744&view=rev Log Message: ----------- Added menu items to insert configurable date/time strings. Modified Paths: -------------- trunk/ChangeLog trunk/TODO 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/keybindings.h trunk/src/keyfile.c trunk/src/main.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/ChangeLog 2006-08-19 12:56:30 UTC (rev 744) @@ -1,3 +1,13 @@ +2006-08-19 Enrico Tröger <enrico.troeger(a)uvena.de> + + * geany.glade, src/interface.c, src/keybindings.c, src/utils.c, + src/geany.h, src/callbacks.c, src/main.c, src/keyfile.c: + Added menu items to insert configurable date/time strings. + * src/dialogs.c, src/callbacks.c: + Replaced dialogs_show_make_target() by dialogs_show_input() to have + a general input dialog. + + 2006-08-19 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/callbacks.c: Fix a segfault at startup if terminal follow path @@ -4,7 +14,7 @@ setting is enabled. -2006-08-18 Administrator <Administrator@localhost> +2006-08-18 Enrico Tröger <enrico.troeger(a)uvena.de> * src/document.c: Use codepage SC_CP_UTF8 because we use always GTK even under Windows. @@ -976,7 +986,7 @@ 2006-06-12 Frank Lanitz <frank(a)frank.uvena.de> * configure.in: Added Belarusian and Russian language support. - More Information at po/ChangeLog + More Information at po/ChangeLog 2006-06-11 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/TODO =================================================================== --- trunk/TODO 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/TODO 2006-08-19 12:56:30 UTC (rev 744) @@ -5,11 +5,8 @@ Geany 0.8 or later: - o configurable "date/time" o Go to xxx - definable command o documentation: list and explain filetype modes - o inverting highlighting by selection - o src/sci_cb.c: improve auto completion(include local tags) o user-definable auto completion structs o documentation: preferences o save build includes & arguments @@ -17,10 +14,10 @@ o don't override Scintilla keybindings by default o allow use of custom global tags files o common default highlighting all in one config file - o show checked items for document->set menuitems o (DBUS) o (startup notification) - o (indent wrapped lines, but how?) + o (indent wrapped lines - Scintilla issue) + o (inverting highlighting by selection - Scintilla issue) o (project management) o (folder tree in the sidebar) o (improved Windows support) Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/geany.glade 2006-08-19 12:56:30 UTC (rev 744) @@ -57,7 +57,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1017"> + <widget class="GtkImage" id="image1037"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -150,7 +150,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="image1018"> + <widget class="GtkImage" id="image1038"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -171,7 +171,7 @@ <signal name="activate" handler="on_toolbutton23_clicked" last_modification_time="Mon, 24 Jul 2006 19:26:04 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1019"> + <widget class="GtkImage" id="image1039"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -191,7 +191,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1020"> + <widget class="GtkImage" id="image1040"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -271,7 +271,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="image1021"> + <widget class="GtkImage" id="image1041"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -402,7 +402,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1022"> + <widget class="GtkImage" id="image1042"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -434,7 +434,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1023"> + <widget class="GtkImage" id="image1043"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -503,6 +503,26 @@ </child> <child> + <widget class="GtkMenuItem" id="insert_date1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Insert Dat_e</property> + <property name="use_underline">True</property> + + <child> + <widget class="GtkMenu" id="insert_date1_menu"> + + <child> + <widget class="GtkMenuItem" id="invisible8"> + <property name="label" translatable="yes">invisible</property> + <property name="use_underline">True</property> + </widget> + </child> + </widget> + </child> + </widget> + </child> + + <child> <widget class="GtkSeparatorMenuItem" id="separator18"> <property name="visible">True</property> </widget> @@ -670,7 +690,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="image1024"> + <widget class="GtkImage" id="image1044"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -712,7 +732,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="image1025"> + <widget class="GtkImage" id="image1045"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -747,7 +767,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="image1026"> + <widget class="GtkImage" id="image1046"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -769,7 +789,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="image1027"> + <widget class="GtkImage" id="image1047"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1021,7 +1041,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Convert and set to CR (_Mac)</property> <property name="use_underline">True</property> - <property name="active">False</property> + <property name="active">True</property> <property name="group">crlf</property> <signal name="activate" handler="on_cr_activate" last_modification_time="Thu, 28 Apr 2005 16:27:24 GMT"/> </widget> @@ -2257,7 +2277,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image983"> + <widget class="GtkImage" id="image1048"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2289,7 +2309,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image984"> + <widget class="GtkImage" id="image1049"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2358,6 +2378,26 @@ </child> <child> + <widget class="GtkMenuItem" id="insert_date2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Insert Dat_e</property> + <property name="use_underline">True</property> + + <child> + <widget class="GtkMenu" id="insert_date2_menu"> + + <child> + <widget class="GtkMenuItem" id="invisible10"> + <property name="label" translatable="yes">invisible</property> + <property name="use_underline">True</property> + </widget> + </child> + </widget> + </child> + </widget> + </child> + + <child> <widget class="GtkSeparatorMenuItem" id="separator17"> <property name="visible">True</property> </widget> @@ -2465,7 +2505,7 @@ <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image985"> + <widget class="GtkImage" id="image1050"> <property name="visible">True</property> <property name="stock">gtk-find</property> <property name="icon_size">1</property> @@ -2511,7 +2551,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 16 Jul 2005 11:20:32 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image986"> + <widget class="GtkImage" id="image1051"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/callbacks.c 2006-08-19 12:56:30 UTC (rev 744) @@ -27,6 +27,7 @@ #include <unistd.h> #include <string.h> #include <gdk/gdkkeysyms.h> +#include <time.h> #include "callbacks.h" #include "interface.h" @@ -1679,8 +1680,14 @@ switch (GPOINTER_TO_INT(user_data)) { case 1: //custom target - dialogs_show_make_target(); - break; + { + dialogs_show_input(_("Enter custom options for the make tool"), + _("Enter custom options here, all entered text is passed to the make command."), + app->build_make_custopt, + G_CALLBACK(on_make_target_dialog_response), + G_CALLBACK(on_make_target_entry_activate)); + break; + } case 2: //make object { @@ -1696,12 +1703,13 @@ object_file = g_strdup_printf("%s.o", noext); g_free(noext); - g_strlcpy(app->build_make_custopt, object_file, 255); + g_free(app->build_make_custopt); + app->build_make_custopt = g_strdup(object_file); g_free(object_file); make_object = TRUE; } + // fall through - case 0: //make all { GPid child_pid; @@ -1775,7 +1783,8 @@ if (doc_list[idx].changed) document_save_file(idx, FALSE); - strncpy(app->build_make_custopt, gtk_entry_get_text(GTK_ENTRY(user_data)), 255); + g_free(app->build_make_custopt); + app->build_make_custopt = g_strdup(gtk_entry_get_text(GTK_ENTRY(user_data))); child_pid = build_make_file(idx, TRUE); if (child_pid != (GPid) 0) @@ -2191,6 +2200,85 @@ void +on_custom_date_dialog_response (GtkDialog *dialog, + gint response, + gpointer user_data) +{ + if (response == GTK_RESPONSE_ACCEPT) + { + g_free(app->custom_date_format); + app->custom_date_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(user_data))); + } + gtk_widget_destroy(GTK_WIDGET(dialog)); +} + + +void +on_custom_date_entry_activate (GtkEntry *entry, + gpointer user_data) +{ + on_custom_date_dialog_response(GTK_DIALOG(user_data), GTK_RESPONSE_ACCEPT, entry); +} + + +void +on_insert_date_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + gint idx = document_get_cur_idx(); + gchar *format; + gchar time_str[300]; // the entered format string can be maximal 256 chars long, so we have + // 44 additional characters for strtime's conversion + time_t t; + struct tm *tm; + + if (idx < 0 || ! doc_list[idx].is_valid) return; + + if (utils_strcmp(_("dd.mm.yyyy"), (gchar*) user_data)) + format = "%d.%m.%Y"; + else if (utils_strcmp(_("mm.dd.yyyy"), (gchar*) user_data)) + format = "%m.%d.%Y"; + else if (utils_strcmp(_("yyyy/mm/dd"), (gchar*) user_data)) + format = "%Y/%m/%d"; + else if (utils_strcmp(_("dd.mm.yyyy hh:mm:ss"), (gchar*) user_data)) + format = "%d.%m.%Y %H:%M:%S"; + else if (utils_strcmp(_("mm.dd.yyyy hh:mm:ss"), (gchar*) user_data)) + format = "%m.%d.%Y %H:%M:%S"; + else if (utils_strcmp(_("yyyy/mm/dd hh:mm:ss"), (gchar*) user_data)) + format = "%Y/%m/%d %H:%M:%S"; + else if (utils_strcmp(_("Use custom date format"), (gchar*) user_data)) + format = app->custom_date_format; + else + { + // set default value + if (utils_strcmp("", app->custom_date_format)) app->custom_date_format = g_strdup("%d.%m.%Y"); + + dialogs_show_input(_("Custom date format"), + _("Enter here a custom date and time format which should be inserted. You can use all conversion specifiers which can be used with the ANSI C strftime function. See \"man strftime\" for more information."), + app->custom_date_format, + G_CALLBACK(on_custom_date_dialog_response), + G_CALLBACK(on_custom_date_entry_activate)); + return; + } + + // get the current time + t = time(NULL); + tm = localtime(&t); + if (strftime(time_str, sizeof time_str, format, tm) != 0) + { + /// FIXME inserts at wrong position if not clicked and the cursor was moved by keyboard + sci_insert_text(doc_list[idx].sci, clickpos, time_str); + } + else + { + utils_beep(); + msgwin_status_add( + _("Date format string could not be converted (possibly too long).")); + } +} + + +void on_insert_include_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -2207,6 +2295,7 @@ text = g_strconcat("#include <", user_data, ">\n", NULL); } + /// FIXME inserts at wrong position if not clicked and the cursor was moved by keyboard sci_insert_text(doc_list[idx].sci, clickpos, text); g_free(text); if (pos > 0) sci_goto_pos(doc_list[idx].sci, pos, FALSE); Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/callbacks.h 2006-08-19 12:56:30 UTC (rev 744) @@ -461,6 +461,19 @@ gpointer user_data); void +on_custom_date_dialog_response (GtkDialog *dialog, + gint response, + gpointer user_data); + +void +on_custom_date_entry_activate (GtkEntry *entry, + gpointer user_data); + +void +on_insert_date_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void on_recent_file_activate (GtkMenuItem *menuitem, gpointer user_data); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/dialogs.c 2006-08-19 12:56:30 UTC (rev 744) @@ -701,28 +701,29 @@ } -void dialogs_show_make_target(void) +void dialogs_show_input(const gchar *title, const gchar *label_text, const gchar *default_text, + GCallback cb_dialog, GCallback cb_entry) { GtkWidget *dialog, *label, *entry; - dialog = gtk_dialog_new_with_buttons(_("Enter custom options for the make tool"), GTK_WINDOW(app->window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(app->window), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - label = gtk_label_new(_("Enter custom options here, all entered text is passed to the make command.")); + label = gtk_label_new(label_text); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_misc_set_padding(GTK_MISC(label), 0, 6); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); entry = gtk_entry_new(); - if (app->build_make_custopt) + if (default_text != NULL) { - gtk_entry_set_text(GTK_ENTRY(entry), app->build_make_custopt); + gtk_entry_set_text(GTK_ENTRY(entry), default_text); } - gtk_entry_set_max_length(GTK_ENTRY(entry), 248); + gtk_entry_set_max_length(GTK_ENTRY(entry), 255); gtk_entry_set_width_chars(GTK_ENTRY(entry), 30); - g_signal_connect((gpointer) entry, "activate", G_CALLBACK(on_make_target_entry_activate), dialog); - g_signal_connect((gpointer) dialog, "response", G_CALLBACK(on_make_target_dialog_response), entry); + if (cb_entry != NULL) g_signal_connect((gpointer) entry, "activate", cb_entry, dialog); + g_signal_connect((gpointer) dialog, "response", cb_dialog, entry); g_signal_connect((gpointer) dialog, "delete_event", G_CALLBACK(gtk_widget_destroy), NULL); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label); Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/dialogs.h 2006-08-19 12:56:30 UTC (rev 744) @@ -47,7 +47,8 @@ GtkWidget *dialogs_create_build_menu_tex(gint idx); -void dialogs_show_make_target(void); +void dialogs_show_input(const gchar *title, const gchar *label_text, const gchar *default_text, + GCallback cb_dialog, GCallback cb_entry); void dialogs_show_goto_line(void); Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/geany.h 2006-08-19 12:56:30 UTC (rev 744) @@ -190,7 +190,8 @@ gchar *configdir; gchar *datadir; gchar *docdir; - gchar build_make_custopt[256]; + gchar *build_make_custopt; + gchar *custom_date_format; gchar *tools_browser_cmd; gchar *tools_make_cmd; gchar *tools_term_cmd; @@ -216,7 +217,7 @@ GtkWidget *redo_items[3]; GtkWidget *undo_items[3]; GtkWidget *save_buttons[2]; - GtkWidget *sensitive_buttons[35]; + GtkWidget *sensitive_buttons[37]; GtkWidget *open_colorsel; GtkWidget *open_fontsel; GtkWidget *open_filesel; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/interface.c 2006-08-19 12:56:30 UTC (rev 744) @@ -37,7 +37,7 @@ GtkWidget *menuitem1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image1017; + GtkWidget *image1037; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -49,11 +49,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image1018; + GtkWidget *image1038; GtkWidget *menu_reload1; - GtkWidget *image1019; + GtkWidget *image1039; GtkWidget *menu_reload_as1; - GtkWidget *image1020; + GtkWidget *image1040; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -63,7 +63,7 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image1021; + GtkWidget *image1041; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -79,17 +79,20 @@ GtkWidget *menu_select_all1; GtkWidget *separator25; GtkWidget *insert_include2; - GtkWidget *image1022; + GtkWidget *image1042; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image1023; + GtkWidget *image1043; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; GtkWidget *insert_function_description2; GtkWidget *insert_multiline_comment2; GtkWidget *insert_gpl_notice2; + GtkWidget *insert_date1; + GtkWidget *insert_date1_menu; + GtkWidget *invisible8; GtkWidget *separator18; GtkWidget *menu_format1; GtkWidget *menu_format1_menu; @@ -111,18 +114,18 @@ GtkWidget *find_next1; GtkWidget *find_previous1; GtkWidget *replace1; - GtkWidget *image1024; + GtkWidget *image1044; GtkWidget *separator27; GtkWidget *find_in_files1; GtkWidget *separator11; GtkWidget *go_to_line1; - GtkWidget *image1025; + GtkWidget *image1045; GtkWidget *menuitem3; GtkWidget *menuitem3_menu; GtkWidget *menu_change_font1; - GtkWidget *image1026; + GtkWidget *image1046; GtkWidget *menu_choose_color1; - GtkWidget *image1027; + GtkWidget *image1047; GtkWidget *menu_separator4; GtkWidget *menu_fullscreen1; GtkWidget *menu_show_messages_window1; @@ -259,9 +262,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1); - image1017 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1017); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1017); + image1037 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1037); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1037); 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); @@ -306,25 +309,25 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image1018 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1018); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1018); + image1038 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1038); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1038); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload1); - image1019 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1019); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1019); + image1039 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1039); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1039); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload as")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload_as1); - image1020 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1020); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1020); + image1040 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1040); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1040); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -365,9 +368,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image1021 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1021); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1021); + image1041 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1041); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1041); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -433,9 +436,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image1022 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1022); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1022); + image1042 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1042); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1042); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -447,9 +450,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image1023 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1023); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1023); + image1043 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1043); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1043); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -479,6 +482,16 @@ gtk_container_add (GTK_CONTAINER (add_comments1_menu), insert_gpl_notice2); gtk_tooltips_set_tip (tooltips, insert_gpl_notice2, _("Inserts a GPL notice (should be done at the beginning of the file)"), NULL); + insert_date1 = gtk_menu_item_new_with_mnemonic (_("Insert Dat_e")); + gtk_widget_show (insert_date1); + gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); + + insert_date1_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); + + invisible8 = gtk_menu_item_new_with_mnemonic (_("invisible")); + gtk_container_add (GTK_CONTAINER (insert_date1_menu), invisible8); + separator18 = gtk_separator_menu_item_new (); gtk_widget_show (separator18); gtk_container_add (GTK_CONTAINER (edit1_menu), separator18); @@ -567,9 +580,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image1024 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1024); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1024); + image1044 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1044); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1044); separator27 = gtk_separator_menu_item_new (); gtk_widget_show (separator27); @@ -589,9 +602,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image1025 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1025); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1025); + image1045 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1045); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1045); menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menuitem3); @@ -605,18 +618,18 @@ gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image1026 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1026); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1026); + image1046 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1046); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1046); 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); - image1027 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1027); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1027); + image1047 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1047); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1047); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -746,6 +759,7 @@ crlf_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (cr)); gtk_widget_show (cr); gtk_container_add (GTK_CONTAINER (menu_line_endings1_menu), cr); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (cr), TRUE); separator8 = gtk_separator_menu_item_new (); gtk_widget_show (separator8); @@ -1358,7 +1372,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, image1017, "image1017"); + GLADE_HOOKUP_OBJECT (window1, image1037, "image1037"); 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"); @@ -1370,11 +1384,11 @@ 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, image1018, "image1018"); + GLADE_HOOKUP_OBJECT (window1, image1038, "image1038"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image1019, "image1019"); + GLADE_HOOKUP_OBJECT (window1, image1039, "image1039"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image1020, "image1020"); + GLADE_HOOKUP_OBJECT (window1, image1040, "image1040"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1384,7 +1398,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, image1021, "image1021"); + GLADE_HOOKUP_OBJECT (window1, image1041, "image1041"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1400,17 +1414,20 @@ 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, image1022, "image1022"); + GLADE_HOOKUP_OBJECT (window1, image1042, "image1042"); 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, image1023, "image1023"); + GLADE_HOOKUP_OBJECT (window1, image1043, "image1043"); 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"); GLADE_HOOKUP_OBJECT (window1, insert_function_description2, "insert_function_description2"); GLADE_HOOKUP_OBJECT (window1, insert_multiline_comment2, "insert_multiline_comment2"); GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); + GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); + GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); + GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, menu_format1, "menu_format1"); GLADE_HOOKUP_OBJECT (window1, menu_format1_menu, "menu_format1_menu"); @@ -1432,18 +1449,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, image1024, "image1024"); + GLADE_HOOKUP_OBJECT (window1, image1044, "image1044"); 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, image1025, "image1025"); + GLADE_HOOKUP_OBJECT (window1, image1045, "image1045"); 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, image1026, "image1026"); + GLADE_HOOKUP_OBJECT (window1, image1046, "image1046"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image1027, "image1027"); + GLADE_HOOKUP_OBJECT (window1, image1047, "image1047"); 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"); @@ -1668,17 +1685,20 @@ GtkWidget *normal_size2; GtkWidget *separator6; GtkWidget *insert_include1; - GtkWidget *image983; + GtkWidget *image1048; GtkWidget *insert_include1_menu; GtkWidget *invisible3; GtkWidget *comments; - GtkWidget *image984; + GtkWidget *image1049; GtkWidget *comments_menu; GtkWidget *add_changelog_entry2; GtkWidget *insert_file_header2; GtkWidget *insert_function_description1; GtkWidget *insert_multiline_comment1; GtkWidget *insert_gpl_notice1; + GtkWidget *insert_date2; + GtkWidget *insert_date2_menu; + GtkWidget *invisible10; GtkWidget *separator17; GtkWidget *menu_format2; GtkWidget *menu_format2_menu; @@ -1693,12 +1713,12 @@ GtkWidget *menu_decrease_indent2; GtkWidget *separator7; GtkWidget *find_usage1; - GtkWidget *image985; + GtkWidget *image1050; GtkWidget *goto_tag_definition1; GtkWidget *goto_tag_declaration1; GtkWidget *separator15; GtkWidget *go_to_line; - GtkWidget *image986; + GtkWidget *image1051; GtkAccelGroup *accel_group; GtkTooltips *tooltips; @@ -1772,9 +1792,9 @@ gtk_widget_show (insert_include1); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); - image983 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image983); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image983); + image1048 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1048); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1048); insert_include1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); @@ -1786,9 +1806,9 @@ gtk_widget_show (comments); gtk_container_add (GTK_CONTAINER (edit_menu1), comments); - image984 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image984); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image984); + image1049 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1049); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1049); comments_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); @@ -1818,6 +1838,16 @@ gtk_container_add (GTK_CONTAINER (comments_menu), insert_gpl_notice1); gtk_tooltips_set_tip (tooltips, insert_gpl_notice1, _("Inserts a GPL notice (should be done at the beginning of the file)"), NULL); + insert_date2 = gtk_menu_item_new_with_mnemonic (_("Insert Dat_e")); + gtk_widget_show (insert_date2); + gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2); + + insert_date2_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu); + + invisible10 = gtk_menu_item_new_with_mnemonic (_("invisible")); + gtk_container_add (GTK_CONTAINER (insert_date2_menu), invisible10); + separator17 = gtk_separator_menu_item_new (); gtk_widget_show (separator17); gtk_container_add (GTK_CONTAINER (edit_menu1), separator17); @@ -1877,9 +1907,9 @@ gtk_widget_show (find_usage1); gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1); - image985 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image985); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image985); + image1050 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1050); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1050); goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to tag definition")); gtk_widget_show (goto_tag_definition1); @@ -1899,9 +1929,9 @@ gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line); gtk_tooltips_set_tip (tooltips, go_to_line, _("Goto to the entered line"), NULL); - image986 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image986); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image986); + image1051 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1051); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1051); g_signal_connect ((gpointer) undo1, "activate", G_CALLBACK (on_undo1_activate), @@ -1999,17 +2029,20 @@ GLADE_HOOKUP_OBJECT (edit_menu1, normal_size2, "normal_size2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator6, "separator6"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image983, "image983"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1048, "image1048"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); - GLADE_HOOKUP_OBJECT (edit_menu1, image984, "image984"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1049, "image1049"); GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_function_description1, "insert_function_description1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_multiline_comment1, "insert_multiline_comment1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_gpl_notice1, "insert_gpl_notice1"); + GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2, "insert_date2"); + GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2_menu, "insert_date2_menu"); + GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10"); GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_format2, "menu_format2"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_format2_menu, "menu_format2_menu"); @@ -2024,12 +2057,12 @@ GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image985, "image985"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1050, "image1050"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1"); GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15"); GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line"); - GLADE_HOOKUP_OBJECT (edit_menu1, image986, "image986"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1051, "image1051"); GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, tooltips, "tooltips"); gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/keybindings.c 2006-08-19 12:56:30 UTC (rev 744) @@ -55,6 +55,7 @@ static void cb_func_menu_redo(void); static void cb_func_menu_selectall(void); static void cb_func_menu_preferences(void); +static void cb_func_menu_insert_date(void); static void cb_func_menu_findnext(void); static void cb_func_menu_findprevious(void); static void cb_func_menu_replace(void); @@ -132,8 +133,10 @@ GDK_y, GDK_CONTROL_MASK, "menu_redo", _("Redo")); keys[GEANY_KEYS_MENU_SELECTALL] = fill(cb_func_menu_selectall, GDK_a, GDK_CONTROL_MASK, "menu_selectall", _("Select All")); + keys[GEANY_KEYS_MENU_INSERTDATE] = fill(cb_func_menu_insert_date, + GDK_d, GDK_SHIFT_MASK | GDK_MOD1_MASK, "menu_insert_date", _("Insert date")); keys[GEANY_KEYS_MENU_PREFERENCES] = fill(cb_func_menu_preferences, - GDK_p, GDK_CONTROL_MASK, "menu_preferences", _("Preferences")); + GDK_p, GDK_MOD1_MASK, "menu_preferences", _("Preferences")); keys[GEANY_KEYS_MENU_FINDNEXT] = fill(cb_func_menu_findnext, GDK_F3, 0, "menu_findnext", _("Find Next")); keys[GEANY_KEYS_MENU_FINDPREVIOUS] = fill(cb_func_menu_findprevious, @@ -272,6 +275,7 @@ GEANY_ADD_ACCEL(GEANY_KEYS_MENU_UNDO, menu_undo2); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_REDO, menu_redo2); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SELECTALL, menu_select_all1); + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_INSERTDATE, insert_date_custom1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_PREFERENCES, preferences1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FINDNEXT, find_next1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FINDPREVIOUS, find_previous1); @@ -295,6 +299,7 @@ GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_UNDO, undo1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_REDO, redo1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_SELECTALL, menu_select_all2); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_INSERTDATE, insert_date_custom2); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_ZOOMIN, zoom_in1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_ZOOMOUT, zoom_out1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_FINDUSAGE, find_usage1); @@ -769,3 +774,8 @@ { on_menu_decrease_indent1_activate(NULL, NULL); } + +static void cb_func_menu_insert_date(void) +{ + gtk_menu_item_activate(GTK_MENU_ITEM(lookup_widget(app->popup_menu, "insert_date_custom2"))); +} Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/keybindings.h 2006-08-19 12:56:30 UTC (rev 744) @@ -52,6 +52,7 @@ GEANY_KEYS_MENU_UNDO, GEANY_KEYS_MENU_REDO, GEANY_KEYS_MENU_SELECTALL, + GEANY_KEYS_MENU_INSERTDATE, GEANY_KEYS_MENU_PREFERENCES, GEANY_KEYS_MENU_FINDNEXT, GEANY_KEYS_MENU_FINDPREVIOUS, Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/keyfile.c 2006-08-19 12:56:30 UTC (rev 744) @@ -113,6 +113,7 @@ _(" VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output;follow path of file"), NULL); g_key_file_set_string(config, PACKAGE, "terminal_settings", app->terminal_settings); #endif + g_key_file_set_string(config, PACKAGE, "custom_date_format", app->custom_date_format); g_key_file_set_string(config, PACKAGE, "editor_font", app->editor_font); g_key_file_set_string(config, PACKAGE, "tagbar_font", app->tagbar_font); g_key_file_set_string(config, PACKAGE, "msgwin_font", app->msgwin_font); @@ -269,6 +270,7 @@ app->tab_order_ltr = utils_get_setting_boolean(config, PACKAGE, "tab_order_ltr", FALSE); app->brace_match_ltgt = utils_get_setting_boolean(config, PACKAGE, "brace_match_ltgt", FALSE); app->switch_msgwin_pages = utils_get_setting_boolean(config, PACKAGE, "switch_msgwin_pages", FALSE); + app->custom_date_format = utils_get_setting_string(config, PACKAGE, "custom_date_format", ""); app->editor_font = utils_get_setting_string(config, PACKAGE, "editor_font", GEANY_DEFAULT_FONT_EDITOR); app->tagbar_font = utils_get_setting_string(config, PACKAGE, "tagbar_font", GEANY_DEFAULT_FONT_SYMBOL_LIST); app->msgwin_font = utils_get_setting_string(config, PACKAGE, "msgwin_font", GEANY_DEFAULT_FONT_MSG_WINDOW); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/main.c 2006-08-19 12:56:30 UTC (rev 744) @@ -288,6 +288,8 @@ app->sensitive_buttons[32] = lookup_widget(app->window, "print1"); app->sensitive_buttons[33] = lookup_widget(app->window, "menu_reload_as1"); app->sensitive_buttons[34] = lookup_widget(app->window, "menu_select_all1"); + app->sensitive_buttons[35] = lookup_widget(app->window, "insert_date1"); + app->sensitive_buttons[36] = lookup_widget(app->window, "menu_format1"); 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"); @@ -589,6 +591,8 @@ #endif if (no_msgwin) app->msgwindow_visible = FALSE; + utils_create_insert_menu_items(); + utils_create_insert_date_menu_items(); keybindings_init(); notebook_init(); templates_init(); @@ -622,7 +626,6 @@ vte_init(); #endif dialogs_create_recent_menu(); - utils_create_insert_menu_items(); msgwin_status_add(_("This is Geany %s."), VERSION); if (config_dir_result != 0) Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/utils.c 2006-08-19 12:56:30 UTC (rev 744) @@ -1653,7 +1653,7 @@ } -static void insert_items(GtkMenu *me, GtkMenu *mp, gchar **includes, gchar *label) +static void insert_include_items(GtkMenu *me, GtkMenu *mp, gchar **includes, gchar *label) { guint i = 0; GtkWidget *tmp_menu; @@ -1726,18 +1726,82 @@ gtk_widget_show(blank); g_signal_connect((gpointer) blank, "activate", G_CALLBACK(on_insert_include_activate), (gpointer) "blank"); - blank = gtk_separator_menu_item_new (); + blank = gtk_separator_menu_item_new(); gtk_container_add(GTK_CONTAINER(menu_popup), blank); gtk_widget_show(blank); - insert_items(menu_edit, menu_popup, (gchar**) c_includes_stdlib, _("C Standard Library")); - insert_items(menu_edit, menu_popup, (gchar**) c_includes_c99, _("ISO C99")); - insert_items(menu_edit, menu_popup, (gchar**) c_includes_cpp, _("C++ (C Standard Library)")); - insert_items(menu_edit, menu_popup, (gchar**) c_includes_cppstdlib, _("C++ Standard Library")); - insert_items(menu_edit, menu_popup, (gchar**) c_includes_stl, _("C++ STL")); + insert_include_items(menu_edit, menu_popup, (gchar**) c_includes_stdlib, _("C Standard Library")); + insert_include_items(menu_edit, menu_popup, (gchar**) c_includes_c99, _("ISO C99")); + insert_include_items(menu_edit, menu_popup, (gchar**) c_includes_cpp, _("C++ (C Standard Library)")); + insert_include_items(menu_edit, menu_popup, (gchar**) c_includes_cppstdlib, _("C++ Standard Library")); + insert_include_items(menu_edit, menu_popup, (gchar**) c_includes_stl, _("C++ STL")); } +static void insert_date_items(GtkMenu *me, GtkMenu *mp, gchar *label) +{ + GtkWidget *item; + + item = gtk_menu_item_new_with_label(label); + gtk_container_add(GTK_CONTAINER(me), item); + gtk_widget_show(item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_insert_date_activate), label); + + item = gtk_menu_item_new_with_label(label); + gtk_container_add(GTK_CONTAINER(mp), item); + gtk_widget_show(item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_insert_date_activate), label); +} + + +void utils_create_insert_date_menu_items(void) +{ + GtkMenu *menu_edit = GTK_MENU(lookup_widget(app->window, "insert_date1_menu")); + GtkMenu *menu_popup = GTK_MENU(lookup_widget(app->popup_menu, "insert_date2_menu")); + GtkWidget *item; + + insert_date_items(menu_edit, menu_popup, _("dd.mm.yyyy")); + insert_date_items(menu_edit, menu_popup, _("mm.dd.yyyy")); + insert_date_items(menu_edit, menu_popup, _("yyyy/mm/dd")); + + item = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(menu_edit), item); + gtk_widget_show(item); + item = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(menu_popup), item); + gtk_widget_show(item); + + insert_date_items(menu_edit, menu_popup, _("dd.mm.yyyy hh:mm:ss")); + insert_date_items(menu_edit, menu_popup, _("mm.dd.yyyy hh:mm:ss")); + insert_date_items(menu_edit, menu_popup, _("yyyy/mm/dd hh:mm:ss")); + + item = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(menu_edit), item); + gtk_widget_show(item); + item = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(menu_popup), item); + gtk_widget_show(item); + + item = gtk_menu_item_new_with_label(_("Use custom date format")); + gtk_container_add(GTK_CONTAINER(menu_edit), item); + gtk_widget_show(item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_insert_date_activate), + _("Use custom date format")); + g_object_set_data_full(G_OBJECT(app->window), "insert_date_custom1", gtk_widget_ref(item), + (GDestroyNotify)gtk_widget_unref); + + item = gtk_menu_item_new_with_label(_("Use custom date format")); + gtk_container_add(GTK_CONTAINER(menu_popup), item); + gtk_widget_show(item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_insert_date_activate), + _("Use custom date format")); + g_object_set_data_full(G_OBJECT(app->popup_menu), "insert_date_custom2", gtk_widget_ref(item), + (GDestroyNotify)gtk_widget_unref); + + insert_date_items(menu_edit, menu_popup, _("Set custom date format")); +} + + gchar *utils_get_initials(gchar *name) { gint i = 1, j = 1; Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-08-19 10:00:21 UTC (rev 743) +++ trunk/src/utils.h 2006-08-19 12:56:30 UTC (rev 744) @@ -163,6 +163,8 @@ void utils_create_insert_menu_items(void); +void utils_create_insert_date_menu_items(void); + gchar *utils_get_initials(gchar *name); void utils_update_toolbar_icons(GtkIconSize size); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [743] trunk
by ntrel＠users.sourceforge.net 19 Aug '06

19 Aug '06

Revision: 743 Author: ntrel Date: 2006-08-19 03:00:21 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=743&view=rev Log Message: ----------- Fix a segfault at startup if terminal follow path setting is enabled Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-19 09:08:48 UTC (rev 742) +++ trunk/ChangeLog 2006-08-19 10:00:21 UTC (rev 743) @@ -1,3 +1,9 @@ +2006-08-19 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/callbacks.c: Fix a segfault at startup if terminal follow path + setting is enabled. + + 2006-08-18 Administrator <Administrator@localhost> * src/document.c: Use codepage SC_CP_UTF8 because we use always Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-08-19 09:08:48 UTC (rev 742) +++ trunk/src/callbacks.c 2006-08-19 10:00:21 UTC (rev 743) @@ -781,7 +781,9 @@ } #ifdef HAVE_VTE - if (app->have_vte && vc->follow_path && doc_list[idx].file_name != NULL) + // at startup, idx is always -1, so terminal startup dir is wrong, + // but we could remember the vte dir to fix this. + if (idx >= 0 && app->have_vte && vc->follow_path && doc_list[idx].file_name != NULL) { gchar *path; gchar *cmd; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [742] trunk/tagmanager/makefile.win32
by eht16＠users.sourceforge.net 19 Aug '06

19 Aug '06

Revision: 742 Author: eht16 Date: 2006-08-19 02:08:48 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=742&view=rev Log Message: ----------- Merged tagmanager/d.c with tagmanager/c.c. Modified Paths: -------------- trunk/tagmanager/makefile.win32 Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2006-08-18 19:57:02 UTC (rev 741) +++ trunk/tagmanager/makefile.win32 2006-08-19 09:08:48 UTC (rev 742) @@ -32,7 +32,7 @@ clean: $(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): args.o c.o fortran.o d.o make.o conf.o pascal.o perl.o php.o \ +$(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o \ python.o regex.o sh.o ctags.o entry.o get.o keyword.o options.o parse.o \ read.o sort.o strlist.o latex.o docbook.o tcl.o ruby.o asm.o sql.o css.o vstring.o tm_workspace.o tm_work_object.o \ tm_source_file.o tm_project.o tm_tag.o tm_symbol.o tm_file_entry.o \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [741] trunk
by ntrel＠users.sourceforge.net 19 Aug '06

19 Aug '06

Revision: 741 Author: ntrel Date: 2006-08-18 12:57:02 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=741&view=rev Log Message: ----------- Merged tagmanager/d.c with tagmanager/c.c, which also adds user function calltips support for D Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/Makefile.am trunk/tagmanager/c.c Removed Paths: ------------- trunk/tagmanager/d.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-18 17:44:46 UTC (rev 740) +++ trunk/ChangeLog 2006-08-18 19:57:02 UTC (rev 741) @@ -13,8 +13,11 @@ Add dialogs_show_question_full for custom buttons and extra text. Don't show message dialogs in the window manager taskbar. * src/utils.c: Use Reload button for utils_check_disk_status dialog. - * src/callbacks.c: Use Reload button for reload dialog. + * src/callbacks.c: Improve Reload and Quit dialog. Share on_reload_as_activate code for reloading. +* tagmanager/d.c, tagmanager/c.c, tagmanager/Makefile.am: + Merged tagmanager/d.c with tagmanager/c.c, which also adds user + function calltips support for D. 2006-08-17 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2006-08-18 17:44:46 UTC (rev 740) +++ trunk/tagmanager/Makefile.am 2006-08-18 19:57:02 UTC (rev 741) @@ -27,7 +27,6 @@ args.c\ args.h\ c.c\ - d.c\ conf.c\ css.c\ docbook.c\ Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2006-08-18 17:44:46 UTC (rev 740) +++ trunk/tagmanager/c.c 2006-08-18 19:57:02 UTC (rev 741) @@ -5,7 +5,7 @@ * 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 C, C++ and Java +* This module contains functions for parsing and scanning C, C++, D and Java * source files. */ @@ -233,6 +233,7 @@ static langType Lang_c; static langType Lang_cpp; static langType Lang_java; +static langType Lang_d; /* Used to index into the CKinds table. */ typedef enum { @@ -819,7 +820,7 @@ static const char* accessField (const statementInfo *const st) { const char* result = NULL; - if (isLanguage (Lang_cpp) && st->scope == SCOPE_FRIEND) + if ((isLanguage (Lang_cpp) || isLanguage (Lang_d)) && st->scope == SCOPE_FRIEND) result = "friend"; else if (st->member.access != ACCESS_UNDEFINED) result = accessString (st->member.access); @@ -866,7 +867,7 @@ vStringValue (st->parentClasses); } if (st->implementation != IMP_DEFAULT && - (isLanguage (Lang_cpp) || isLanguage (Lang_java))) + (isLanguage (Lang_cpp) || isLanguage (Lang_java) || isLanguage (Lang_d))) { tag->extensionFields.implementation = implementationString (st->implementation); @@ -900,7 +901,7 @@ static void addContextSeparator (vString *const scope) { - if (isLanguage (Lang_c) || isLanguage (Lang_cpp)) + if (isLanguage (Lang_c) || isLanguage (Lang_cpp) || isLanguage (Lang_d)) vStringCatS (scope, "::"); else if (isLanguage (Lang_java)) vStringCatS (scope, "."); @@ -1426,7 +1427,7 @@ { if (isMember (st)) { - if (isLanguage (Lang_cpp)) + if (isLanguage (Lang_cpp) || isLanguage (Lang_d)) { int c = skipToNonWhite (); @@ -1981,7 +1982,7 @@ { if (vStringLength (st->context->name) > 0) { - if (isLanguage (Lang_c) || isLanguage (Lang_cpp)) + if (isLanguage (Lang_c) || isLanguage (Lang_cpp) || isLanguage (Lang_d)) vStringCatS (st->context->name, "::"); else if (isLanguage (Lang_java)) vStringCatS (st->context->name, "."); @@ -2004,7 +2005,7 @@ else { cppUngetc (c); - if (isLanguage (Lang_cpp) && ( + if ((isLanguage (Lang_cpp) || isLanguage (Lang_d)) && ( st->declaration == DECL_CLASS || st->declaration == DECL_STRUCT)) { readParents (st, ':'); @@ -2403,6 +2404,12 @@ buildKeywordHash (language, 2); } +static void initializeDParser (const langType language) +{ + Lang_d = language; + buildKeywordHash (language, 17); +} + extern parserDefinition* CParser (void) { static const char *const extensions [] = { "c", "pc", "sc", NULL }; @@ -2446,4 +2453,17 @@ return def; } +extern parserDefinition* DParser (void) +{ + static const char *const extensions [] = { "d", "di", NULL }; + parserDefinition* def = parserNew ("D"); + def->kinds = CKinds; + def->kindCount = KIND_COUNT (CKinds); + def->extensions = extensions; + def->parser2 = findCTags; + def->initialize = initializeDParser; + return def; +} + + /* vi:set tabstop=8 shiftwidth=4: */ Deleted: trunk/tagmanager/d.c =================================================================== --- trunk/tagmanager/d.c 2006-08-18 17:44:46 UTC (rev 740) +++ trunk/tagmanager/d.c 2006-08-18 19:57:02 UTC (rev 741) @@ -1,2303 +0,0 @@ -/* -* -* 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: */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [740] trunk
by eht16＠users.sourceforge.net 18 Aug '06

18 Aug '06

Revision: 740 Author: eht16 Date: 2006-08-18 10:44:46 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=740&view=rev Log Message: ----------- Use codepage SC_CP_UTF8 because we use always GTK even under Windows. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-18 17:26:42 UTC (rev 739) +++ trunk/ChangeLog 2006-08-18 17:44:46 UTC (rev 740) @@ -1,3 +1,9 @@ +2006-08-18 Administrator <Administrator@localhost> + + * src/document.c: Use codepage SC_CP_UTF8 because we use always + GTK even under Windows. + + 2006-08-18 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/keyfile.c: Fix a small memory leak in configuration_load. Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-08-18 17:26:42 UTC (rev 739) +++ trunk/src/document.c 2006-08-18 17:44:46 UTC (rev 740) @@ -238,11 +238,7 @@ gtk_widget_show(GTK_WIDGET(sci)); -#ifdef G_OS_WIN32 - sci_set_codepage(sci, 0); -#else sci_set_codepage(sci, SC_CP_UTF8); -#endif //SSM(sci, SCI_SETWRAPSTARTINDENT, 4, 0); // disable scintilla provided popup menu sci_use_popup(sci, FALSE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [739] trunk/TODO
by ntrel＠users.sourceforge.net 18 Aug '06

18 Aug '06

Revision: 739 Author: ntrel Date: 2006-08-18 10:26:42 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=739&view=rev Log Message: ----------- Remove descriptive buttons entry now we are using dialogs_show_question_full Modified Paths: -------------- trunk/TODO Modified: trunk/TODO =================================================================== --- trunk/TODO 2006-08-18 17:24:44 UTC (rev 738) +++ trunk/TODO 2006-08-18 17:26:42 UTC (rev 739) @@ -11,7 +11,6 @@ o inverting highlighting by selection o src/sci_cb.c: improve auto completion(include local tags) o user-definable auto completion structs - o dialogs to use descriptive buttons and 12px border o documentation: preferences o save build includes & arguments o separate filetype for HTML This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [738] trunk
by ntrel＠users.sourceforge.net 18 Aug '06

18 Aug '06

Revision: 738 Author: ntrel Date: 2006-08-18 10:24:44 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=738&view=rev Log Message: ----------- Use Reload button for reload dialog; Share on_reload_as_activate code for reloading Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-08-18 17:23:40 UTC (rev 737) +++ trunk/ChangeLog 2006-08-18 17:24:44 UTC (rev 738) @@ -3,6 +3,12 @@ * src/keyfile.c: Fix a small memory leak in configuration_load. * src/dialogs.c: Change Don't save button icon and add mnemonic. * src/main.c: Fix building on win32 - thanks to Củ Văn Chuối. + * src/dialogs.c, src/dialogs.h: + Add dialogs_show_question_full for custom buttons and extra text. + Don't show message dialogs in the window manager taskbar. + * src/utils.c: Use Reload button for utils_check_disk_status dialog. + * src/callbacks.c: Use Reload button for reload dialog. + Share on_reload_as_activate code for reloading. 2006-08-17 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-08-18 17:23:40 UTC (rev 737) +++ trunk/src/callbacks.c 2006-08-18 17:24:44 UTC (rev 738) @@ -196,8 +196,9 @@ { if (app->pref_main_confirm_exit) { - if (dialogs_show_question(_("Do you really want to quit?")) && - on_close_all1_activate(NULL, NULL)) destroyapp(NULL, gdata); + if (dialogs_show_question_full(GTK_STOCK_QUIT, GTK_STOCK_CANCEL, NULL, + _("Do you really want to quit?")) && on_close_all1_activate(NULL, NULL)) + destroyapp(NULL, gdata); else app->quitting = FALSE; } else @@ -211,7 +212,9 @@ { if (app->pref_main_confirm_exit) { - if (dialogs_show_question(_("Do you really want to quit?"))) destroyapp(NULL, gdata); + if (dialogs_show_question(GTK_STOCK_QUIT, GTK_STOCK_CANCEL, NULL, + _("Do you really want to quit?"))) + destroyapp(NULL, gdata); else app->quitting = FALSE; } else @@ -489,19 +492,37 @@ on_toolbutton23_clicked (GtkToolButton *toolbutton, gpointer user_data) { + on_reload_as_activate(NULL, GINT_TO_POINTER(-1)); +} + + +// also used for reloading when user_data is -1 +void +on_reload_as_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ gint idx = document_get_cur_idx(); gchar *basename; + gint i = GPOINTER_TO_INT(user_data); + gchar *charset = NULL; - if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_name == NULL) return; + if (idx < 0 || ! doc_list[idx].is_valid || doc_list[idx].file_name == NULL) + return; + if (i >= 0) + { + if (i >= GEANY_ENCODINGS_MAX || encodings[i].charset == NULL) return; + charset = encodings[i].charset; + } basename = g_path_get_basename(doc_list[idx].file_name); - if (dialogs_show_question(_ - ("Are you sure you want to reload '%s'?\nAny unsaved changes will be lost."), - basename)) + if (dialogs_show_question_full(_("_Reload"), GTK_STOCK_CANCEL, + _("Any unsaved changes will be lost."), + _("Are you sure you want to reload '%s'?"), basename)) { - document_reload_file(idx, NULL); + document_reload_file(idx, charset); + if (charset != NULL) + utils_update_statusbar(idx, -1); } - g_free(basename); } @@ -2347,29 +2368,6 @@ void -on_reload_as_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - gint idx = document_get_cur_idx(); - gchar *basename; - gint i = GPOINTER_TO_INT(user_data); - - if (idx < 0 || ! doc_list[idx].is_valid || doc_list[idx].file_name == NULL || - i < 0 || i >= GEANY_ENCODINGS_MAX || encodings[i].charset == NULL) - return; - - basename = g_path_get_basename(doc_list[idx].file_name); - if (dialogs_show_question(_ - ("Are you sure you want to reload '%s'?\nAny unsaved changes will be lost."), - basename)) - { - document_reload_file(idx, encodings[i].charset); - utils_update_statusbar(idx, -1); - } - g_free(basename); -} - -void on_print1_activate (GtkMenuItem *menuitem, gpointer user_data) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [737] trunk/src/utils.c
by ntrel＠users.sourceforge.net 18 Aug '06

18 Aug '06

Revision: 737 Author: ntrel Date: 2006-08-18 10:23:40 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=737&view=rev Log Message: ----------- Use Reload button for utils_check_disk_status dialog Modified Paths: -------------- trunk/src/utils.c Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-08-18 17:22:57 UTC (rev 736) +++ trunk/src/utils.c 2006-08-18 17:23:40 UTC (rev 737) @@ -980,9 +980,10 @@ { gchar *basename = g_path_get_basename(doc_list[idx].file_name); - if (dialogs_show_question(_ - ("The file '%s' on the disk is more recent than\n" - "the current buffer.\nDo you want to reload it?"), basename)) + if (dialogs_show_question_full(_("_Reload"), GTK_STOCK_CANCEL, + _("Do you want to reload it?"), + _("The file '%s' on the disk is more recent than\n" + "the current buffer."), basename)) { document_reload_file(idx, NULL); doc_list[idx].last_check = t; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2006