--- a/lisp/w3/w3-xemac.el	Mon Aug 13 09:15:13 2007 +0200
+++ b/lisp/w3/w3-xemac.el	Mon Aug 13 09:15:49 2007 +0200
@@ -1,7 +1,7 @@
 ;;; w3-xemac.el --- XEmacs specific functions for emacs-w3
 ;; Author: wmperry
-;; Created: 1997/02/10 16:08:10
-;; Version: 1.14
+;; Created: 1997/02/17 23:09:24
+;; Version: 1.15
 ;; Keywords: faces, help, mouse, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -31,6 +31,7 @@
 (require 'w3-widget)
 (require 'w3-menu)
 (require 'w3-forms)
+(require 'w3-script)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Enhancements For XEmacs
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -39,26 +40,14 @@
   (interactive "e")
   (let* ((pt (event-point e))
 	 (good (eq (event-window e) (selected-window)))
-	 (widget (and good pt (number-or-marker-p pt) (widget-at pt)))
-	 (link (and widget (or (widget-get widget 'href)
-			       (widget-get widget 'name))))
-	 (form (and widget (widget-get widget :w3-form-data)))
-	 (imag nil)
-	 )
-    (cond
-     (link (message "%s" (w3-widget-echo widget)))
-     (form
-      (cond
-       ((eq 'submit (w3-form-element-type form))
-	(message "Submit form to %s"
-		 (cdr-safe (assq 'action (w3-form-element-action form)))))
-       ((eq 'reset (w3-form-element-type form))
-	(message "Reset form contents"))
-       (t
-	(message "Form entry (name=%s, type=%s)" (w3-form-element-name form)
-		 (w3-form-element-type form)))))
-     (imag (message "Inlined image (%s)" (car imag)))
-     (t (message "")))))
+	 (mouse-events))
+    (if (not (and good pt (number-or-marker-p pt)))
+	nil
+      (if (and inhibit-help-echo w3-track-mouse)
+	  (widget-echo-help pt))
+      (setq mouse-events (w3-script-find-event-handlers pt 'mouse))
+      (if (assq 'onmouseover mouse-events)
+	  (w3-script-evaluate-form (cdr (assq 'onmouseover mouse-events)))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Functions to build menus of urls
@@ -151,12 +140,10 @@
 (defun w3-mode-version-specifics ()
   "XEmacs specific stuff for w3-mode"
   (if (featurep 'mouse)
-      (cond
-       ((not w3-track-mouse)
-	(setq inhibit-help-echo nil))
-       (inhibit-help-echo
-	(setq mode-motion-hook 'w3-mouse-handler))
-       (t nil)))
+      (progn
+	(if (not w3-track-mouse)
+	    (setq inhibit-help-echo nil))
+	(setq mode-motion-hook 'w3-mouse-handler)))
   (if (eq (device-type) 'tty)
       nil
     (w3-add-toolbar-to-buffer))