| blob | 42d798d14d7947ead0697bcb4767906951b49253 |
1 ---
3 doc/help.etx | 10 ++
4 source/highlightData.c | 2
5 source/macro.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++++
6 3 files changed, 179 insertions(+), 1 deletion(-)
8 diff --quilt old/source/macro.c new/source/macro.c
9 --- old/source/macro.c
10 +++ new/source/macro.c
11 @@ -445,10 +445,15 @@ static int toPosMS(WindowInfo *window, D
12 static int toLineMS(WindowInfo *window, DataValue *argList, int nArgs,
13 DataValue *result, char **errMsg);
14 static int toColumnMS(WindowInfo *window, DataValue *argList, int nArgs,
15 DataValue *result, char **errMsg);
17 +static int timerAddMS(WindowInfo *window, DataValue *argList,
18 + int nArgs, DataValue *result, char **errMsg);
19 +static int timerRemoveMS(WindowInfo *window, DataValue *argList,
20 + int nArgs, DataValue *result, char **errMsg);
21 +
22 /* Built-in subroutines and variables for the macro language */
23 static const BuiltInSubrName MacroSubrs[] = {
24 { "length", lengthMS },
25 { "get_range", getRangeMS },
26 { "t_print", tPrintMS },
27 @@ -516,10 +521,12 @@ static const BuiltInSubrName MacroSubrs[
28 { "define", defineMS },
29 { "to_pos", toPosMS },
30 { "to_line", toLineMS },
31 { "to_column", toColumnMS },
32 { "set_window_title", setWindowTitleMS },
33 + { "timer_add", timerAddMS },
34 + { "timer_remove", timerRemoveMS },
35 { NULL, NULL } /* sentinel */
36 };
38 static const BuiltInSubrName SpecialVars[] = {
39 { "$cursor", cursorMV },
40 @@ -3900,10 +3907,171 @@ static int setWindowTitleMS(WindowInfo *
41 window->titleFormat = newFmt;
42 UpdateWindowTitle(window);
43 return True;
44 }
46 +typedef struct _TimerProcData {
47 + struct _TimerProcData *next;
48 + XtIntervalId id;
49 + WindowInfo *window;
50 + int global;
51 + char name[1];
52 +} TimerProcData;
53 +
54 +static TimerProcData *allTimerProcData;
55 +
56 +static void macroTimerProc(XtPointer clientData, XtIntervalId *id)
57 +{
58 + TimerProcData *data = clientData, **s;
59 + WindowInfo *win;
60 +
61 + s = &allTimerProcData;
62 + while (*s) {
63 + if ((*s)->id == data->id) {
64 + *s = data->next;
65 + break;
66 + }
67 + s = &(*s)->next;
68 + }
69 +
70 + /* check if window is still there, but don't trust the pointer */
71 + for (win = WindowList; win; win = win->next) {
72 + if (win == data->window) {
73 + break;
74 + }
75 + }
76 + if (win != data->window) {
77 + goto out;
78 + }
79 +
80 + if (*id != data->id) {
81 + goto out;
82 + }
83 +
84 + /* don't call macro if its not a global timer and current top-window is
85 + different from timer_add() window */
86 + if (!data->global && !IsTopDocument(data->window)) {
87 + goto out;
88 + }
89 +
90 + MacroApplyHook(data->window, data->name, 0, NULL, NULL);
91 +
92 +out:
93 + XtFree((char *)data);
94 +}
95 +
96 +/*
97 + * timer_ID = timer_add(macro_name, timeout[, "global"])
98 + */
99 +static int timerAddMS(WindowInfo *window, DataValue *argList, int nArgs,
100 + DataValue *result, char **errMsg)
101 +{
102 + int timeout;
103 + char stringStorage[2][TYPE_INT_STR_SIZE(int)];
104 + char *name = NULL;
105 + int is_global = 0;
106 + char *global;
107 + TimerProcData *data;
108 +
109 + if (nArgs < 2 || nArgs > 3) {
110 + return wrongNArgsErr(errMsg);
111 + }
112 + if (!readStringArg(argList[0], &name, stringStorage[0], errMsg)) {
113 + return False;
114 + }
115 + if (!readIntArg(argList[1], &timeout, errMsg)) {
116 + return False;
117 + }
118 + if (nArgs >= 3) {
119 + if(!readStringArg(argList[2], &global, stringStorage[1], errMsg)) {
120 + return False;
121 + }
122 + if (!strcmp(global, "global")) {
123 + is_global = 1;
124 + } else {
125 + *errMsg = "unknown argument for subroutine %s";
126 + return False;
127 + }
128 + }
129 +
130 + if (timeout < 100) {
131 + *errMsg = "timeout too small";
132 + return False;
133 + }
134 +
135 + /* terminating NIL is already in struct */
136 + data = (TimerProcData *)XtMalloc(sizeof(*data) +
137 + (strlen(name) * sizeof(char)));
138 + if (!data) {
139 + *errMsg = "internal error";
140 + return False;
141 + }
142 +
143 + data->window = window;
144 + data->global = is_global;
145 + strcpy(data->name, name);
146 +
147 + data->next = allTimerProcData;
148 + allTimerProcData = data;
149 +
150 + data->id = XtAppAddTimeOut(XtWidgetToApplicationContext(window->shell),
151 + timeout, macroTimerProc, data);
152 +
153 + result->tag = INT_TAG;
154 + if (data->id != (XtIntervalId)(int)data->id) {
155 + *errMsg = "warning: can't convert from XtIntervalId to int, timer not removable";
156 + result->val.n = 0;
157 + } else {
158 + result->val.n = data->id;
159 + }
160 +
161 + return True;
162 +}
163 +
164 +/*
165 + * timer_remove(timer_ID)
166 + */
167 +static int timerRemoveMS(WindowInfo *window, DataValue *argList, int nArgs,
168 + DataValue *result, char **errMsg)
169 +{
170 + int timerid;
171 + XtIntervalId id;
172 + TimerProcData *data, **s;
173 +
174 + if (nArgs != 1) {
175 + return wrongNArgsErr(errMsg);
176 + }
177 + if (!readIntArg(argList[0], &timerid, errMsg)) {
178 + return False;
179 + }
180 +
181 + if (0 == timerid) {
182 + /* we return 0 as timerid when we can't convert the id to int
183 + the timer can therefore not removed and the TimerProcData is freed
184 + when the timer is fired
185 + */
186 + return True;
187 + }
188 +
189 + id = timerid;
190 +
191 + XtRemoveTimeOut(id);
192 +
193 + s = &allTimerProcData;
194 + while (*s) {
195 + if ((*s)->id == id) {
196 + data = *s;
197 + *s = data->next;
198 + XtFree((char *)data);
199 + break;
200 + }
201 + s = &(*s)->next;
202 + }
203 +
204 + return True;
205 +}
206 +
207 /* T Balinski */
208 static int listDialogMS(WindowInfo *window, DataValue *argList, int nArgs,
209 DataValue *result, char **errMsg)
210 {
211 macroCmdInfo *cmdData;
212 diff --quilt old/source/highlightData.c new/source/highlightData.c
213 --- old/source/highlightData.c
214 +++ new/source/highlightData.c
215 @@ -549,11 +549,11 @@ static char *DefaultPatternSets[] = {
216 README:\"NEdit Macro syntax highlighting patterns, version 2.6, maintainer Thorsten Haude, nedit at thorstenhau.de\":::Flag::D\n\
217 Comment:\"#\":\"$\"::Comment::\n\
218 Built-in Misc Vars:\"(?<!\\Y)\\$(?:active_pane|args|calltip_ID|column|cursor|display_width|empty_array|file_name|file_path|language_mode|line|locked|max_font_width|min_font_width|modified|n_display_lines|n_panes|rangeset_list|read_only|selection_(?:start|end|left|right)|server_name|text_length|top_line|transient|VERSION|NEDIT_HOME)>\":::Identifier::\n\
219 Built-in Pref Vars:\"(?<!\\Y)\\$(?:auto_indent|em_tab_dist|file_format|font_name|font_name_bold|font_name_bold_italic|font_name_italic|highlight_syntax|incremental_backup|incremental_search_line|make_backup_copy|match_syntax_based|overtype_mode|show_line_numbers|show_matching|statistics_line|tab_dist|use_tabs|wrap_margin|wrap_text)>\":::Identifier2::\n\
220 Built-in Special Vars:\"(?<!\\Y)\\$(?:[1-9]|list_dialog_button|n_args|read_status|search_end|shell_cmd_status|string_dialog_button|sub_sep)>\":::String1::\n\
221 - Built-in Subrs:\"<(?:append_file|beep|call|calltip|clipboard_to_string|define|dialog|filename_dialog|dict_(?:insert|complete|save|append|is_element)|focus_window|get_character|get_matching|get_pattern_(by_name|at_pos)|get_range|get_selection|get_style_(by_name|at_pos)|getenv|highlight_calltip_line|kill_calltip|length|list_dialog|max|min|rangeset_(?:add|create|destroy|get_by_name|includes|info|invert|range|set_color|set_mode|set_name|subtract)|read_file|replace_in_string|replace_range|replace_selection|replace_substring|search|search_string|select|select_rectangle|set_cursor_pos|set_transient|set_window_title|shell_command|split|string_compare|string_dialog|string_to_clipboard|substring|t_print|to_(?:column|line|pos)|tolower|toupper|valid_number|write_file)(?=\\s*\\()\":::Subroutine::\n\
222 + Built-in Subrs:\"<(?:append_file|beep|call|calltip|clipboard_to_string|define|dialog|filename_dialog|dict_(?:insert|complete|save|append|is_element)|focus_window|get_character|get_matching|get_pattern_(by_name|at_pos)|get_range|get_selection|get_style_(by_name|at_pos)|getenv|highlight_calltip_line|kill_calltip|length|list_dialog|max|min|rangeset_(?:add|create|destroy|get_by_name|includes|info|invert|range|set_color|set_mode|set_name|subtract)|read_file|replace_in_string|replace_range|replace_selection|replace_substring|search|search_string|select|select_rectangle|set_cursor_pos|set_transient|set_window_title|shell_command|split|string_compare|string_dialog|string_to_clipboard|substring|t_print|timer_(?:add|remove)|to_(?:column|line|pos)|tolower|toupper|valid_number|write_file)(?=\\s*\\()\":::Subroutine::\n\
223 Menu Actions:\"<(?:new(?:_tab|_opposite)?|open|open-dialog|open_dialog|open-selected|open_selected|close|save|save-as|save_as|save-as-dialog|save_as_dialog|revert-to-saved|revert_to_saved|revert_to_saved_dialog|include-file|include_file|include-file-dialog|include_file_dialog|load-macro-file|load_macro_file|load-macro-file-dialog|load_macro_file_dialog|load-tags-file|load_tags_file|load-tags-file-dialog|load_tags_file_dialog|unload_tags_file|load_tips_file|load_tips_file_dialog|unload_tips_file|print|print-selection|print_selection|exit|undo|redo|delete|select-all|select_all|shift-left|shift_left|shift-left-by-tab|shift_left_by_tab|shift-right|shift_right|shift-right-by-tab|shift_right_by_tab|find|find-dialog|find_dialog|find-again|find_again|find-selection|find_selection|find_incremental|start_incremental_find|replace|replace-dialog|replace_dialog|replace-all|replace_all|replace-in-selection|replace_in_selection|replace-again|replace_again|replace_find|replace_find_same|replace_find_again|goto-line-number|goto_line_number|goto-line-number-dialog|goto_line_number_dialog|goto-selected|goto_selected|mark|mark-dialog|mark_dialog|goto-mark|goto_mark|goto-mark-dialog|goto_mark_dialog|match|select_to_matching|goto_matching|find-definition|find_definition|show_tip|split-pane|split_pane|close-pane|close_pane|detach_document(?:_dialog)?|move_document_dialog|(?:next|previous|last)_document|uppercase|lowercase|fill-paragraph|fill_paragraph|control-code-dialog|control_code_dialog|filter-selection-dialog|filter_selection_dialog|filter-selection|filter_selection|execute-command|execute_command|execute-command-dialog|execute_command_dialog|execute-command-line|execute_command_line|shell-menu-command|shell_menu_command|macro-menu-command|macro_menu_command|bg_menu_command|post_window_bg_menu|post_tab_context_menu|beginning-of-selection|beginning_of_selection|end-of-selection|end_of_selection|repeat_macro|repeat_dialog|raise_window|focus_pane|set_statistics_line|set_incremental_search_line|set_show_line_numbers|set_auto_indent|set_wrap_text|set_wrap_margin|set_highlight_syntax|set_make_backup_copy|set_incremental_backup|set_show_matching|set_match_syntax_based|set_overtype_mode|set_locked|set_tab_dist|set_em_tab_dist|set_use_tabs|set_fonts|set_language_mode)(?=\\s*\\()\":::Subroutine::\n\
224 Text Actions:\"<(?:self-insert|self_insert|grab-focus|grab_focus|extend-adjust|extend_adjust|extend-start|extend_start|extend-end|extend_end|secondary-adjust|secondary_adjust|secondary-or-drag-adjust|secondary_or_drag_adjust|secondary-start|secondary_start|secondary-or-drag-start|secondary_or_drag_start|process-bdrag|process_bdrag|move-destination|move_destination|move-to|move_to|move-to-or-end-drag|move_to_or_end_drag|end_drag|copy-to|copy_to|copy-to-or-end-drag|copy_to_or_end_drag|exchange|process-cancel|process_cancel|paste-clipboard|paste_clipboard|copy-clipboard|copy_clipboard|cut-clipboard|cut_clipboard|copy-primary|copy_primary|cut-primary|cut_primary|newline|newline-and-indent|newline_and_indent|newline-no-indent|newline_no_indent|delete-selection|delete_selection|delete-previous-character|delete_previous_character|delete-next-character|delete_next_character|delete-previous-word|delete_previous_word|delete-next-word|delete_next_word|delete-to-start-of-line|delete_to_start_of_line|delete-to-end-of-line|delete_to_end_of_line|forward-character|forward_character|backward-character|backward_character|key-select|key_select|process-up|process_up|process-down|process_down|process-shift-up|process_shift_up|process-shift-down|process_shift_down|process-home|process_home|forward-word|forward_word|backward-word|backward_word|forward-paragraph|forward_paragraph|backward-paragraph|backward_paragraph|beginning-of-line|beginning_of_line|end-of-line|end_of_line|beginning-of-file|beginning_of_file|end-of-file|end_of_file|next-page|next_page|previous-page|previous_page|page-left|page_left|page-right|page_right|toggle-overstrike|toggle_overstrike|scroll-up|scroll_up|scroll-down|scroll_down|scroll_left|scroll_right|scroll-to-line|scroll_to_line|select-all|select_all|deselect-all|deselect_all|focusIn|focusOut|process-return|process_return|process-tab|process_tab|insert-string|insert_string|mouse_pan)(?=\\s*\\()\":::Subroutine::\n\
225 Macro Hooks:\"<(?:(?:pre|post)_(?open|save)|cursor_moved|modified|(?:losing_)?focus)_hook(?=\\s*\\()\":::Subroutine1::\n\
226 Keyword:\"<(?:break|continue|define|delete|else|for|if|in|return|typeof|while)>\":::Keyword::\n\
227 Braces:\"[{}\\[\\]]\":::Keyword::\n\
228 diff --quilt old/doc/help.etx new/doc/help.etx
229 --- old/doc/help.etx
230 +++ new/doc/help.etx
231 @@ -2886,10 +2886,20 @@ Macro Subroutines
232 is beyond the end position, the empty string is returned.
234 **t_print( string1, string2, ... )**
235 Writes strings to the terminal (stdout) from which NEdit was started.
237 +**timer_add( func_name, timeout [, "global"] )**
238 + Install a new timer that call the macro routine ~func_name~ after ~timeout~
239 + milli seconds. The function is only called if the top window is the same as
240 + the window from which ~timer_add()~ was called, this can be overriden with the
241 + optional ~"global"~ parameter. The macro returns a timer ID which can be used
242 + to remove a timer before expiration with ~timer_remove()~.
243 +
244 +**timer_remove( timer_ID )**
245 + Removes the timer with ID ~timer_ID~.
246 +
247 **to_column( position )**
248 Convert given position to column number in current window.
250 **to_line( position )**
251 Convert given position to line number in current window.