From: Jason Wilson <edu/mit/csail/zurich/jawilson>
Date: Mon, 9 Aug 1993 19:22:40 +0000 (+0000)
Subject: Changed the button event handler so that it would search for a command
X-Git-Tag: 20090517-FFI~8110
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=ccfe3e0b70a9beb97910c7ab1c892e96a9e3f80d;p=mit-scheme.git

Changed the button event handler so that it would search for a command
table in the text before calling the ordinary routine.
---

diff --git a/v7/src/edwin/edtfrm.scm b/v7/src/edwin/edtfrm.scm
index 28c5a6baf..30257a78a 100644
--- a/v7/src/edwin/edtfrm.scm
+++ b/v7/src/edwin/edtfrm.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: edtfrm.scm,v 1.85 1993/01/09 01:16:06 cph Exp $
+;;;	$Id: edtfrm.scm,v 1.86 1993/08/09 19:22:40 jawilson Exp $
 ;;;
 ;;;	Copyright (c) 1985, 1989-93 Massachusetts Institute of Technology
 ;;;
@@ -192,14 +192,22 @@
 	  ;; buffer, not in the modeline or other decoration.
 	  (cond ((and (< -1 relative-x (buffer-frame-x-size frame))
 		      (< -1 relative-y (buffer-frame-y-size frame)))
-		 (let ((command
-			(comtab-entry (buffer-comtabs (window-buffer frame))
-				      button)))
-		   (cond (command
-			  (with-current-button-event
-			   (make-button-event frame relative-x relative-y)
-			   (lambda () (execute-command command))))
-			 ((button/down? button)
-			  (editor-beep)))))
+		 (let* ((point (window-coordinates->mark frame relative-x relative-y))
+			(txtprp-comtab (and point
+					    (get-property-at
+					     'command-table
+					     (mark-index point)
+					     (mark-group point)))))
+		   (let ((command
+			  (or (and txtprp-comtab (comtab-entry (cadr txtprp-comtab)
+							       button))
+			      (comtab-entry (buffer-comtabs (window-buffer frame))
+					    button))))
+		     (cond (command
+			    (with-current-button-event
+				(make-button-event frame relative-x relative-y)
+			      (lambda () (execute-command command))))
+			   ((button/down? button)
+			    (editor-beep))))))
 		((button/down? button)
-		 (editor-beep)))))))
\ No newline at end of file
+		 (editor-beep)))))))