Commits February 2013

commits@lists.geany.org

1 participants
53 discussions

[geany/geany] 7d6ad6: Merge branch 'master' of https://github.com/geany/geany
by Lex 21 Feb '13

21 Feb '13

Branch: refs/heads/master Author: Lex <elextr(a)gmail.com> Committer: Lex <elextr(a)gmail.com> Date: Thu, 21 Feb 2013 02:05:54 UTC Commit: 7d6ad6d50fb8b6801448144b1195302f1a3a26d2 https://github.com/geany/geany/commit/7d6ad6d50fb8b6801448144b1195302f1a3a2… Log Message: ----------- Merge branch 'master' of https://github.com/geany/geany Modified Paths: -------------- data/geany.glade doc/geany.txt src/keybindings.c src/keybindings.h Modified: data/geany.glade 28 files changed, 0 insertions(+), 28 deletions(-) =================================================================== @@ -99,7 +99,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_undo1_activate" swapped="no"/> </object> </child> @@ -111,7 +110,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_redo1_activate" swapped="no"/> </object> </child> @@ -129,7 +127,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_cut1_activate" swapped="no"/> </object> </child> @@ -141,7 +138,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_copy1_activate" swapped="no"/> </object> </child> @@ -153,7 +149,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_paste1_activate" swapped="no"/> </object> </child> @@ -165,7 +160,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_delete1_activate" swapped="no"/> </object> </child> @@ -183,7 +177,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_menu_select_all1_activate" swapped="no"/> </object> </child> @@ -7333,7 +7326,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_new1_activate" swapped="no"/> </object> </child> @@ -7362,7 +7354,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_open1_activate" swapped="no"/> </object> </child> @@ -7399,7 +7390,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_save1_activate" swapped="no"/> </object> </child> @@ -7411,7 +7401,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_save_as1_activate" swapped="no"/> </object> </child> @@ -7477,7 +7466,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_file_properties_activate" swapped="no"/> </object> </child> @@ -7505,7 +7493,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_print1_activate" swapped="no"/> </object> </child> @@ -7523,7 +7510,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_close1_activate" swapped="no"/> </object> </child> @@ -7565,7 +7551,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_quit1_activate" swapped="no"/> </object> </child> @@ -7592,7 +7577,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_undo1_activate" swapped="no"/> </object> </child> @@ -7604,7 +7588,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_redo1_activate" swapped="no"/> </object> </child> @@ -7622,7 +7605,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_cut1_activate" swapped="no"/> </object> </child> @@ -7634,7 +7616,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_copy1_activate" swapped="no"/> </object> </child> @@ -7646,7 +7627,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_paste1_activate" swapped="no"/> </object> </child> @@ -7658,7 +7638,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_delete1_activate" swapped="no"/> </object> </child> @@ -7676,7 +7655,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_menu_select_all1_activate" swapped="no"/> </object> </child> @@ -8149,7 +8127,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_find1_activate" swapped="no"/> </object> </child> @@ -8563,7 +8540,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_zoom_in1_activate" swapped="no"/> </object> </child> @@ -8575,7 +8551,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_zoom_out1_activate" swapped="no"/> </object> </child> @@ -8587,7 +8562,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_normal_size1_activate" swapped="no"/> </object> </child> @@ -9130,7 +9104,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_project_properties1_activate" swapped="no"/> </object> </child> @@ -9325,7 +9298,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_info1_activate" swapped="no"/> </object> </child> Modified: doc/geany.txt 10 files changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -3204,14 +3204,6 @@ want to assign to the action and it will be saved when you press OK. You can define only one key combination for each action and each key combination can only be defined for one action. -Some of the default key combinations are common across many -applications, for example *Ctrl-N* for New and *Ctrl-O* for Open. -Because they are so common it is not advisable to change these, but -you can add other key combinations for these actions. For example -*Ctrl-O* is set to execute menu_open by default, but you can also -define *Alt-O*, so that the file open dialog is shown by pressing -either *Ctrl-O* or *Alt-O*. - The following tables list all customizable keyboard shortcuts, those which are common to many applications are marked with (C) after the shortcut. @@ -3243,6 +3235,8 @@ Reload file Ctrl-R (C) Reloads the current fi will be lost. Print Ctrl-P (C) Prints the current file. + +Quit Ctrl-Q (C) Quits Geany. =============================== ========================= ================================================== Modified: src/keybindings.c 23 files changed, 17 insertions(+), 6 deletions(-) =================================================================== @@ -248,14 +248,14 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_FILE); add_kb(group, GEANY_KEYS_FILE_NEW, NULL, - GDK_n, GDK_CONTROL_MASK, "menu_new", _("New"), NULL); + GDK_n, GDK_CONTROL_MASK, "menu_new", _("New"), "menu_new1"); add_kb(group, GEANY_KEYS_FILE_OPEN, NULL, - GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open"), NULL); + GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open"), "menu_open1"); add_kb(group, GEANY_KEYS_FILE_OPENSELECTED, NULL, GDK_o, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_open_selected", _("Open selected file"), "menu_open_selected_file1"); add_kb(group, GEANY_KEYS_FILE_SAVE, NULL, - GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save"), NULL); + GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save"), "menu_save1"); add_kb(group, GEANY_KEYS_FILE_SAVEAS, NULL, 0, 0, "menu_saveas", _("Save as"), "menu_save_as1"); add_kb(group, GEANY_KEYS_FILE_SAVEALL, NULL, @@ -272,6 +272,8 @@ static void init_default_kb(void) GDK_r, GDK_CONTROL_MASK, "menu_reloadfile", _("Reload file"), "menu_reload1"); add_kb(group, GEANY_KEYS_FILE_OPENLASTTAB, NULL, 0, 0, "file_openlasttab", _("Re-open last closed tab"), NULL); + add_kb(group, GEANY_KEYS_FILE_QUIT, NULL, + GDK_q, GDK_CONTROL_MASK, "menu_quit", _("Quit"), "menu_quit1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_PROJECT); @@ -335,11 +337,11 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_CLIPBOARD); add_kb(group, GEANY_KEYS_CLIPBOARD_CUT, NULL, - GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut"), NULL); + GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut"), "menu_cut1"); add_kb(group, GEANY_KEYS_CLIPBOARD_COPY, NULL, - GDK_c, GDK_CONTROL_MASK, "menu_copy", _("Copy"), NULL); + GDK_c, GDK_CONTROL_MASK, "menu_copy", _("Copy"), "menu_copy1"); add_kb(group, GEANY_KEYS_CLIPBOARD_PASTE, NULL, - GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste"), NULL); + GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste"), "menu_paste1"); add_kb(group, GEANY_KEYS_CLIPBOARD_COPYLINE, NULL, GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_copyline", _("_Copy Current Line(s)"), "copy_current_lines1"); @@ -729,6 +731,7 @@ static void add_menu_accel(GeanyKeyGroup *group, guint kb_id, GtkWidget *menuite add_menu_accel(group, kb_id, ui_lookup_widget(main_widgets.editor_menu, G_STRINGIFY(wid))) /* set the menu item accelerator shortcuts (just for visibility, they are handled anyway) */ +/* FIXME: update those during runtime */ static void add_popup_menu_accels(void) { GeanyKeyGroup *group; @@ -738,6 +741,11 @@ static void add_popup_menu_accels(void) GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_REDO, redo1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_CONTEXTACTION, context_action1); + group = keybindings_get_core_group(GEANY_KEY_GROUP_CLIPBOARD); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_CLIPBOARD_CUT, cut1); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_CLIPBOARD_COPY, copy1); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_CLIPBOARD_PASTE, paste1); + group = keybindings_get_core_group(GEANY_KEY_GROUP_SELECT); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SELECT_ALL, menu_select_all2); @@ -1329,6 +1337,9 @@ static gboolean cb_func_file_action(guint key_id) case GEANY_KEYS_FILE_PRINT: on_print1_activate(NULL, NULL); break; + case GEANY_KEYS_FILE_QUIT: + on_quit1_activate(NULL, NULL); + break; } return TRUE; } Modified: src/keybindings.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -247,6 +247,7 @@ enum GeanyKeyBindingID GEANY_KEYS_FORMAT_JOINLINES, /**< Keybinding. */ GEANY_KEYS_GOTO_LINESTARTVISUAL, /**< Keybinding. */ GEANY_KEYS_DOCUMENT_CLONE, /**< Keybinding. */ + GEANY_KEYS_FILE_QUIT, /**< Keybinding. */ GEANY_KEYS_COUNT /* must not be used by plugins */ }; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5df79b: Adjust Terminal tooltip in preferences
by Lex 21 Feb '13

21 Feb '13

Branch: refs/heads/master Author: Lex <elextr(a)gmail.com> Committer: Lex <elextr(a)gmail.com> Date: Thu, 21 Feb 2013 01:42:30 UTC Commit: 5df79bc13515d4da647be4185c0c7a47dcb4f82a https://github.com/geany/geany/commit/5df79bc13515d4da647be4185c0c7a47dcb4f… Log Message: ----------- Adjust Terminal tooltip in preferences Adjust to say it is a full command and that %c is substituted by the geany_run_script path. Modified Paths: -------------- data/geany.glade Modified: data/geany.glade 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4783,7 +4783,7 @@ <object class="GtkEntry" id="entry_com_term"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)</property> + <property name="tooltip_text" translatable="yes">A terminal emulator command (%c is substituted with the Geany run script filename)</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> <property name="primary_icon_sensitive">True</property> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a0dc8a: Fix GTK default keybindings being still active after being unbound
by Colomban Wendling 21 Feb '13

21 Feb '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 21 Feb 2013 00:31:38 UTC Commit: a0dc8af9c4238fe435c7f45ef4c39c358b6803d2 https://github.com/geany/geany/commit/a0dc8af9c4238fe435c7f45ef4c39c358b680… Log Message: ----------- Fix GTK default keybindings being still active after being unbound If we provide an AccelGroup when creating a menu item using a sock ID, it installs the GTK default accelerator, accelerator we can't remove since we don't know about it. So, don't give an AccelGroup so GTK don't install it's own accelerator. This fix also required to properly update the accelerator on some item we used to ignore since the update didn't work anyway (since the GTK accelerator was displayed instead). Note that this doesn't fix the fact the editor popup menu accelerators are never updated after startup so they don't get updated before restart after changing a keybinding in the preferences. This is a separate (and less problematic) issue due to a simple lack of update. Closes #1912683 and #3599251. Modified Paths: -------------- data/geany.glade doc/geany.txt src/keybindings.c Modified: data/geany.glade 27 files changed, 0 insertions(+), 27 deletions(-) =================================================================== @@ -99,7 +99,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_undo1_activate" swapped="no"/> </object> </child> @@ -111,7 +110,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_redo1_activate" swapped="no"/> </object> </child> @@ -129,7 +127,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_cut1_activate" swapped="no"/> </object> </child> @@ -141,7 +138,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_copy1_activate" swapped="no"/> </object> </child> @@ -153,7 +149,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_paste1_activate" swapped="no"/> </object> </child> @@ -165,7 +160,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_delete1_activate" swapped="no"/> </object> </child> @@ -183,7 +177,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_menu_select_all1_activate" swapped="no"/> </object> </child> @@ -7333,7 +7326,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_new1_activate" swapped="no"/> </object> </child> @@ -7362,7 +7354,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_open1_activate" swapped="no"/> </object> </child> @@ -7399,7 +7390,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_save1_activate" swapped="no"/> </object> </child> @@ -7411,7 +7401,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_save_as1_activate" swapped="no"/> </object> </child> @@ -7477,7 +7466,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_file_properties_activate" swapped="no"/> </object> </child> @@ -7505,7 +7493,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_print1_activate" swapped="no"/> </object> </child> @@ -7523,7 +7510,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_close1_activate" swapped="no"/> </object> </child> @@ -7592,7 +7578,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_undo1_activate" swapped="no"/> </object> </child> @@ -7604,7 +7589,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_redo1_activate" swapped="no"/> </object> </child> @@ -7622,7 +7606,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_cut1_activate" swapped="no"/> </object> </child> @@ -7634,7 +7617,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_copy1_activate" swapped="no"/> </object> </child> @@ -7646,7 +7628,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_paste1_activate" swapped="no"/> </object> </child> @@ -7658,7 +7639,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_delete1_activate" swapped="no"/> </object> </child> @@ -7676,7 +7656,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_menu_select_all1_activate" swapped="no"/> </object> </child> @@ -8149,7 +8128,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_find1_activate" swapped="no"/> </object> </child> @@ -8563,7 +8541,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_zoom_in1_activate" swapped="no"/> </object> </child> @@ -8575,7 +8552,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_zoom_out1_activate" swapped="no"/> </object> </child> @@ -8587,7 +8563,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_normal_size1_activate" swapped="no"/> </object> </child> @@ -9130,7 +9105,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_project_properties1_activate" swapped="no"/> </object> </child> @@ -9325,7 +9299,6 @@ <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <property name="accel_group">accelgroup1</property> <signal name="activate" handler="on_info1_activate" swapped="no"/> </object> </child> Modified: doc/geany.txt 8 files changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -3204,14 +3204,6 @@ want to assign to the action and it will be saved when you press OK. You can define only one key combination for each action and each key combination can only be defined for one action. -Some of the default key combinations are common across many -applications, for example *Ctrl-N* for New and *Ctrl-O* for Open. -Because they are so common it is not advisable to change these, but -you can add other key combinations for these actions. For example -*Ctrl-O* is set to execute menu_open by default, but you can also -define *Alt-O*, so that the file open dialog is shown by pressing -either *Ctrl-O* or *Alt-O*. - The following tables list all customizable keyboard shortcuts, those which are common to many applications are marked with (C) after the shortcut. Modified: src/keybindings.c 18 files changed, 12 insertions(+), 6 deletions(-) =================================================================== @@ -248,14 +248,14 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_FILE); add_kb(group, GEANY_KEYS_FILE_NEW, NULL, - GDK_n, GDK_CONTROL_MASK, "menu_new", _("New"), NULL); + GDK_n, GDK_CONTROL_MASK, "menu_new", _("New"), "menu_new1"); add_kb(group, GEANY_KEYS_FILE_OPEN, NULL, - GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open"), NULL); + GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open"), "menu_open1"); add_kb(group, GEANY_KEYS_FILE_OPENSELECTED, NULL, GDK_o, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_open_selected", _("Open selected file"), "menu_open_selected_file1"); add_kb(group, GEANY_KEYS_FILE_SAVE, NULL, - GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save"), NULL); + GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save"), "menu_save1"); add_kb(group, GEANY_KEYS_FILE_SAVEAS, NULL, 0, 0, "menu_saveas", _("Save as"), "menu_save_as1"); add_kb(group, GEANY_KEYS_FILE_SAVEALL, NULL, @@ -335,11 +335,11 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_CLIPBOARD); add_kb(group, GEANY_KEYS_CLIPBOARD_CUT, NULL, - GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut"), NULL); + GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut"), "menu_cut1"); add_kb(group, GEANY_KEYS_CLIPBOARD_COPY, NULL, - GDK_c, GDK_CONTROL_MASK, "menu_copy", _("Copy"), NULL); + GDK_c, GDK_CONTROL_MASK, "menu_copy", _("Copy"), "menu_copy1"); add_kb(group, GEANY_KEYS_CLIPBOARD_PASTE, NULL, - GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste"), NULL); + GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste"), "menu_paste1"); add_kb(group, GEANY_KEYS_CLIPBOARD_COPYLINE, NULL, GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_copyline", _("_Copy Current Line(s)"), "copy_current_lines1"); @@ -729,6 +729,7 @@ static void add_menu_accel(GeanyKeyGroup *group, guint kb_id, GtkWidget *menuite add_menu_accel(group, kb_id, ui_lookup_widget(main_widgets.editor_menu, G_STRINGIFY(wid))) /* set the menu item accelerator shortcuts (just for visibility, they are handled anyway) */ +/* FIXME: update those during runtime */ static void add_popup_menu_accels(void) { GeanyKeyGroup *group; @@ -738,6 +739,11 @@ static void add_popup_menu_accels(void) GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_REDO, redo1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_CONTEXTACTION, context_action1); + group = keybindings_get_core_group(GEANY_KEY_GROUP_CLIPBOARD); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_CLIPBOARD_CUT, cut1); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_CLIPBOARD_COPY, copy1); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_CLIPBOARD_PASTE, paste1); + group = keybindings_get_core_group(GEANY_KEY_GROUP_SELECT); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SELECT_ALL, menu_select_all2); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] dba93f: Allow Quit keybinding to be configured
by Colomban Wendling 21 Feb '13

21 Feb '13

1 0

[geany/geany] 3c2dc5: Make the tools->terminal setting more flexible.
by Lex 17 Feb '13

17 Feb '13

Branch: refs/heads/master Author: Lex <elextr(a)gmail.com> Committer: Lex <elextr(a)gmail.com> Date: Sun, 17 Feb 2013 00:38:53 UTC Commit: 3c2dc547cdc9343573765ec0502effc00a61f39b https://github.com/geany/geany/commit/3c2dc547cdc9343573765ec0502effc00a61f… Log Message: ----------- Make the tools->terminal setting more flexible. Previously was hard coded with options to suit xterm. As this is being replaced with different terminal programs some do not accept the same options. The new setting stores the whole command with %c to substitute the script name. Upgrades old settings if a new one does not exist. Modified Paths: -------------- doc/geany.txt src/build.c src/keyfile.c Modified: doc/geany.txt 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2346,7 +2346,8 @@ Tool paths `````````` Terminal - The location of your terminal executable. + The command to execute a script in a terminal. Occurrences of %c + in the command are substituted with the run script name. Browser The location of your web browser executable. Modified: src/build.c 44 files changed, 15 insertions(+), 29 deletions(-) =================================================================== @@ -998,25 +998,30 @@ static GPid build_run_cmd(GeanyDocument *doc, guint cmdindex) #endif { gchar *locale_term_cmd = NULL; - gchar **term_argv = NULL; - guint term_argv_len, i; + gint argv_len, i; gchar **argv = NULL; /* get the terminal path */ locale_term_cmd = utils_get_locale_from_utf8(tool_prefs.term_cmd); /* split the term_cmd, so arguments will work too */ - term_argv = g_strsplit(locale_term_cmd, " ", -1); - term_argv_len = g_strv_length(term_argv); + if (!g_shell_parse_argv(locale_term_cmd, &argv_len, &argv, NULL)) + { + ui_set_statusbar(TRUE, + _("Could not parse terminal command \"%s\" " + "(check Terminal tool setting in Preferences)"), tool_prefs.term_cmd); + run_info[cmdindex].pid = (GPid) 1; + goto free_strings; + } /* check that terminal exists (to prevent misleading error messages) */ - if (term_argv[0] != NULL) + if (argv[0] != NULL) { - gchar *tmp = term_argv[0]; + gchar *tmp = argv[0]; /* g_find_program_in_path checks whether tmp exists and is executable */ - term_argv[0] = g_find_program_in_path(tmp); + argv[0] = g_find_program_in_path(tmp); g_free(tmp); } - if (term_argv[0] == NULL) + if (argv[0] == NULL) { ui_set_statusbar(TRUE, _("Could not find terminal \"%s\" " @@ -1025,28 +1030,10 @@ static GPid build_run_cmd(GeanyDocument *doc, guint cmdindex) goto free_strings; } - argv = g_new0(gchar *, term_argv_len + 3); - for (i = 0; i < term_argv_len; i++) + for (i = 0; i < argv_len; i++) { - argv[i] = g_strdup(term_argv[i]); + utils_str_replace_all(&(argv[i]), "%c", RUN_SCRIPT_CMD); } -#ifdef G_OS_WIN32 - /* command line arguments only for cmd.exe */ - if (strstr(argv[0], "cmd.exe") != NULL) - { - argv[term_argv_len] = g_strdup("/Q /C"); - argv[term_argv_len + 1] = g_strdup(RUN_SCRIPT_CMD); - } - else - { - argv[term_argv_len] = g_strdup(RUN_SCRIPT_CMD); - argv[term_argv_len + 1] = NULL; - } -#else - argv[term_argv_len ] = g_strdup("-e"); - argv[term_argv_len + 1] = g_strconcat("/bin/sh ", RUN_SCRIPT_CMD, NULL); -#endif - argv[term_argv_len + 2] = NULL; if (! g_spawn_async(working_dir, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &(run_info[cmdindex].pid), &error)) @@ -1067,7 +1054,6 @@ static GPid build_run_cmd(GeanyDocument *doc, guint cmdindex) } free_strings: g_strfreev(argv); - g_strfreev(term_argv); g_free(locale_term_cmd); } Modified: src/keyfile.c 29 files changed, 25 insertions(+), 4 deletions(-) =================================================================== @@ -69,9 +69,9 @@ #define GEANY_DISK_CHECK_TIMEOUT 30 #define GEANY_DEFAULT_TOOLS_MAKE "make" #ifdef G_OS_WIN32 -#define GEANY_DEFAULT_TOOLS_TERMINAL "cmd.exe" +#define GEANY_DEFAULT_TOOLS_TERMINAL "cmd.exe /Q /C %c" #else -#define GEANY_DEFAULT_TOOLS_TERMINAL "xterm" +#define GEANY_DEFAULT_TOOLS_TERMINAL "xterm -e \"bin/sh %c\"" #endif #define GEANY_DEFAULT_TOOLS_BROWSER "firefox" #define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr" @@ -473,7 +473,7 @@ static void save_dialog_prefs(GKeyFile *config) g_key_file_set_string(config, PACKAGE, "pref_template_datetime", template_prefs.datetime_format); /* tools settings */ - g_key_file_set_string(config, "tools", "term_cmd", tool_prefs.term_cmd ? tool_prefs.term_cmd : ""); + g_key_file_set_string(config, "tools", "terminal_cmd", tool_prefs.term_cmd ? tool_prefs.term_cmd : ""); g_key_file_set_string(config, "tools", "browser_cmd", tool_prefs.browser_cmd ? tool_prefs.browser_cmd : ""); g_key_file_set_string(config, "tools", "grep_cmd", tool_prefs.grep_cmd ? tool_prefs.grep_cmd : ""); g_key_file_set_string(config, PACKAGE, "context_action_cmd", tool_prefs.context_action_cmd); @@ -693,6 +693,7 @@ static void load_dialog_prefs(GKeyFile *config) { gchar *tmp_string, *tmp_string2; const gchar *default_charset = NULL; + gchar *cmd; /* compatibility with Geany 0.20 */ if (!g_key_file_has_key(config, PACKAGE, atomic_file_saving_key, NULL)) @@ -882,7 +883,27 @@ static void load_dialog_prefs(GKeyFile *config) template_prefs.datetime_format = utils_get_setting_string(config, PACKAGE, "pref_template_datetime", "%d.%m.%Y %H:%M:%S %Z"); /* tools */ - tool_prefs.term_cmd = utils_get_setting_string(config, "tools", "term_cmd", GEANY_DEFAULT_TOOLS_TERMINAL); + cmd = utils_get_setting_string(config, "tools", "terminal_cmd", ""); + if (!NZV(cmd)) + { + cmd = utils_get_setting_string(config, "tools", "term_cmd", ""); + if (NZV(cmd)) + { + tmp_string = cmd; +#ifdef G_OS_WIN32 + if (strstr(cmd, "cmd.exe")) + cmd = g_strconcat(cmd, " /Q /C %c", NULL); + else + cmd = g_strconcat(cmd, " %c", NULL); +#else + cmd = g_strconcat(cmd, " -e \"/bin/sh %c\"", NULL); +#endif + g_free(tmp_string); + } + else + cmd = g_strdup(GEANY_DEFAULT_TOOLS_TERMINAL); + } + tool_prefs.term_cmd = cmd; tool_prefs.browser_cmd = utils_get_setting_string(config, "tools", "browser_cmd", GEANY_DEFAULT_TOOLS_BROWSER); tool_prefs.grep_cmd = utils_get_setting_string(config, "tools", "grep_cmd", GEANY_DEFAULT_TOOLS_GREP); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] eab86b: win32: Fix crash with -v if stream redirection setup fails
by Colomban Wendling 14 Feb '13

14 Feb '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 13 Feb 2013 23:50:59 UTC Commit: eab86bc6adf76764046a2d3959953309ba3cd658 https://github.com/geany/geany/commit/eab86bc6adf76764046a2d3959953309ba3cd… Log Message: ----------- win32: Fix crash with -v if stream redirection setup fails Properly check for errors when setting up debug console stream redirections so if it fails it doesn't crash everything. Modified Paths: -------------- src/win32.c Modified: src/win32.c 71 files changed, 54 insertions(+), 17 deletions(-) =================================================================== @@ -757,11 +757,54 @@ gboolean win32_get_exit_status(GPid child_pid) } +static FILE *open_std_handle(DWORD handle, const char *mode) +{ + HANDLE lStdHandle; + int hConHandle; + FILE *fp; + + lStdHandle = GetStdHandle(handle); + if (lStdHandle == INVALID_HANDLE_VALUE) + { + gchar *err = g_win32_error_message(GetLastError()); + g_warning("GetStdHandle(%ld) failed: %s", (long)handle, err); + g_free(err); + return NULL; + } + hConHandle = _open_osfhandle((long)lStdHandle, _O_TEXT); + if (hConHandle == -1) + { + gchar *err = g_win32_error_message(GetLastError()); + g_warning("_open_osfhandle(%ld, _O_TEXT) failed: %s", (long)lStdHandle, err); + g_free(err); + return NULL; + } + fp = _fdopen(hConHandle, mode); + if (! fp) + { + gchar *err = g_win32_error_message(GetLastError()); + g_warning("_fdopen(%d, \"%s\") failed: %s", hConHandle, mode, err); + g_free(err); + return NULL; + } + if (setvbuf(fp, NULL, _IONBF, 0) != 0) + { + gchar *err = g_win32_error_message(GetLastError()); + g_warning("setvbuf(%p, NULL, _IONBF, 0) failed: %s", fp, err); + g_free(err); + fclose(fp); + return NULL; + } + + return fp; +} + + static void debug_setup_console() { static const WORD MAX_CONSOLE_LINES = 500; - gint hConHandle; - glong lStdHandle; + int hConHandle; + long lStdHandle; CONSOLE_SCREEN_BUFFER_INFO coninfo; FILE *fp; @@ -774,25 +817,19 @@ static void debug_setup_console() SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), coninfo.dwSize); /* redirect unbuffered STDOUT to the console */ - lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE); - hConHandle = _open_osfhandle(lStdHandle, _O_TEXT); - fp = _fdopen(hConHandle, "w"); - *stdout = *fp; - setvbuf(stdout, NULL, _IONBF, 0); + fp = open_std_handle(STD_OUTPUT_HANDLE, "w"); + if (fp) + *stdout = *fp; /* redirect unbuffered STDERR to the console */ - lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE); - hConHandle = _open_osfhandle(lStdHandle, _O_TEXT); - fp = _fdopen(hConHandle, "w"); - *stderr = *fp; - setvbuf(stderr, NULL, _IONBF, 0); + fp = open_std_handle(STD_ERROR_HANDLE, "w"); + if (fp) + *stderr = *fp; /* redirect unbuffered STDIN to the console */ - lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE); - hConHandle = _open_osfhandle(lStdHandle, _O_TEXT); - fp = _fdopen( hConHandle, "r" ); - *stdin = *fp; - setvbuf(stdin, NULL, _IONBF, 0); + fp = open_std_handle(STD_INPUT_HANDLE, "r"); + if (fp) + *stdin = *fp; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 164650: Fix build with bleeding edge GLib
by Colomban Wendling 13 Feb '13

13 Feb '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 12 Feb 2013 23:22:16 UTC Commit: 1646504a46e4b5af354406fd1f819da0dd6754fa https://github.com/geany/geany/commit/1646504a46e4b5af354406fd1f819da0dd675… Log Message: ----------- Fix build with bleeding edge GLib CTags defines __unused__ and __printf__, which not only are reserved identifiers, but actually are used by GNUC as arguments of the __attribute__() extension. This used to work because no code seeing those definitions was trying to use them as __attribute__() argument, but a recent change in GLib made it use it in atomic operation, which are used by the tagmanager, which itself includes the CTags header defining those, leading to a weird build failure -- since __unused__ expanded to an unexpected value. To fix this, rename CTag's __ununsed__ to UNUSED and __printf__ to PRINTF. Modified Paths: -------------- tagmanager/ctags/c.c tagmanager/ctags/ctags.c tagmanager/ctags/general.h tagmanager/ctags/lregex.c tagmanager/ctags/lua.c tagmanager/ctags/main.h tagmanager/ctags/options.h tagmanager/ctags/parse.c tagmanager/ctags/parse.h tagmanager/src/tm_file_entry.c tagmanager/src/tm_project.c tagmanager/src/tm_source_file.c tagmanager/src/tm_workspace.c Modified: tagmanager/ctags/c.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -735,7 +735,7 @@ static const char *keywordString (const keywordId keyword) return name; } -static void __unused__ pt (tokenInfo *const token) +static void UNUSED pt (tokenInfo *const token) { if (isType (token, TOKEN_NAME)) printf("type: %-12s: %-13s line: %lu\n", @@ -750,7 +750,7 @@ static void __unused__ pt (tokenInfo *const token) tokenString (token->type), token->lineNumber); } -static void __unused__ ps (statementInfo *const st) +static void UNUSED ps (statementInfo *const st) { unsigned int i; printf("scope: %s decl: %s gotName: %s gotParenName: %s\n", Modified: tagmanager/ctags/ctags.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -892,7 +892,7 @@ extern vString *combinePathAndFile (const char *const path, * Create tags */ -extern void processExcludeOption (const char *const __unused__ option, +extern void processExcludeOption (const char *const UNUSED option, const char *const parameter) { if (parameter [0] == '\0') @@ -1328,7 +1328,7 @@ static void setExecutableName (const char *const path) #endif } -extern int ctags_main (int __unused__ argc, char **argv) +extern int ctags_main (int UNUSED argc, char **argv) { cookedArgs *args; #ifdef VMS Modified: tagmanager/ctags/general.h 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -31,11 +31,11 @@ * to prevent warnings about unused variables. */ #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) && !(defined (__APPLE_CC__) || defined (__GNUG__)) -# define __unused__ __attribute__((unused)) -# define __printf__(s,f) __attribute__((format (printf, s, f))) +# define UNUSED __attribute__((unused)) +# define PRINTF(s,f) __attribute__((format (printf, s, f))) #else -# define __unused__ -# define __printf__(s,f) +# define UNUSED +# define PRINTF(s,f) #endif Modified: tagmanager/ctags/lregex.c 30 files changed, 15 insertions(+), 15 deletions(-) =================================================================== @@ -538,11 +538,11 @@ extern void findRegexTags (void) #endif /* HAVE_REGEX */ extern void addTagRegex ( - const langType language __unused__, - const char* const regex __unused__, - const char* const name __unused__, - const char* const kinds __unused__, - const char* const flags __unused__) + const langType language UNUSED, + const char* const regex UNUSED, + const char* const name UNUSED, + const char* const kinds UNUSED, + const char* const flags UNUSED) { #ifdef HAVE_REGEX Assert (regex != NULL); @@ -564,10 +564,10 @@ extern void addTagRegex ( } extern void addCallbackRegex ( - const langType language __unused__, - const char* const regex __unused__, - const char* const flags __unused__, - const regexCallback callback __unused__) + const langType language UNUSED, + const char* const regex UNUSED, + const char* const flags UNUSED, + const regexCallback callback UNUSED) { #ifdef HAVE_REGEX Assert (regex != NULL); @@ -581,7 +581,7 @@ extern void addCallbackRegex ( } extern void addLanguageRegex ( - const langType language __unused__, const char* const regex __unused__) + const langType language UNUSED, const char* const regex UNUSED) { #ifdef HAVE_REGEX if (! regexBroken) @@ -602,7 +602,7 @@ extern void addLanguageRegex ( */ extern boolean processRegexOption (const char *const option, - const char *const parameter __unused__) + const char *const parameter UNUSED) { boolean handled = FALSE; const char* const dash = strchr (option, '-'); @@ -624,7 +624,7 @@ extern boolean processRegexOption (const char *const option, return handled; } -extern void disableRegexKinds (const langType language __unused__) +extern void disableRegexKinds (const langType language UNUSED) { #ifdef HAVE_REGEX if (language <= SetUpper && Sets [language].count > 0) @@ -639,8 +639,8 @@ extern void disableRegexKinds (const langType language __unused__) } extern boolean enableRegexKind ( - const langType language __unused__, - const int kind __unused__, const boolean mode __unused__) + const langType language UNUSED, + const int kind UNUSED, const boolean mode UNUSED) { boolean result = FALSE; #ifdef HAVE_REGEX @@ -660,7 +660,7 @@ extern boolean enableRegexKind ( return result; } -extern void printRegexKinds (const langType language __unused__, boolean indent __unused__) +extern void printRegexKinds (const langType language UNUSED, boolean indent UNUSED) { #ifdef HAVE_REGEX if (language <= SetUpper && Sets [language].count > 0) Modified: tagmanager/ctags/lua.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -34,7 +34,7 @@ */ /* for debugging purposes */ -static void __unused__ print_string (char *p, char *q) +static void UNUSED print_string (char *p, char *q) { for ( ; p != q; p++) fprintf (errout, "%c", *p); Modified: tagmanager/ctags/main.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -41,7 +41,7 @@ extern void *realloc (void *ptr, size_t); #endif -extern void error (const errorSelection selection, const char *const format, ...) __printf__ (2, 3); +extern void error (const errorSelection selection, const char *const format, ...) PRINTF (2, 3); extern FILE *tempFile (const char *const mode, char **const pName); extern char* eStrdup (const char* str); extern void *eMalloc (const size_t size); Modified: tagmanager/ctags/options.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -93,7 +93,7 @@ /* * FUNCTION PROTOTYPES */ -extern void verbose (const char *const format, ...) __printf__ (1, 2); +extern void verbose (const char *const format, ...) PRINTF (1, 2); extern void freeList (stringList** const pString); extern void setDefaultTagFileName (void); Modified: tagmanager/ctags/parse.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -355,7 +355,7 @@ extern void freeParserResources (void) */ extern void processLanguageDefineOption (const char *const option, - const char *const __unused__ parameter) + const char *const UNUSED parameter) { #ifdef HAVE_REGEX if (parameter [0] == '\0') Modified: tagmanager/ctags/parse.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -120,7 +120,7 @@ extern void addLanguageRegex (const langType language, const char* const regex); extern void addTagRegex (const langType language, const char* const regex, const char* const name, const char* const kinds, const char* const flags); extern void addCallbackRegex (const langType language, const char* const regex, const char* flags, const regexCallback callback); -extern void disableRegexKinds (const langType __unused__ language); +extern void disableRegexKinds (const langType UNUSED language); extern boolean enableRegexKind (const langType language, const int kind, const boolean mode); extern void printRegexKindOptions (const langType language); extern void freeRegexResources (void); Modified: tagmanager/src/tm_file_entry.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,7 @@ #define FILE_FREE(T) g_slice_free(TMFileEntry, (T)) -void tm_file_entry_print(TMFileEntry *entry, gpointer __unused__ user_data +void tm_file_entry_print(TMFileEntry *entry, gpointer UNUSED user_data , guint level) { guint i; Modified: tagmanager/src/tm_project.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -473,7 +473,7 @@ gboolean tm_project_save(TMProject *project) } static void tm_project_add_file_recursive(TMFileEntry *entry - , gpointer user_data, guint __unused__ level) + , gpointer user_data, guint UNUSED level) { TMProject *project; if (!user_data || !entry || (tm_file_dir_t == entry->type)) Modified: tagmanager/src/tm_source_file.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -265,7 +265,7 @@ int tm_source_file_tags(const tagEntryInfo *tag) } gboolean tm_source_file_update(TMWorkObject *source_file, gboolean force - , gboolean __unused__ recurse, gboolean update_parent) + , gboolean UNUSED recurse, gboolean update_parent) { if (force) { Modified: tagmanager/src/tm_workspace.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -517,7 +517,7 @@ void tm_workspace_recreate_tags_array(void) } gboolean tm_workspace_update(TMWorkObject *workspace, gboolean force - , gboolean recurse, gboolean __unused__ update_parent) + , gboolean recurse, gboolean UNUSED update_parent) { guint i; gboolean update_tags = force; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 76a6e9: Merge branch 'touste/abaqus-support'
by Colomban Wendling 12 Feb '13

12 Feb '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 12 Feb 2013 14:01:00 UTC Commit: 76a6e945ec6d64e7eeae0ae81263850da670462a https://github.com/geany/geany/commit/76a6e945ec6d64e7eeae0ae81263850da6704… Log Message: ----------- Merge branch 'touste/abaqus-support' Modified Paths: -------------- data/filetype_extensions.conf data/filetypes.abaqus scintilla/Makefile.am scintilla/lexers/LexAbaqus.cxx scintilla/makefile.win32 scintilla/scintilla_changes.patch scintilla/src/Catalogue.cxx src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h src/symbols.c tagmanager/ctags/Makefile.am tagmanager/ctags/abaqus.c tagmanager/ctags/makefile.win32 tagmanager/ctags/parsers.h wscript Modified: data/filetype_extensions.conf 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ # Insert as many items as you want, seperate them with a ";". # See Geany's main documentation for details. [Extensions] +Abaqus=*.inp; Abc=*.abc;*.abp; ActionScript=*.as; Ada=*.adb;*.ads; Modified: data/filetypes.abaqus 62 files changed, 62 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,62 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead +default=default +comment=comment_line +number=number +string=string_1 +operator=operator +processor=preprocessor +starcommand=keyword +argument=parameter + +[keywords] +# all items must be in one line +starcommands=amplitude assembly beam boundary buckle bulk cload conditions conductivity contact damping density dload dsflux dsload dynamic el elastic element element output elgen elset encastre end step expansion explicit equation embedded element field freq frequency friction generate heading heat transfer history imperfectio import include initial initial conditions instance interactio internal interval marks material monitor mpc ncopy nfill ngen nlgeom node node output node print nset number output pair parameter part physical constants plastic print preprint radiate restart shell shell section solid section specific heat sradiate static step surface temperature time type variable viscosity +arguments=elset engineering inc input line material name nset pin tie type write generate field variable history stefan boltzmann absolute zero zero frequency steady state new old set change number shift model position newset oldset host + +[settings] +# default extension used when saving files +extension=inp + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comments, like # in this file +comment_single=** +# multiline comments +#comment_open= +#comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=false + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler= +run_cmd=abaqus job="%f" interactive datacheck + +[build-menu] +FT_00_LB=Datacheck +FT_00_CM=abaqus job="%f" interactive datacheck +FT_00_BD=false +FT_01_LB=Run Job +FT_01_CM=abaqus job="%f" interactive +FT_01_BD=false + Modified: scintilla/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -6,6 +6,7 @@ noinst_LIBRARIES=libscintilla.a AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER -DG_THREADS_IMPL_NONE LEXER_SRCS= \ +lexers/LexAbaqus.cxx \ lexers/LexAda.cxx \ lexers/LexAsm.cxx \ lexers/LexBash.cxx \ Modified: scintilla/lexers/LexAbaqus.cxx 620 files changed, 620 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,620 @@ +// Scintilla source code edit control +/** @file LexABAQUS.cxx + ** Lexer for ABAQUS. Based on the lexer for APDL by Hadar Raz. + ** By Sergio Lucato. + ** Sort of completely rewritten by Gertjan Kloosterman + **/ +// The License.txt file describes the conditions under which this software may be distributed. + +// Code folding copyied and modified from LexBasic.cxx + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> + +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +static inline bool IsAWordChar(const int ch) { + return (ch < 0x80 && (isalnum(ch) || (ch == '_'))); +} + +static inline bool IsAKeywordChar(const int ch) { + return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == ' '))); +} + +static inline bool IsASetChar(const int ch) { + return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == '.') || (ch == '-'))); +} + +static inline bool IsAnOperator(char ch) { + // '.' left out as it is used to make up numbers + if (ch == '*' || ch == '/' || ch == '-' || ch == '+' || + ch == '(' || ch == ')' || ch == '=' || ch == '^' || + ch == '[' || ch == ']' || ch == '<' || ch == '&' || + ch == '>' || ch == ',' || ch == '|' || ch == '~' || + ch == '$' || ch == ':' || ch == '%') + return true; + return false; +} + +static void ColouriseABAQUSDoc(unsigned int startPos, int length, int initStyle, WordList*[] /* *keywordlists[] */, + Accessor &styler) { + enum localState { KW_LINE_KW, KW_LINE_COMMA, KW_LINE_PAR, KW_LINE_EQ, KW_LINE_VAL, \ + DAT_LINE_VAL, DAT_LINE_COMMA,\ + COMMENT_LINE,\ + ST_ERROR, LINE_END } state ; + + // Do not leak onto next line + state = LINE_END ; + initStyle = SCE_ABAQUS_DEFAULT; + StyleContext sc(startPos, length, initStyle, styler); + + // Things are actually quite simple + // we have commentlines + // keywordlines and datalines + // On a data line there will only be colouring of numbers + // a keyword line is constructed as + // *word,[ paramname[=paramvalue]]* + // if the line ends with a , the keyword line continues onto the new line + + for (; sc.More(); sc.Forward()) { + switch ( state ) { + case KW_LINE_KW : + if ( sc.atLineEnd ) { + // finished the line in keyword state, switch to LINE_END + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } else if ( IsAKeywordChar(sc.ch) ) { + // nothing changes + state = KW_LINE_KW ; + } else if ( sc.ch == ',' ) { + // Well well we say a comma, arguments *MUST* follow + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = KW_LINE_COMMA ; + } else { + // Flag an error + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + // Done with processing + break ; + case KW_LINE_COMMA : + // acomma on a keywordline was seen + if ( IsAKeywordChar(sc.ch)) { + sc.SetState(SCE_ABAQUS_ARGUMENT) ; + state = KW_LINE_PAR ; + } else if ( sc.atLineEnd || (sc.ch == ',') ) { + // we remain in keyword mode + state = KW_LINE_COMMA ; + } else if ( sc.ch == ' ' ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = KW_LINE_COMMA ; + } else { + // Anything else constitutes an error + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case KW_LINE_PAR : + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } else if ( IsAKeywordChar(sc.ch) || (sc.ch == '-') ) { + // remain in this state + state = KW_LINE_PAR ; + } else if ( sc.ch == ',' ) { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = KW_LINE_COMMA ; + } else if ( sc.ch == '=' ) { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = KW_LINE_EQ ; + } else { + // Anything else constitutes an error + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case KW_LINE_EQ : + if ( sc.ch == ' ' ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + // remain in this state + state = KW_LINE_EQ ; + } else if ( IsADigit(sc.ch) || (sc.ch == '-') || (sc.ch == '.' && IsADigit(sc.chNext)) ) { + sc.SetState(SCE_ABAQUS_NUMBER) ; + state = KW_LINE_VAL ; + } else if ( IsAKeywordChar(sc.ch) ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = KW_LINE_VAL ; + } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) { + sc.SetState(SCE_ABAQUS_STRING) ; + state = KW_LINE_VAL ; + } else { + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case KW_LINE_VAL : + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } else if ( IsASetChar(sc.ch) && (sc.state == SCE_ABAQUS_DEFAULT) ) { + // nothing changes + state = KW_LINE_VAL ; + } else if (( (IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') || + ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) && + (sc.state == SCE_ABAQUS_NUMBER)) { + // remain in number mode + state = KW_LINE_VAL ; + } else if (sc.state == SCE_ABAQUS_STRING) { + // accept everything until a closing quote + if ( sc.ch == '\'' || sc.ch == '\"' ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = KW_LINE_VAL ; + } + } else if ( sc.ch == ',' ) { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = KW_LINE_COMMA ; + } else { + // anything else is an error + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case DAT_LINE_VAL : + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } else if ( IsASetChar(sc.ch) && (sc.state == SCE_ABAQUS_DEFAULT) ) { + // nothing changes + state = DAT_LINE_VAL ; + } else if (( (IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') || + ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) && + (sc.state == SCE_ABAQUS_NUMBER)) { + // remain in number mode + state = DAT_LINE_VAL ; + } else if (sc.state == SCE_ABAQUS_STRING) { + // accept everything until a closing quote + if ( sc.ch == '\'' || sc.ch == '\"' ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = DAT_LINE_VAL ; + } + } else if ( sc.ch == ',' ) { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = DAT_LINE_COMMA ; + } else { + // anything else is an error + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case DAT_LINE_COMMA : + // a comma on a data line was seen + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } else if ( sc.ch == ' ' ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = DAT_LINE_COMMA ; + } else if (sc.ch == ',') { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = DAT_LINE_COMMA ; + } else if ( IsADigit(sc.ch) || (sc.ch == '-')|| (sc.ch == '.' && IsADigit(sc.chNext)) ) { + sc.SetState(SCE_ABAQUS_NUMBER) ; + state = DAT_LINE_VAL ; + } else if ( IsAKeywordChar(sc.ch) ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = DAT_LINE_VAL ; + } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) { + sc.SetState(SCE_ABAQUS_STRING) ; + state = DAT_LINE_VAL ; + } else { + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case COMMENT_LINE : + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } + break ; + case ST_ERROR : + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } + break ; + case LINE_END : + if ( sc.atLineEnd || sc.ch == ' ' ) { + // nothing changes + state = LINE_END ; + } else if ( sc.ch == '*' ) { + if ( sc.chNext == '*' ) { + state = COMMENT_LINE ; + sc.SetState(SCE_ABAQUS_COMMENT) ; + } else { + state = KW_LINE_KW ; + sc.SetState(SCE_ABAQUS_STARCOMMAND) ; + } + } else { + // it must be a data line, things are as if we are in DAT_LINE_COMMA + if ( sc.ch == ',' ) { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = DAT_LINE_COMMA ; + } else if ( IsADigit(sc.ch) || (sc.ch == '-')|| (sc.ch == '.' && IsADigit(sc.chNext)) ) { + sc.SetState(SCE_ABAQUS_NUMBER) ; + state = DAT_LINE_VAL ; + } else if ( IsAKeywordChar(sc.ch) ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = DAT_LINE_VAL ; + } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) { + sc.SetState(SCE_ABAQUS_STRING) ; + state = DAT_LINE_VAL ; + } else { + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + } + break ; + } + } + sc.Complete(); +} + +//------------------------------------------------------------------------------ +// This copyied and modified from LexBasic.cxx +//------------------------------------------------------------------------------ + +/* Bits: + * 1 - whitespace + * 2 - operator + * 4 - identifier + * 8 - decimal digit + * 16 - hex digit + * 32 - bin digit + */ +static int character_classification[128] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 2, 0, 2, 2, 2, 2, 2, 2, 2, 6, 2, 2, 2, 10, 6, + 60, 60, 28, 28, 28, 28, 28, 28, 28, 28, 2, 2, 2, 2, 2, 2, + 2, 20, 20, 20, 20, 20, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 4, + 2, 20, 20, 20, 20, 20, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 0 +}; + +static bool IsSpace(int c) { + return c < 128 && (character_classification[c] & 1); +} + +static bool IsIdentifier(int c) { + return c < 128 && (character_classification[c] & 4); +} + +static int LowerCase(int c) +{ + if (c >= 'A' && c <= 'Z') + return 'a' + c - 'A'; + return c; +} + +static int LineEnd(int line, Accessor &styler) +{ + const int docLines = styler.GetLine(styler.Length() - 1); // Available last line + int eol_pos ; + // if the line is the last line, the eol_pos is styler.Length() + // eol will contain a new line, or a virtual new line + if ( docLines == line ) + eol_pos = styler.Length() ; + else + eol_pos = styler.LineStart(line + 1) - 1; + return eol_pos ; +} + +static int LineStart(int line, Accessor &styler) +{ + return styler.LineStart(line) ; +} + +// LineType +// +// bits determines the line type +// 1 : data line +// 2 : only whitespace +// 3 : data line with only whitespace +// 4 : keyword line +// 5 : block open keyword line +// 6 : block close keyword line +// 7 : keyword line in error +// 8 : comment line +static int LineType(int line, Accessor &styler) { + int pos = LineStart(line, styler) ; + int eol_pos = LineEnd(line, styler) ; + + int c ; + char ch = ' '; + + int i = pos ; + while ( i < eol_pos ) { + c = styler.SafeGetCharAt(i); + ch = static_cast<char>(LowerCase(c)); + // We can say something as soon as no whitespace + // was encountered + if ( !IsSpace(c) ) + break ; + i++ ; + } + + if ( i >= eol_pos ) { + // This is a whitespace line, currently + // classifies as data line + return 3 ; + } + + if ( ch != '*' ) { + // This is a data line + return 1 ; + } + + if ( i == eol_pos - 1 ) { + // Only a single *, error but make keyword line + return 4+3 ; + } + + // This means we can have a second character + // if that is also a * this means a comment + // otherwise it is a keyword. + c = styler.SafeGetCharAt(i+1); + ch = static_cast<char>(LowerCase(c)); + if ( ch == '*' ) { + return 8 ; + } + + // At this point we know this is a keyword line + // the character at position i is a * + // it is not a comment line + char word[256] ; + int wlen = 0; + + word[wlen] = '*' ; + wlen++ ; + + i++ ; + while ( (i < eol_pos) && (wlen < 255) ) { + c = styler.SafeGetCharAt(i); + ch = static_cast<char>(LowerCase(c)); + + if ( (!IsSpace(c)) && (!IsIdentifier(c)) ) + break ; + + if ( IsIdentifier(c) ) { + word[wlen] = ch ; + wlen++ ; + } + + i++ ; + } + + word[wlen] = 0 ; + + // Make a comparison + if ( !strcmp(word, "*step") || + !strcmp(word, "*part") || + !strcmp(word, "*instance") || + !strcmp(word, "*assembly")) { + return 4+1 ; + } + + if ( !strcmp(word, "*endstep") || + !strcmp(word, "*endpart") || + !strcmp(word, "*endinstance") || + !strcmp(word, "*endassembly")) { + return 4+2 ; + } + + return 4 ; +} + +static void SafeSetLevel(int line, int level, Accessor &styler) +{ + if ( line < 0 ) + return ; + + int mask = ((~SC_FOLDLEVELHEADERFLAG) | (~SC_FOLDLEVELWHITEFLAG)); + + if ( (level & mask) < 0 ) + return ; + + if ( styler.LevelAt(line) != level ) + styler.SetLevel(line, level) ; +} + +static void FoldABAQUSDoc(unsigned int startPos, int length, int, +WordList *[], Accessor &styler) { + int startLine = styler.GetLine(startPos) ; + int endLine = styler.GetLine(startPos+length-1) ; + + // bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + // We want to deal with all the cases + // To know the correct indentlevel, we need to look back to the + // previous command line indentation level + // order of formatting keyline datalines commentlines + int beginData = -1 ; + int beginComment = -1 ; + int prvKeyLine = startLine ; + int prvKeyLineTp = 0 ; + + // Scan until we find the previous keyword line + // this will give us the level reference that we need + while ( prvKeyLine > 0 ) { + prvKeyLine-- ; + prvKeyLineTp = LineType(prvKeyLine, styler) ; + if ( prvKeyLineTp & 4 ) + break ; + } + + // Determine the base line level of all lines following + // the previous keyword + // new keyword lines are placed on this level + //if ( prvKeyLineTp & 4 ) { + int level = styler.LevelAt(prvKeyLine) & ~SC_FOLDLEVELHEADERFLAG ; + //} + + // uncomment line below if weird behaviour continues + prvKeyLine = -1 ; + + // Now start scanning over the lines. + for ( int line = startLine; line <= endLine; line++ ) { + int lineType = LineType(line, styler) ; + + // Check for comment line + if ( lineType == 8 ) { + if ( beginComment < 0 ) { + beginComment = line ; + } + } + + // Check for data line + if ( (lineType == 1) || (lineType == 3) ) { + if ( beginData < 0 ) { + if ( beginComment >= 0 ) { + beginData = beginComment ; + } else { + beginData = line ; + } + } + beginComment = -1 ; + } + + // Check for keywordline. + // As soon as a keyword line is encountered, we can set the + // levels of everything from the previous keyword line to this one + if ( lineType & 4 ) { + // this is a keyword, we can now place the previous keyword + // all its data lines and the remainder + + // Write comments and data line + if ( beginComment < 0 ) { + beginComment = line ; + } + + if ( beginData < 0 ) { + beginData = beginComment ; + if ( prvKeyLineTp != 5 ) + SafeSetLevel(prvKeyLine, level, styler) ; + else + SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ; + } else { + SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ; + } + + int datLevel = level + 1 ; + if ( !(prvKeyLineTp & 4) ) { + datLevel = level ; + } + + for ( int ll = beginData; ll < beginComment; ll++ ) + SafeSetLevel(ll, datLevel, styler) ; + + // The keyword we just found is going to be written at another level + // if we have a type 5 and type 6 + if ( prvKeyLineTp == 5 ) { + level += 1 ; + } + + if ( prvKeyLineTp == 6 ) { + level -= 1 ; + if ( level < 0 ) { + level = 0 ; + } + } + + for ( int lll = beginComment; lll < line; lll++ ) + SafeSetLevel(lll, level, styler) ; + + // wrap and reset + beginComment = -1 ; + beginData = -1 ; + prvKeyLine = line ; + prvKeyLineTp = lineType ; + } + + } + + if ( beginComment < 0 ) { + beginComment = endLine + 1 ; + } else { + // We need to find out whether this comment block is followed by + // a data line or a keyword line + const int docLines = styler.GetLine(styler.Length() - 1); + + for ( int line = endLine + 1; line <= docLines; line++ ) { + int lineType = LineType(line, styler) ; + + if ( lineType != 8 ) { + if ( !(lineType & 4) ) { + beginComment = endLine + 1 ; + } + break ; + } + } + } + + if ( beginData < 0 ) { + beginData = beginComment ; + if ( prvKeyLineTp != 5 ) + SafeSetLevel(prvKeyLine, level, styler) ; + else + SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ; + } else { + SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ; + } + + int datLevel = level + 1 ; + if ( !(prvKeyLineTp & 4) ) { + datLevel = level ; + } + + for ( int ll = beginData; ll < beginComment; ll++ ) + SafeSetLevel(ll, datLevel, styler) ; + + if ( prvKeyLineTp == 5 ) { + level += 1 ; + } + + if ( prvKeyLineTp == 6 ) { + level -= 1 ; + } + for ( int m = beginComment; m <= endLine; m++ ) + SafeSetLevel(m, level, styler) ; +} + +static const char * const abaqusWordListDesc[] = { + "processors", + "commands", + "slashommands", + "starcommands", + "arguments", + "functions", + 0 +}; + +LexerModule lmAbaqus(SCLEX_ABAQUS, ColouriseABAQUSDoc, "abaqus", FoldABAQUSDoc, abaqusWordListDesc); Modified: scintilla/makefile.win32 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -63,6 +63,7 @@ MARSHALLER=scintilla-marshal.o $(CC) $(CXXFLAGS) -c $< LEXOBJS=\ +LexAbaqus.o \ LexAda.o \ LexAsm.o \ LexBash.o \ Modified: scintilla/scintilla_changes.patch 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -36,7 +36,7 @@ index 2f75247..a34f834 100644 //++Autogenerated -- run src/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ - LINK_LEXER(lmA68k); -- LINK_LEXER(lmAbaqus); + LINK_LEXER(lmAbaqus); LINK_LEXER(lmAda); - LINK_LEXER(lmAns1); - LINK_LEXER(lmAPDL); Modified: scintilla/src/Catalogue.cxx 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -81,6 +81,7 @@ int Scintilla_LinkLexers() { //++Autogenerated -- run src/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ + LINK_LEXER(lmAbaqus); LINK_LEXER(lmAda); LINK_LEXER(lmAsm); LINK_LEXER(lmBash); Modified: src/filetypes.c 6 files changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -504,6 +504,12 @@ static void init_builtin_filetypes(void) filetype_make_title(ft, TITLE_SOURCE_FILE); ft->group = GEANY_FILETYPE_GROUP_MARKUP; +#define ABAQUS + ft = filetypes[GEANY_FILETYPES_ABAQUS]; + ft->lang = 44; + ft->name = g_strdup("Abaqus"); + filetype_make_title(ft, TITLE_SOURCE_FILE); + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; } Modified: src/filetypes.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -91,6 +91,7 @@ GEANY_FILETYPES_COBOL, GEANY_FILETYPES_OBJECTIVEC, GEANY_FILETYPES_ASCIIDOC, + GEANY_FILETYPES_ABAQUS, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -1039,6 +1039,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co switch (lexer_id) { + init_styleset_case(ABAQUS); init_styleset_case(ADA); init_styleset_case(ASM); init_styleset_case(BASIC); @@ -1118,6 +1119,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) switch (lexer_id) { + styleset_case(ABAQUS); styleset_case(ADA); styleset_case(ASM); styleset_case(BASIC); @@ -1563,6 +1565,9 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_ADA_STRING || style == SCE_ADA_CHARACTEREOL || style == SCE_ADA_STRINGEOL); + + case SCLEX_ABAQUS: + return (style == SCE_ABAQUS_STRING); } return FALSE; } @@ -1700,6 +1705,10 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) return (style == SCE_ADA_COMMENTLINE || style == SCE_NSIS_COMMENTBOX); + case SCLEX_ABAQUS: + return (style == SCE_ABAQUS_COMMENT || + style == SCE_ABAQUS_COMMENTBLOCK); + case SCLEX_ASM: return (style == SCE_ASM_COMMENT || style == SCE_ASM_COMMENTBLOCK || Modified: src/highlightingmappings.h 25 files changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -69,6 +69,31 @@ #define HL_N_ENTRIES(array) ((array != NULL) ? G_N_ELEMENTS(array) : 0) +/* Abaqus */ +#define highlighting_lexer_ABAQUS SCLEX_ABAQUS +static const HLStyle highlighting_styles_ABAQUS[] = +{ + { SCE_ABAQUS_DEFAULT, "default", FALSE }, + { SCE_ABAQUS_COMMENT, "comment", FALSE }, + { SCE_ABAQUS_NUMBER, "number", FALSE }, + { SCE_ABAQUS_STRING, "string", FALSE }, + { SCE_ABAQUS_OPERATOR, "operator", FALSE }, + { SCE_ABAQUS_PROCESSOR, "processor", FALSE }, + { SCE_ABAQUS_STARCOMMAND, "starcommand", FALSE }, + { SCE_ABAQUS_ARGUMENT, "argument", FALSE } +}; +static const HLKeyword highlighting_keywords_ABAQUS[] = +{ + { 0, "processors", FALSE }, + { 1, "commands", FALSE }, + { 2, "slashommands", FALSE }, + { 3, "starcommands", FALSE }, + { 4, "arguments", FALSE }, + { 5, "functions", FALSE } +}; +#define highlighting_properties_ABAQUS EMPTY_PROPERTIES + + /* Ada */ #define highlighting_lexer_ADA SCLEX_ADA static const HLStyle highlighting_styles_ADA[] = Modified: src/symbols.c 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -746,6 +746,15 @@ static void add_top_level_items(GeanyDocument *doc) NULL); break; } + case GEANY_FILETYPES_ABAQUS: + { + tag_list_add_groups(tag_store, + &(tv_iters.tag_class), _("Parts"), NULL, + &(tv_iters.tag_member), _("Assembly"), NULL, + &(tv_iters.tag_namespace), _("Steps"), NULL, + NULL); + break; + } case GEANY_FILETYPES_R: { tag_list_add_groups(tag_store, Modified: tagmanager/ctags/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -11,6 +11,7 @@ EXTRA_DIST = \ noinst_LIBRARIES = libctags.a parsers = \ + abaqus.c \ abc.c \ actionscript.c \ asciidoc.c \ Modified: tagmanager/ctags/abaqus.c 126 files changed, 126 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,126 @@ +/* + * This source code is released for free distribution under the terms of the + * GNU General Public License. + * + * This module contains functions for generating tags for source files + * for inp files (Abaqus). + */ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <ctype.h> +#include <string.h> + +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ +typedef enum { + K_PART, + K_ASSEMBLY, + K_STEP +} AbaqusKind; + +static kindOption AbaqusKinds[] = { + { TRUE, 'c', "class", "Parts" }, + { TRUE, 'm', "member", "Assembly" }, + { TRUE, 'n', "namespace", "Steps" } +}; + +/* +* FUNCTION DEFINITIONS +*/ + +static int getWord(const char *ref, const char **ptr) +{ + const char *p = *ptr; + + while ((*ref != '\0') && (*p != '\0') && (tolower(*ref) == tolower(*p))) ref++, p++; + + if (*ref) return FALSE; + + *ptr = p; + return TRUE; +} + + +static void createTag(AbaqusKind kind, const char *buf) +{ + vString *name; + + if (*buf == '\0') return; + + buf = strstr(buf, "="); + if (buf == NULL) return; + + buf += 1; + + if (*buf == '\0') return; + + name = vStringNew(); + + do + { + vStringPut(name, (int) *buf); + ++buf; + } while ((*buf != '\0') && (*buf != ',')); + vStringTerminate(name); + makeSimpleTag(name, AbaqusKinds, kind); + vStringDelete(name); +} + + +static void findAbaqusTags(void) +{ + const char *line; + + while ((line = (const char*)fileReadLine()) != NULL) + { + const char *cp = line; + + for (; *cp != '\0'; cp++) + { + if (*cp == '*') + { + cp++; + + /* Parts*/ + if (getWord("part", &cp)) + { + createTag(K_PART, cp); + continue; + } + /* Assembly */ + if (getWord("assembly", &cp)) + { + createTag(K_ASSEMBLY, cp); + continue; + } + /* Steps */ + if (getWord("step", &cp)) + { + createTag(K_STEP, cp); + continue; + } + } + } + } +} + + +extern parserDefinition* AbaqusParser (void) +{ + static const char *const extensions [] = { "inp", NULL }; + parserDefinition * def = parserNew ("Abaqus"); + def->kinds = AbaqusKinds; + def->kindCount = KIND_COUNT (AbaqusKinds); + def->extensions = extensions; + def->parser = findAbaqusTags; + return def; +} Modified: tagmanager/ctags/makefile.win32 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ all: $(COMPLIB) clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ +$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ actionscript.o nsis.o objc.o \ haskell.o haxe.o html.o python.o lregex.o asciidoc.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ Modified: tagmanager/ctags/parsers.h 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -58,7 +58,8 @@ RParser, \ CobolParser, \ ObjcParser, \ - AsciidocParser + AsciidocParser, \ + AbaqusParser /* langType of each parser 0 CParser @@ -105,6 +106,7 @@ 41 CobolParser 42 ObjcParser 43 AsciidocParser +44 AbaqusParser */ #endif /* _PARSERS_H */ Modified: wscript 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -61,6 +61,7 @@ out = '_build_' mio_sources = set(['tagmanager/mio/mio.c']) ctags_sources = set([ + 'tagmanager/ctags/abaqus.c', 'tagmanager/ctags/args.c', 'tagmanager/ctags/abc.c', 'tagmanager/ctags/actionscript.c', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2203d8: Abaqus: remove styles not actually used by the lexer
by Baptiste Pierrat 12 Feb '13

12 Feb '13

Branch: refs/heads/master Author: Baptiste Pierrat <baptiste.pierrat(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 12 Feb 2013 13:57:12 UTC Commit: 2203d8f085801492f7863c2c5c468e968df789bc https://github.com/geany/geany/commit/2203d8f085801492f7863c2c5c468e968df78… Log Message: ----------- Abaqus: remove styles not actually used by the lexer Modified Paths: -------------- data/filetypes.abaqus src/highlightingmappings.h Modified: data/filetypes.abaqus 11 files changed, 3 insertions(+), 8 deletions(-) =================================================================== @@ -3,17 +3,12 @@ # Edit these in the colorscheme .conf file instead default=default comment=comment_line -commentblock=comment number=number string=string_1 operator=operator -word=string -processors=preprocessor -commands=keyword -slashcommands=keyword -starcommands=keyword -arguments=parameter -functions=function +processor=preprocessor +starcommand=keyword +argument=parameter [keywords] # all items must be in one line Modified: src/highlightingmappings.h 11 files changed, 3 insertions(+), 8 deletions(-) =================================================================== @@ -75,17 +75,12 @@ { { SCE_ABAQUS_DEFAULT, "default", FALSE }, { SCE_ABAQUS_COMMENT, "comment", FALSE }, - { SCE_ABAQUS_COMMENTBLOCK, "commentblock", FALSE }, { SCE_ABAQUS_NUMBER, "number", FALSE }, { SCE_ABAQUS_STRING, "string", FALSE }, { SCE_ABAQUS_OPERATOR, "operator", FALSE }, - { SCE_ABAQUS_WORD, "word", FALSE }, - { SCE_ABAQUS_PROCESSOR, "processors", FALSE }, - { SCE_ABAQUS_COMMAND, "commands", FALSE }, - { SCE_ABAQUS_SLASHCOMMAND, "slashcommands", FALSE }, - { SCE_ABAQUS_STARCOMMAND, "starcommands", FALSE }, - { SCE_ABAQUS_ARGUMENT, "arguments", FALSE }, - { SCE_ABAQUS_FUNCTION, "functions", FALSE } + { SCE_ABAQUS_PROCESSOR, "processor", FALSE }, + { SCE_ABAQUS_STARCOMMAND, "starcommand", FALSE }, + { SCE_ABAQUS_ARGUMENT, "argument", FALSE } }; static const HLKeyword highlighting_keywords_ABAQUS[] = { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d4e61b: Add support for Abaqus files
by Baptiste Pierrat 12 Feb '13

12 Feb '13

Branch: refs/heads/master Author: Baptiste Pierrat <baptiste.pierrat(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 12 Feb 2013 13:56:38 UTC Commit: d4e61bf0933038b3de8f7a16425e82bb51c44285 https://github.com/geany/geany/commit/d4e61bf0933038b3de8f7a16425e82bb51c44… Log Message: ----------- Add support for Abaqus files Support for Abaqus (.inp) files, including scintilla lexer and tag parser. Signed-off-by: Baptiste Pierrat <baptiste.pierrat(a)gmail.com> Modified Paths: -------------- data/filetype_extensions.conf data/filetypes.abaqus scintilla/Makefile.am scintilla/lexers/LexAbaqus.cxx scintilla/makefile.win32 scintilla/scintilla_changes.patch scintilla/src/Catalogue.cxx src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h src/symbols.c tagmanager/ctags/Makefile.am tagmanager/ctags/abaqus.c tagmanager/ctags/makefile.win32 tagmanager/ctags/parsers.h wscript Modified: data/filetype_extensions.conf 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ # Insert as many items as you want, seperate them with a ";". # See Geany's main documentation for details. [Extensions] +Abaqus=*.inp; Abc=*.abc;*.abp; ActionScript=*.as; Ada=*.adb;*.ads; Modified: data/filetypes.abaqus 67 files changed, 67 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,67 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead +default=default +comment=comment_line +commentblock=comment +number=number +string=string_1 +operator=operator +word=string +processors=preprocessor +commands=keyword +slashcommands=keyword +starcommands=keyword +arguments=parameter +functions=function + +[keywords] +# all items must be in one line +starcommands=amplitude assembly beam boundary buckle bulk cload conditions conductivity contact damping density dload dsflux dsload dynamic el elastic element element output elgen elset encastre end step expansion explicit equation embedded element field freq frequency friction generate heading heat transfer history imperfectio import include initial initial conditions instance interactio internal interval marks material monitor mpc ncopy nfill ngen nlgeom node node output node print nset number output pair parameter part physical constants plastic print preprint radiate restart shell shell section solid section specific heat sradiate static step surface temperature time type variable viscosity +arguments=elset engineering inc input line material name nset pin tie type write generate field variable history stefan boltzmann absolute zero zero frequency steady state new old set change number shift model position newset oldset host + +[settings] +# default extension used when saving files +extension=inp + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comments, like # in this file +comment_single=** +# multiline comments +#comment_open= +#comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=false + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler= +run_cmd=abaqus job="%f" interactive datacheck + +[build-menu] +FT_00_LB=Datacheck +FT_00_CM=abaqus job="%f" interactive datacheck +FT_00_BD=false +FT_01_LB=Run Job +FT_01_CM=abaqus job="%f" interactive +FT_01_BD=false + Modified: scintilla/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -6,6 +6,7 @@ noinst_LIBRARIES=libscintilla.a AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER -DG_THREADS_IMPL_NONE LEXER_SRCS= \ +lexers/LexAbaqus.cxx \ lexers/LexAda.cxx \ lexers/LexAsm.cxx \ lexers/LexBash.cxx \ Modified: scintilla/lexers/LexAbaqus.cxx 620 files changed, 620 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,620 @@ +// Scintilla source code edit control +/** @file LexABAQUS.cxx + ** Lexer for ABAQUS. Based on the lexer for APDL by Hadar Raz. + ** By Sergio Lucato. + ** Sort of completely rewritten by Gertjan Kloosterman + **/ +// The License.txt file describes the conditions under which this software may be distributed. + +// Code folding copyied and modified from LexBasic.cxx + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> + +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +static inline bool IsAWordChar(const int ch) { + return (ch < 0x80 && (isalnum(ch) || (ch == '_'))); +} + +static inline bool IsAKeywordChar(const int ch) { + return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == ' '))); +} + +static inline bool IsASetChar(const int ch) { + return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == '.') || (ch == '-'))); +} + +static inline bool IsAnOperator(char ch) { + // '.' left out as it is used to make up numbers + if (ch == '*' || ch == '/' || ch == '-' || ch == '+' || + ch == '(' || ch == ')' || ch == '=' || ch == '^' || + ch == '[' || ch == ']' || ch == '<' || ch == '&' || + ch == '>' || ch == ',' || ch == '|' || ch == '~' || + ch == '$' || ch == ':' || ch == '%') + return true; + return false; +} + +static void ColouriseABAQUSDoc(unsigned int startPos, int length, int initStyle, WordList*[] /* *keywordlists[] */, + Accessor &styler) { + enum localState { KW_LINE_KW, KW_LINE_COMMA, KW_LINE_PAR, KW_LINE_EQ, KW_LINE_VAL, \ + DAT_LINE_VAL, DAT_LINE_COMMA,\ + COMMENT_LINE,\ + ST_ERROR, LINE_END } state ; + + // Do not leak onto next line + state = LINE_END ; + initStyle = SCE_ABAQUS_DEFAULT; + StyleContext sc(startPos, length, initStyle, styler); + + // Things are actually quite simple + // we have commentlines + // keywordlines and datalines + // On a data line there will only be colouring of numbers + // a keyword line is constructed as + // *word,[ paramname[=paramvalue]]* + // if the line ends with a , the keyword line continues onto the new line + + for (; sc.More(); sc.Forward()) { + switch ( state ) { + case KW_LINE_KW : + if ( sc.atLineEnd ) { + // finished the line in keyword state, switch to LINE_END + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } else if ( IsAKeywordChar(sc.ch) ) { + // nothing changes + state = KW_LINE_KW ; + } else if ( sc.ch == ',' ) { + // Well well we say a comma, arguments *MUST* follow + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = KW_LINE_COMMA ; + } else { + // Flag an error + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + // Done with processing + break ; + case KW_LINE_COMMA : + // acomma on a keywordline was seen + if ( IsAKeywordChar(sc.ch)) { + sc.SetState(SCE_ABAQUS_ARGUMENT) ; + state = KW_LINE_PAR ; + } else if ( sc.atLineEnd || (sc.ch == ',') ) { + // we remain in keyword mode + state = KW_LINE_COMMA ; + } else if ( sc.ch == ' ' ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = KW_LINE_COMMA ; + } else { + // Anything else constitutes an error + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case KW_LINE_PAR : + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } else if ( IsAKeywordChar(sc.ch) || (sc.ch == '-') ) { + // remain in this state + state = KW_LINE_PAR ; + } else if ( sc.ch == ',' ) { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = KW_LINE_COMMA ; + } else if ( sc.ch == '=' ) { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = KW_LINE_EQ ; + } else { + // Anything else constitutes an error + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case KW_LINE_EQ : + if ( sc.ch == ' ' ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + // remain in this state + state = KW_LINE_EQ ; + } else if ( IsADigit(sc.ch) || (sc.ch == '-') || (sc.ch == '.' && IsADigit(sc.chNext)) ) { + sc.SetState(SCE_ABAQUS_NUMBER) ; + state = KW_LINE_VAL ; + } else if ( IsAKeywordChar(sc.ch) ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = KW_LINE_VAL ; + } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) { + sc.SetState(SCE_ABAQUS_STRING) ; + state = KW_LINE_VAL ; + } else { + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case KW_LINE_VAL : + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } else if ( IsASetChar(sc.ch) && (sc.state == SCE_ABAQUS_DEFAULT) ) { + // nothing changes + state = KW_LINE_VAL ; + } else if (( (IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') || + ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) && + (sc.state == SCE_ABAQUS_NUMBER)) { + // remain in number mode + state = KW_LINE_VAL ; + } else if (sc.state == SCE_ABAQUS_STRING) { + // accept everything until a closing quote + if ( sc.ch == '\'' || sc.ch == '\"' ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = KW_LINE_VAL ; + } + } else if ( sc.ch == ',' ) { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = KW_LINE_COMMA ; + } else { + // anything else is an error + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case DAT_LINE_VAL : + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } else if ( IsASetChar(sc.ch) && (sc.state == SCE_ABAQUS_DEFAULT) ) { + // nothing changes + state = DAT_LINE_VAL ; + } else if (( (IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') || + ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) && + (sc.state == SCE_ABAQUS_NUMBER)) { + // remain in number mode + state = DAT_LINE_VAL ; + } else if (sc.state == SCE_ABAQUS_STRING) { + // accept everything until a closing quote + if ( sc.ch == '\'' || sc.ch == '\"' ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = DAT_LINE_VAL ; + } + } else if ( sc.ch == ',' ) { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = DAT_LINE_COMMA ; + } else { + // anything else is an error + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case DAT_LINE_COMMA : + // a comma on a data line was seen + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } else if ( sc.ch == ' ' ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = DAT_LINE_COMMA ; + } else if (sc.ch == ',') { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = DAT_LINE_COMMA ; + } else if ( IsADigit(sc.ch) || (sc.ch == '-')|| (sc.ch == '.' && IsADigit(sc.chNext)) ) { + sc.SetState(SCE_ABAQUS_NUMBER) ; + state = DAT_LINE_VAL ; + } else if ( IsAKeywordChar(sc.ch) ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = DAT_LINE_VAL ; + } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) { + sc.SetState(SCE_ABAQUS_STRING) ; + state = DAT_LINE_VAL ; + } else { + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + break ; + case COMMENT_LINE : + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } + break ; + case ST_ERROR : + if ( sc.atLineEnd ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = LINE_END ; + } + break ; + case LINE_END : + if ( sc.atLineEnd || sc.ch == ' ' ) { + // nothing changes + state = LINE_END ; + } else if ( sc.ch == '*' ) { + if ( sc.chNext == '*' ) { + state = COMMENT_LINE ; + sc.SetState(SCE_ABAQUS_COMMENT) ; + } else { + state = KW_LINE_KW ; + sc.SetState(SCE_ABAQUS_STARCOMMAND) ; + } + } else { + // it must be a data line, things are as if we are in DAT_LINE_COMMA + if ( sc.ch == ',' ) { + sc.SetState(SCE_ABAQUS_OPERATOR) ; + state = DAT_LINE_COMMA ; + } else if ( IsADigit(sc.ch) || (sc.ch == '-')|| (sc.ch == '.' && IsADigit(sc.chNext)) ) { + sc.SetState(SCE_ABAQUS_NUMBER) ; + state = DAT_LINE_VAL ; + } else if ( IsAKeywordChar(sc.ch) ) { + sc.SetState(SCE_ABAQUS_DEFAULT) ; + state = DAT_LINE_VAL ; + } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) { + sc.SetState(SCE_ABAQUS_STRING) ; + state = DAT_LINE_VAL ; + } else { + sc.SetState(SCE_ABAQUS_PROCESSOR) ; + state = ST_ERROR ; + } + } + break ; + } + } + sc.Complete(); +} + +//------------------------------------------------------------------------------ +// This copyied and modified from LexBasic.cxx +//------------------------------------------------------------------------------ + +/* Bits: + * 1 - whitespace + * 2 - operator + * 4 - identifier + * 8 - decimal digit + * 16 - hex digit + * 32 - bin digit + */ +static int character_classification[128] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 2, 0, 2, 2, 2, 2, 2, 2, 2, 6, 2, 2, 2, 10, 6, + 60, 60, 28, 28, 28, 28, 28, 28, 28, 28, 2, 2, 2, 2, 2, 2, + 2, 20, 20, 20, 20, 20, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 4, + 2, 20, 20, 20, 20, 20, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 0 +}; + +static bool IsSpace(int c) { + return c < 128 && (character_classification[c] & 1); +} + +static bool IsIdentifier(int c) { + return c < 128 && (character_classification[c] & 4); +} + +static int LowerCase(int c) +{ + if (c >= 'A' && c <= 'Z') + return 'a' + c - 'A'; + return c; +} + +static int LineEnd(int line, Accessor &styler) +{ + const int docLines = styler.GetLine(styler.Length() - 1); // Available last line + int eol_pos ; + // if the line is the last line, the eol_pos is styler.Length() + // eol will contain a new line, or a virtual new line + if ( docLines == line ) + eol_pos = styler.Length() ; + else + eol_pos = styler.LineStart(line + 1) - 1; + return eol_pos ; +} + +static int LineStart(int line, Accessor &styler) +{ + return styler.LineStart(line) ; +} + +// LineType +// +// bits determines the line type +// 1 : data line +// 2 : only whitespace +// 3 : data line with only whitespace +// 4 : keyword line +// 5 : block open keyword line +// 6 : block close keyword line +// 7 : keyword line in error +// 8 : comment line +static int LineType(int line, Accessor &styler) { + int pos = LineStart(line, styler) ; + int eol_pos = LineEnd(line, styler) ; + + int c ; + char ch = ' '; + + int i = pos ; + while ( i < eol_pos ) { + c = styler.SafeGetCharAt(i); + ch = static_cast<char>(LowerCase(c)); + // We can say something as soon as no whitespace + // was encountered + if ( !IsSpace(c) ) + break ; + i++ ; + } + + if ( i >= eol_pos ) { + // This is a whitespace line, currently + // classifies as data line + return 3 ; + } + + if ( ch != '*' ) { + // This is a data line + return 1 ; + } + + if ( i == eol_pos - 1 ) { + // Only a single *, error but make keyword line + return 4+3 ; + } + + // This means we can have a second character + // if that is also a * this means a comment + // otherwise it is a keyword. + c = styler.SafeGetCharAt(i+1); + ch = static_cast<char>(LowerCase(c)); + if ( ch == '*' ) { + return 8 ; + } + + // At this point we know this is a keyword line + // the character at position i is a * + // it is not a comment line + char word[256] ; + int wlen = 0; + + word[wlen] = '*' ; + wlen++ ; + + i++ ; + while ( (i < eol_pos) && (wlen < 255) ) { + c = styler.SafeGetCharAt(i); + ch = static_cast<char>(LowerCase(c)); + + if ( (!IsSpace(c)) && (!IsIdentifier(c)) ) + break ; + + if ( IsIdentifier(c) ) { + word[wlen] = ch ; + wlen++ ; + } + + i++ ; + } + + word[wlen] = 0 ; + + // Make a comparison + if ( !strcmp(word, "*step") || + !strcmp(word, "*part") || + !strcmp(word, "*instance") || + !strcmp(word, "*assembly")) { + return 4+1 ; + } + + if ( !strcmp(word, "*endstep") || + !strcmp(word, "*endpart") || + !strcmp(word, "*endinstance") || + !strcmp(word, "*endassembly")) { + return 4+2 ; + } + + return 4 ; +} + +static void SafeSetLevel(int line, int level, Accessor &styler) +{ + if ( line < 0 ) + return ; + + int mask = ((~SC_FOLDLEVELHEADERFLAG) | (~SC_FOLDLEVELWHITEFLAG)); + + if ( (level & mask) < 0 ) + return ; + + if ( styler.LevelAt(line) != level ) + styler.SetLevel(line, level) ; +} + +static void FoldABAQUSDoc(unsigned int startPos, int length, int, +WordList *[], Accessor &styler) { + int startLine = styler.GetLine(startPos) ; + int endLine = styler.GetLine(startPos+length-1) ; + + // bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + // We want to deal with all the cases + // To know the correct indentlevel, we need to look back to the + // previous command line indentation level + // order of formatting keyline datalines commentlines + int beginData = -1 ; + int beginComment = -1 ; + int prvKeyLine = startLine ; + int prvKeyLineTp = 0 ; + + // Scan until we find the previous keyword line + // this will give us the level reference that we need + while ( prvKeyLine > 0 ) { + prvKeyLine-- ; + prvKeyLineTp = LineType(prvKeyLine, styler) ; + if ( prvKeyLineTp & 4 ) + break ; + } + + // Determine the base line level of all lines following + // the previous keyword + // new keyword lines are placed on this level + //if ( prvKeyLineTp & 4 ) { + int level = styler.LevelAt(prvKeyLine) & ~SC_FOLDLEVELHEADERFLAG ; + //} + + // uncomment line below if weird behaviour continues + prvKeyLine = -1 ; + + // Now start scanning over the lines. + for ( int line = startLine; line <= endLine; line++ ) { + int lineType = LineType(line, styler) ; + + // Check for comment line + if ( lineType == 8 ) { + if ( beginComment < 0 ) { + beginComment = line ; + } + } + + // Check for data line + if ( (lineType == 1) || (lineType == 3) ) { + if ( beginData < 0 ) { + if ( beginComment >= 0 ) { + beginData = beginComment ; + } else { + beginData = line ; + } + } + beginComment = -1 ; + } + + // Check for keywordline. + // As soon as a keyword line is encountered, we can set the + // levels of everything from the previous keyword line to this one + if ( lineType & 4 ) { + // this is a keyword, we can now place the previous keyword + // all its data lines and the remainder + + // Write comments and data line + if ( beginComment < 0 ) { + beginComment = line ; + } + + if ( beginData < 0 ) { + beginData = beginComment ; + if ( prvKeyLineTp != 5 ) + SafeSetLevel(prvKeyLine, level, styler) ; + else + SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ; + } else { + SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ; + } + + int datLevel = level + 1 ; + if ( !(prvKeyLineTp & 4) ) { + datLevel = level ; + } + + for ( int ll = beginData; ll < beginComment; ll++ ) + SafeSetLevel(ll, datLevel, styler) ; + + // The keyword we just found is going to be written at another level + // if we have a type 5 and type 6 + if ( prvKeyLineTp == 5 ) { + level += 1 ; + } + + if ( prvKeyLineTp == 6 ) { + level -= 1 ; + if ( level < 0 ) { + level = 0 ; + } + } + + for ( int lll = beginComment; lll < line; lll++ ) + SafeSetLevel(lll, level, styler) ; + + // wrap and reset + beginComment = -1 ; + beginData = -1 ; + prvKeyLine = line ; + prvKeyLineTp = lineType ; + } + + } + + if ( beginComment < 0 ) { + beginComment = endLine + 1 ; + } else { + // We need to find out whether this comment block is followed by + // a data line or a keyword line + const int docLines = styler.GetLine(styler.Length() - 1); + + for ( int line = endLine + 1; line <= docLines; line++ ) { + int lineType = LineType(line, styler) ; + + if ( lineType != 8 ) { + if ( !(lineType & 4) ) { + beginComment = endLine + 1 ; + } + break ; + } + } + } + + if ( beginData < 0 ) { + beginData = beginComment ; + if ( prvKeyLineTp != 5 ) + SafeSetLevel(prvKeyLine, level, styler) ; + else + SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ; + } else { + SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ; + } + + int datLevel = level + 1 ; + if ( !(prvKeyLineTp & 4) ) { + datLevel = level ; + } + + for ( int ll = beginData; ll < beginComment; ll++ ) + SafeSetLevel(ll, datLevel, styler) ; + + if ( prvKeyLineTp == 5 ) { + level += 1 ; + } + + if ( prvKeyLineTp == 6 ) { + level -= 1 ; + } + for ( int m = beginComment; m <= endLine; m++ ) + SafeSetLevel(m, level, styler) ; +} + +static const char * const abaqusWordListDesc[] = { + "processors", + "commands", + "slashommands", + "starcommands", + "arguments", + "functions", + 0 +}; + +LexerModule lmAbaqus(SCLEX_ABAQUS, ColouriseABAQUSDoc, "abaqus", FoldABAQUSDoc, abaqusWordListDesc); Modified: scintilla/makefile.win32 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -63,6 +63,7 @@ MARSHALLER=scintilla-marshal.o $(CC) $(CXXFLAGS) -c $< LEXOBJS=\ +LexAbaqus.o \ LexAda.o \ LexAsm.o \ LexBash.o \ Modified: scintilla/scintilla_changes.patch 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -36,7 +36,7 @@ index 2f75247..a34f834 100644 //++Autogenerated -- run src/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ - LINK_LEXER(lmA68k); -- LINK_LEXER(lmAbaqus); + LINK_LEXER(lmAbaqus); LINK_LEXER(lmAda); - LINK_LEXER(lmAns1); - LINK_LEXER(lmAPDL); Modified: scintilla/src/Catalogue.cxx 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -81,6 +81,7 @@ int Scintilla_LinkLexers() { //++Autogenerated -- run src/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ + LINK_LEXER(lmAbaqus); LINK_LEXER(lmAda); LINK_LEXER(lmAsm); LINK_LEXER(lmBash); Modified: src/filetypes.c 6 files changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -504,6 +504,12 @@ static void init_builtin_filetypes(void) filetype_make_title(ft, TITLE_SOURCE_FILE); ft->group = GEANY_FILETYPE_GROUP_MARKUP; +#define ABAQUS + ft = filetypes[GEANY_FILETYPES_ABAQUS]; + ft->lang = 44; + ft->name = g_strdup("Abaqus"); + filetype_make_title(ft, TITLE_SOURCE_FILE); + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; } Modified: src/filetypes.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -91,6 +91,7 @@ GEANY_FILETYPES_COBOL, GEANY_FILETYPES_OBJECTIVEC, GEANY_FILETYPES_ASCIIDOC, + GEANY_FILETYPES_ABAQUS, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -1039,6 +1039,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co switch (lexer_id) { + init_styleset_case(ABAQUS); init_styleset_case(ADA); init_styleset_case(ASM); init_styleset_case(BASIC); @@ -1118,6 +1119,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) switch (lexer_id) { + styleset_case(ABAQUS); styleset_case(ADA); styleset_case(ASM); styleset_case(BASIC); @@ -1563,6 +1565,9 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_ADA_STRING || style == SCE_ADA_CHARACTEREOL || style == SCE_ADA_STRINGEOL); + + case SCLEX_ABAQUS: + return (style == SCE_ABAQUS_STRING); } return FALSE; } @@ -1700,6 +1705,10 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) return (style == SCE_ADA_COMMENTLINE || style == SCE_NSIS_COMMENTBOX); + case SCLEX_ABAQUS: + return (style == SCE_ABAQUS_COMMENT || + style == SCE_ABAQUS_COMMENTBLOCK); + case SCLEX_ASM: return (style == SCE_ASM_COMMENT || style == SCE_ASM_COMMENTBLOCK || Modified: src/highlightingmappings.h 30 files changed, 30 insertions(+), 0 deletions(-) =================================================================== @@ -69,6 +69,36 @@ #define HL_N_ENTRIES(array) ((array != NULL) ? G_N_ELEMENTS(array) : 0) +/* Abaqus */ +#define highlighting_lexer_ABAQUS SCLEX_ABAQUS +static const HLStyle highlighting_styles_ABAQUS[] = +{ + { SCE_ABAQUS_DEFAULT, "default", FALSE }, + { SCE_ABAQUS_COMMENT, "comment", FALSE }, + { SCE_ABAQUS_COMMENTBLOCK, "commentblock", FALSE }, + { SCE_ABAQUS_NUMBER, "number", FALSE }, + { SCE_ABAQUS_STRING, "string", FALSE }, + { SCE_ABAQUS_OPERATOR, "operator", FALSE }, + { SCE_ABAQUS_WORD, "word", FALSE }, + { SCE_ABAQUS_PROCESSOR, "processors", FALSE }, + { SCE_ABAQUS_COMMAND, "commands", FALSE }, + { SCE_ABAQUS_SLASHCOMMAND, "slashcommands", FALSE }, + { SCE_ABAQUS_STARCOMMAND, "starcommands", FALSE }, + { SCE_ABAQUS_ARGUMENT, "arguments", FALSE }, + { SCE_ABAQUS_FUNCTION, "functions", FALSE } +}; +static const HLKeyword highlighting_keywords_ABAQUS[] = +{ + { 0, "processors", FALSE }, + { 1, "commands", FALSE }, + { 2, "slashommands", FALSE }, + { 3, "starcommands", FALSE }, + { 4, "arguments", FALSE }, + { 5, "functions", FALSE } +}; +#define highlighting_properties_ABAQUS EMPTY_PROPERTIES + + /* Ada */ #define highlighting_lexer_ADA SCLEX_ADA static const HLStyle highlighting_styles_ADA[] = Modified: src/symbols.c 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -746,6 +746,15 @@ static void add_top_level_items(GeanyDocument *doc) NULL); break; } + case GEANY_FILETYPES_ABAQUS: + { + tag_list_add_groups(tag_store, + &(tv_iters.tag_class), _("Parts"), NULL, + &(tv_iters.tag_member), _("Assembly"), NULL, + &(tv_iters.tag_namespace), _("Steps"), NULL, + NULL); + break; + } case GEANY_FILETYPES_R: { tag_list_add_groups(tag_store, Modified: tagmanager/ctags/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -11,6 +11,7 @@ EXTRA_DIST = \ noinst_LIBRARIES = libctags.a parsers = \ + abaqus.c \ abc.c \ actionscript.c \ asciidoc.c \ Modified: tagmanager/ctags/abaqus.c 126 files changed, 126 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,126 @@ +/* + * This source code is released for free distribution under the terms of the + * GNU General Public License. + * + * This module contains functions for generating tags for source files + * for inp files (Abaqus). + */ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <ctype.h> +#include <string.h> + +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ +typedef enum { + K_PART, + K_ASSEMBLY, + K_STEP +} AbaqusKind; + +static kindOption AbaqusKinds[] = { + { TRUE, 'c', "class", "Parts" }, + { TRUE, 'm', "member", "Assembly" }, + { TRUE, 'n', "namespace", "Steps" } +}; + +/* +* FUNCTION DEFINITIONS +*/ + +static int getWord(const char *ref, const char **ptr) +{ + const char *p = *ptr; + + while ((*ref != '\0') && (*p != '\0') && (tolower(*ref) == tolower(*p))) ref++, p++; + + if (*ref) return FALSE; + + *ptr = p; + return TRUE; +} + + +static void createTag(AbaqusKind kind, const char *buf) +{ + vString *name; + + if (*buf == '\0') return; + + buf = strstr(buf, "="); + if (buf == NULL) return; + + buf += 1; + + if (*buf == '\0') return; + + name = vStringNew(); + + do + { + vStringPut(name, (int) *buf); + ++buf; + } while ((*buf != '\0') && (*buf != ',')); + vStringTerminate(name); + makeSimpleTag(name, AbaqusKinds, kind); + vStringDelete(name); +} + + +static void findAbaqusTags(void) +{ + const char *line; + + while ((line = (const char*)fileReadLine()) != NULL) + { + const char *cp = line; + + for (; *cp != '\0'; cp++) + { + if (*cp == '*') + { + cp++; + + /* Parts*/ + if (getWord("part", &cp)) + { + createTag(K_PART, cp); + continue; + } + /* Assembly */ + if (getWord("assembly", &cp)) + { + createTag(K_ASSEMBLY, cp); + continue; + } + /* Steps */ + if (getWord("step", &cp)) + { + createTag(K_STEP, cp); + continue; + } + } + } + } +} + + +extern parserDefinition* AbaqusParser (void) +{ + static const char *const extensions [] = { "inp", NULL }; + parserDefinition * def = parserNew ("Abaqus"); + def->kinds = AbaqusKinds; + def->kindCount = KIND_COUNT (AbaqusKinds); + def->extensions = extensions; + def->parser = findAbaqusTags; + return def; +} Modified: tagmanager/ctags/makefile.win32 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ all: $(COMPLIB) clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ +$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ actionscript.o nsis.o objc.o \ haskell.o haxe.o html.o python.o lregex.o asciidoc.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ Modified: tagmanager/ctags/parsers.h 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -58,7 +58,8 @@ RParser, \ CobolParser, \ ObjcParser, \ - AsciidocParser + AsciidocParser, \ + AbaqusParser /* langType of each parser 0 CParser @@ -105,6 +106,7 @@ 41 CobolParser 42 ObjcParser 43 AsciidocParser +44 AbaqusParser */ #endif /* _PARSERS_H */ Modified: wscript 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -61,6 +61,7 @@ out = '_build_' mio_sources = set(['tagmanager/mio/mio.c']) ctags_sources = set([ + 'tagmanager/ctags/abaqus.c', 'tagmanager/ctags/args.c', 'tagmanager/ctags/abc.c', 'tagmanager/ctags/actionscript.c', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2013