| blob | 042f9a930de55d75ec6319ebeb77869834365156 |
1 From: Tony Balinski <ajbj@free.fr>
2 Subject: Allow a macro to set the document's window title or title format
4 This is done by allowing the document window to carry a custom version
5 of the title format string. The new macro function,
6 set_window_title_format(), is called as follows:
8 set_window_title_format(string)
9 set_window_title_format(string, "text")
10 set_window_title_format(string, "format")
12 The string will be interpreted as a title format if the "format" keyword is
13 supplied, or as a fixed title string otherwise. The format directives are
14 those used in Preferences> Default Settings> Customize Window Title...
15 dialog. If an empty string is used, the default format (from the
16 Preferences) is applied.
18 ---
20 doc/help.etx | 7 ++++
21 source/built-ins.h | 1
22 source/highlightData.c | 2 -
23 source/macro.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++
24 source/nedit.h | 1
25 source/window.c | 25 ++++++++++++----
26 6 files changed, 103 insertions(+), 7 deletions(-)
28 diff --quilt old/doc/help.etx new/doc/help.etx
29 --- old/doc/help.etx
30 +++ new/doc/help.etx
31 @@ -4047,9 +4047,16 @@ Preferences
32 below).
34 **Customize Window Title**
35 +.. ? help~
36 + Opens a dialog where the information to be displayed in the window's title
37 + field can be defined and tested. The Customize_Window_Title_Dialog_ contains
38 + a Help button, providing further information about the options available.
39 +.. ~ help
40 +.. ! help~
41 Opens a dialog where the information to be displayed in the window's title
42 field can be defined and tested. The dialog contains a Help button, providing
43 further information about the options available.
44 +.. ~ help
46 **Searching**
47 Options for controlling the behavior of Find and Replace commands:
48 diff --quilt old/source/macro.c new/source/macro.c
49 --- old/source/macro.c
50 +++ new/source/macro.c
51 @@ -3442,6 +3442,80 @@ static int defineMS(WindowInfo *window,
52 return True;
53 }
55 +/*
56 + * set_window_title(format[, ("text"|"format")])
57 + */
58 +static int setWindowTitleMS(WindowInfo *window, DataValue *argList,
59 + int nArgs, DataValue *result, char **errMsg)
60 +{
61 + char stringStorage[2][TYPE_INT_STR_SIZE(int)];
62 + char *fmt = NULL;
63 + char *type = NULL;
64 + char *newFmt;
65 + char *from, *to;
66 + int isText = 1;
67 + int perCents;
68 +
69 + if (nArgs > 2) {
70 + *errMsg = "subroutine %s called with too many arguments";
71 + return False;
72 + }
73 + if (nArgs > 0 &&
74 + !readStringArg(argList[0], &fmt, stringStorage[0], errMsg)) {
75 + return False;
76 + }
77 + if (nArgs > 1 &&
78 + !readStringArg(argList[1], &type, stringStorage[1], errMsg)) {
79 + return False;
80 + }
81 + if (type) {
82 + if (strcmp(type, "text") == 0)
83 + isText = 1;
84 + else if (strcmp(type, "format") == 0)
85 + isText = 0;
86 + else {
87 + *errMsg = "subroutine %s type value must be \"text\" or \"format\"";
88 + return False;
89 + }
90 + }
91 +
92 + if (!fmt || !*fmt) {
93 + /* empty string: return tu default behaviour */
94 + XtFree(window->titleFormat);
95 + window->titleFormat = NULL;
96 + UpdateWindowTitle(window);
97 + return True;
98 + }
99 +
100 + perCents = 0;
101 + if (!isText) {
102 + /* measure extra space for '%' */
103 + for (from = fmt; *from; from++)
104 + if ('%' == *from)
105 + ++perCents;
106 + }
107 +
108 + newFmt = XtMalloc(strlen(fmt) + perCents + 1);
109 + if (!newFmt) {
110 + *errMsg = "subroutine %s failed to allocate format value";
111 + return False;
112 + }
113 + if (isText) {
114 + /* double up any % signs */
115 + for (from = fmt, to = newFmt; *from; *to++ = *from++)
116 + if ('%' == *from)
117 + *to++ = '%';
118 + *to = '\0';
119 + }
120 + else
121 + strcpy(newFmt, fmt);
122 +
123 + XtFree(window->titleFormat);
124 + window->titleFormat = newFmt;
125 + UpdateWindowTitle(window);
126 + return True;
127 +}
128 +
129 /* T Balinski */
130 static int listDialogMS(WindowInfo *window, DataValue *argList, int nArgs,
131 DataValue *result, char **errMsg)
132 diff --quilt old/source/nedit.h new/source/nedit.h
133 --- old/source/nedit.h
134 +++ new/source/nedit.h
135 @@ -459,6 +459,7 @@ typedef struct _WindowInfo {
136 #endif
137 char filename[MAXPATHLEN]; /* name component of file being edited*/
138 char path[MAXPATHLEN]; /* path component of file being edited*/
139 + char *titleFormat; /* custom title format string */
140 unsigned fileMode; /* permissions of file being edited */
141 uid_t fileUid; /* last recorded user id of the file */
142 gid_t fileGid; /* last recorded group id of the file */
143 diff --quilt old/source/window.c new/source/window.c
144 --- old/source/window.c
145 +++ new/source/window.c
146 @@ -253,6 +253,7 @@ WindowInfo *CreateWindow(const char *nam
147 window->writableWindows = NULL;
148 window->nWritableWindows = 0;
149 window->fileChanged = FALSE;
150 + window->titleFormat = NULL;
151 window->fileMode = 0;
152 window->fileUid = 0;
153 window->fileGid = 0;
154 @@ -977,7 +978,13 @@ void CloseWindow(WindowInfo *window)
155 /* Kill shell sub-process and free related memory */
156 AbortShellCommand(window);
157 #endif /*VMS*/
158 -
159 +
160 + /* drop any custom title */
161 + if (window->titleFormat) {
162 + XtFree(window->titleFormat);
163 + window->titleFormat = NULL;
164 + }
165 +
166 /* Unload the default tips files for this language mode if necessary */
167 UnloadLanguageModeTipsFile(window);
169 @@ -2097,11 +2104,13 @@ void SetWindowModified(WindowInfo *windo
170 */
171 void UpdateWindowTitle(const WindowInfo *window)
172 {
173 - char *iconTitle, *title;
174 + char *iconTitle, *title, *format, *filename;
176 if (!IsTopDocument(window))
177 return;
179 + format = window->titleFormat ? window->titleFormat : GetPrefTitleFormat();
180 + filename = window->filename;
181 title = FormatWindowTitle(window->filename,
182 window->path,
183 #ifdef VMS
184 @@ -2115,11 +2124,14 @@ void UpdateWindowTitle(const WindowInfo
185 window->lockReasons,
186 window->fileChanged,
187 window->transient,
188 - GetPrefTitleFormat());
189 -
190 - iconTitle = XtMalloc(strlen(window->filename) + 2); /* strlen("*")+1 */
191 + format);
192 +
193 + if (strcmp(title, format) == 0)
194 + filename = title;
195 +
196 + iconTitle = XtMalloc(strlen(filename) + 2); /* strlen("*")+1 */
198 - strcpy(iconTitle, window->filename);
199 + strcpy(iconTitle, filename);
200 if (window->fileChanged && !window->transient)
201 strcat(iconTitle, "*");
202 XtVaSetValues(window->shell, XmNtitle, title, XmNiconName, iconTitle, NULL);
203 @@ -3430,6 +3442,7 @@ WindowInfo* CreateDocument(WindowInfo* s
204 window->nWritableWindows = 0;
205 window->fileChanged = FALSE;
206 window->fileMissing = True;
207 + window->titleFormat = NULL;
208 window->fileMode = 0;
209 window->fileUid = 0;
210 window->fileGid = 0;
211 diff --quilt old/source/highlightData.c new/source/highlightData.c
212 --- old/source/highlightData.c
213 +++ new/source/highlightData.c
214 @@ -551,7 +551,7 @@ static char *DefaultPatternSets[] = {
215 Built-in Misc Vars:\"(?<!\\Y)\\$(?:active_pane|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\
216 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\
217 Built-in Special Vars:\"(?<!\\Y)\\$(?:args|[1-9]|list_dialog_button|n_args|read_status|search_end|shell_cmd_status|string_dialog_button|sub_sep)>\":::String1::\n\
218 - Built-in Subrs:\"<(?:args|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|n_args|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|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\
219 + Built-in Subrs:\"<(?:args|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|n_args|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\
220 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\
221 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\
222 Macro Hooks:\"<(?:(?:pre|post)_(?:open|save)|cursor_moved|modified|(?:losing_)?focus)_hook(?=\\s*\\()\":::Subroutine1::\n\
223 diff --quilt old/source/built-ins.h new/source/built-ins.h
224 --- old/source/built-ins.h
225 +++ new/source/built-ins.h
226 @@ -72,6 +72,7 @@ MS(define, define)
227 MS(to_pos, toPos)
228 MS(to_line, toLine)
229 MS(to_column, toColumn)
230 +MS(set_window_title, setWindowTitle)
232 MV(cursor, cursor)
233 MV(line, line)