CVS rebase

[nedit-bw.git] / macro_hooks.patch

---

 doc/help.etx                 |   46 ++++++++++++++++++++++++++++++
 source/Makefile.dependencies |    6 +--
 source/file.c                |   18 +++++++++++
 source/highlightData.c       |    1 
 source/macro.c               |   63 ++++++++++++++++++++++++++++++++++++++++-
 source/macro.h               |    3 +
 source/menu.c                |   28 +++++++++++++++++-
 source/nedit.c               |   24 +++++----------
 source/nedit.h               |    1 
 source/selection.c           |   65 ++++++++++++++++++++++++++++++++++---------
 source/window.c              |   28 ++++++++++++++++++
 11 files changed, 247 insertions(+), 36 deletions(-)

diff --quilt old/doc/help.etx new/doc/help.etx
--- old/doc/help.etx
+++ new/doc/help.etx
@@ -3748,6 +3748,51 @@ Action Routines
   To be attached to a key-press event, inserts the character
   equivalent of the key pressed.
 
+
+Hooks
+-----
+
+  Hooks are macro routines which are called at specific points in NEdit's
+  execution. You can use hooks to tie in user-defined functionality at these
+  points.
+
+  No hooks are provided. To use a hook, simply define a macro function with
+  the name of the hook. The next time the hook will catch, the macro function
+  is called.
+
+  You don't have to provide any hook. If a certain hook does not exist, it is
+  simply skipped.
+
+**pre_open_hook(~filename~)**
+  Called before NEdit opens a file using a certain name. The parameter is
+  the filename NEdit intends to open.
+
+  Return a string to use instead of the original filename. Return 0 to tell
+  NEdit to use the original filename.
+
+**post_open_hook()**
+  Called when an existing file is opened.
+
+**pre_save_hook()**
+  Called before a file will be save saved.
+
+  Return a string to use this as the file name.
+
+**post_save_hook()**
+  Called after an file was saved.
+
+**cursor_moved_hook()**
+  Called when the was cursor moved.
+
+**modified_hook()**
+  Called when the text buffer changed.
+
+**focus_hook()**
+  Called when a document gets the input focus.
+
+**losing_focus_hook()**
+  Called before a document lost the input focus.
+
    ----------------------------------------------------------------------
 
 Customizing
@@ -6036,6 +6081,7 @@ Problems/Defects
 .. Menu:   Rangesets                        # rangeset
 .. Menu:   Highlighting Information         # hiliteInfo
 .. Menu:   Action Routines                  # actions
+.. Menu:   H_o_oks                          # hooks
 
 .. Menu: Customizing                        # customizing
 .. Menu:   Customizing NEdit                # customize
diff --quilt old/source/Makefile.dependencies new/source/Makefile.dependencies
--- old/source/Makefile.dependencies
+++ new/source/Makefile.dependencies
@@ -4,7 +4,7 @@ calltips.o: calltips.c text.h textBuf.h 
 file.o: file.c file.h nedit.h textBuf.h text.h window.h preferences.h \
   undo.h menu.h tags.h server.h ../util/misc.h ../util/DialogF.h \
   ../util/fileUtils.h ../util/getfiles.h ../util/printUtils.h \
-  ../util/utils.h
+  ../util/utils.h macro.h
 help.o: help.c help.h help_topic.h textBuf.h text.h textP.h textDisp.h \
   textSel.h nedit.h search.h window.h preferences.h help_data.h file.h \
   highlight.h ../util/misc.h ../util/DialogF.h ../util/system.h
@@ -41,7 +41,7 @@ preferences.o: preferences.c preferences
   help_topic.h regularExp.h smartIndent.h windowTitle.h server.h tags.h \
   ../util/prefFile.h ../util/misc.h ../util/DialogF.h \
   ../util/managedList.h ../util/fontsel.h ../util/fileUtils.h \
-  ../util/utils.h ../util/clearcase.h
+  ../util/utils.h ../util/clearcase.h macro.h
 rangeset.o: rangeset.c textBuf.h textDisp.h rangeset.h
 rbTree.o: rbTree.c rbTree.h
 regexConvert.o: regexConvert.c regexConvert.h
@@ -50,7 +50,7 @@ search.o: search.c search.h nedit.h text
   server.h window.h preferences.h file.h highlight.h ../util/DialogF.h \
   ../util/misc.h
 selection.o: selection.c selection.h nedit.h textBuf.h text.h file.h \
-  window.h menu.h server.h ../util/DialogF.h ../util/fileUtils.h
+  window.h menu.h server.h ../util/DialogF.h ../util/fileUtils.h macro.h
 server.o: server.c server.h window.h nedit.h textBuf.h file.h selection.h \
   macro.h menu.h preferences.h server_common.h ../util/fileUtils.h \
   ../util/utils.h
diff --quilt old/source/file.c new/source/file.c
--- old/source/file.c
+++ new/source/file.c
@@ -41,6 +41,7 @@ static const char CVSID[] = "$Id: file.c
 #include "tags.h"
 #include "server.h"
 #include "interpret.h"
+#include "macro.h"
 #include "../util/misc.h"
 #include "../util/DialogF.h"
 #include "../util/fileUtils.h"
@@ -272,6 +273,8 @@ WindowInfo *EditExistingFile(WindowInfo 
        AddRelTagsFile(GetPrefTagFile(), path, TAG);
     AddToPrevOpenMenu(fullname);
 
+    MacroApplyHook(window, "post_open_hook", 0, NULL, NULL);
+
     return window;
 }
 
@@ -932,6 +935,18 @@ static int doSave(WindowInfo *window)
     struct stat statbuf;
     FILE *fp;
     int fileLen, result;
+    DataValue hookResult = {NO_TAG,{0}};
+    Boolean success;
+
+    /* call the "pre_save_hook", if the macro returns a string, interpret this
+       as the new filename */
+    success = MacroApplyHook(window, "pre_save_hook", 0, NULL, &hookResult);
+    if (success && hookResult.tag == STRING_TAG) {
+        if (ParseFilename(hookResult.val.str.rep,
+                window->filename, window->path)) {
+            return FALSE;
+        }
+    }
 
     /* Get the full name of the file */
     strcpy(fullname, window->path);
@@ -1069,6 +1084,9 @@ static int doSave(WindowInfo *window)
         window->inode = 0;
     }
 
+    /* call "post_save_hook" */
+    MacroApplyHook(window, "post_save_hook", 0, NULL, NULL);
+
     return TRUE;
 }
 
diff --quilt old/source/highlightData.c new/source/highlightData.c
--- old/source/highlightData.c
+++ new/source/highlightData.c
@@ -554,6 +554,7 @@ static char *DefaultPatternSets[] = {
         Built-in Subrs:\"<(?:append_file|beep|call|calltip|clipboard_to_string|dialog|filename_dialog|focus_window|get_character|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|shell_command|split|string_compare|string_dialog|string_to_clipboard|substring|t_print|tolower|toupper|valid_number|write_file)(?=\\s*\\()\":::Subroutine::\n\
         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\
         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\
+        Macro Hooks:\"<(?:(?:pre|post)_(?:open|save)|cursor_moved|modified|(?:losing_)?focus)_hook(?=\\s*\\()\":::Subroutine1::\n\
         Keyword:\"<(?:break|continue|define|delete|else|for|if|in|return|while)>\":::Keyword::\n\
         Braces:\"[{}\\[\\]]\":::Keyword::\n\
         Global Variable:\"\\$[A-Za-z0-9_]+\":::Identifier1::\n\
diff --quilt old/source/macro.c new/source/macro.c
--- old/source/macro.c
+++ new/source/macro.c
@@ -1280,8 +1280,10 @@ void SafeGC(void)
     WindowInfo *win;
     
     for (win=WindowList; win!=NULL; win=win->next)
-       if (win->macroCmdData != NULL || InSmartIndentMacros(win))
-           return;
+        if (win->macroCmdData != NULL
+                || InSmartIndentMacros(win)
+                || win->inMacroHook)
+            return;
     GarbageCollectStrings();
 }
 
@@ -6018,3 +6020,60 @@ static int readStringArg(DataValue dv, c
     *errMsg = "%s called with unknown object";
     return False;
 }
+
+/*
+** call a macro function, if it exists, with the given arguments and store
+** the return value in resultDV.
+**
+** Currently, only non-preemtable macros are supported.
+*/
+Boolean MacroApplyHook(WindowInfo *document, const char *hook, int argc,
+        DataValue *argv, DataValue *resultDV)
+{
+    Symbol *hookSymbol;
+    Boolean succ = False;
+
+    hookSymbol = LookupSymbol(hook);
+    if (NULL != hookSymbol && MACRO_FUNCTION_SYM == hookSymbol->type) {
+        Program *hookProg = hookSymbol->value.val.prog;
+        RestartData *restartData;
+        DataValue dummyResultDV;
+        DataValue *resultDVPtr = &dummyResultDV;
+        int status;
+        char *errMsg;
+
+        /* ExecuteMacro() can't be called with a NULL resultDV, therefore the
+           dummyResultDV */
+        if (resultDV) {
+            resultDVPtr = resultDV;
+        }
+
+        /* prevent calling the GC */
+        document->inMacroHook++;
+
+        status = ExecuteMacro(document, hookProg, argc, argv,
+                resultDVPtr, &restartData, &errMsg);
+
+        while (MACRO_TIME_LIMIT == status) {
+            status = ContinueMacro(restartData, resultDVPtr, &errMsg);
+        }
+
+        document->inMacroHook--;
+
+        /* call the GC only if the caller of this function is not interested
+           in any result, else it may happen, that strings and arrays are swept
+           away by the GC. */
+        if (NULL == resultDV) {
+            SafeGC();
+        }
+
+        if (MACRO_PREEMPT == status || MACRO_ERROR == status) {
+            fprintf(stderr, "nedit: \"%s\" error: %s\n", hook, (MACRO_ERROR == status) ? errMsg : "No dialogs");
+        } else {
+            /*  Macro is done here without errors */
+            succ = True;
+        }
+    }
+
+    return succ;
+}
diff --quilt old/source/macro.h new/source/macro.h
--- old/source/macro.h
+++ new/source/macro.h
@@ -73,5 +73,8 @@ int CheckMacroString(Widget dialogParent
 char *GetReplayMacro(void);
 void ReadMacroInitFile(WindowInfo *window);
 void ReturnShellCommandOutput(WindowInfo *window, const char *outText, int status);
+struct DataValueTag;
+Boolean MacroApplyHook(WindowInfo *document, const char *hook, int argc,
+        struct DataValueTag *argv, struct DataValueTag *resultDV);
 
 #endif /* NEDIT_MACRO_H_INCLUDED */
diff --quilt old/source/menu.c new/source/menu.c
--- old/source/menu.c
+++ new/source/menu.c
@@ -2849,19 +2849,43 @@ static void openAP(Widget w, XEvent *eve
 {
     WindowInfo *window = WidgetToWindow(w);
     char filename[MAXPATHLEN], pathname[MAXPATHLEN];
+    DataValue fileNameArg;
+    DataValue resultDV = {NO_TAG, {0}};
+    Boolean hook_successful = False;
+    char *fileNameToOpen;
     
     if (*nArgs == 0) {
        fprintf(stderr, "nedit: open action requires file argument\n");
        return;
     }
-    if (0 != ParseFilename(args[0], filename, pathname)
+
+    /* call "pre_open_hook", use the returned string as the filename to open.
+       The macro is not executed in the new window. */
+    fileNameArg.tag = STRING_TAG;
+    AllocNStringNCpy(&fileNameArg.val.str, args[0], MAXPATHLEN);
+    hook_successful = MacroApplyHook(window, "pre_open_hook",
+            1, &fileNameArg, &resultDV);
+
+    if (hook_successful && resultDV.tag == STRING_TAG) {
+        fileNameToOpen = resultDV.val.str.rep;
+    } else {
+        fileNameToOpen = args[0];
+    }
+
+    if (0 != ParseFilename(fileNameToOpen, filename, pathname)
             || strlen(filename) + strlen(pathname) > MAXPATHLEN - 1) {
         fprintf(stderr, "nedit: invalid file name for open action: %s\n",
-                args[0]);
+                fileNameToOpen);
         return;
     }
+
+    /* we call the GC, because the "pre_open_hook" argument and possible
+       return value are strings */
+    SafeGC();
+
     EditExistingFile(window, filename, pathname, 0, NULL, False, 
             NULL, GetPrefOpenInTab(), False);
+
     CheckCloseDim();
 }
 
diff --quilt old/source/nedit.c new/source/nedit.c
--- old/source/nedit.c
+++ new/source/nedit.c
@@ -388,7 +388,7 @@ static const char cmdLineHelp[] =
 int main(int argc, char **argv)
 {
     int i, lineNum, nRead, fileSpecified = FALSE, editFlags = CREATE;
-    int gotoLine = False, macroFileRead = False, opts = True;
+    int gotoLine = False, opts = True;
     int iconic=False, tabbed = -1, group = 0, isTabbed;
     char *toDoCommand = NULL, *geometry = NULL, *langMode = NULL;
     char filename[MAXPATHLEN], pathname[MAXPATHLEN];
@@ -567,6 +567,10 @@ int main(int argc, char **argv)
         IsServer = True;
     }
 
+    EditNewFile(NULL, geometry, iconic, langMode, NULL);
+    ReadMacroInitFile(WindowList);
+    CheckCloseDim();
+
     /* Process any command line arguments (-tags, -do, -read, -create,
        +<line_number>, -line, -server, and files to edit) not already
        processed by RestoreNEditPrefs. */
@@ -682,10 +686,6 @@ int main(int argc, char **argv)
                            RaiseDocument(lastFile);
                        }
                        
-                       if (!macroFileRead) {
-                           ReadMacroInitFile(WindowList);
-                           macroFileRead = True;
-                       }
                        if (gotoLine)
                            SelectNumberedLine(window, lineNum);
                        if (toDoCommand != NULL) {
@@ -739,10 +739,6 @@ int main(int argc, char **argv)
                        RaiseDocument(lastFile);
                    }
 
-                   if (!macroFileRead) {
-                       ReadMacroInitFile(WindowList);
-                       macroFileRead = True;
-                   }
                    if (gotoLine)
                        SelectNumberedLine(window, lineNum);
                    if (toDoCommand != NULL) {
@@ -775,13 +771,9 @@ int main(int argc, char **argv)
     }
     CheckCloseDim();
 
-    /* If no file to edit was specified, open a window to edit "Untitled" */
-    if (!fileSpecified) {
-       EditNewFile(NULL, geometry, iconic, langMode, NULL);
-       ReadMacroInitFile(WindowList);
-       CheckCloseDim();
-       if (toDoCommand != NULL)
-           DoMacro(WindowList, toDoCommand, "-do macro");
+    /* If no file to edit was specified, do at least the -do macro */
+    if (!fileSpecified && toDoCommand != NULL) {
+        DoMacro(WindowList, toDoCommand, "-do macro");
     }
     
     /* Begin remembering last command invoked for "Repeat" menu item */
diff --quilt old/source/nedit.h new/source/nedit.h
--- old/source/nedit.h
+++ new/source/nedit.h
@@ -566,6 +566,7 @@ typedef struct _WindowInfo {
     UserBGMenuCache  userBGMenuCache;   /* shell & macro menu are shared over all
                                            "tabbed" documents, while each document
                                            has its own background menu. */
+    int         inMacroHook;            /* to protect GC in MacroApplyHook() */
 } WindowInfo;
 
 extern WindowInfo *WindowList;
diff --quilt old/source/selection.c new/source/selection.c
--- old/source/selection.c
+++ new/source/selection.c
@@ -38,6 +38,8 @@ static const char CVSID[] = "$Id: select
 #include "menu.h"
 #include "preferences.h"
 #include "server.h"
+#include "interpret.h"
+#include "macro.h"
 #include "../util/DialogF.h"
 #include "../util/fileUtils.h"
 
@@ -338,14 +340,32 @@ static void fileCB(Widget widget, Window
       _XmOSGetDirEntries(pathname, filename, XmFILE_ANY_TYPE, False, True,
              &nameList, &nFiles, &maxFiles);
       for (i=0; i<nFiles; i++) {
-         if (ParseFilename(nameList[i], filename, pathname) != 0) {
-             XBell(TheDisplay, 0);
-         }
-        else {
-             EditExistingFile(window, filename, pathname, 0, 
-                     NULL, False, NULL, GetPrefOpenInTab(), False);
-         }
+            DataValue fileNameArg;
+            DataValue resultDV = {NO_TAG, {0}};
+            Boolean hook_successful = False;
+            char *fileNameToOpen;
+
+            fileNameArg.tag = STRING_TAG;
+            AllocNStringNCpy(&fileNameArg.val.str, nameList[i],
+                    MAXPATHLEN);
+            hook_successful = MacroApplyHook(window, "pre_open_hook",
+                    1, &fileNameArg, &resultDV);
+
+            if (hook_successful && resultDV.tag == STRING_TAG) {
+                fileNameToOpen = resultDV.val.str.rep;
+            } else {
+                fileNameToOpen = nameList[i];
+            }
+
+            if (ParseFilename(fileNameToOpen, filename, pathname) != 0) {
+                XBell(TheDisplay, 0);
+            } else {
+                EditExistingFile(GetPrefOpenInTab() ? window : NULL, filename,
+                        pathname, 0, NULL, False, NULL, GetPrefOpenInTab(),
+                        False);
+            }
       }
+      SafeGC();
       for (i=0; i<nFiles; i++) {
           XtFree(nameList[i]);
        }
@@ -357,13 +377,32 @@ static void fileCB(Widget widget, Window
 
       glob(nameText, GLOB_NOCHECK, NULL, &globbuf);
       for (i=0; i<(int)globbuf.gl_pathc; i++) {
-         if (ParseFilename(globbuf.gl_pathv[i], filename, pathname) != 0)
-             XBell(TheDisplay, 0);
-         else
-             EditExistingFile(GetPrefOpenInTab()? window : NULL, 
-                     filename, pathname, 0, NULL, False, NULL, 
-                     GetPrefOpenInTab(), False);
+            DataValue fileNameArg;
+            DataValue resultDV = {NO_TAG, {0}};
+            Boolean hook_successful = False;
+            char *fileNameToOpen;
+
+            fileNameArg.tag = STRING_TAG;
+            AllocNStringNCpy(&fileNameArg.val.str, globbuf.gl_pathv[i],
+                    MAXPATHLEN);
+            hook_successful = MacroApplyHook(window, "pre_open_hook",
+                    1, &fileNameArg, &resultDV);
+
+            if (hook_successful && resultDV.tag == STRING_TAG) {
+                fileNameToOpen = resultDV.val.str.rep;
+            } else {
+                fileNameToOpen = globbuf.gl_pathv[i];
+            }
+
+            if (ParseFilename(fileNameToOpen, filename, pathname) != 0) {
+                XBell(TheDisplay, 0);
+            } else {
+                EditExistingFile(GetPrefOpenInTab() ? window : NULL, filename,
+                        pathname, 0, NULL, False, NULL, GetPrefOpenInTab(),
+                        False);
+            }
       }
+      SafeGC();
       globfree(&globbuf);
     }
 #endif
diff --quilt old/source/window.c new/source/window.c
--- old/source/window.c
+++ new/source/window.c
@@ -169,6 +169,7 @@ static void showStatsForm(WindowInfo *wi
 static void addToWindowList(WindowInfo *window);
 static void removeFromWindowList(WindowInfo *window);
 static void focusCB(Widget w, WindowInfo *window, XtPointer callData);
+static void losingFocusCB(Widget w, WindowInfo *window, XtPointer callData);
 static void modifiedCB(int pos, int nInserted, int nDeleted, int nRestyled,
         const char *deletedText, void *cbArg);
 static void movedCB(Widget w, WindowInfo *window, XtPointer callData);
@@ -325,6 +326,7 @@ WindowInfo *CreateWindow(const char *nam
     window->tab = NULL;
     window->device = 0;
     window->inode = 0;
+    window->inMacroHook = 0;
 
     /* If window geometry was specified, split it apart into a window position
        component and a window size component.  Create a new geometry string
@@ -1032,6 +1034,10 @@ void CloseWindow(WindowInfo *window)
         return;
     }
     
+    if (window->inMacroHook) {
+        fprintf(stderr, "nedit: warning closing window while in MacroHook\n");
+    }
+
     /* Free syntax highlighting patterns, if any. w/o redisplaying */
     FreeHighlightingData(window);
         
@@ -2324,6 +2330,8 @@ static Widget createTextArea(Widget pare
 
     /* add focus, drag, cursor tracking, and smart indent callbacks */
     XtAddCallback(text, textNfocusCallback, (XtCallbackProc)focusCB, window);
+    XtAddCallback(text, textNlosingFocusCallback,
+            (XtCallbackProc)losingFocusCB, window);
     XtAddCallback(text, textNcursorMovementCallback, (XtCallbackProc)movedCB,
             window);
     XtAddCallback(text, textNdragStartCallback, (XtCallbackProc)dragStartCB,
@@ -2376,6 +2384,10 @@ static void movedCB(Widget w, WindowInfo
         /*  Start blinking the caret again.  */
         ResetCursorBlink(textWidget, False);
     }
+
+    /* thats a hight frequency hook, should never force a preemptable
+       context */
+    MacroApplyHook(window, "cursor_moved_hook", 0, NULL, NULL);
 }
 
 static void modifiedCB(int pos, int nInserted, int nDeleted, int nRestyled,
@@ -2447,6 +2459,10 @@ static void modifiedCB(int pos, int nIns
     
     /* Check if external changes have been made to file and warn user */
     CheckForChangesToFile(window);
+
+    /* thats a hight frequency hook, should never force a preemptable
+       context */
+    MacroApplyHook(window, "modified_hook", 0, NULL, NULL);
 }
 
 static void focusCB(Widget w, WindowInfo *window, XtPointer callData) 
@@ -2462,6 +2478,17 @@ static void focusCB(Widget w, WindowInfo
     
     /* Check for changes to read-only status and/or file modifications */
     CheckForChangesToFile(window);
+
+    /* thats a hight frequency hook, should never force a preemptable
+       context */
+    MacroApplyHook(window, "focus_hook", 0, NULL, NULL);
+}
+
+static void losingFocusCB(Widget w, WindowInfo *window, XtPointer callData)
+{
+    /* thats a hight frequency hook, should never force a preemptable
+       context */
+    MacroApplyHook(window, "losing_focus_hook", 0, NULL, NULL);
 }
 
 static void dragStartCB(Widget w, WindowInfo *window, XtPointer callData) 
@@ -3469,6 +3496,7 @@ WindowInfo* CreateDocument(WindowInfo* s
     window->bgMenuRedoItem = NULL;
     window->device = 0;
     window->inode = 0;
+    window->inMacroHook = 0;
 
     if (window->fontList == NULL)
         XtVaGetValues(shellWindow->statsLine, XmNfontList,